Фиксы
This commit is contained in:
parent
f4d5e7a9de
commit
922bf9d021
5
app/src/main/res/drawable/search_corner_radius.xml
Normal file
5
app/src/main/res/drawable/search_corner_radius.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<corners android:radius="16dp"/>
|
||||||
|
<solid android:color="@android:color/transparent"/>
|
||||||
|
</shape>
|
@ -53,9 +53,10 @@
|
|||||||
android:layout_width="60dp"
|
android:layout_width="60dp"
|
||||||
android:layout_height="60dp"
|
android:layout_height="60dp"
|
||||||
android:layout_marginStart="20dp"
|
android:layout_marginStart="20dp"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
android:contentDescription="@string/scan_btn"
|
android:contentDescription="@string/scan_btn"
|
||||||
android:src="@drawable/logo_search"
|
android:src="@drawable/logo_search"
|
||||||
android:background="@android:color/transparent" />
|
android:background="@drawable/search_corner_radius" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment">
|
|||||||
android:id="@+id/imageView"
|
android:id="@+id/imageView"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="104dp"
|
android:layout_marginBottom="80dp"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginTop="80dp"
|
android:layout_marginTop="80dp"
|
||||||
android:src="@drawable/logo_login"
|
android:src="@drawable/logo_login"
|
||||||
@ -45,7 +45,7 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment">
|
|||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintLeft_toLeftOf="@id/guideline_left"
|
app:layout_constraintLeft_toLeftOf="@id/guideline_left"
|
||||||
app:layout_constraintRight_toRightOf="@id/guideline_right"
|
app:layout_constraintRight_toRightOf="@id/guideline_right"
|
||||||
app:layout_constraintVertical_bias="0.4">
|
app:layout_constraintVertical_bias="0.3">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/login_title"
|
android:id="@+id/login_title"
|
||||||
|
@ -188,8 +188,13 @@
|
|||||||
<Button
|
<Button
|
||||||
android:id="@+id/admin"
|
android:id="@+id/admin"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="60dp"
|
||||||
android:text="Admin" />
|
android:layout_marginTop="4dp"
|
||||||
|
android:backgroundTint="@color/primary_text_color"
|
||||||
|
android:textAllCaps="false"
|
||||||
|
android:textSize="20sp"
|
||||||
|
app:cornerRadius="16dp"
|
||||||
|
android:text="@string/admin_btn" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
android:layout_gravity="start"
|
android:layout_gravity="start"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
|
android:clipToOutline="true"
|
||||||
app:srcCompat="@drawable/avatar_alt"
|
app:srcCompat="@drawable/avatar_alt"
|
||||||
tools:ignore="ImageContrastCheck" />
|
tools:ignore="ImageContrastCheck" />
|
||||||
|
|
||||||
|
@ -23,7 +23,8 @@
|
|||||||
<string name="starter_tiser">Welcome to</string>
|
<string name="starter_tiser">Welcome to</string>
|
||||||
<string name="starter_tiser_accent">S Company Pass</string>
|
<string name="starter_tiser_accent">S Company Pass</string>
|
||||||
<string name="description">View visits and an electronic pass in one application</string>
|
<string name="description">View visits and an electronic pass in one application</string>
|
||||||
<string name="admin_unauthorized">Вы не авторизованы</string>
|
<string name="admin_unauthorized">You are not logged in</string>
|
||||||
<string name="admin_forbidden">Нет доступа</string>
|
<string name="admin_forbidden">No access</string>
|
||||||
<string name="not_found">404\nEmployee not found</string>
|
<string name="not_found">404\nEmployee not found</string>
|
||||||
|
<string name="admin_btn">Admin</string>
|
||||||
</resources>
|
</resources>
|
@ -22,12 +22,13 @@
|
|||||||
<string name="search_hint">Введите логин сотрудника</string>
|
<string name="search_hint">Введите логин сотрудника</string>
|
||||||
<string name="block_btn">Заблокировать</string>
|
<string name="block_btn">Заблокировать</string>
|
||||||
<string name="unblock_btn">Разблокировать</string>
|
<string name="unblock_btn">Разблокировать</string>
|
||||||
<string name="admin_unauthorized">Добро пожаловать в</string>
|
<string name="admin_unauthorized">Вы не авторизованы</string>
|
||||||
<string name="admin_forbidden">Нет доступа</string>
|
<string name="admin_forbidden">Нет доступа</string>
|
||||||
<string name="not_found">404\nСотрудник не найден</string>
|
<string name="not_found">404\nСотрудник не найден</string>
|
||||||
<string name="starter_tiser">Добро пожаловать в</string>
|
<string name="starter_tiser">Добро пожаловать в</string>
|
||||||
<string name="starter_tiser_accent">S Company Pass</string>
|
<string name="starter_tiser_accent">S Company Pass</string>
|
||||||
<string name="description">Просмотр посещений и электронный пропуск в одном приложении</string>
|
<string name="description">Просмотр посещений и электронный пропуск в одном приложении</string>
|
||||||
|
<string name="admin_btn">Админ</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
Loading…
x
Reference in New Issue
Block a user