From b645f9bd368e81d9f36a3951fe45493881f89a90 Mon Sep 17 00:00:00 2001
From: Serafim_Pankin <serafimpankin@yandex.ru>
Date: Wed, 19 Feb 2025 12:38:38 +0300
Subject: [PATCH 1/3] repair

---
 app/src/main/res/layout/fragment_auth.xml    |  2 +-
 app/src/main/res/layout/fragment_profile.xml | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml
index ca53562..e6c4e6b 100644
--- a/app/src/main/res/layout/fragment_auth.xml
+++ b/app/src/main/res/layout/fragment_auth.xml
@@ -92,7 +92,7 @@
                     android:layout_height="wrap_content"
                     android:padding="14dp"
 
-                    android:hint="@string/login"
+                    android:hint="@string/password"
                     android:textColorHint="?attr/colorSecondary"
                     android:textColor="?attr/colorSecondary" />
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index a0f76a0..eb8215e 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.core.widget.NestedScrollView
     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:id="@+id/swipeRefresh"
     android:fillViewport="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/swipeRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -66,7 +71,6 @@
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/fio"
-                    android:layout_marginTop="10dp"
                     android:textAlignment="center"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -159,5 +163,6 @@
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.core.widget.NestedScrollView>
+

From c65c3d61998e04816b46938656a3481cf15985d7 Mon Sep 17 00:00:00 2001
From: Serafim_Pankin <serafimpankin@yandex.ru>
Date: Wed, 19 Feb 2025 12:45:52 +0300
Subject: [PATCH 2/3] repair

---
 app/src/main/res/layout/fragment_profile.xml | 274 ++++++++++---------
 1 file changed, 138 insertions(+), 136 deletions(-)

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index eb8215e..5d359cd 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -13,156 +13,158 @@
         android:id="@+id/swipeRefresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:attr/colorBackground">
-    <TextView
-    android:padding="15dp"
-    android:layout_marginTop="10dp"
-    android:id="@+id/title_profile"
-    android:textAlignment="center"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textSize="20sp"
-    android:letterSpacing="0.05"
-    android:background="?android:attr/colorBackground"
-    android:textColor="?attr/colorOnBackground"
-    android:text="@string/title_profile"
-        tools:ignore="MissingConstraints" />
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center_horizontal"
-            android:paddingTop="50dp">
-
-            <ImageView
-                android:id="@+id/avatar"
+            android:background="?android:attr/colorBackground">
+            <TextView
+                android:padding="15dp"
                 android:layout_marginTop="10dp"
+                android:id="@+id/title_profile"
+                android:textAlignment="center"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
-                android:foregroundGravity="center"
-                android:importantForAccessibility="no"
-                android:src="@drawable/_user_"
-
-                app:layout_constraintBottom_toTopOf="@+id/title"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <androidx.constraintlayout.helper.widget.Flow
-                android:id="@+id/flow"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:orientation="vertical"
-                app:constraint_referenced_ids="avatar, fio, next,error, logout"
-                app:flow_verticalGap="16dp"
-                app:flow_verticalStyle="packed"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:letterSpacing="0.05"
+                android:background="?android:attr/colorBackground"
+                android:textColor="?attr/colorOnBackground"
+                android:text="@string/title_profile"
+                tools:ignore="MissingConstraints" />
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:gravity="center_horizontal">
+                android:gravity="center_horizontal"
+                android:paddingTop="50dp">
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/fio"
-                    android:textAlignment="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="24sp"
-                    android:letterSpacing="0.05"
-                    android:background="?android:attr/colorBackground"
-                    android:textColor="?attr/colorOnBackground"
-                    android:text="Name"/>
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/position"
-                    android:padding="15dp"
-                    android:layout_margin="16dp"
+                <ImageView
+                    android:layout_margin="10dp"
+                    android:id="@+id/avatar"
                     android:layout_marginTop="10dp"
-
-                    android:textAlignment="center"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="18sp"
-                    android:letterSpacing="0.05"
-                    android:background="?android:attr/colorBackground"
-                    android:textColor="?attr/colorOnBackground"
-                    android:text="Должность пользователя" />
+                    android:layout_height="150dp"
+                    android:foregroundGravity="center"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/_user_"
 
+                    app:layout_constraintBottom_toTopOf="@+id/title"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/logout"
-                    android:layout_margin="16dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/logout"
-
-                    android:padding="12dp"
-
-                    android:textSize="16sp"
-                    android:textColor="@color/white"
-                    app:cornerRadius="8dp"
-                    app:backgroundTint="@color/primary"
-                    app:rippleColor="@color/white"/>
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/scan"
-                    android:layout_margin="16dp"
-
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/scan"
-                    app:icon="@drawable/qr_code_scan"
-                    app:iconGravity="textStart"
-                    android:padding="12dp"
-                    android:textSize="16sp"
-                    android:layout_marginTop="10dp"
-
-                    android:textColor="@color/white"
-                    app:cornerRadius="8dp"
-                    app:backgroundTint="@color/primary"
-                    app:rippleColor="@color/white"/>
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_search"
-
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/administrator_searc_button_search"
-                    android:padding="12dp"
-                    android:textSize="16sp"
-                    android:layout_marginTop="10dp"
-                    android:layout_margin="16dp"
-
-                    android:textColor="@color/white"
-                    app:cornerRadius="8dp"
-                    app:backgroundTint="@color/primary"
-                    app:rippleColor="@color/white"
-                    android:gravity="center"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"/>
-
-                <TextView
-                    android:visibility="gone"
-                    android:id="@+id/error"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/recyclerViewLogs"
-                    android:layout_width="match_parent"
+                <androidx.constraintlayout.helper.widget.Flow
+                    android:id="@+id/flow"
+                    android:layout_width="0dp"
                     android:layout_height="0dp"
-                    android:layout_weight="1"
-                    tools:listitem="@layout/item_scanner_view"
-                    android:padding="16dp" />
-            </LinearLayout>
-        </LinearLayout>
+                    android:orientation="vertical"
+                    app:constraint_referenced_ids="avatar, fio, next,error, logout"
+                    app:flow_verticalGap="16dp"
+                    app:flow_verticalStyle="packed"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:gravity="center_horizontal">
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/fio"
+                        android:layout_margin="10dp"
+                        android:textAlignment="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="24sp"
+                        android:letterSpacing="0.05"
+                        android:background="?android:attr/colorBackground"
+                        android:textColor="?attr/colorOnBackground"
+                        android:text="Name"/>
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/position"
+                        android:padding="15dp"
+                        android:layout_margin="16dp"
+                        android:layout_marginTop="10dp"
+
+                        android:textAlignment="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="18sp"
+                        android:letterSpacing="0.05"
+                        android:background="?android:attr/colorBackground"
+                        android:textColor="?attr/colorOnBackground"
+                        android:text="Должность пользователя" />
+
+
+
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/scan"
+                        android:layout_margin="16dp"
+
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/scan"
+                        app:icon="@drawable/qr_code_scan"
+                        app:iconGravity="textStart"
+                        android:padding="12dp"
+                        android:textSize="16sp"
+                        android:layout_marginTop="10dp"
+
+                        android:textColor="@color/white"
+                        app:cornerRadius="8dp"
+                        app:backgroundTint="@color/primary"
+                        app:rippleColor="@color/white"/>
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/button_search"
+
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/administrator_searc_button_search"
+                        android:padding="12dp"
+                        android:textSize="16sp"
+                        android:layout_marginTop="10dp"
+                        android:layout_margin="16dp"
+
+                        android:textColor="@color/white"
+                        app:cornerRadius="8dp"
+                        app:backgroundTint="@color/primary"
+                        app:rippleColor="@color/white"
+                        android:gravity="center"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"/>
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/logout"
+                        android:layout_margin="16dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/logout"
+
+                        android:padding="12dp"
+
+                        android:textSize="16sp"
+                        android:textColor="@color/white"
+                        app:cornerRadius="8dp"
+                        app:backgroundTint="@color/primary"
+                        app:rippleColor="@color/white"/>
+                    <TextView
+                        android:visibility="gone"
+                        android:id="@+id/error"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerViewLogs"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        tools:listitem="@layout/item_scanner_view"
+                        android:padding="16dp" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.core.widget.NestedScrollView>
 

From 1513a6dac057d70e234feef356019cd7cf45f0f5 Mon Sep 17 00:00:00 2001
From: Serafim_Pankin <serafimpankin@yandex.ru>
Date: Wed, 19 Feb 2025 12:52:41 +0300
Subject: [PATCH 3/3] repair SwipeRefresh

---
 app/src/main/res/layout/fragment_profile.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 5d359cd..bc942e2 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/swipeRefresh"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 <androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -7,12 +12,7 @@
     android:fillViewport="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/swipeRefresh"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -165,6 +165,7 @@
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.core.widget.NestedScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+