From 2dab5d544917b8424fb62d507e18dad2534e6e89 Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Thu, 20 Feb 2025 14:12:26 +0300
Subject: [PATCH 1/5] code: Modification Login Screen

---
 app/src/main/res/layout/fragment_login.xml | 98 ++++++++++------------
 1 file changed, 45 insertions(+), 53 deletions(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 5c73e3b..aaf7314 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.19" />
+        app:layout_constraintGuide_percent="0.15" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_bottom"
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.45" />
+        app:layout_constraintGuide_percent="0.47" />
 
 
     <TextView
@@ -59,67 +59,61 @@
         android:textColor="@color/black"
         android:textSize="18sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/textView3"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 
     <TextView
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="30dp"
         android:gravity="center"
         android:text="@string/welcomeDescriptionLoginText"
         android:textColor="@color/black"
         android:textSize="15sp"
-        app:layout_constraintBottom_toTopOf="@+id/username"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <View
-        android:id="@+id/field_view"
-        android:layout_width="320dp"
-        android:layout_height="40dp"
-        android:background="@drawable/button_grestroke_whiteback"
-        app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <EditText
-        android:id="@+id/username"
-        style="@style/NoUnderLineEditText"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
-        android:hint="@string/loginText"
-        android:inputType="text"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/field_view"
-        app:layout_constraintStart_toStartOf="@+id/field_view"
-        app:layout_constraintTop_toTopOf="@+id/field_view" />
-
-    <View
-        android:id="@+id/field_view2"
-        android:layout_width="320dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/button_grestroke_whiteback"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline_mid" />
+        app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
-    <EditText
-        android:id="@+id/password"
-        style="@style/NoUnderLineEditText"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/username_box"
         android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
+        android:layout_height="50dp"
+        android:layout_marginBottom="10dp"
+        android:hint="@string/loginText"
+        app:boxStrokeColor="@color/white"
+        app:boxStrokeWidth="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_mid"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_beigestroke_whitefill" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/password_box"
+        android:layout_width="320dp"
+        android:layout_height="50dp"
         android:hint="@string/passwordText"
-        android:inputType="textPassword"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/field_view2"
-        app:layout_constraintStart_toStartOf="@+id/field_view2"
-        app:layout_constraintTop_toTopOf="@+id/field_view2" />
+        app:boxStrokeColor="@color/white"
+        app:boxStrokeWidth="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline_mid">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_beigestroke_whitefill" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
 
     <Button
@@ -149,23 +143,21 @@
         android:id="@+id/line"
         android:layout_width="320dp"
         android:layout_height="10dp"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="20dp"
         android:background="@drawable/ic_line"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/field_view2" />
+        app:layout_constraintTop_toBottomOf="@+id/password_box" />
 
     <TextView
         android:id="@+id/error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
         android:gravity="center"
         android:text="@string/loginError"
         android:textSize="14sp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/field_view2" />
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 2102fba304bd7e1efd5b3f418a51fc12b9330a1c Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Thu, 20 Feb 2025 14:12:43 +0300
Subject: [PATCH 2/5] code: Modification Admin Screen

---
 app/src/main/res/layout/fragment_admin.xml | 35 ++++++++--------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index 64728d1..08b1b51 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -63,29 +63,21 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_input_login" />
 
-    <View
-        android:id="@+id/input_field"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/username"
         android:layout_width="320dp"
         android:layout_height="40dp"
-        android:layout_marginTop="15dp"
-        android:background="@drawable/button_beigestroke"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.424"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_for" />
-
-    <EditText
-        android:id="@+id/username"
-        style="@style/NoUnderLineEditText"
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:autofillHints=""
         android:hint="@string/loginText"
-        android:paddingStart="10dp"
-        android:inputType="text"
-        app:layout_constraintBottom_toBottomOf="@+id/input_field"
-        app:layout_constraintStart_toStartOf="@+id/input_field"
-        app:layout_constraintTop_toTopOf="@+id/input_field" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_for">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_beigestroke_whitefill" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
     <View
         android:id="@+id/line"
@@ -167,7 +159,7 @@
         android:layout_height="35dp"
         android:background="@drawable/button_grestroke_whiteback"
         app:layout_constraintBottom_toBottomOf="@+id/photo_field"
-        app:layout_constraintEnd_toEndOf="@+id/username_field" />
+        app:layout_constraintStart_toStartOf="@+id/position_field" />
 
 
     <TextView
@@ -231,7 +223,6 @@
         android:layout_width="320dp"
         android:layout_height="140dp"
         android:layout_marginTop="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/block">

From e71db2e013159fc5aa682ff7f9b580ca4123af0e Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Thu, 20 Feb 2025 14:14:15 +0300
Subject: [PATCH 3/5] code: Modification Admin Screen

---
 app/src/main/res/layout/fragment_admin.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index 08b1b51..be8452f 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -64,15 +64,19 @@
         app:layout_constraintTop_toBottomOf="@+id/text_input_login" />
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/username"
+        android:id="@+id/username_box"
         android:layout_width="320dp"
         android:layout_height="40dp"
+        android:layout_marginTop="10dp"
         android:hint="@string/loginText"
+        app:boxStrokeColor="@color/white"
+        app:boxStrokeWidth="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_for">
 
         <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/button_beigestroke_whitefill" />

From 8a8d56e56da7e3589db8f6744582fc3b0b63acaf Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Thu, 20 Feb 2025 14:18:48 +0300
Subject: [PATCH 4/5] code: Modification for Login Screen

---
 app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt
index 60695ac..2a9cb38 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt
@@ -47,7 +47,6 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
 
     private fun setupLoginComponents() {
         binding.username.apply {
-            inputType = InputType.TYPE_CLASS_TEXT
             addTextChangedListener(object : TextWatcher {
                 override fun afterTextChanged(s: Editable?) {
                     val login = s.toString()

From 1010fa32b3086e3bd304f42eb73c79838cfa7b35 Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Thu, 20 Feb 2025 14:26:15 +0300
Subject: [PATCH 5/5] code: Modification for Admin Screen

---
 app/src/main/res/layout/fragment_admin.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index be8452f..940ed47 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -73,7 +73,8 @@
         app:boxStrokeWidth="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_for">
+        app:layout_constraintTop_toBottomOf="@+id/text_for"
+        >
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/username"