diff --git a/app/src/main/res/drawable/search_corner_radius.xml b/app/src/main/res/drawable/search_corner_radius.xml new file mode 100644 index 0000000..c90dc07 --- /dev/null +++ b/app/src/main/res/drawable/search_corner_radius.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index fc54d03..4eef7d5 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -53,9 +53,10 @@ android:layout_width="60dp" android:layout_height="60dp" android:layout_marginStart="20dp" + app:cornerRadius="16dp" android:contentDescription="@string/scan_btn" android:src="@drawable/logo_search" - android:background="@android:color/transparent" /> + android:background="@drawable/search_corner_radius" /> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index fbadf80..3c91ec8 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -24,7 +24,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment"> android:id="@+id/imageView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="104dp" + android:layout_marginBottom="80dp" android:layout_gravity="center" android:layout_marginTop="80dp" android:src="@drawable/logo_login" @@ -45,7 +45,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment"> app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/guideline_left" app:layout_constraintRight_toRightOf="@id/guideline_right" - app:layout_constraintVertical_bias="0.4"> + app:layout_constraintVertical_bias="0.3"> + android:layout_height="60dp" + android:layout_marginTop="4dp" + android:backgroundTint="@color/primary_text_color" + android:textAllCaps="false" + android:textSize="20sp" + app:cornerRadius="16dp" + android:text="@string/admin_btn" /> diff --git a/app/src/main/res/layout/item_employee.xml b/app/src/main/res/layout/item_employee.xml index 0071a2a..2dbfbcf 100644 --- a/app/src/main/res/layout/item_employee.xml +++ b/app/src/main/res/layout/item_employee.xml @@ -15,6 +15,7 @@ android:layout_gravity="start" android:background="@android:color/transparent" android:importantForAccessibility="no" + android:clipToOutline="true" app:srcCompat="@drawable/avatar_alt" tools:ignore="ImageContrastCheck" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 84b8779..83ee51c 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -23,7 +23,8 @@ Welcome to S Company Pass View visits and an electronic pass in one application - Вы не авторизованы - Нет доступа + You are not logged in + No access 404\nEmployee not found + Admin \ 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 10a14a4..bd4560f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,12 +22,13 @@ Введите логин сотрудника Заблокировать Разблокировать - Добро пожаловать в + Вы не авторизованы Нет доступа 404\nСотрудник не найден Добро пожаловать в S Company Pass Просмотр посещений и электронный пропуск в одном приложении + Админ \ No newline at end of file