From 00365646056da8830fe7e3fb17266cfe38275f0d Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Tue, 18 Feb 2025 20:22:03 +0300
Subject: [PATCH 1/4] =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D1=81=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                       | 1 +
 app/src/main/java/ru/myitschool/work/core/Constants.kt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 795af31..d444f2f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:usesCleartextTraffic="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Default"
diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt
index 8f8138d..56697d1 100644
--- a/app/src/main/java/ru/myitschool/work/core/Constants.kt
+++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt
@@ -1,5 +1,6 @@
 package ru.myitschool.work.core
 
 object Constants {
-    const val SERVER_ADDRESS = "http://localhost:8090"
+//    "http://localhost:8080"
+    const val SERVER_ADDRESS = "http://10.0.2.2:8080"
 }
\ No newline at end of file

From 420b7c6f43024605746fb18089e0a6c85c9d6891 Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Tue, 18 Feb 2025 20:34:57 +0300
Subject: [PATCH 2/4] =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=80=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8F=20=D0=B8=D0=B7=D1=83=D1=80=D0=BE=D0=B4=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D1=8B=D0=B9=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 02a3619..9bec25e 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -27,6 +27,8 @@
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
@@ -36,10 +38,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
+        android:layout_marginTop="16dp"
+        android:textAlignment="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-        app:layout_constraintEnd_toStartOf="@id/buttons"
-        app:layout_constraintStart_toEndOf="@id/photo"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/photo"
         tools:text="@tools:sample/full_names" />
 
     <TextView
@@ -57,9 +61,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        app:layout_constraintEnd_toStartOf="@id/buttons"
-        app:layout_constraintStart_toEndOf="@id/position"
-        app:layout_constraintTop_toTopOf="@id/position"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="@+id/fullname"
+        app:layout_constraintStart_toStartOf="@+id/fullname"
+        app:layout_constraintTop_toBottomOf="@+id/fullname"
         tools:text="@tools:sample/date/hhmm" />
 
     <TextView
@@ -68,6 +73,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:textAlignment="center"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -84,15 +90,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/logout"
-        style="?attr/floatingActionButtonSmallStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/profile_refresh_button"
-        android:src="@drawable/ic_logout"
-        app:elevation="0dp" />
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/refresh"
         style="?attr/floatingActionButtonSmallStyle"
@@ -100,7 +97,20 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/profile_refresh_button"
         android:src="@drawable/ic_refresh"
-        app:elevation="0dp" />
+        app:elevation="0dp"
+        tools:layout_editor_absoluteX="323dp"
+        tools:layout_editor_absoluteY="170dp" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/logout"
+        style="?attr/floatingActionButtonSmallStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/profile_refresh_button"
+        android:src="@drawable/ic_logout"
+        app:elevation="0dp"
+        tools:layout_editor_absoluteX="166dp"
+        tools:layout_editor_absoluteY="567dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/scan"
@@ -110,6 +120,5 @@
         android:src="@drawable/ic_qr_code"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:useCompatPadding="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b7306b371ada9bd8d29379bdcf116200195bfc9f Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 10:01:47 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2.=20?=
 =?UTF-8?q?=D0=A0=D0=B5=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D1=8D=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B0=20=D1=81=20=D1=80=D0=B5=D0=B7=D1=83?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=BC=20=D0=BE=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_qr_result.xml    |  2 ++
 app/src/main/res/values/TextStyle.xml         | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 app/src/main/res/values/TextStyle.xml

diff --git a/app/src/main/res/layout/fragment_qr_result.xml b/app/src/main/res/layout/fragment_qr_result.xml
index 8f4c92b..468aad2 100644
--- a/app/src/main/res/layout/fragment_qr_result.xml
+++ b/app/src/main/res/layout/fragment_qr_result.xml
@@ -28,6 +28,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        style="@style/Theme.UiTemplate.TextH1"
         tools:text="This is test text with result scanning"
         tools:visibility="visible" />
 
@@ -37,6 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:text="@string/close_button"
+        style="@style/Theme.UiTemplate.Button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/values/TextStyle.xml b/app/src/main/res/values/TextStyle.xml
new file mode 100644
index 0000000..639155c
--- /dev/null
+++ b/app/src/main/res/values/TextStyle.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+        <style name="Theme.UiTemplate.TextH1">
+            <item name="android:textSize">28sp</item>
+            <item name="android:fontFamily">@font/gilroyextrabold</item>
+            <item name="android:textColor">@color/black</item>
+        </style>
+        <style name="Theme.UiTemplate.TextH2">
+            <item name="android:textSize">28sp</item>
+            <item name="android:textColor">@color/TextBlack</item>
+            <item name="android:fontFamily">@font/gilroybold</item>
+        </style>
+        <style name="Theme.UiTemplate.TextH3">
+            <item name="android:textSize">20sp</item>
+            <item name="android:textColor">@color/TextBlack</item>
+            <item name="android:fontFamily">@font/montbold</item>
+        </style>
+        <style name="Theme.UiTemplate.TextH4">
+            <item name="android:textSize">16sp</item>
+            <item name="android:textColor">@color/Gray6</item>
+            <item name="android:fontFamily">@font/gilroysemibold</item>
+        </style>
+        <style name="Theme.UiTemplate.TextH4_2">
+            <item name="android:textSize">16sp</item>
+            <item name="android:textColor">@color/Gray5</item>
+            <item name="android:fontFamily">@font/gilroysemibold</item>
+        </style>
+        <style name="Theme.UiTemplate.TextH5">
+            <item name="android:textSize">14sp</item>
+            <item name="android:textColor">@color/Gray5</item>
+            <item name="android:fontFamily">@font/montsemibold</item>
+        </style>
+</resources>

From 60d04a520b2c5871bb3f612561e374b92ea77475 Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 10:14:03 +0300
Subject: [PATCH 4/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=20=D0=B1=D0=B0=D1=80=D0=B0=20=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B2=20=D0=B1=D0=B0=D1=80=D0=B0.=20=D0=94=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BD=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_profile.xml  | 30 +++++++++++--------
 .../main/res/layout/fragment_qr_result.xml    |  2 +-
 app/src/main/res/values/strings_profile.xml   |  1 +
 app/src/main/res/values/themes.xml            |  2 ++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 9bec25e..0abc630 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -12,6 +12,17 @@
         android:layout_height="0dp"
         app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" />
 
+
+    <TextView
+        android:id="@+id/textView"
+        style="@style/Theme.UiTemplate.TextH1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/profile_main_textview"
+        app:layout_constraintBottom_toBottomOf="@+id/logout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ProgressBar
         android:id="@+id/loading"
         android:layout_width="wrap_content"
@@ -80,15 +91,6 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Something wrong. Try later" />
 
-    <androidx.constraintlayout.helper.widget.Flow
-        android:id="@+id/buttons"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:constraint_referenced_ids="logout,refresh"
-        app:flow_horizontalGap="4dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/refresh"
@@ -98,8 +100,8 @@
         android:contentDescription="@string/profile_refresh_button"
         android:src="@drawable/ic_refresh"
         app:elevation="0dp"
-        tools:layout_editor_absoluteX="323dp"
-        tools:layout_editor_absoluteY="170dp" />
+        tools:layout_editor_absoluteX="167dp"
+        tools:layout_editor_absoluteY="521dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/logout"
@@ -109,8 +111,8 @@
         android:contentDescription="@string/profile_refresh_button"
         android:src="@drawable/ic_logout"
         app:elevation="0dp"
-        tools:layout_editor_absoluteX="166dp"
-        tools:layout_editor_absoluteY="567dp" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/scan"
@@ -121,4 +123,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:useCompatPadding="true" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_qr_result.xml b/app/src/main/res/layout/fragment_qr_result.xml
index 468aad2..f49e321 100644
--- a/app/src/main/res/layout/fragment_qr_result.xml
+++ b/app/src/main/res/layout/fragment_qr_result.xml
@@ -28,7 +28,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        style="@style/Theme.UiTemplate.TextH1"
+        style="@style/Theme.UiTemplate.TextH2"
         tools:text="This is test text with result scanning"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/values/strings_profile.xml b/app/src/main/res/values/strings_profile.xml
index 1c399af..3fa8596 100644
--- a/app/src/main/res/values/strings_profile.xml
+++ b/app/src/main/res/values/strings_profile.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="profile_refresh_button">Refresh</string>
     <string name="profile_scan_button">Scan QR</string>
+    <string name="profile_main_textview">Home</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d164577..cc9f550 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,8 @@
     <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/AccentBlue</item>
+        <item name="colorPrimaryDark">@color/white</item>
+        <item name="android:navigationBarColor">@color/white</item>
         <item name="android:colorBackground">@color/white</item>
     </style>