From ea8dd6f8698ee7ed511941b5503fcfc8845c4dd7 Mon Sep 17 00:00:00 2001
From: veronicagtea <vsbnow@gmail.com>
Date: Wed, 19 Feb 2025 09:57:17 +0300
Subject: [PATCH] =?UTF-8?q?code:=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=20?=
 =?UTF-8?q?=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20XML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/button_black.xml    |   8 +
 .../drawable/button_grestroke_whiteback.xml   |   2 +-
 app/src/main/res/layout/fragment_login.xml    | 188 +++++++++++++-----
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/values/styles.xml            |   9 +
 6 files changed, 155 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_black.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/main/res/drawable/button_black.xml b/app/src/main/res/drawable/button_black.xml
new file mode 100644
index 0000000..fc6d007
--- /dev/null
+++ b/app/src/main/res/drawable/button_black.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/black" />
+    <corners android:radius="8dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_grestroke_whiteback.xml b/app/src/main/res/drawable/button_grestroke_whiteback.xml
index e2f9272..3771b3c 100644
--- a/app/src/main/res/drawable/button_grestroke_whiteback.xml
+++ b/app/src/main/res/drawable/button_grestroke_whiteback.xml
@@ -3,6 +3,6 @@
     <solid android:color="@color/white" />
     <stroke
         android:width="2dp"
-        android:color="@color/black" />
+        android:color="@color/grey" />
     <corners android:radius="8dp"/>
 </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 2010dc5..4d26763 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+
     android:layout_height="match_parent">
 
     <ProgressBar
@@ -13,59 +15,137 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:padding="24dp"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/welcomeText"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            android:gravity="center" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/inputLoginText"
-            android:textSize="18sp"
-            android:gravity="center" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/welcomeDescriptionLoginText"
-            android:textSize="14sp"
-            android:gravity="center" />
-        <EditText
-            android:id="@+id/username"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:autofillHints=""
-            android:hint="@string/loginText"
-            android:inputType="text"
-            android:padding="12dp" />
-        <Button
-            android:id="@+id/login"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="@string/continueText"
-            android:textSize="18sp"
-            android:enabled="false"/>
-        <TextView
-            android:id="@+id/error"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/loginError"
-            android:textSize="14sp"
-            android:gravity="center"
-            android:visibility="gone"/>
-    </LinearLayout>
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.25" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_bottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.8" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_mid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.55" />
+
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/welcomeText"
+        android:textColor="@color/black"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guideline_top" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:text="@string/inputLoginText"
+        android:textColor="@color/black"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="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:gravity="center"
+        android:text="@string/welcomeDescriptionLoginText"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+
+    <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="wrap_content"
+        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" />
+
+    <EditText
+        android:id="@+id/password"
+        style="@style/NoUnderLineEditText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autofillHints=""
+        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" />
+
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="320dp"
+        android:layout_height="40dp"
+        android:background="@drawable/button_black"
+        android:enabled="false"
+        android:text="@string/continueText"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/field_view2" />
+
+    <TextView
+        android:id="@+id/error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/loginError"
+        android:textSize="14sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 51025bc..17e04d7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,5 @@
     <color name="white">#FFFFFFFF</color>
     <color name="buttonBackground">#5C5C5C</color>
     <color name="buttonText">#C0C0C0</color>
+    <color name="grey">#808080</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 09c6b87..7e44b16 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="loginText">Логин</string>
+    <string name="loginText">логин</string>
     <string name="welcomeText">Добро пожаловать!</string>
     <string name="inputLoginText">Введите свой логин</string>
     <string name="welcomeDescriptionLoginText">для авторизации в приложении</string>
@@ -19,4 +19,5 @@
     <string name="closeText">Закрыть/Close</string>
     <string name="errorLoginText">Ошибка входа</string>
     <string name="text_last_enter">Последний вход 12.12.1212</string>
+    <string name="passwordText">пароль</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..41369d0
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NoUnderLineEditText"
+        parent = "Widget.AppCompat.EditText" >
+        <item
+            name = "android:background" >@null</item>
+    </style>
+
+</resources>
\ No newline at end of file