day2_commit.1.21_закругление_кнопок

This commit is contained in:
EgorVorobev 2025-02-19 17:41:42 +03:00
parent d608af144b
commit 65c2669c37
6 changed files with 22 additions and 3 deletions

View File

@ -14,7 +14,7 @@
android:hint="@string/username_hint"
android:inputType="text"
android:padding="12dp"
android:background="#F0F0F0"
android:background="@drawable/ic_android_black_24dp"
android:layout_marginBottom="16dp"/>
<EditText
@ -24,7 +24,7 @@
android:hint="@string/password_hint"
android:inputType="textPassword"
android:padding="12dp"
android:background="#F0F0F0"
android:background="@drawable/ic_android_black_24dp"
android:layout_marginBottom="16dp"/>
<Button
@ -35,6 +35,7 @@
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:padding="12dp"
app:cornerRadius="16dp"
android:layout_marginBottom="16dp"/>
<TextView

View File

@ -69,6 +69,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/refresh"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:padding="12dp"/>
@ -91,6 +92,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/scan_qr_code"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:visibility="gone" />
@ -101,6 +103,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/logout"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:visibility="gone" />
@ -111,6 +114,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/admin_panel"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:visibility="gone" />
</LinearLayout>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/qrScanResultLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -21,6 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/close_button"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:padding="12dp"

View File

@ -1,6 +1,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:padding="16dp">
@ -16,13 +17,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/worker_username"
android:padding="12dp"
android:background="@drawable/ic_android_black_24dp"
android:inputType="text" />
<Button
android:id="@+id/view_employee_info"
android:layout_width="match_parent"
android:layout_width="280dp"
android:layout_gravity="center_horizontal"
android:layout_height="wrap_content"
android:text="@string/watch_info_about_worker"
android:backgroundTint="@color/colorPrimary"
app:cornerRadius="16dp"
android:layout_marginTop="16dp" />
<TextView

View File

@ -51,6 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/refresh"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:layout_marginBottom="12dp"
@ -81,6 +82,7 @@
android:text="@string/scan_qr_code"
android:layout_marginBottom="12dp"
android:backgroundTint="@color/colorPrimary"
app:cornerRadius="16dp"
android:textColor="@android:color/white"
android:visibility="gone" />
@ -90,6 +92,7 @@
android:layout_height="wrap_content"
android:text="@string/logout"
android:layout_marginBottom="50dp"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:visibility="gone" />
@ -99,6 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/admin_panel"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:layout_marginTop="16dp"
android:visibility="gone" />

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/qrScanResultLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -21,6 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/close_button"
app:cornerRadius="16dp"
android:backgroundTint="@color/colorPrimary"
android:textColor="@android:color/white"
android:padding="12dp"