From 265eb29b993b124e8f2a4366b36ba46f0c22c0bb Mon Sep 17 00:00:00 2001
From: EgorVorobev <vorobevegor999@gmail.com>
Date: Wed, 19 Feb 2025 10:35:55 +0300
Subject: [PATCH] day2_commit_1.2_xml_edited

---
 app/src/main/res/layout/fragment_login.xml | 6 +++---
 app/src/main/res/values-en-rGB/strings.xml | 1 +
 app/src/main/res/values/strings.xml        | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 342c902..6752e45 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -11,7 +11,7 @@
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Введите логин"
+        android:hint="@string/username_hint"
         android:inputType="text"
         android:padding="12dp"
         app:CornerRadius="20dp"
@@ -22,7 +22,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="#F0F0F0"
@@ -32,7 +32,7 @@
         android:id="@+id/login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Войти"
+        android:text="@string/login_button"
         android:backgroundTint="@color/colorPrimary"
         android:textColor="@android:color/white"
         android:padding="12dp"
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 36750e4..d4dc600 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -14,6 +14,7 @@
 
     <!-- Строки для экрана авторизации -->
     <string name="username_hint">Enter your username</string>
+    <string name="password_hint">Enter the password</string>
     <string name="login_button">Enter</string>
     <string name="error_invalid_username">The login is invalid. Check the entered data.</string>
     <string name="error_empty_username">The login field must not be empty.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 825c499..c79e39d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <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>
 
@@ -14,6 +14,7 @@
 
     <!-- Строки для экрана авторизации -->
     <string name="username_hint">Введите логин</string>
+    <string name="password_hint">Введите пароль</string>
     <string name="login_button">Войти</string>
     <string name="error_invalid_username">Логин недействителен. Проверьте введенные данные.</string>
     <string name="error_empty_username">Поле логина не должно быть пустым.</string>
@@ -32,4 +33,5 @@
     <string name="qr_scan_failure">Что-то пошло не так</string>
     <string name="qr_scan_cancelled">Вход был отменён/Operation was cancelled</string>
 
+
 </resources>
\ No newline at end of file