From cc3771488150dff3ab86dba6cc58e384489c19d4 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 17:33:18 +0300
Subject: [PATCH 1/8] day2_commit.1.20_add_strings_for_admin_panel

---
 app/src/main/res/layout/fragment_admin.xml | 8 ++++----
 app/src/main/res/values-en-rGB/strings.xml | 6 ++++++
 app/src/main/res/values/strings.xml        | 8 +++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index e22daaa..bd4c8eb 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -7,7 +7,7 @@
     <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 +15,14 @@
         android:id="@+id/employee_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Логин сотрудника"
+        android:hint="@string/worker_username"
         android:inputType="text" />
 
     <Button
         android:id="@+id/view_employee_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Просмотреть информацию о сотруднике"
+        android:text="@string/watch_info_about_worker"
         android:layout_marginTop="16dp" />
 
     <TextView
@@ -37,7 +37,7 @@
         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" />
 
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 147294f..7b6fe56 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -34,4 +34,10 @@
     <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>
 </resources>
\ 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 123f9f3..3b0c333 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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,10 @@
     <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>
 </resources>
\ No newline at end of file

From 65c2669c375dcbe76fdc4930701a9697ab11d806 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 17:41:42 +0300
Subject: [PATCH 2/8] =?UTF-8?q?day2=5Fcommit.1.21=5F=D0=B7=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=80=D1=83=D0=B3=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=5F=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout-land/fragment_login.xml          | 5 +++--
 app/src/main/res/layout-land/fragment_main.xml           | 4 ++++
 app/src/main/res/layout-land/fragment_qr_scan_result.xml | 2 ++
 app/src/main/res/layout/fragment_admin.xml               | 8 +++++++-
 app/src/main/res/layout/fragment_main.xml                | 4 ++++
 app/src/main/res/layout/fragment_qr_scan_result.xml      | 2 ++
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout-land/fragment_login.xml b/app/src/main/res/layout-land/fragment_login.xml
index 8dee749..e130e8f 100644
--- a/app/src/main/res/layout-land/fragment_login.xml
+++ b/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
diff --git a/app/src/main/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml
index baa3b78..d5ebef4 100644
--- a/app/src/main/res/layout-land/fragment_main.xml
+++ b/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>
diff --git a/app/src/main/res/layout-land/fragment_qr_scan_result.xml b/app/src/main/res/layout-land/fragment_qr_scan_result.xml
index 4e2fa4f..54f43f9 100644
--- a/app/src/main/res/layout-land/fragment_qr_scan_result.xml
+++ b/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"
diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index bd4c8eb..90902b0 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -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
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index b95edae..8106711 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/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" />
diff --git a/app/src/main/res/layout/fragment_qr_scan_result.xml b/app/src/main/res/layout/fragment_qr_scan_result.xml
index 4e2fa4f..54f43f9 100644
--- a/app/src/main/res/layout/fragment_qr_scan_result.xml
+++ b/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"

From 0cc58544519dac073710b32b633b2ef2caa1714d Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 17:49:35 +0300
Subject: [PATCH 3/8] day2_commit.1.22_add_landscape_for_admin_panel

---
 .../main/res/layout-land/fragment_admin.xml   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 app/src/main/res/layout-land/fragment_admin.xml

diff --git a/app/src/main/res/layout-land/fragment_admin.xml b/app/src/main/res/layout-land/fragment_admin.xml
new file mode 100644
index 0000000..90902b0
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_admin.xml
@@ -0,0 +1,50 @@
+<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" />
+
+</LinearLayout>
\ No newline at end of file

From a6f5b89b004665902f870c7263db318bb54e9085 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 18:11:21 +0300
Subject: [PATCH 4/8] day2_commit.1.23_fragment_login_edited

---
 app/src/main/res/layout-land/fragment_login.xml | 1 +
 app/src/main/res/layout/fragment_login.xml      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout-land/fragment_login.xml b/app/src/main/res/layout-land/fragment_login.xml
index e130e8f..1916e8e 100644
--- a/app/src/main/res/layout-land/fragment_login.xml
+++ b/app/src/main/res/layout-land/fragment_login.xml
@@ -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"/>
 
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 525aea1..b7c326c 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/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"/>
 

From 856b00e591ac8b40b054a69bbe01380071b55f16 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 18:22:16 +0300
Subject: [PATCH 5/8] day2_commit.1.24_change_port

---
 app/src/main/java/ru/myitschool/work/core/Constants.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt
index 235327b..63a66e1 100644
--- a/app/src/main/java/ru/myitschool/work/core/Constants.kt
+++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt
@@ -1,5 +1,5 @@
 package ru.myitschool.work.core
 // БЕРИТЕ И ИЗМЕНЯЙТЕ ХОСТ ТОЛЬКО ЗДЕСЬ И НЕ БЕРИТЕ ИЗ ДРУГИХ МЕСТ. ФАЙЛ ПЕРЕМЕЩАТЬ НЕЛЬЗЯ
 object Constants {
-    const val SERVER_ADDRESS = "http://192.168.1.131:8080"
+    const val SERVER_ADDRESS = "http://10.6.66.110:8080"
 }
\ No newline at end of file

From c13d4c12d654ca07fc40bcad056b398f3c707795 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 18:53:35 +0300
Subject: [PATCH 6/8] day2_commit.1.100_temple

---
 .../work/ui/login/LoginViewModel.kt           | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
index 25dcb8a..135f321 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
@@ -27,20 +27,32 @@ class LoginViewModel @Inject constructor(
                     val response = apiService.authenticate(username, password)
                     Log.d("LoginViewModel", "Response code: ${response.code()}")
 
-                    if (response.isSuccessful) {
-                        val userAuthResponse = response.body() // Получаем JSON-ответ
-                        Log.d("LoginViewModel", "User  Auth Response: $userAuthResponse") // Логируем ответ
+                    when (response.code()) {
+                        200 -> {
+                            val userAuthResponse = response.body() // Получаем JSON-ответ
+                            Log.d("LoginViewModel", "User  Auth Response: $userAuthResponse") // Логируем ответ
 
-                        // Обработка JSON-ответа
-                        if (userAuthResponse != null) {
-                            SessionManager.userLogin = username
-                            SessionManager.userRole = userAuthResponse.role // Сохраняем роль
-                            _state.value = LoginState(success = true) // Успешная авторизация
-                        } else {
+                            // Обработка JSON-ответа
+                            if (userAuthResponse != null) {
+                                SessionManager.userLogin = username
+                                SessionManager.userRole = userAuthResponse.role // Сохраняем роль
+                                _state.value = LoginState(success = true) // Успешная авторизация
+                            } else {
+                                _state.value = LoginState(error = "Ошибка авторизации: Неверные учетные данные.")
+                            }
+                        }
+                        401 -> {
+                            Log.d("LoginViewModel", "Unauthorized access: ${response.message()}")
                             _state.value = LoginState(error = "Ошибка авторизации: Неверные учетные данные.")
                         }
-                    } else {
-                        _state.value = LoginState(error = "Ошибка авторизации: ${response.message()}")
+                        400 -> {
+                            Log.d("LoginViewModel", "Bad request: ${response.message()}")
+                            _state.value = LoginState(error = "Ошибка авторизации: Неправильный запрос.")
+                        }
+                        else -> {
+                            Log.d("LoginViewModel", "Error: ${response.message()}")
+                            _state.value = LoginState(error = "Ошибка авторизации: ${response.message()}")
+                        }
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()

From a2a82383a22e6834b15fbf45de8ae8c8c6c4233c Mon Sep 17 00:00:00 2001
From: EgorVorobev <egorvorobev@noreply.sicampus.ru>
Date: Wed, 19 Feb 2025 15:55:26 +0000
Subject: [PATCH 7/8] revert c13d4c12d654ca07fc40bcad056b398f3c707795

revert day2_commit.1.100_temple
---
 .../work/ui/login/LoginViewModel.kt           | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
index 135f321..25dcb8a 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
@@ -27,32 +27,20 @@ class LoginViewModel @Inject constructor(
                     val response = apiService.authenticate(username, password)
                     Log.d("LoginViewModel", "Response code: ${response.code()}")
 
-                    when (response.code()) {
-                        200 -> {
-                            val userAuthResponse = response.body() // Получаем JSON-ответ
-                            Log.d("LoginViewModel", "User  Auth Response: $userAuthResponse") // Логируем ответ
+                    if (response.isSuccessful) {
+                        val userAuthResponse = response.body() // Получаем JSON-ответ
+                        Log.d("LoginViewModel", "User  Auth Response: $userAuthResponse") // Логируем ответ
 
-                            // Обработка JSON-ответа
-                            if (userAuthResponse != null) {
-                                SessionManager.userLogin = username
-                                SessionManager.userRole = userAuthResponse.role // Сохраняем роль
-                                _state.value = LoginState(success = true) // Успешная авторизация
-                            } else {
-                                _state.value = LoginState(error = "Ошибка авторизации: Неверные учетные данные.")
-                            }
-                        }
-                        401 -> {
-                            Log.d("LoginViewModel", "Unauthorized access: ${response.message()}")
+                        // Обработка JSON-ответа
+                        if (userAuthResponse != null) {
+                            SessionManager.userLogin = username
+                            SessionManager.userRole = userAuthResponse.role // Сохраняем роль
+                            _state.value = LoginState(success = true) // Успешная авторизация
+                        } else {
                             _state.value = LoginState(error = "Ошибка авторизации: Неверные учетные данные.")
                         }
-                        400 -> {
-                            Log.d("LoginViewModel", "Bad request: ${response.message()}")
-                            _state.value = LoginState(error = "Ошибка авторизации: Неправильный запрос.")
-                        }
-                        else -> {
-                            Log.d("LoginViewModel", "Error: ${response.message()}")
-                            _state.value = LoginState(error = "Ошибка авторизации: ${response.message()}")
-                        }
+                    } else {
+                        _state.value = LoginState(error = "Ошибка авторизации: ${response.message()}")
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()

From 3850be2eb592a69aac1a211a5ce933424b031eab Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Thu, 20 Feb 2025 10:03:13 +0300
Subject: [PATCH 8/8] day3_commit.1.1_add_close_button_at_admin_panel

---
 app/src/main/res/layout-land/fragment_admin.xml | 10 ++++++++++
 app/src/main/res/layout/fragment_admin.xml      | 11 +++++++++++
 app/src/main/res/values-en-rGB/strings.xml      |  1 +
 app/src/main/res/values/strings.xml             |  1 +
 4 files changed, 23 insertions(+)

diff --git a/app/src/main/res/layout-land/fragment_admin.xml b/app/src/main/res/layout-land/fragment_admin.xml
index 90902b0..8113021 100644
--- a/app/src/main/res/layout-land/fragment_admin.xml
+++ b/app/src/main/res/layout-land/fragment_admin.xml
@@ -47,4 +47,14 @@
         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>
\ 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 90902b0..a1e6698 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -47,4 +47,15 @@
         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>
\ No newline at end of file
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 7b6fe56..dd3f0c0 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -40,4 +40,5 @@
     <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>
\ 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 3b0c333..2a31f4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,4 +41,5 @@
     <string name="worker_username">Логин сотрудника</string>
     <string name="watch_info_about_worker">Просмотреть информацию о сотруднике</string>
     <string name="block_or_unblock">Блокировать/Разблокировать доступ</string>
+    <string name="back">Назад</string>
 </resources>
\ No newline at end of file