Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/src/main/res/drawable/button_beigestroke_whitefill.xml
#	app/src/main/res/drawable/res_success.xml
#	app/src/main/res/layout/fragment_admin.xml
#	app/src/main/res/layout/fragment_main.xml
#	app/src/main/res/layout/fragment_scan_result.xml

README.md

@@ -1,5 +1,7 @@
 [![Android Studio version](https://img.shields.io/endpoint?url=https%3A%2F%2Fsicampus.ru%2Fgitea%2Fcore%2Fdocs%2Fraw%2Fbranch%2Fmain%2Fandroid-studio-label.json)](https://sicampus.ru/gitea/core/docs/src/branch/main/how-upload-project.md)
 
+# Figma Design file - https://www.figma.com/design/L2bc8N9gPzGhcWQJa3OPmG/Untitled?node-id=0-1&t=EDlrWwl5oFm6xpoN-1 
+
 # НТО 2024. II отборочный этап. Командные задани — клиентская часть
 
 ## 📖 Предыстория

app/src/main/res/drawable/button_beigestroke_whitefill.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/white" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/beige" />
+    <corners android:radius="8dp"/>
+</shape>

app/src/main/res/drawable/button_grey.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/grey" />
+    <solid android:color="@color/light_grey" />
     <stroke
         android:width="2dp"
-        android:color="@color/grey" />
+        android:color="@color/light_grey" />
     <corners android:radius="8dp"/>
 </shape>

app/src/main/res/drawable/res_success.xml

@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="77.53dp"
+    android:height="115.35dp"
+    android:viewportWidth="77.53"
+    android:viewportHeight="115.35">
+  <path
+      android:pathData="M28.08,43.07h3.94v1h-3.94z"
+      android:fillColor="#E9D4C3"/>
+  <path
+      android:pathData="M36.1,43.07h12.85v1h-12.85z"
+      android:fillColor="#E9D4C3"/>
+  <path
+      android:pathData="M72.47,26l-2.49,28.5a5.18,5.18 0,0 1,-5.06 4.65,4.2 4.2,0 0,1 -4.25,-4.65L63.14,26a15.08,15.08 0,0 0,-15.24 -16.7L37.74,9.3A18.61,18.61 0,0 0,19.58 26l-1,11.64h-9.3l1,-11.64c1.25,-14.34 13.94,-26 28.27,-26h10.2A23.47,23.47 0,0 1,72.47 26Z"
+      android:fillColor="#E9D4C3"/>
+  <path
+      android:pathData="M72.47,26l-2.49,28.5a5.18,5.18 0,0 1,-5.06 4.65,4.2 4.2,0 0,1 -4.25,-4.65L63.14,26a15.08,15.08 0,0 0,-15.24 -16.7L37.74,9.3A18.61,18.61 0,0 0,19.58 26l-1,11.64h-9.3l1,-11.64c1.25,-14.34 13.94,-26 28.27,-26h10.2A23.47,23.47 0,0 1,72.47 26Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#fff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M73.14,53.46 L68.29,109a7.07,7.07 0,0 1,-6.92 6.35L5.83,115.35a5.73,5.73 0,0 1,-5.8 -6.35l4.86,-55.54a7.07,7.07 0,0 1,3.46 -5.39,6.8 6.8,0 0,1 3.46,-1L67.34,47.07a6,6 0,0 1,3.21 0.91A5.76,5.76 0,0 1,73.14 53.46Z"
+      android:fillColor="#E9D4C3"/>
+  <path
+      android:pathData="M15.39,77.72l14.43,22.21 47.59,-47.59a0.48,0.48 0,0 0,-0.63 -0.71l-45.35,35.55 -8.57,-13.81Z"
+      android:fillColor="#fff"/>
+</vector>

app/src/main/res/layout/fragment_admin.xml

@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.4" />
+        app:layout_constraintGuide_percent="0.36" />
 
     <View
         android:id="@+id/back"
@@ -78,6 +78,17 @@
         app:layout_constraintStart_toStartOf="@+id/input_field"
         app:layout_constraintTop_toTopOf="@+id/input_field" />
 
+    <View
+        android:id="@+id/line"
+        android:layout_width="320dp"
+        android:layout_height="10dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/ic_line"
+        app:layout_constraintBottom_toTopOf="@+id/guideline2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
 
     <View
         android:id="@+id/username_field"
@@ -208,16 +219,23 @@
         app:layout_constraintEnd_toEndOf="@+id/block"
         app:layout_constraintTop_toTopOf="@+id/block" />
 
+    <LinearLayout
+        android:layout_width="320dp"
+        android:layout_height="140dp"
+        android:layout_marginTop="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/block">
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/entrance_data"
-        android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.485"
             app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/block"
+            app:layout_constraintTop_toBottomOf="@+id/scan" />
-        app:layout_constraintVertical_bias="0.0" />
+    </LinearLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_login.xml

@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.53" />
+        app:layout_constraintGuide_percent="0.55" />
 
 
     <View
@@ -54,6 +54,7 @@
         android:gravity="center"
         android:text="@string/welcomeText"
         android:textColor="@color/black"
+        android:textStyle="bold"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,9 +64,10 @@
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="15dp"
         android:gravity="center"
         android:text="@string/inputLoginText"
+        android:textStyle="bold"
         android:textColor="@color/black"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/fragment_main.xml

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.31" />
+        app:layout_constraintGuide_percent="0.35" />
 
 
     <View
@@ -33,6 +33,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:id="@+id/admin"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        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/icon_profile"
         android:layout_width="170dp"

app/src/main/res/layout/fragment_scan_result.xml

@@ -19,7 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.29" />
+        app:layout_constraintGuide_percent="0.21" />
 
     <TextView
         android:id="@+id/error"
@@ -28,7 +28,7 @@
         android:layout_marginTop="20dp"
         android:gravity="center"
         android:text="@string/serverError"
-
+        android:visibility="gone"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.58" />
+        app:layout_constraintGuide_percent="0.62" />
 
     <View
         android:id="@+id/close"
@@ -54,9 +54,9 @@
 
     <View
         android:id="@+id/success_icon"
-        android:layout_width="150dp"
+        android:layout_width="190dp"
-        android:layout_height="150dp"
+        android:layout_height="250dp"
-        android:background="@drawable/res_success_ic"
+        android:background="@drawable/res_success"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/guideline_top" />
@@ -76,7 +76,7 @@
         android:layout_width="320dp"
         android:layout_height="80dp"
         android:layout_marginTop="10dp"
-        android:background="@drawable/button_grey"
+        android:background="@drawable/button_beige"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/guideline_bottom" />

app/src/main/res/values/colors.xml

@@ -10,5 +10,6 @@
     <color name="buttonBackground">#5C5C5C</color>
     <color name="buttonText">#C0C0C0</color>
     <color name="grey">#808080</color>
-    <color name="beige">#E9D4C3</color>
+    <color name="light_grey">#BEBEBE</color>
+    <color name="beige">#E2D8C7</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -5,5 +5,4 @@
         <item
             name = "android:background" >@null</item>
     </style>
-
 </resources>