fix: Small fixes

Lastaapps · Jan 22, 2024 · 2fc05a6 · 2fc05a6
1 parent 9888cf3
commit 2fc05a6
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 41 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -53,6 +53,9 @@ android {
         // And some Apache shit
         resources.excludes.add("org/apache/**")
         resources.excludes.add("org/htmlunit/**")
+
+        // Taken from the AS template project, should be safe
+        resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+  ~    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
   ~
   ~     This file is part of Menza.
   ~
@@ -49,7 +49,7 @@
         android:localeConfig="@xml/locales_config"
         android:theme="@style/AppTheme.Starting"
         android:enableOnBackInvokedCallback="true"
-        tools:targetApi="tiramisu">
+        tools:targetApi="34">
         <activity
             android:name=".MainActivity"
             android:exported="true"

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/MainActivity.kt b/app/src/main/kotlin/cz/lastaapps/menza/MainActivity.kt
@@ -20,9 +20,9 @@
 package cz.lastaapps.menza
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -35,7 +35,7 @@ import cz.lastaapps.menza.ui.ApplyAppTheme
 import cz.lastaapps.menza.ui.locals.WithFoldingFeature
 import cz.lastaapps.menza.ui.locals.WithLocalWindowSizes
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/info/ui/widgets/OpeningHours.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/info/ui/widgets/OpeningHours.kt
@@ -65,7 +65,7 @@ fun OpeningHoursList(
         ) {
             Text(
                 stringResource(R.string.info_opening_hours_title),
-                style = MaterialTheme.typography.titleLarge
+                style = MaterialTheme.typography.titleLarge,
             )
             data.forEach {
                 OpeningHoursLocationUI(
@@ -97,7 +97,10 @@ private fun OpeningHoursLocationUI(
     ) {
         Column(
             verticalArrangement = Arrangement.spacedBy(Padding.Small),
-            modifier = Modifier.padding(Padding.MidSmall),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .padding(Padding.MidSmall)
+                .align(Alignment.CenterHorizontally),
         ) {
             Text(
                 text = data.name,

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/di/settingsModule.kt
@@ -34,6 +34,7 @@ import cz.lastaapps.menza.features.settings.data.datasource.OrderDataSourceImpl
 import cz.lastaapps.menza.features.settings.data.datasource.OrderSettings
 import cz.lastaapps.menza.features.settings.domain.MainSettingsRepo
 import cz.lastaapps.menza.features.settings.domain.OrderRepo
+import cz.lastaapps.menza.features.settings.domain.usecase.FullAppReloadUC
 import cz.lastaapps.menza.features.settings.domain.usecase.GetDishLanguageUC
 import cz.lastaapps.menza.features.settings.domain.usecase.GetDishListModeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.GetImageScaleRangeUC
@@ -88,7 +89,7 @@ val settingsModule = module {
         SettingsViewModel(
             get(), get(), get(), get(), get(),
             get(), get(), get(), get(), get(),
-            get(), get(), get(),
+            get(), get(), get(), get(),
         )
         // @formatter:on
     }
@@ -108,6 +109,7 @@ val settingsModule = module {
     factoryOf(::SetLatestMenzaUC)
     factoryOf(::SetPreferredMenzaUC)
     factoryOf(::GetPreferredMenzaUC)
+    factoryOf(::FullAppReloadUC)
 
     // Others
     factoryOf(::GetImageScaleUC)

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/FullAppReloadUC.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/domain/usecase/FullAppReloadUC.kt
@@ -0,0 +1,47 @@
+/*
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *
+ *     This file is part of Menza.
+ *
+ *     Menza is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     Menza is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package cz.lastaapps.menza.features.settings.domain.usecase
+
+import cz.lastaapps.core.domain.UCContext
+import cz.lastaapps.core.domain.UseCase
+
+class FullAppReloadUC(
+    context: UCContext,
+) : UseCase(context) {
+
+    suspend operator fun invoke(): Nothing = launch {
+        TODO("Implement me!!!")
+//        listOf(
+//            allergenRepo,
+//            locationRepo,
+//            messagesRepo,
+//            menzaRepo,
+//            contactsRepo,
+//            openingHoursRepo
+//        ).forEach {
+//            it.clearData()
+//        }
+//        app.imageLoader.diskCache?.clear()
+//
+//        withContext(Dispatchers.Main) {
+//            exitProcess(0)
+//        }
+    }
+}
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/screens/DishLanguageScreen.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/screens/DishLanguageScreen.kt
@@ -153,7 +153,9 @@ private fun LanguageButton(
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(Padding.Tiny),
-        modifier = Modifier.padding(Padding.MidSmall),
+        modifier = Modifier
+            .padding(Padding.MidSmall)
+            .fillMaxWidth(),
     ) {
         Text(
             title,

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/screens/SettingsScreen.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/screens/SettingsScreen.kt
@@ -276,9 +276,12 @@ private fun Buttons(
             onCrashesDialog = onCrashesDialog,
         )
 
-        FullDataReload(
-            onFullRefresh = onFullRefresh,
-        )
+        @Suppress("ConstantConditionIf")
+        if (false) {
+            FullDataReload(
+                onFullRefresh = onFullRefresh,
+            )
+        }
     }
 }
 

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt b/app/src/main/kotlin/cz/lastaapps/menza/features/settings/ui/vm/SettingsViewModel.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -30,6 +30,7 @@ import cz.lastaapps.menza.features.settings.domain.model.DarkMode
 import cz.lastaapps.menza.features.settings.domain.model.DarkMode.Dark
 import cz.lastaapps.menza.features.settings.domain.model.InitialSelectionBehaviour
 import cz.lastaapps.menza.features.settings.domain.model.PriceType
+import cz.lastaapps.menza.features.settings.domain.usecase.FullAppReloadUC
 import cz.lastaapps.menza.features.settings.domain.usecase.GetImagesOnMeteredUC
 import cz.lastaapps.menza.features.settings.domain.usecase.GetPriceTypeUC
 import cz.lastaapps.menza.features.settings.domain.usecase.OnSettingsOpenedUC
@@ -60,6 +61,7 @@ internal class SettingsViewModel(
     val setInitialMenzaUC: SetInitialMenzaUC,
     val getPreferredMenzaUC: GetPreferredMenzaUC,
     val setPreferredMenzaUC: SetPreferredMenzaUC,
+    val fullAppReloadUC: FullAppReloadUC,
 ) : StateViewModel<SettingsState>(SettingsState(), vmContext), Appearing {
     override var hasAppeared: Boolean = false
 
@@ -107,23 +109,8 @@ internal class SettingsViewModel(
         setPreferredMenzaUC(menza.type)
     }
 
-    fun fullAppReload() {
-        TODO("Implement me!!!")
-//        listOf(
-//            allergenRepo,
-//            locationRepo,
-//            messagesRepo,
-//            menzaRepo,
-//            contactsRepo,
-//            openingHoursRepo
-//        ).forEach {
-//            it.clearData()
-//        }
-//        app.imageLoader.diskCache?.clear()
-//
-//        withContext(Dispatchers.Main) {
-//            exitProcess(0)
-//        }
+    fun fullAppReload() = launchVM {
+        fullAppReloadUC()
     }
 }
 

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/Theme.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/theme/Theme.kt
@@ -65,28 +65,32 @@ fun AppTheme(
             }
 
         Agata ->
-            if (isLightMode)
+            if (isLightMode) {
                 AgataLightColors
-            else
+            } else {
                 AgataDarkColors
+            }
 
         CTU ->
-            if (isLightMode)
+            if (isLightMode) {
                 CtuLightColors
-            else
+            } else {
                 CtuDarkColors
+            }
 
         Uwu ->
-            if (isLightMode)
+            if (isLightMode) {
                 UwuLightColors
-            else
+            } else {
                 UwuDarkColors
+            }
 
         Kitty ->
-            if (isLightMode)
+            if (isLightMode) {
                 KittyLightColors
-            else
+            } else {
                 KittyDarkColors
+            }
     }.animated()
 
     MaterialTheme(
@@ -141,5 +145,12 @@ private fun ColorScheme.animated(): ColorScheme {
         tertiaryContainer = animateColorAsState(tertiaryContainer).value,
         outlineVariant = animateColorAsState(outlineVariant).value,
         scrim = animateColorAsState(scrim).value,
+        surfaceBright = animateColorAsState(surfaceBright).value,
+        surfaceDim = animateColorAsState(surfaceDim).value,
+        surfaceContainer = animateColorAsState(surfaceContainer).value,
+        surfaceContainerHigh = animateColorAsState(surfaceContainerHigh).value,
+        surfaceContainerHighest = animateColorAsState(surfaceContainerHighest).value,
+        surfaceContainerLow = animateColorAsState(surfaceContainerLow).value,
+        surfaceContainerLowest = animateColorAsState(surfaceContainerLowest).value,
     )
 }
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -42,7 +42,7 @@
     <string name="language_choose_czech_description">Hezky podomácku</string>
     <string name="language_choose_english_title">🇬🇧 Angliky</string>
     <string name="language_choose_english_description">Se všemi veselými překlady</string>
-    <string name="language_choose_disclaimer">Přeloženy jsou pouye denní menu a pouze v některých menzách. Žádný text nebyl přeložen aplikací samotnou.</string>
+    <string name="language_choose_disclaimer">Přeloženy jsou pouze denní menu a pouze v některých menzách. Žádný text nebyl přeložen aplikací samotnou.</string>
     <string name="privacy_title">Zásady ochrany osobních údajů</string>
     <string name="privacy_text">
         Tato aplikace neshromažďuje žádná (osobní) data.
@@ -194,7 +194,7 @@
     <string name="today_list_mode_compact">Klasika</string>
     <string name="today_list_mode_grid">Velké</string>
     <string name="today_list_mode_horizontal">Řádky</string>
-    <string name="today_experimental_cafeteria">Experimentální menza - nemusí fungovat správně. Prosím hlašte chyby v nastavení.</string>
+    <string name="today_experimental_cafeteria">Experimentální menza - nemusí fungovat správně. Prosím, hlašte chyby v nastavení.</string>
     <string name="week_list_none">Data nejsou dostupná</string>
     <string name="week_list_web">Otevřít web</string>
     <string name="error_button_report">Nahlásit</string>
@@ -262,9 +262,9 @@
     <string name="wallet_login_tab_stravnik">Strávník</string>
     <string name="wallet_login_tab_ctu">ČVUT</string>
     <string name="wallet_login_tab_uct">VŠCHT</string>
-    <string name="wallet_login_subtitle_stravnik">Doporučená možnost. Použijte své udaje do portálu Strávník. Helso si můžete nastavit na webu Strávníka.</string>
+    <string name="wallet_login_subtitle_stravnik">Doporučená možnost. Použijte své údaje do portálu Strávník. Helso si můžete nastavit na webu Strávníka.</string>
     <string name="wallet_login_subtitle_ctu">Pro zvýšenou bezpečnost použijte přihlášení přes Strávníka.\nPoužij svoje ČVUT údaje.</string>
-    <string name="wallet_login_subtitle_uct">Jsi z VŠCHT? Kontaktuj vývojáře v nastavení a pomož přidat tvvoji metodu přihlášení! Prozatím použij přihlášení přes Strávníka.</string>
+    <string name="wallet_login_subtitle_uct">Jsi z VŠCHT? Kontaktuj vývojáře v nastavení a pomož přidat tvoji metodu přihlášení! Prozatím použij přihlášení přes Strávníka.</string>
     <string name="wallet_login_username">Uživatelské jmeno</string>
     <string name="wallet_login_password">Velmi tajné heslo</string>
     <string name="wallet_login_password_policy_hint">Uložení hesla</string>