Refactor/add di mobile app

apps/mobile-app/build.gradle.kts

@@ -71,6 +71,9 @@ dependencies {
   implementation(composeBom)
   androidTestImplementation(composeBom)
 
+  val koinBom = platform(libs.koin.bom)
+  implementation(koinBom)
+
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.browser)
   implementation(libs.androidx.compose.ui)
@@ -88,10 +91,13 @@ dependencies {
   implementation(libs.androidx.navigation.runtime.ktx)
   implementation(libs.androidx.window)
   implementation(libs.coil.compose)
-  implementation(libs.kotlinx.coroutines.android)
-  implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.google.guava)
   implementation(libs.google.oss.licenses)
   implementation(libs.jakewharton.timber)
+  implementation(libs.koin.androidx.compose)
+  implementation(libs.koin.androidx.compose.navigation)
+  implementation(libs.kotlinx.coroutines.android)
+  implementation(libs.kotlinx.coroutines.core)
   implementation(libs.bundles.database.room)
 
   testImplementation(libs.junit)

apps/mobile-app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
   <uses-permission android:name="android.permission.INTERNET" />
 
   <application
-    android:name="dev.marlonlom.apps.cappajv.CappajvApp"
+    android:name=".CappajvApp"
     android:allowBackup="true"
     android:dataExtractionRules="@xml/data_extraction_rules"
     android:fullBackupContent="@xml/backup_rules"
@@ -22,8 +22,9 @@
     android:enableOnBackInvokedCallback="true"
     android:theme="@style/Theme.Cappajv.Starting"
     tools:targetApi="tiramisu">
+
     <activity
-      android:name="dev.marlonlom.apps.cappajv.ui.main.MainActivity"
+      android:name=".ui.main.MainActivity"
       android:exported="true"
       android:theme="@style/Theme.Cappajv.Starting">
       <intent-filter>

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/CappajvApp.kt

@@ -14,6 +14,11 @@ import coil.disk.DiskCache
 import coil.memory.MemoryCache
 import coil.request.CachePolicy
 import coil.util.DebugLogger
+import dev.marlonlom.apps.cappajv.di.appModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import timber.log.Timber
 
 /**
@@ -30,9 +35,11 @@ val Context.dataStore by preferencesDataStore("cappajv-preferences")
  * @author marlonlom
  */
 class CappajvApp : Application(), ImageLoaderFactory {
+
   override fun onCreate() {
     super.onCreate()
     setupTimber()
+    initializeKoinConfig()
   }
 
   override fun newImageLoader(): ImageLoader = ImageLoader(this)
@@ -60,4 +67,12 @@ class CappajvApp : Application(), ImageLoaderFactory {
     }
   }
 
+  private fun initializeKoinConfig() {
+    startKoin {
+      androidContext(this@CappajvApp)
+      androidLogger(Level.DEBUG)
+      modules(appModule)
+    }
+  }
+
 }

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/di/app_module.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Marlonlom
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package dev.marlonlom.apps.cappajv.di
+
+import dev.marlonlom.apps.cappajv.ui.main.MainActivityViewModel
+import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.dsl.module
+
+val mainActivityModule = module {
+  viewModelOf(::MainActivityViewModel)
+}
+
+val appModule = module {
+  includes(viewModelsModule)
+  includes(mainActivityModule)
+}

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/di/data_module.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 Marlonlom
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package dev.marlonlom.apps.cappajv.di
+
+import dev.marlonlom.apps.cappajv.core.catalog_source.CatalogDataService
+import dev.marlonlom.apps.cappajv.core.database.CappaDatabase
+import dev.marlonlom.apps.cappajv.core.database.datasource.LocalDataSource
+import dev.marlonlom.apps.cappajv.core.database.datasource.LocalDataSourceImpl
+import dev.marlonlom.apps.cappajv.core.preferences.UserPreferencesRepository
+import dev.marlonlom.apps.cappajv.dataStore
+import dev.marlonlom.apps.cappajv.features.catalog_list.CatalogListRepository
+import org.koin.android.ext.koin.androidContext
+import org.koin.dsl.module
+import java.util.Locale
+
+val dataModule = module {
+  single<LocalDataSource> {
+    CappaDatabase.getInstance(androidContext()).let { db ->
+      LocalDataSourceImpl(
+        catalogItemsDao = db.catalogProductsDao(),
+        catalogPunctuationsDao = db.catalogPunctuationsDao(),
+        catalogFavoriteItemsDao = db.catalogFavoriteItemsDao()
+      )
+    }
+  }
+  single<CatalogDataService> {
+    CatalogDataService(Locale.getDefault().language)
+  }
+  single<CatalogListRepository> {
+    CatalogListRepository(
+      localDataSource = get(),
+      catalogDataService = get(),
+    )
+  }
+  single {
+    UserPreferencesRepository(androidContext().dataStore)
+  }
+}

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/di/viewmodels_module.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024 Marlonlom
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package dev.marlonlom.apps.cappajv.di
+
+import dev.marlonlom.apps.cappajv.features.catalog_detail.CatalogDetailViewModel
+import dev.marlonlom.apps.cappajv.features.catalog_list.CatalogListViewModel
+import dev.marlonlom.apps.cappajv.features.settings.SettingsViewModel
+import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.dsl.module
+
+val viewModelsModule = module {
+  includes(dataModule)
+  viewModelOf(::CatalogListViewModel)
+  viewModelOf(::CatalogDetailViewModel)
+  viewModelOf(::SettingsViewModel)
+}

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/catalog_detail/CatalogDetailViewModel.kt

@@ -8,7 +8,6 @@ package dev.marlonlom.apps.cappajv.features.catalog_detail
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
 
@@ -34,15 +33,4 @@ class CatalogDetailViewModel(
     }
   }
 
-  companion object {
-
-    fun factory(
-      repository: CatalogDetailRepository
-    ): ViewModelProvider.Factory = object : ViewModelProvider.Factory {
-      @Suppress("UNCHECKED_CAST")
-      override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return CatalogDetailViewModel(repository) as T
-      }
-    }
-  }
 }

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/catalog_favorites/FavoriteProductsRoute.kt

@@ -21,8 +21,8 @@ fun FavoriteProductsRoute(
   appState: CappajvAppState,
 ) {
   val contentHorizontalPadding = when {
-    appState.isLandscapeOrientation.not().and(appState.is7InTabletWidth) -> 40.dp
-    appState.isLandscapeOrientation.not().and(appState.is10InTabletWidth) -> 80.dp
+    appState.isLandscape.not().and(appState.isMediumWidth) -> 40.dp
+    appState.isLandscape.not().and(appState.isExpandedWidth) -> 80.dp
     else -> 20.dp
   }
   Column(

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/catalog_list/CatalogListRoute.kt

@@ -27,6 +27,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -38,11 +39,13 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import dev.marlonlom.apps.cappajv.R
 import dev.marlonlom.apps.cappajv.core.database.entities.CatalogItemTuple
 import dev.marlonlom.apps.cappajv.ui.main.CappajvAppState
+import org.koin.androidx.compose.koinViewModel
 import timber.log.Timber
 
 @ExperimentalFoundationApi
@@ -51,10 +54,14 @@ import timber.log.Timber
 @Composable
 fun CatalogListRoute(
   appState: CappajvAppState,
+  viewModel: CatalogListViewModel = koinViewModel(),
 ) {
+
+  val catalogListState: CatalogListState by viewModel.uiState.collectAsStateWithLifecycle()
+
   val contentHorizontalPadding = when {
-    appState.isLandscapeOrientation.not().and(appState.is7InTabletWidth) -> 40.dp
-    appState.isLandscapeOrientation.not().and(appState.is10InTabletWidth) -> 80.dp
+    appState.isLandscape.not().and(appState.isMediumWidth) -> 40.dp
+    appState.isLandscape.not().and(appState.isExpandedWidth) -> 80.dp
     else -> 20.dp
   }
 
@@ -76,7 +83,7 @@ fun CatalogListRoute(
       )
     }
 
-    when (val catalogListState = appState.catalogListState) {
+    when (catalogListState) {
       CatalogListState.Empty -> {
         item {
           Text(" :( ")
@@ -88,8 +95,9 @@ fun CatalogListRoute(
       }
 
       is CatalogListState.Listing -> {
+        val listingsData = catalogListState as CatalogListState.Listing
 
-        catalogListState.map.keys.sorted().forEach { category ->
+        listingsData.map.keys.sorted().forEach { category ->
           item {
             Row(
               modifier = Modifier
@@ -110,7 +118,7 @@ fun CatalogListRoute(
           }
 
           item {
-            val tuples: List<CatalogItemTuple> = catalogListState.map[category]
+            val tuples: List<CatalogItemTuple> = listingsData.map[category]
               .orEmpty().shuffled().subList(0, 5)
             LazyRow(
               horizontalArrangement = Arrangement.spacedBy(20.dp),

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/catalog_search/SearchProductsRoute.kt

@@ -21,8 +21,8 @@ fun SearchProductsRoute(
   appState: CappajvAppState,
 ) {
   val contentHorizontalPadding = when {
-    appState.isLandscapeOrientation.not().and(appState.is7InTabletWidth) -> 40.dp
-    appState.isLandscapeOrientation.not().and(appState.is10InTabletWidth) -> 80.dp
+    appState.isLandscape.not().and(appState.isMediumWidth) -> 40.dp
+    appState.isLandscape.not().and(appState.isExpandedWidth) -> 80.dp
     else -> 20.dp
   }
   Column(

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/settings/dialog.kt

@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -25,6 +25,7 @@ import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dev.marlonlom.apps.cappajv.R
 import dev.marlonlom.apps.cappajv.ui.main.CappajvAppState
+import org.koin.androidx.compose.koinViewModel
 
 /**
  * Settings dialog route composable ui.
@@ -41,10 +42,10 @@ import dev.marlonlom.apps.cappajv.ui.main.CappajvAppState
 @Composable
 fun SettingsDialog(
   appState: CappajvAppState,
-  viewModel: SettingsViewModel,
   onDialogDismissed: () -> Unit,
   openOssLicencesInfo: () -> Unit,
-  openExternalUrl: (String) -> Unit
+  openExternalUrl: (String) -> Unit,
+  viewModel: SettingsViewModel = koinViewModel()
 ) {
   val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle()
   when (settingsUiState) {
@@ -104,15 +105,15 @@ internal fun SettingsDialogContent(
     },
     text = {
       Column {
-        Divider()
+        HorizontalDivider()
         BooleanSettingsContent(
           appState,
           editableSettings,
           onBooleanSettingUpdated
         )
         SectionDivider()
         LinksPanelContent(openExternalUrl, openOssLicencesInfo)
-        Divider()
+        HorizontalDivider()
       }
     },
     confirmButton = {

apps/mobile-app/src/main/kotlin/dev/marlonlom/apps/cappajv/features/settings/dialog_ui_parts.kt

@@ -16,7 +16,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
@@ -46,7 +46,7 @@ internal fun LinksPanelContent(
   FlowRow(
     horizontalArrangement = Arrangement.spacedBy(
       space = 16.dp,
-      alignment = Alignment.Start,
+      alignment = Alignment.CenterHorizontally,
     ),
     modifier = Modifier.fillMaxWidth(),
   ) {
@@ -82,7 +82,7 @@ internal fun LinksPanelContent(
  */
 @Composable
 fun SectionDivider() {
-  Divider(Modifier.padding(top = 8.dp))
+  HorizontalDivider(Modifier.padding(top = 8.dp))
 }
 
 /**
@@ -100,7 +100,7 @@ internal fun BooleanSettingsContent(
   editableSettings: UserEditableSettings,
   onBooleanSettingUpdated: (String, Boolean) -> Unit
 ) {
-  if (appState.is7InTabletWidth) {
+  if (appState.isMediumWidth) {
     Row(
       horizontalArrangement = Arrangement.SpaceBetween,
       verticalAlignment = Alignment.CenterVertically