diff --git a/app/src/main/res/drawable/admin_header_corner_radius.xml b/app/src/main/res/drawable/admin_header_corner_radius.xml new file mode 100644 index 0000000..6a70e98 --- /dev/null +++ b/app/src/main/res/drawable/admin_header_corner_radius.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/logo_search.xml b/app/src/main/res/drawable/logo_search.xml new file mode 100644 index 0000000..c1b7b60 --- /dev/null +++ b/app/src/main/res/drawable/logo_search.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index c3d0247..587f386 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -5,29 +5,60 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/bg_color" tools:context=".admin"> - - + android:orientation="vertical" + app:layout_constraintGuide_begin="16dp"/> + + + + + + + + + + android:layout_marginTop="20dp" android:autofillHints="username" android:background="@drawable/input_corner_radius" + android:textSize="16sp" android:hint="@string/username_hint" android:inputType="text" /> @@ -61,6 +62,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment"> android:layout_marginTop="20dp" android:autofillHints="password" android:background="@drawable/input_corner_radius" + android:textSize="16sp" android:hint="@string/password_hint" android:inputType="textPassword" /> @@ -73,6 +75,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment"> android:layout_marginEnd="10sp" android:backgroundTint="@color/bg_color" android:enabled="false" + android:textAllCaps="false" android:fontFamily="@font/montserrat_medium" android:text="@string/login_btn" android:textColor="@color/secondary_text_color" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 116e019..d35c830 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -17,4 +17,5 @@ Enter the password Visit history Incorrect login or password + Enter the employee\'s username \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3d3a7a..a2ec4ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,7 @@ Введите пароль История посещений Неправильное имя пользователя или пароль + Введите логин сотрудника