минус progress bar на главной
This commit is contained in:
parent
d45ac95e98
commit
4842013e53
@ -53,7 +53,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
|
|||||||
viewModel.state.collectWhenStarted(this) { state ->
|
viewModel.state.collectWhenStarted(this) { state ->
|
||||||
binding.showState.visibleOrGone(state is ProfileViewModel.State.Show)
|
binding.showState.visibleOrGone(state is ProfileViewModel.State.Show)
|
||||||
binding.error.visibleOrGone(state is ProfileViewModel.State.Error)
|
binding.error.visibleOrGone(state is ProfileViewModel.State.Error)
|
||||||
binding.loading.visibleOrGone(state is ProfileViewModel.State.Loading)
|
|
||||||
|
|
||||||
when(state) {
|
when(state) {
|
||||||
is ProfileViewModel.State.Loading -> {
|
is ProfileViewModel.State.Loading -> {
|
||||||
|
@ -43,16 +43,6 @@
|
|||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="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
|
<androidx.cardview.widget.CardView
|
||||||
android:id="@+id/photo2"
|
android:id="@+id/photo2"
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<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. -->
|
<!-- Customize your light theme here. -->
|
||||||
<item name="colorPrimary">@color/AccentBlue</item>
|
<item name="colorPrimary">@color/AccentBlue</item>
|
||||||
<item name="colorPrimaryDark">@color/white</item>
|
<item name="colorPrimaryDark">@color/black</item>
|
||||||
<item name="android:windowLightStatusBar">true</item>
|
<item name="android:windowLightStatusBar">false</item>
|
||||||
<item name="android:navigationBarColor">@color/white</item>
|
<item name="android:navigationBarColor">@color/white</item>
|
||||||
<item name="android:colorBackground">@color/white</item>
|
<item name="android:colorBackground">@color/black</item>
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
@ -1,5 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
|
|
||||||
<style name="Theme.UiTemplate.TextH1">
|
<style name="Theme.UiTemplate.TextH1">
|
||||||
<item name="android:textSize">28sp</item>
|
<item name="android:textSize">28sp</item>
|
||||||
<item name="android:textAlignment">center</item>
|
<item name="android:textAlignment">center</item>
|
||||||
@ -36,4 +38,5 @@
|
|||||||
<item name="android:textAlignment">center</item>
|
<item name="android:textAlignment">center</item>
|
||||||
<item name="android:fontFamily">@font/montsemibold</item>
|
<item name="android:fontFamily">@font/montsemibold</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -14,4 +14,5 @@
|
|||||||
<style name="ProgressBarTheme" parent="ThemeOverlay.AppCompat.Light">
|
<style name="ProgressBarTheme" parent="ThemeOverlay.AppCompat.Light">
|
||||||
<item name="colorAccent">@color/AccentBlue</item>
|
<item name="colorAccent">@color/AccentBlue</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
@ -3,10 +3,10 @@
|
|||||||
<style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.Light.NoActionBar">
|
<style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||||
<!-- Customize your light theme here. -->
|
<!-- Customize your light theme here. -->
|
||||||
<item name="colorPrimary">@color/AccentBlue</item>
|
<item name="colorPrimary">@color/AccentBlue</item>
|
||||||
<item name="colorPrimaryDark">@color/white</item>
|
|
||||||
<item name="android:windowLightStatusBar">true</item>
|
<item name="android:windowLightStatusBar">true</item>
|
||||||
<item name="android:navigationBarColor">@color/white</item>
|
<item name="android:navigationBarColor">@color/white</item>
|
||||||
<item name="android:colorBackground">@color/white</item>
|
<item name="android:colorBackground">@color/white</item>
|
||||||
|
<item name="colorOnPrimary">@color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />
|
<style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user