From 94245f656cf026b5d876a0df0c94db4e307aa844 Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Tue, 18 Feb 2025 20:18:20 +0300
Subject: [PATCH] day1_commit_1.3_strings_updated

---
 app/src/main/res/layout/fragment_login.xml          | 4 ++--
 app/src/main/res/layout/fragment_main.xml           | 6 +++---
 app/src/main/res/layout/fragment_qr_scan_result.xml | 4 ++--
 app/src/main/res/values-en-rGB/strings.xml          | 6 ++++++
 app/src/main/res/values/strings.xml                 | 7 ++++++-
 app/src/main/res/values/strings_qr.xml              | 2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 63e7aa6..844424e 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -8,14 +8,14 @@
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Введите логин"
+        android:hint="@string/username_hint"
         android:inputType="text"/>
 
     <Button
         android:id="@+id/login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Войти"
+        android:text="@string/login_button"
         android:visibility="gone" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index cf2e0cd..78d5d4a 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -11,7 +11,7 @@
         android:id="@+id/fullname"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Имя Фамилия"
+        android:text="@string/name_and_surname"
         android:textSize="18sp"
         android:visibility="gone" />
 
@@ -29,7 +29,7 @@
         android:id="@+id/position"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Должность"
+        android:text="@string/position_label"
         android:visibility="gone" />
 
     <!-- Поле для даты последнего входа -->
@@ -37,7 +37,7 @@
         android:id="@+id/lastEntry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="2024-02-31 08:31"
+        android:text="@string/date_and_time"
         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 112b70f..9223ad4 100644
--- a/app/src/main/res/layout/fragment_qr_scan_result.xml
+++ b/app/src/main/res/layout/fragment_qr_scan_result.xml
@@ -11,7 +11,7 @@
         android:id="@+id/result"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Результат"
+        android:text="@string/result"
         android:textSize="18sp"
         android:gravity="center"
         android:padding="16dp" />
@@ -20,7 +20,7 @@
         android:id="@+id/close"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Закрыть"
+        android:text="@string/close_button"
         android:padding="12dp"
         android:layout_marginTop="24dp" />
 
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 36750e4..c2c6252 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -5,12 +5,14 @@
     <string name="navigate">Go over</string>
 
     <string name="photo_description">User\'s photo</string>
+    <string name="name_and_surname">Name Surname</string>
     <string name="logout">Exit</string>
     <string name="refresh">Update</string>
     <string name="scan_qr_code">Scan QR Code</string>
     <string name="error_placeholder">An error has occurred</string>
     <string name="error_loading_data">Data upload error</string>
     <string name="logged_out">You have logged out of your account</string>
+    <string name="date_and_time">2024-02-31 08:31</string>
 
     <!-- Строки для экрана авторизации -->
     <string name="username_hint">Enter your username</string>
@@ -31,4 +33,8 @@
     <string name="qr_scan_success">Successfully</string>
     <string name="qr_scan_failure">Something went wrong.</string>
     <string name="qr_scan_cancelled">Operation was cancelled</string>
+
+    <string name="close_button">Close</string>
+    <string name="result">Result</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 0cfc273..d8562ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,16 +1,18 @@
 <resources>
 
-        <string name="app_name">NTO Pass</string>
+        <string name="app_name" translatable="false">NTO Pass</string>
         <string name="welcome_message">Добро пожаловать в приложение!</string>
         <string name="navigate">Перейти</string>
 
         <string name="photo_description">Фото пользователя</string>
+        <string name="name_and_surname">Имя Фамилия</string>
         <string name="logout">Выйти</string>
         <string name="refresh">Обновить</string>
         <string name="scan_qr_code">Сканировать QR</string>
         <string name="error_placeholder">Произошла ошибка</string>
         <string name="error_loading_data">Ошибка загрузки данных</string>
         <string name="logged_out">Вы вышли из аккаунта</string>
+        <string name="date_and_time">2024-02-31 08:31</string>
 
         <!-- Строки для экрана авторизации -->
         <string name="username_hint">Введите логин</string>
@@ -32,4 +34,7 @@
         <string name="qr_scan_failure">Что-то пошло не так</string>
         <string name="qr_scan_cancelled">Вход был отменён/Operation was cancelled</string>
 
+        <string name="close_button">Закрыть</string>
+        <string name="result">Результат</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_qr.xml b/app/src/main/res/values/strings_qr.xml
index ce50067..0d2c4cc 100644
--- a/app/src/main/res/values/strings_qr.xml
+++ b/app/src/main/res/values/strings_qr.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="close_button">Close</string>
+
 </resources>
\ No newline at end of file