DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge2

Browse Source
This commit is contained in:
Universall 2025-02-20 11:03:51 +03:00
commit 78518576b2
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/fragment_auth.xml
View File

@ -93,16 +93,19 @@
app:hintTextColor="?attr/colorOnBackground" app:hintTextColor="?attr/colorOnBackground"
app:helperTextTextColor="?attr/colorOnBackground" app:helperTextTextColor="?attr/colorOnBackground"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:hint="@string/password"> android:layout_marginLeft="70dp"
android:layout_marginRight="70dp"
>
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/password" android:id="@+id/password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="70dp"
android:layout_marginRight="70dp"
android:padding="14dp" android:padding="14dp"
android:maxLines="1" android:maxLines="1"
android:hint="@string/password"
android:textColorHint="?attr/colorSecondary" android:textColorHint="?attr/colorSecondary"

2
app/src/main/res/layout/fragment_profile.xml
View File

@ -180,7 +180,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="gone" android:visibility="gone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/сhange_rights" android:text="@string/change_rights"
android:maxHeight="200dp" android:maxHeight="200dp"
android:padding="12dp" android:padding="12dp"

21
app/src/main/res/values-ru/strings-ru.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">AS</string> <string name="app_name">AS</string>
<string name="login">Введите логин</string> <string name="login">Введите логин</string>
<string name="password">Введите пароль</string> <string name="password">Введите пароль</string>
<string name="hello">Здравствуйте!</string> <string name="hello">Здравствуйте!</string>
@ -15,15 +15,14 @@
<string name="error_401">Логина не существует или неверный</string> <string name="error_401">Логина не существует или неверный</string>
<string name="ok">ОК</string> <string name="ok">ОК</string>
<string name="error">Ошибка</string> <string name="error">Ошибка</string>
<string name="change_rights">Изменить права входа с помощью смартфона</string> <string name="administrator_search">Введите логин пользователя</string>
<string name="noInternet">Интернет соединение потеряно</string> <string name="administrator_searc_button_search"> Поиск </string>
<string name="administrator_search">Введите логин пользователя</string> <string name="title_profile">Профиль</string>
<string name="administrator_searc_button_search">🔍 Поиск 🔍</string> <string name="change_rights">Изменить права входа с помощью смартфона</string>
<string name="title_profile">Профиль</string> ><string name="admin">Панель администратора</string><string name="profile">Profile</string>
<string name="admin">Панель администратора</string> <string name="authFragment">Log in to your account</string>
<string name="authFragment">Log in to your account</string> <string name="qrScanFragment">QR code scanning</string>
<string name="qrScanFragment">QR code scanning</string> <string name="qrResultFragment">Scan result</string>
<string name="qrResultFragment">Scan result</string> <string name="AdminFragment">Checking the session employee</string>
<string name="AdminFragment">Checking the session employee</string>
</resources> </resources>