From 1d0e56195d4d892ede0200fdaf3b70f343e2c0a7 Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 10:54:35 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BB=D0=BE=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout-land/fragment_profile.xml |  4 ++--
 app/src/main/res/layout/fragment_profile.xml  |  4 ++--
 app/src/main/res/values-ru/strings.xml        | 21 -------------------
 app/src/main/res/values-ru/strings_admin.xml  |  7 +++++++
 .../main/res/values-ru/strings_entry_list.xml |  4 ++++
 app/src/main/res/values-ru/strings_login.xml  | 10 +++++++++
 .../main/res/values-ru/strings_profile.xml    |  8 +++++++
 app/src/main/res/values-ru/strings_qr.xml     |  4 ++++
 .../main/res/values-ru/strings_qr_result.xml  |  6 ++++++
 app/src/main/res/values/strings.xml           |  1 +
 10 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/values-ru/strings_admin.xml
 create mode 100644 app/src/main/res/values-ru/strings_entry_list.xml
 create mode 100644 app/src/main/res/values-ru/strings_login.xml
 create mode 100644 app/src/main/res/values-ru/strings_profile.xml
 create mode 100644 app/src/main/res/values-ru/strings_qr.xml
 create mode 100644 app/src/main/res/values-ru/strings_qr_result.xml

diff --git a/app/src/main/res/layout-land/fragment_profile.xml b/app/src/main/res/layout-land/fragment_profile.xml
index 9d300f9..df7a31e 100644
--- a/app/src/main/res/layout-land/fragment_profile.xml
+++ b/app/src/main/res/layout-land/fragment_profile.xml
@@ -58,7 +58,8 @@
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:layout_margin="2dp"
-            android:elevation="10dp"
+            android:elevation="0dp"
+            app:cardElevation="0dp"
             app:cardCornerRadius="12dp"
             app:layout_constraintBottom_toTopOf="@+id/scan"
             app:layout_constraintEnd_toEndOf="parent"
@@ -70,7 +71,6 @@
                 style="@style/roundedImageView"
                 android:layout_width="120dp"
                 android:layout_height="120dp"
-                android:layout_marginBottom="10dp"
                 android:contentDescription="@null"
                 app:layout_constraintBottom_toTopOf="@+id/scan"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 858d183..067ce88 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -58,7 +58,8 @@
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:layout_margin="5dp"
-            android:elevation="10dp"
+            android:elevation="0dp"
+            app:cardElevation="0dp"
             app:cardCornerRadius="12dp"
             app:layout_constraintBottom_toTopOf="@+id/scan"
             app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +73,6 @@
                 android:layout_height="120dp"
                 android:layout_marginBottom="16dp"
                 android:contentDescription="@null"
-
                 app:layout_constraintBottom_toTopOf="@+id/scan"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3516fe6..b4b39cd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,25 +2,4 @@
 <resources>
     <string name="app_name">NTO Pass</string>
     <string name="entry_history">История входов</string>
-    <string name="admin_main">Проверить информацию о сотруднике</string>
-    <string name="admin_input_hint">Введите логин сотрудника</string>
-    <string name="admin_button">Проверить</string>
-    <string name="admin_block">Заблокировать доступ</string>
-    <string name="list_name">История входов</string>
-    <string name="login_username_hint">Имя пользователя</string>
-    <string name="login_button">Войти</string>
-    <string name="login_error">Что-то пошло не так</string>
-    <string name="login_password_hint">Пароль</string>
-    <string name="login_welcome">Добро пожаловать!</string>
-    <string name="login_text">Войдите чтобы продолжить</string>
-    <string name="login_login">Войти</string>
-    <string name="profile_refresh_button">Обновить</string>
-    <string name="profile_scan_button">Сканировать QR</string>
-    <string name="profile_main_textview">Главная</string>
-    <string name="profile_admin_button">Страница администратора</string>
-    <string name="profile_list_button">история входов</string>
-    <string name="close_button">Закрыть</string>
-    <string name="qr_result_status_success">Успешно</string>
-    <string name="qr_result_status_cancel">Операция отменена</string>
-    <string name="qr_result_status_error">Что-то пошло не так</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_admin.xml b/app/src/main/res/values-ru/strings_admin.xml
new file mode 100644
index 0000000..7d69917
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_admin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="admin_main">Проверить информацию о сотруднике</string>
+    <string name="admin_input_hint">Введите логин сотрудника</string>
+    <string name="admin_button">Проверить</string>
+    <string name="admin_block">Заблокировать доступ</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_entry_list.xml b/app/src/main/res/values-ru/strings_entry_list.xml
new file mode 100644
index 0000000..415ea09
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_entry_list.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="list_name">История входов</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_login.xml b/app/src/main/res/values-ru/strings_login.xml
new file mode 100644
index 0000000..ed7fdf9
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_login.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="login_username_hint">Имя пользователя</string>
+    <string name="login_button">Войти</string>
+    <string name="login_error">Что-то пошло не так</string>
+    <string name="login_password_hint">Пароль</string>
+    <string name="login_welcome">Добро пожаловать!</string>
+    <string name="login_text">Войдите чтобы продолжить</string>
+    <string name="login_login">Войти</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_profile.xml b/app/src/main/res/values-ru/strings_profile.xml
new file mode 100644
index 0000000..53acb21
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_profile.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_refresh_button">Обновить</string>
+    <string name="profile_scan_button">Сканировать QR</string>
+    <string name="profile_main_textview">Главная</string>
+    <string name="profile_admin_button">Страница администратора</string>
+    <string name="profile_list_button">история входов</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_qr.xml b/app/src/main/res/values-ru/strings_qr.xml
new file mode 100644
index 0000000..40b13b6
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_qr.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="close_button">Закрыть</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings_qr_result.xml b/app/src/main/res/values-ru/strings_qr_result.xml
new file mode 100644
index 0000000..b16b3de
--- /dev/null
+++ b/app/src/main/res/values-ru/strings_qr_result.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="qr_result_status_success">Успешно</string>
+    <string name="qr_result_status_cancel">Операция отменена</string>
+    <string name="qr_result_status_error">Что-то пошло не так</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 9b2b311..d4e7919 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">NTO Pass</string>
     <string name="entry_history">Entry History</string>
+
 </resources>
\ No newline at end of file

From b8595d19b59648c5cd99edb50949db6c9fc22903 Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 10:59:20 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-ru/strings_profile.xml | 2 ++
 app/src/main/res/values/strings_profile.xml    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/res/values-ru/strings_profile.xml b/app/src/main/res/values-ru/strings_profile.xml
index 53acb21..92cc72a 100644
--- a/app/src/main/res/values-ru/strings_profile.xml
+++ b/app/src/main/res/values-ru/strings_profile.xml
@@ -5,4 +5,6 @@
     <string name="profile_main_textview">Главная</string>
     <string name="profile_admin_button">Страница администратора</string>
     <string name="profile_list_button">история входов</string>
+    <string name="logout">Выйти</string>
+    <string name="cancel">Отменить</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_profile.xml b/app/src/main/res/values/strings_profile.xml
index 1d0f409..62cce40 100644
--- a/app/src/main/res/values/strings_profile.xml
+++ b/app/src/main/res/values/strings_profile.xml
@@ -6,5 +6,7 @@
     <string name="profile_admin_button">Admin panel</string>
     <string name="profile_list_button">Entry History</string>
     <string name="profile_logout_dialog">Logout</string>
+    <string name="logout">Logout</string>
+    <string name="cancel">Cancel</string>
     <string name="profile_logout_text_dialog">Are you sure you want to log out?</string>
 </resources>
\ No newline at end of file

From a8e4b9d3b77e7ce50fb842847da809fe2281f294 Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 11:00:46 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-ru/strings_profile.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-ru/strings_profile.xml b/app/src/main/res/values-ru/strings_profile.xml
index 92cc72a..4216426 100644
--- a/app/src/main/res/values-ru/strings_profile.xml
+++ b/app/src/main/res/values-ru/strings_profile.xml
@@ -7,4 +7,6 @@
     <string name="profile_list_button">история входов</string>
     <string name="logout">Выйти</string>
     <string name="cancel">Отменить</string>
+    <string name="profile_logout_dialog">Выйти</string>
+    <string name="profile_logout_text_dialog">Вы уверены, что хотите выйти из аккаунта?</string>
 </resources>
\ No newline at end of file