From 3b534bafc1a0a3b1b2267e2ee1aba006da0b273e Mon Sep 17 00:00:00 2001
From: senijan <senikdav@mail.ru>
Date: Wed, 19 Feb 2025 13:00:33 +0300
Subject: [PATCH] styles.xml

---
 .../main/res/drawable/input_corner_radius.xml |  5 +++
 app/src/main/res/layout/fragment_login.xml    | 35 +++++++++----------
 app/src/main/res/values-en/strings.xml        |  5 ++-
 app/src/main/res/values/colors.xml            |  8 +++++
 app/src/main/res/values/strings.xml           |  7 ++--
 app/src/main/res/values/strings_qr.xml        |  4 ---
 app/src/main/res/values/styles.xml            | 17 +++++++++
 7 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/input_corner_radius.xml
 delete mode 100644 app/src/main/res/values/strings_qr.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/main/res/drawable/input_corner_radius.xml b/app/src/main/res/drawable/input_corner_radius.xml
new file mode 100644
index 0000000..9a965a1
--- /dev/null
+++ b/app/src/main/res/drawable/input_corner_radius.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="@color/input_color"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 53fc078..2f2bec7 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -20,53 +20,50 @@ tools:context="ru.myitschool.work.ui.login.LoginFragment">
     app:layout_constraintTop_toTopOf="parent">
 
     <TextView
-        android:id="@+id/textView4"
+        android:id="@+id/login_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fontFamily="@font/montserrat_bold"
         android:text="@string/login_title"
         android:textAlignment="center"
-        android:textSize="20sp" />
+        android:textSize="24sp" />
 
     <EditText
         android:id="@+id/username"
+        style="@style/login_input"
         android:layout_width="match_parent"
         android:layout_height="61dp"
-        android:layout_marginTop="20sp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/input_corner_radius"
         android:autofillHints="username"
-        android:ems="10"
-        android:fontFamily="@font/montserrat_medium"
         android:hint="@string/username_hint"
-        android:inputType="text"
-        android:textAlignment="textStart"
-        android:textColorLink="#000000" />
+        android:inputType="text" />
 
     <EditText
         android:id="@+id/password"
+        style="@style/login_input"
         android:layout_width="match_parent"
         android:layout_height="61dp"
-        android:layout_marginTop="20sp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/input_corner_radius"
         android:autofillHints="password"
-        android:ems="10"
-        android:fontFamily="@font/montserrat_medium"
         android:hint="@string/password_hint"
-        android:inputType="textPassword"
-        android:textAlignment="textStart"
-        android:textColorLink="#000000" />
+        android:inputType="textPassword" />
 
     <Button
         android:id="@+id/loginBtn"
+        style="@style/secondary_text_color"
         android:layout_width="312dp"
         android:layout_height="68dp"
         android:layout_marginStart="10sp"
         android:layout_marginEnd="10sp"
-        android:backgroundTint="@color/enable_btn"
+        android:backgroundTint="@color/bg_color"
+        app:cornerRadius="16dp"
         android:enabled="false"
-        android:fontFamily="@font/montserrat_bold"
+        android:fontFamily="@font/montserrat_medium"
         android:text="@string/login_btn"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        app:cornerRadius="10sp" />
+        android:textColor="@color/secondary_text_color"
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/error"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 27f3f27..e17955a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">NTO Pass</string>
-    <string name="login_title">Login</string>
+    <string name="login_title">Log in to your account</string>
     <string name="username_hint">Enter your username</string>
     <string name="login_btn">Login</string>
     <string name="login_error">Login Error</string>
@@ -13,7 +13,6 @@
     <string name="result_success_text">Success</string>
     <string name="result_fail_text">Something wrong</string>
     <string name="close_btn">Close</string>
-    <string name="close_button">Close</string>
     <string name="result_null_text">Operation was cancelled</string>
-    <string name="password_hint">Enter your password</string>
+    <string name="password_hint">Enter the password</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2b45670..70ebc85 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,12 @@
     <color name="enable_btn">#E78A07</color>
     <color name="disable_btn">#C3C3C3</color>
     <color name="gray">#E78A07</color>
+
+
+    <color name="theme_color">#FFFFFF</color>
+    <color name="primary_text_color">#000000</color>
+    <color name="secondary_text_color">#777777</color>
+    <color name="accent_color">#004BFF</color>
+    <color name="bg_color">#F2F1F7</color>
+    <color name="input_color">#E5E2F5</color>
 </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 bfadd8f..b066113 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,9 @@
 <resources>
     <string name="app_name">NTO Pass</string>
-    <string name="login_title">Логин</string>
-    <string name="username_hint">Введите ваше имя пользователя</string>
-    <string name="login_btn">Логин</string>
+
+    <string name="login_title">Войти в аккаунт</string>
+    <string name="username_hint">Введите логин</string>
+    <string name="login_btn">Войти</string>
     <string name="login_error">Ошибка логина</string>
 
     <string name="main_title">Главная страница</string>
diff --git a/app/src/main/res/values/strings_qr.xml b/app/src/main/res/values/strings_qr.xml
deleted file mode 100644
index ce50067..0000000
--- a/app/src/main/res/values/strings_qr.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="close_button">Close</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..d60aa3e
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="secondary_text_color">
+        <item name="android:textColor">@color/secondary_text_color</item>
+    </style>
+
+    <style name="login_input">
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:textAlignment">textStart</item>
+        <item name="android:ems">10</item>
+        <item name="android:fontFamily">@font/montserrat_medium</item>
+        <item name="android:textColorHint">@color/secondary_text_color</item>
+        <item name="android:textColorLink">@color/accent_color</item>
+    </style>
+
+</resources>
\ No newline at end of file