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] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D1=83=D1=81=20progress=20bar?=
 =?UTF-8?q?=20=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

---
 .../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" />