From b9502345233b5c5b7fbbfd856970d2e663e3d28e Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Wed, 19 Feb 2025 10:31:11 +0300
Subject: [PATCH] Changed login screen

---
 app/src/main/res/layout/fragment_login.xml | 61 ++++++++++++++++++----
 app/src/main/res/values/colors.xml         |  6 +--
 app/src/main/res/values/input.xml          | 32 ++++++++++++
 app/src/main/res/values/strings_login.xml  |  2 +
 app/src/main/res/values/text_style.xml     | 35 +++++++++++++
 5 files changed, 122 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/values/input.xml
 create mode 100644 app/src/main/res/values/text_style.xml

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 805e67a..2a92b15 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -6,29 +6,70 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/flow"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:constraint_referenced_ids="username,login"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:constraint_referenced_ids="text_welcome, input_username, input_password, login"
         app:flow_verticalGap="32dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/username"
-        android:layout_width="0dp"
+    <TextView
+        android:id="@+id/text_welcome"
+        style="@style/Theme.UiTemplate.TextH1"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:hint="@string/login_username_hint"
-        android:inputType="text"
-        android:maxLines="1"
+        android:text="@string/login_welcome" />
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Theme.UiTemplate.Input"
+        android:id="@+id/input_username"
+        android:layout_marginTop="8dp"
+        android:layout_width="match_parent"
         app:layout_constraintWidth_max="400dp"
-        app:layout_constraintWidth_percent="0.8" />
+        app:layout_constraintWidth_percent="0.8"
+        android:layout_height="58dp">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/username"
+            style="@style/Theme.UiTemplate.Input.Text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1"
+            android:hint="@string/login_username_hint">
+        </com.google.android.material.textfield.TextInputEditText>
+    </com.google.android.material.textfield.TextInputLayout>
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Theme.UiTemplate.Input"
+        android:id="@+id/input_password"
+        android:layout_marginTop="2dp"
+        android:layout_width="match_parent"
+        app:layout_constraintWidth_max="400dp"
+        app:layout_constraintWidth_percent="0.8"
+        android:layout_height="58dp">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/password"
+            style="@style/Theme.UiTemplate.Input.Text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1"
+            android:hint="@string/login_password_hint">
+        </com.google.android.material.textfield.TextInputEditText>
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+
+
 
     <Button
         android:id="@+id/login"
-        android:layout_width="wrap_content"
+        android:layout_width="250dp"
         android:layout_height="wrap_content"
         style="@style/Theme.UiTemplate.Button"
         android:text="@string/login_button" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 19bd3d6..348fad6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
+    <color name="purple_500">#2B56F6</color>
+    <color name="purple_700">#2B56F6</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="AccentBlue">#2B56F6</color>
diff --git a/app/src/main/res/values/input.xml b/app/src/main/res/values/input.xml
new file mode 100644
index 0000000..d8feeed
--- /dev/null
+++ b/app/src/main/res/values/input.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.UiTemplate.Input">
+        <item name="hintTextColor">@color/Gray5</item>
+        <item name="boxBackgroundColor">@color/BackgroundGray</item>
+        <item name="boxBackgroundMode">filled</item>
+        <item name="boxCollapsedPaddingTop">4dp</item>
+        <item name="boxCornerRadiusBottomEnd">20dp</item>
+        <item name="boxCornerRadiusTopStart">20dp</item>
+        <item name="boxCornerRadiusTopEnd">20dp</item>
+        <item name="boxCornerRadiusBottomStart">20dp</item>
+        <item name="hintTextAppearance">@style/Theme.UiTemplate.Input.hint</item>
+        <item name="boxStrokeColor">@android:color/transparent</item>
+        <item name="boxStrokeWidth">0dp</item>
+
+        <item name="boxStrokeWidthFocused">0dp</item>
+        <item name="hintAnimationEnabled">false</item>
+
+    </style>
+
+    <style name="Theme.UiTemplate.Input.hint" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">@font/gilroysemibold</item>
+        <item name="android:textColor">@color/Gray5</item>
+    </style>
+    <style name="Theme.UiTemplate.Input.Text">
+        <item name="singleLine">true</item>
+        <item name="android:textCursorDrawable">@null</item>
+        <item name="android:textSize">16sp</item>
+        <item name="fontFamily">@font/gilroysemibold</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_login.xml b/app/src/main/res/values/strings_login.xml
index e046352..888f173 100644
--- a/app/src/main/res/values/strings_login.xml
+++ b/app/src/main/res/values/strings_login.xml
@@ -3,4 +3,6 @@
     <string name="login_username_hint">Username</string>
     <string name="login_button">Login</string>
     <string name="login_error">Something wrong</string>
+    <string name="login_password_hint">Password</string>
+    <string name="login_welcome">Добро пожаловать</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/text_style.xml b/app/src/main/res/values/text_style.xml
new file mode 100644
index 0000000..8fd2640
--- /dev/null
+++ b/app/src/main/res/values/text_style.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.UiTemplate.TextH1">
+        <item name="android:textSize">28sp</item>
+        <item name="android:fontFamily">@font/gilroyextrabold</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <style name="Theme.UiTemplate.TextH2">
+        <item name="android:textSize">28sp</item>
+        <item name="android:textColor">@color/TextBlack</item>
+        <item name="android:fontFamily">@font/gilroybold</item>
+    </style>
+    <style name="Theme.UiTemplate.TextH3">
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">@color/TextBlack</item>
+        <item name="android:fontFamily">@font/montbold</item>
+    </style>
+    <style name="Theme.UiTemplate.TextH4">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/Gray6</item>
+        <item name="android:fontFamily">@font/gilroysemibold</item>
+    </style>
+    <style name="Theme.UiTemplate.TextH4_2">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/Gray5</item>
+        <item name="android:fontFamily">@font/gilroysemibold</item>
+    </style>
+    <style name="Theme.UiTemplate.TextH5">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/Gray5</item>
+        <item name="android:fontFamily">@font/montsemibold</item>
+
+    </style>
+</resources>
\ No newline at end of file