From 0c722d75cf17358b50ecd0e9c91c18ff2581be7f Mon Sep 17 00:00:00 2001
From: shipovnikaaa <shpovniktuklosaw@gmail.com>
Date: Thu, 20 Feb 2025 14:13:50 +0300
Subject: [PATCH] qr-basic-admin-scrollview(luche), no mne ploho

---
 .../work/data/remote/PersonInfoDto.kt         |  2 ++
 .../myitschool/work/ui/main/MainFragment.kt   |  6 +++++
 .../ru/myitschool/work/ui/main/MainState.kt   |  2 ++
 .../myitschool/work/ui/main/MainViewModel.kt  |  2 ++
 app/src/main/res/drawable/button.xml          | 17 ++++++++++++++
 app/src/main/res/drawable/entry.xml           | 12 +++++-----
 app/src/main/res/layout/fragment_main.xml     | 23 ++++++++++---------
 7 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/button.xml

diff --git a/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt b/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt
index 47b27c8..a6769ce 100644
--- a/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt
+++ b/app/src/main/java/ru/myitschool/work/data/remote/PersonInfoDto.kt
@@ -7,4 +7,6 @@ data class PersonInfoDto(
   val photo: String,
   val position: String,
   val lastVisit: String,
+  val role: String,
+  val isBanned: Boolean
 )
diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt
index f4eef65..866b9c4 100644
--- a/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/main/MainFragment.kt
@@ -108,6 +108,12 @@ class MainFragment: Fragment(R.layout.fragment_main) {
       if (state.photo.isNotEmpty()) {
         picasso.load(state.photo).into(binding.photo)
       }
+      if (state.isBanned){
+        binding.scan.visibility = View.VISIBLE
+      }
+      if (state.role == "ADMIN"){
+        binding.admin.visibility = View.VISIBLE
+      }
       binding.fullname.text = state.fullName
       binding.position.text = state.position
       binding.lastEntry.text = state.lastVisit
diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt
index 5596a57..1155a12 100644
--- a/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/main/MainState.kt
@@ -5,5 +5,7 @@ data class MainState(
   val photo: String = "",
   val position: String = "",
   val lastVisit: String = "",
+  val role: String = "",
+  val isBanned: Boolean = false,
   val error: String? = null
 )
diff --git a/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt
index 864c33f..d7506c9 100644
--- a/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/main/MainViewModel.kt
@@ -52,6 +52,8 @@ class MainViewModel @Inject constructor(
                 photo = personInfo.photo,
                 position = personInfo.position,
                 lastVisit = dfo.format(dfi.parse(personInfo.lastVisit)!!),
+                role = personInfo.role,
+                isBanned = personInfo.isBanned,
                 error = null
               )
             }
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
new file mode 100644
index 0000000..1c19a0d
--- /dev/null
+++ b/app/src/main/res/drawable/button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/purple_500"/>
+<!--    <stroke android:width="1dip" android:color="@color/purple_700"/>-->
+    <corners
+        android:radius="15dp"
+        android:bottomLeftRadius="15dp"
+        android:bottomRightRadius="15dp"
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp"
+        />
+
+    <padding android:bottom="10dip"
+        android:left="10dip"
+        android:right="10dip"
+        android:top="10dip"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/entry.xml b/app/src/main/res/drawable/entry.xml
index 1c19a0d..c751c5d 100644
--- a/app/src/main/res/drawable/entry.xml
+++ b/app/src/main/res/drawable/entry.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/purple_500"/>
-<!--    <stroke android:width="1dip" android:color="@color/purple_700"/>-->
+    <solid android:color="@color/app_background"/>
+    <!--    <stroke android:width="1dip" android:color="@color/purple_700"/>-->
     <corners
         android:radius="15dp"
-        android:bottomLeftRadius="15dp"
-        android:bottomRightRadius="15dp"
-        android:topLeftRadius="15dp"
-        android:topRightRadius="15dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="40dp"
+        android:topRightRadius="40dp"
         />
 
     <padding android:bottom="10dip"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 2573be0..f1937b8 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -23,7 +23,7 @@
         android:layout_height="48dp"
         android:layout_margin="10sp"
         android:layout_marginTop="4dp"
-        android:background="@drawable/entry"
+        android:background="@drawable/button"
         android:text="Refresh"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.503"
@@ -35,15 +35,16 @@
         android:layout_width="256dp"
         android:layout_height="48dp"
         android:layout_margin="10sp"
-
         android:layout_marginTop="16dp"
         android:layout_weight="10"
-        android:background="@drawable/entry"
+        android:background="@drawable/button"
         android:text="Scan QR"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.503"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/refresh" />
+        app:layout_constraintTop_toBottomOf="@+id/refresh"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/position"
@@ -66,7 +67,7 @@
 
         android:layout_margin="10sp"
         android:layout_marginTop="4dp"
-        android:background="@drawable/entry"
+        android:background="@drawable/button"
         android:text="LOGOUT"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.503"
@@ -91,9 +92,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="10sp"
-        android:background="@drawable/entry"
+        android:background="@drawable/button"
         android:text="admin"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/photo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.603"
@@ -121,7 +122,7 @@
         android:layout_width="251dp"
         android:layout_height="58dp"
         android:layout_marginTop="28dp"
-        android:background="@drawable/entry"
+        android:background="@drawable/button"
         android:paddingTop="15sp"
         android:paddingBottom="15sp"
         android:text="Ваши проходы"
@@ -141,7 +142,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="10sp"
-
         android:layout_marginTop="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.501"
@@ -153,7 +153,7 @@
         android:layout_width="0sp"
         android:layout_height="0sp"
         android:layout_marginTop="20dp"
-        android:background="@color/app_background"
+        android:background="@drawable/entry"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -171,7 +171,8 @@
                 android:id="@+id/textView4"
                 android:layout_width="185dp"
                 android:layout_height="wrap_content"
-                android:background="@drawable/entry"
+                android:layout_gravity="center"
+                android:background="@drawable/button"
                 android:paddingTop="15sp"
                 android:paddingBottom="15sp"
                 android:text="Ваши проходы"