fixes #29 🐛

🆙 major internal refactors full migration to view-models
yamin8000 · Feb 2, 2024 · b7df1ca · b7df1ca
1 parent 1ebf636
commit b7df1ca
Show file tree

Hide file tree

Showing 26 changed files with 627 additions and 928 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -39,8 +39,8 @@ android {
         applicationId = appId
         minSdk = 21
         targetSdk = 34
-        versionCode = 36
-        versionName = "1.5.91"
+        versionCode = 37
+        versionName = "1.6.0"
         vectorDrawables.useSupportLibrary = true
         ksp.arg("room.schemaLocation", "$projectDir/schemas")
         archivesName = "$applicationId-v$versionCode($versionName)"

diff --git a/...ithub.yamin8000.owl.db.AppDatabase/1.json → ....yamin8000.owl.data.db.AppDatabase/1.json b/...ithub.yamin8000.owl.db.AppDatabase/1.json → ....yamin8000.owl.data.db.AppDatabase/1.json
diff --git a/...ithub.yamin8000.owl.db.AppDatabase/2.json → ....yamin8000.owl.data.db.AppDatabase/2.json b/...ithub.yamin8000.owl.db.AppDatabase/2.json → ....yamin8000.owl.data.db.AppDatabase/2.json
diff --git a/...ithub.yamin8000.owl.db.AppDatabase/3.json → ....yamin8000.owl.data.db.AppDatabase/3.json b/...ithub.yamin8000.owl.db.AppDatabase/3.json → ....yamin8000.owl.data.db.AppDatabase/3.json
diff --git a/...ithub.yamin8000.owl.db.AppDatabase/4.json → ....yamin8000.owl.data.db.AppDatabase/4.json b/...ithub.yamin8000.owl.db.AppDatabase/4.json → ....yamin8000.owl.data.db.AppDatabase/4.json
diff --git a/...ithub.yamin8000.owl.db.AppDatabase/5.json → ....yamin8000.owl.data.db.AppDatabase/5.json b/...ithub.yamin8000.owl.db.AppDatabase/5.json → ....yamin8000.owl.data.db.AppDatabase/5.json
diff --git a/app/schemas/io.github.yamin8000.owl.db.AppDatabase/6.json b/app/schemas/io.github.yamin8000.owl.db.AppDatabase/6.json
diff --git a/app/src/main/java/io/github/yamin8000/owl/ui/content/MainActivity.kt b/app/src/main/java/io/github/yamin8000/owl/ui/content/MainActivity.kt
@@ -39,17 +39,17 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.room.Room
+import io.github.yamin8000.owl.data.DataStoreRepository
+import io.github.yamin8000.owl.data.db.AppDatabase
 import io.github.yamin8000.owl.ui.content.favourites.FavouritesContent
 import io.github.yamin8000.owl.ui.content.history.HistoryContent
 import io.github.yamin8000.owl.ui.content.home.HomeContent
 import io.github.yamin8000.owl.ui.content.settings.SettingsContent
 import io.github.yamin8000.owl.ui.content.settings.ThemeSetting
-import io.github.yamin8000.owl.data.db.AppDatabase
-import io.github.yamin8000.owl.ui.settingsDataStore
 import io.github.yamin8000.owl.ui.navigation.Nav
+import io.github.yamin8000.owl.ui.settingsDataStore
 import io.github.yamin8000.owl.ui.theme.OwlTheme
 import io.github.yamin8000.owl.util.Constants
-import io.github.yamin8000.owl.data.DataStoreRepository
 import io.github.yamin8000.owl.util.log
 import kotlinx.coroutines.runBlocking
 
@@ -83,7 +83,8 @@ internal class MainActivity : ComponentActivity() {
     }
 
     private suspend fun getCurrentTheme() = ThemeSetting.valueOf(
-        DataStoreRepository(settingsDataStore).getString(Constants.THEME) ?: ThemeSetting.System.name
+        DataStoreRepository(settingsDataStore).getString(Constants.THEME)
+            ?: ThemeSetting.System.name
     )
 
     private fun createDb() = Room.databaseBuilder(this, AppDatabase::class.java, "db")
@@ -146,10 +147,16 @@ internal class MainActivity : ComponentActivity() {
                         searchTerm = outsideInput.toString()
                     HomeContent(
                         searchTerm = searchTerm,
-                        onFavouritesClick = { navController.navigate(Nav.Routes.Favourites.toString()) },
-                        onHistoryClick = { navController.navigate(Nav.Routes.History.toString()) },
-                        onInfoClick = { navController.navigate(Nav.Routes.About.toString()) },
-                        onSettingsClick = { navController.navigate(Nav.Routes.Settings.toString()) }
+                        onTopBarClick = { item ->
+                            val route = when (item) {
+                                TopBarItem.Favourites -> Nav.Routes.Favourites.toString()
+                                TopBarItem.History -> Nav.Routes.History.toString()
+                                TopBarItem.Info -> Nav.Routes.About.toString()
+                                TopBarItem.Random -> Nav.Routes.Home.toString()
+                                TopBarItem.Settings -> Nav.Routes.Settings.toString()
+                            }
+                            navController.navigate(route)
+                        }
                     )
                 }