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

---
 app/src/main/res/layout/fragment_main.xml | 31 ++++++++---------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index eafbc69..dcb856f 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -12,16 +12,6 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.36" />
 
-    <View
-        android:id="@+id/logout"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/icon_exit"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <View
         android:id="@+id/refresh"
         android:layout_width="42dp"
@@ -33,25 +23,24 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <View
-        android:id="@+id/logout2"
+        android:id="@+id/admin"
         android:layout_width="48dp"
         android:layout_height="48dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/ic_admin"
+        app:layout_constraintEnd_toStartOf="@+id/refresh"
+        app:layout_constraintTop_toTopOf="parent" />
+    <View
+        android:id="@+id/logout"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:background="@drawable/icon_exit"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <View
-        android:id="@+id/refresh2"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="20dp"
-        android:background="@drawable/icon_refresh"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <View
         android:id="@+id/icon_profile"
         android:layout_width="170dp"

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

---
 app/src/main/res/layout/fragment_login.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index f9b411a..97f5077 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -3,7 +3,6 @@
     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

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

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

diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml
index 4480bb4..ec8afd7 100644
--- a/app/src/main/res/layout/fragment_admin.xml
+++ b/app/src/main/res/layout/fragment_admin.xml
@@ -249,5 +249,18 @@
             app:layout_constraintTop_toBottomOf="@+id/scan" />
     </LinearLayout>
 
+    <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_toTopOf="@+id/username_box"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_for" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file