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-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 62981b4..1b0dfc7 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" /> + android:padding="25dp"> - 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..d385113 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,11 +1,11 @@ - - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 44cf4b3..254011f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,4 +11,8 @@ textEnd 10dp + + \ 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 @@