Code review

Infomaniak · Aug 30, 2024 · 27a4945 · 27a4945
1 parent 9ecad63
commit 27a4945
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/di/ApplicationModule.kt b/app/src/main/java/com/infomaniak/swisstransfer/di/ApplicationModule.kt
@@ -23,6 +23,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import javax.inject.Singleton
 
 @Module
@@ -32,4 +34,10 @@ object ApplicationModule {
     @Provides
     @Singleton
     fun providesSwissTransferInjection() = SwissTransferInjection()
+
+    @Provides
+    @Singleton
+    fun providesGlobalCoroutineScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope {
+        return CoroutineScope(defaultDispatcher)
+    }
 }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/MainApplication.kt
@@ -24,16 +24,22 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.infomaniak.multiplatform_swisstransfer.SwissTransferInjection
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltAndroidApp
-class MainApplication : Application(), DefaultLifecycleObserver {
+class MainApplication : Application() {
 
     @Inject
     lateinit var swissTransferInjection: SwissTransferInjection
 
-    override fun onStart(owner: LifecycleOwner) {
-        owner.lifecycleScope.launch { swissTransferInjection.loadDefaultAccount() }
+    @Inject
+    lateinit var globalCoroutineScope: CoroutineScope
+
+    override fun onCreate() {
+        super.onCreate()
+        globalCoroutineScope.launch { swissTransferInjection.loadDefaultAccount() }
     }
 }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/settings/SettingsScreen.kt
@@ -55,7 +55,7 @@ import com.infomaniak.swisstransfer.ui.utils.PreviewMobile
 fun SettingsScreen(
     onItemClick: (SettingsOptionScreens) -> Unit,
     getSelectedSetting: () -> SettingsOptionScreens?,
-    appSettings: AppSettings? = null
+    appSettings: AppSettings
 ) {
     val selectedSetting = getSelectedSetting()
 
@@ -77,7 +77,7 @@ fun SettingsScreen(
                 titleRes = R.string.settingsOptionTheme,
                 isSelected = { selectedSetting == THEME },
                 icon = AppIcons.PaintbrushPalette,
-                description = appSettings?.theme?.getString(),
+                description = appSettings.theme.getString(),
                 CHEVRON
             ) {
                 onItemClick(THEME)
@@ -99,7 +99,7 @@ fun SettingsScreen(
                 titleRes = R.string.settingsOptionValidityPeriod,
                 isSelected = { selectedSetting == VALIDITY_PERIOD },
                 icon = AppIcons.FileBadgeArrowDown,
-                description = appSettings?.validityPeriod?.getString(),
+                description = appSettings.validityPeriod.getString(),
                 endIcon = CHEVRON,
             ) {
                 onItemClick(VALIDITY_PERIOD)
@@ -108,7 +108,7 @@ fun SettingsScreen(
                 titleRes = R.string.settingsOptionDownloadLimit,
                 isSelected = { selectedSetting == DOWNLOAD_LIMIT },
                 icon = AppIcons.Clock,
-                description = appSettings?.downloadLimit?.getString(),
+                description = appSettings.downloadLimit.getString(),
                 endIcon = CHEVRON,
             ) {
                 onItemClick(DOWNLOAD_LIMIT)
@@ -117,7 +117,7 @@ fun SettingsScreen(
                 titleRes = R.string.settingsOptionEmailLanguage,
                 isSelected = { selectedSetting == EMAIL_LANGUAGE },
                 icon = AppIcons.SpeechBubble,
-                description = appSettings?.emailLanguage?.getString(),
+                description = appSettings.emailLanguage.getString(),
                 endIcon = CHEVRON,
             ) {
                 onItemClick(EMAIL_LANGUAGE)
@@ -182,12 +182,19 @@ enum class SettingsOptionScreens {
     DISCOVER_INFOMANIAK, SHARE_IDEAS, GIVE_FEEDBACK,
 }
 
+private class DummyAppSettings(
+    override var theme: Theme = Theme.SYSTEM,
+    override var downloadLimit: DownloadLimit = DownloadLimit.TWOHUNDREDFIFTY,
+    override var emailLanguage: EmailLanguage = EmailLanguage.FRENCH,
+    override var validityPeriod: ValidityPeriod = ValidityPeriod.THIRTY,
+) : AppSettings
+
 @PreviewMobile
 @Composable
 private fun SettingsScreenPreview() {
     SwissTransferTheme {
         Surface(color = MaterialTheme.colorScheme.background) {
-            SettingsScreen(onItemClick = {}, getSelectedSetting = { null })
+            SettingsScreen(onItemClick = {}, getSelectedSetting = { null }, DummyAppSettings())
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ lifecycleRuntimeKtx = "2.8.4"
 material3Beta = "1.3.0-rc01"
 navigation = "2.8.0-rc01"
 serialization = "1.7.1"
-swisstransfer = "0.1.0"
+swisstransfer = "0.1.1"
 
 [libraries]
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }