From db7af594ea6610b02aed554c488b427bb978b5d8 Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 12:06:01 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D1=86=D0=B2=D0=B5=D1=82=20progress=20bar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout-land/fragment_login.xml     |  1 +
 app/src/main/res/layout-land/fragment_profile.xml   |  1 +
 app/src/main/res/layout-land/fragment_qr_result.xml |  1 +
 app/src/main/res/layout-land/fragment_qr_scan.xml   |  1 +
 app/src/main/res/layout/fragment_login.xml          |  1 +
 app/src/main/res/layout/fragment_profile.xml        |  3 ++-
 app/src/main/res/layout/fragment_qr_result.xml      |  1 +
 app/src/main/res/layout/fragment_qr_scan.xml        |  1 +
 app/src/main/res/layout/fragment_splash.xml         |  1 +
 app/src/main/res/values-night/themes.xml            | 10 +++++-----
 app/src/main/res/values/styles.xml                  |  5 ++++-
 11 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout-land/fragment_login.xml b/app/src/main/res/layout-land/fragment_login.xml
index 6fc41d1..b991ced 100644
--- a/app/src/main/res/layout-land/fragment_login.xml
+++ b/app/src/main/res/layout-land/fragment_login.xml
@@ -103,6 +103,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:theme="@style/ProgressBarTheme"
             android:layout_marginTop="25dp"
             android:visibility="gone" />
 
diff --git a/app/src/main/res/layout-land/fragment_profile.xml b/app/src/main/res/layout-land/fragment_profile.xml
index 0081b91..c004afa 100644
--- a/app/src/main/res/layout-land/fragment_profile.xml
+++ b/app/src/main/res/layout-land/fragment_profile.xml
@@ -48,6 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
+            android:theme="@style/ProgressBarTheme"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/fragment_qr_result.xml b/app/src/main/res/layout-land/fragment_qr_result.xml
index f49e321..cd45a47 100644
--- a/app/src/main/res/layout-land/fragment_qr_result.xml
+++ b/app/src/main/res/layout-land/fragment_qr_result.xml
@@ -9,6 +9,7 @@
         android:id="@+id/loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/ProgressBarTheme"
         app:layout_constraintBottom_toTopOf="@id/close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/fragment_qr_scan.xml b/app/src/main/res/layout-land/fragment_qr_scan.xml
index 4690065..62f2dcd 100644
--- a/app/src/main/res/layout-land/fragment_qr_scan.xml
+++ b/app/src/main/res/layout-land/fragment_qr_scan.xml
@@ -17,6 +17,7 @@
         android:id="@+id/loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/ProgressBarTheme"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 71ec989..bf9475f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -104,6 +104,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="25dp"
+        android:theme="@style/ProgressBarTheme"
         android:visibility="gone" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index ac313f1..cf1fc54 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -37,7 +37,7 @@
             style="@style/Theme.UiTemplate.TextH1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="15dp"
             android:text="@string/profile_main_textview"
             android:textAlignment="center"
             app:layout_constraintStart_toStartOf="parent"
@@ -48,6 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
+            android:theme="@style/ProgressBarTheme"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_qr_result.xml b/app/src/main/res/layout/fragment_qr_result.xml
index f49e321..3772971 100644
--- a/app/src/main/res/layout/fragment_qr_result.xml
+++ b/app/src/main/res/layout/fragment_qr_result.xml
@@ -11,6 +11,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@id/close"
         app:layout_constraintEnd_toEndOf="parent"
+        android:theme="@style/ProgressBarTheme"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_qr_scan.xml b/app/src/main/res/layout/fragment_qr_scan.xml
index 4690065..62f2dcd 100644
--- a/app/src/main/res/layout/fragment_qr_scan.xml
+++ b/app/src/main/res/layout/fragment_qr_scan.xml
@@ -17,6 +17,7 @@
         android:id="@+id/loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:theme="@style/ProgressBarTheme"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
index 6091984..9ec2b52 100644
--- a/app/src/main/res/layout/fragment_splash.xml
+++ b/app/src/main/res/layout/fragment_splash.xml
@@ -8,6 +8,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
+        android:theme="@style/ProgressBarTheme"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index ed98d3b..fb82be8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Base.Theme.UiTemplate" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/AccentBlue</item>
-        <item name="android:colorBackground">@color/black</item>
-        <item name="android:navigationBarColor">@color/black</item>
-        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorPrimaryDark">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@color/white</item>
+        <item name="android:colorBackground">@color/white</item>
     </style>
-    <style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 59a631e..068cac5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.UITemplate.Button" parent="Widget.Material3.Button">
+    <style name="Theme.UiTemplate.Button" parent="Widget.Material3.Button">
         <item name="android:colorBackground">@color/AccentBlue</item>
         <item name="cornerRadius">50dp</item>
         <item name="android:height">59dp</item>
@@ -11,4 +11,7 @@
         <item name="iconGravity">textEnd</item>
         <item name="iconPadding">10dp</item>
     </style>
+    <style name="ProgressBarTheme" parent="ThemeOverlay.AppCompat.Light">
+        <item name="colorAccent">@color/AccentBlue</item>
+    </style>
 </resources>
\ No newline at end of file

From 4842013e53c38bfe9d23b1c858bbc04788576dbf Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 13:59:17 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D1=83=D1=81=20progress?=
 =?UTF-8?q?=20bar=20=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/myitschool/work/ui/profile/ProfileFragment.kt   |  1 -
 app/src/main/res/layout/fragment_profile.xml           | 10 ----------
 app/src/main/res/values-night/themes.xml               |  8 ++++----
 app/src/main/res/values/TextStyle.xml                  |  3 +++
 app/src/main/res/values/styles.xml                     |  1 +
 app/src/main/res/values/themes.xml                     |  2 +-
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
index c3d65b4..853948d 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
@@ -53,7 +53,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
         viewModel.state.collectWhenStarted(this) { state ->
             binding.showState.visibleOrGone(state is ProfileViewModel.State.Show)
             binding.error.visibleOrGone(state is ProfileViewModel.State.Error)
-            binding.loading.visibleOrGone(state is ProfileViewModel.State.Loading)
 
             when(state) {
                 is ProfileViewModel.State.Loading -> {
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index cf1fc54..dcac63d 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -43,16 +43,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ProgressBar
-            android:id="@+id/loading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:theme="@style/ProgressBarTheme"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.cardview.widget.CardView
             android:id="@+id/photo2"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fb82be8..d385113 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/AccentBlue</item>
-        <item name="colorPrimaryDark">@color/white</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@color/white</item>
-        <item name="android:colorBackground">@color/white</item>
+        <item name="android:colorBackground">@color/black</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/TextStyle.xml b/app/src/main/res/values/TextStyle.xml
index 099f69a..251ca83 100644
--- a/app/src/main/res/values/TextStyle.xml
+++ b/app/src/main/res/values/TextStyle.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+
         <style name="Theme.UiTemplate.TextH1">
             <item name="android:textSize">28sp</item>
             <item name="android:textAlignment">center</item>
@@ -36,4 +38,5 @@
             <item name="android:textAlignment">center</item>
             <item name="android:fontFamily">@font/montsemibold</item>
         </style>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 068cac5..254011f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,4 +14,5 @@
     <style name="ProgressBarTheme" parent="ThemeOverlay.AppCompat.Light">
         <item name="colorAccent">@color/AccentBlue</item>
     </style>
+
 </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 ba58133..9834864 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,10 +3,10 @@
     <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your light theme here. -->
         <item name="colorPrimary">@color/AccentBlue</item>
-        <item name="colorPrimaryDark">@color/white</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:navigationBarColor">@color/white</item>
         <item name="android:colorBackground">@color/white</item>
+        <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />

From e63ef4710d62f8fa69a652679bae55fbf1db748b Mon Sep 17 00:00:00 2001
From: Juja2025 <drnaleks@gmail.com>
Date: Thu, 20 Feb 2025 14:13:11 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_profile.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index dcac63d..1b0ac1e 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="16dp">
+        android:padding="25dp">
 
         <TextView
             android:id="@+id/error"
@@ -63,6 +63,7 @@
                 android:layout_height="120dp"
                 android:layout_marginBottom="16dp"
                 android:contentDescription="@null"
+                android:scaleType="fitXY"
                 app:layout_constraintBottom_toTopOf="@+id/scan"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"