Merge branch 'Frontend_UI' into Frontend

# Conflicts:
#	app/src/main/java/ru/myitschool/work/core/Constants.kt

app/src/main/res/layout-land/fragment_admin.xml

@@ -0,0 +1,60 @@
+<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">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/enter_worker_username"
+        android:textSize="18sp"
+        android:layout_marginBottom="8dp" />
+
+    <EditText
+        android:id="@+id/employee_login"
+        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="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
+        android:id="@+id/employee_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textSize="16sp"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/toggle_access"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/block_or_unblock"
+        android:layout_marginTop="16dp"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/close"
+        android:layout_width="280dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_height="wrap_content"
+        android:text="@string/back"
+        android:backgroundTint="@color/colorPrimary"
+        app:cornerRadius="16dp"
+        android:layout_marginTop="0dp" />
+
+</LinearLayout>

app/src/main/res/layout-land/fragment_login.xml

@@ -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
@@ -42,6 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
+        android:gravity="center_horizontal"
         android:textColor="@android:color/holo_red_light"
         android:layout_marginBottom="16dp"/>
 

app/src/main/res/layout-land/fragment_main.xml

@@ -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>

app/src/main/res/layout-land/fragment_qr_scan_result.xml

@@ -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"

app/src/main/res/layout/fragment_admin.xml

@@ -1,13 +1,14 @@
 <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">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Введите логин сотрудника:"
+        android:text="@string/enter_worker_username"
         android:textSize="18sp"
         android:layout_marginBottom="8dp" />
 
@@ -15,14 +16,19 @@
         android:id="@+id/employee_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Логин сотрудника"
+        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="Просмотреть информацию о сотруднике"
+        android:text="@string/watch_info_about_worker"
+        android:backgroundTint="@color/colorPrimary"
+        app:cornerRadius="16dp"
         android:layout_marginTop="16dp" />
 
     <TextView
@@ -37,8 +43,19 @@
         android:id="@+id/toggle_access"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Блокировать/Разблокировать доступ"
+        android:text="@string/block_or_unblock"
         android:layout_marginTop="16dp"
         android:visibility="gone" />
 
+    <Button
+        android:id="@+id/close"
+        android:layout_width="280dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_height="wrap_content"
+        android:text="@string/back"
+        android:backgroundTint="@color/colorPrimary"
+        app:cornerRadius="16dp"
+        android:layout_marginTop="0dp" />
+
+
 </LinearLayout>

app/src/main/res/layout/fragment_login.xml

@@ -21,7 +21,7 @@
         android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Введите пароль"
+        android:hint="@string/password_hint"
         android:inputType="textPassword"
         android:padding="12dp"
         android:background="@drawable/ic_android_black_24dp"
@@ -43,6 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
+        android:gravity="center_horizontal"
         android:textColor="@android:color/holo_red_light"
         android:layout_marginBottom="16dp"/>
 

app/src/main/res/layout/fragment_main.xml

@@ -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" />

app/src/main/res/layout/fragment_qr_scan_result.xml

@@ -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"

app/src/main/res/values-en-rGB/strings.xml

@@ -34,4 +34,11 @@
     <string name="qr_scan_cancelled">Operation was cancelled</string>
     <string name="close_button">Close</string>
     <string name="result">Result</string>
+
+    <!-- Админ панель -->
+    <string name="enter_worker_username">Enter the employee\'s username:</string>
+    <string name="worker_username">Employee\'s login</string>
+    <string name="watch_info_about_worker">View employee information</string>
+    <string name="block_or_unblock">Block/Unblock access</string>
+    <string name="back">Back</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -27,6 +27,7 @@
     <string name="position_label">Должность</string>
     <string name="last_entry_label">Время последнего входа</string>
     <string name="error_no_user_data">Нет данных о пользователе.</string>
+    <string name="admin_panel" translatable="false">Admin Panel</string>
 
     <!-- Строки для экрана сканирования QR-кода -->
     <string name="qr_scan_success">Успешно</string>
@@ -34,5 +35,11 @@
     <string name="qr_scan_cancelled">Вход был отменён / Operation was cancelled</string>
     <string name="close_button">Закрыть</string>
     <string name="result">Результат</string>
-    <string name="admin_panel" translatable="false">Admin Panel</string>
+
+    <!-- Админ панель -->
+    <string name="enter_worker_username">Введите логин сотрудника:</string>
+    <string name="worker_username">Логин сотрудника</string>
+    <string name="watch_info_about_worker">Просмотреть информацию о сотруднике</string>
+    <string name="block_or_unblock">Блокировать/Разблокировать доступ</string>
+    <string name="back">Назад</string>
 </resources>