v228a/droidocat-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
v228a 2025-02-20 14:16:48 +03:00
commit 438aca7b75
14 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
View File

@ -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 -> {

1
app/src/main/res/layout-land/fragment_login.xml
View File

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

1
app/src/main/res/layout-land/fragment_profile.xml
View File

@ -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"

1
app/src/main/res/layout-land/fragment_qr_result.xml
View File

@ -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"

1
app/src/main/res/layout-land/fragment_qr_scan.xml
View File

@ -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"

1
app/src/main/res/layout/fragment_login.xml
View File

@ -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

14
app/src/main/res/layout/fragment_profile.xml
View File

@ -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"
@ -37,21 +37,12 @@
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"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
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"
@ -72,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"

1
app/src/main/res/layout/fragment_qr_result.xml
View File

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

1
app/src/main/res/layout/fragment_qr_scan.xml
View File

@ -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"

1
app/src/main/res/layout/fragment_splash.xml
View File

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

10
app/src/main/res/values-night/themes.xml
View File

@ -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.DayNight.DarkActionBar">
<!-- 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="android:windowLightStatusBar">true</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">@color/white</item>
<item name="android:colorBackground">@color/black</item>
</style>
<style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />
</resources>

3
app/src/main/res/values/TextStyle.xml
View File

@ -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>

4
app/src/main/res/values/styles.xml
View File

@ -11,4 +11,8 @@
<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>

2
app/src/main/res/values/themes.xml
View File

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