Merge branch 'dev'

Author: nsh07

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
         applicationId = "org.nsh07.wikireader"
         minSdk = 26
         targetSdk = 36
-        versionCode = 45
-        versionName = "2.4.1"
+        versionCode = 48
+        versionName = "2.5.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -47,7 +47,7 @@ android {
     }
     kotlin {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17) // Use the enum for target JVM version
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
     ksp {
@@ -81,7 +81,6 @@ dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.adaptive)
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.material.icons.core)
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
@@ -91,6 +90,8 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
 
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.navigation3.runtime)
     implementation(libs.androidx.room.runtime)
     implementation(libs.androidx.room.ktx)
     ksp(libs.androidx.room.compiler)

app/src/main/java/org/nsh07/wikireader/MainActivity.kt

@@ -16,27 +16,29 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import org.nsh07.wikireader.data.AppStatus
 import org.nsh07.wikireader.data.isRtl
 import org.nsh07.wikireader.data.toColor
 import org.nsh07.wikireader.ui.AppScreen
+import org.nsh07.wikireader.ui.homeScreen.viewModel.HomeScreenViewModel
+import org.nsh07.wikireader.ui.settingsScreen.viewModel.SettingsViewModel
 import org.nsh07.wikireader.ui.theme.WikiReaderTheme
-import org.nsh07.wikireader.ui.viewModel.UiViewModel
 
 class MainActivity : ComponentActivity() {
 
-    val viewModel: UiViewModel by viewModels<UiViewModel>(factoryProducer = { UiViewModel.Factory })
+    val viewModel: HomeScreenViewModel by viewModels<HomeScreenViewModel>(factoryProducer = { HomeScreenViewModel.Factory })
+    val settingsViewModel: SettingsViewModel by viewModels<SettingsViewModel>(factoryProducer = { SettingsViewModel.Factory })
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        installSplashScreen().setKeepOnScreenCondition { !viewModel.isReady }
+        installSplashScreen().setKeepOnScreenCondition { viewModel.appStatus.value != AppStatus.INITIALIZED }
 
         viewModel.setFilesDir(filesDir.path)
-        viewModel.migrateArticles()
 
         enableEdgeToEdge()
 
         setContent {
-            val preferencesState by viewModel.preferencesState.collectAsStateWithLifecycle()
+            val preferencesState by settingsViewModel.preferencesState.collectAsStateWithLifecycle()
 
             val darkTheme = when (preferencesState.theme) {
                 "dark" -> true
@@ -62,7 +64,7 @@ class MainActivity : ComponentActivity() {
                 ) {
                     AppScreen(
                         viewModel = viewModel,
-                        preferencesState = preferencesState,
+                        settingsViewModel = settingsViewModel,
                         modifier = Modifier.fillMaxSize()
                     )
                 }

app/src/main/java/org/nsh07/wikireader/data/AppContainer.kt

@@ -3,15 +3,19 @@ package org.nsh07.wikireader.data
 import android.content.Context
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import org.nsh07.wikireader.network.HostSelectionInterceptor
 import org.nsh07.wikireader.network.WikipediaApiService
+import org.nsh07.wikireader.ui.settingsScreen.viewModel.PreferencesState
 import retrofit2.Retrofit
 import retrofit2.converter.scalars.ScalarsConverterFactory
 
 interface AppContainer {
+    val appStatus: MutableStateFlow<AppStatus>
+    val preferencesStateMutableFlow: MutableStateFlow<PreferencesState>
     val interceptor: HostSelectionInterceptor
     val wikipediaRepository: WikipediaRepository
     val appPreferencesRepository: AppPreferencesRepository
@@ -24,6 +28,9 @@ class DefaultAppContainer(context: Context) : AppContainer {
 
     override val interceptor = HostSelectionInterceptor()
 
+    override val appStatus = MutableStateFlow(AppStatus.NOT_INITIALIZED)
+    override val preferencesStateMutableFlow = MutableStateFlow(PreferencesState())
+
     private val okHttpClient by lazy {
         OkHttpClient.Builder()
             .addInterceptor(interceptor)

app/src/main/java/org/nsh07/wikireader/data/WRStatus.kt

@@ -1,10 +1,19 @@
 package org.nsh07.wikireader.data
 
 enum class WRStatus {
-    SUCCESS, NETWORK_ERROR, IO_ERROR, NO_SEARCH_RESULT, UNINITIALIZED,
+    SUCCESS, NETWORK_ERROR, NO_SEARCH_RESULT, UNINITIALIZED,
     FEED_LOADED, FEED_NETWORK_ERROR, OTHER, DATABASE_ERROR
 }
 
 enum class SavedStatus {
     NOT_SAVED, SAVING, SAVED
+}
+
+/**
+ * Enum class to track the app's startup status. On startup, the app status is
+ * [AppStatus.NOT_INITIALIZED]. After all the settings are loaded and applied, the status is set to
+ * [AppStatus.INITIALIZED]. This status is used to control the visibility of the splash screen
+ */
+enum class AppStatus {
+    INITIALIZED, NOT_INITIALIZED
 }

app/src/main/java/org/nsh07/wikireader/data/misc.kt

@@ -1,6 +1,7 @@
 package org.nsh07.wikireader.data
 
 import androidx.compose.ui.graphics.Color
+import java.util.Locale
 
 /**
  * Extension function for [String] to convert it to a [Color]
@@ -79,6 +80,36 @@ fun bytesToHumanReadableSize(bytes: Double) = when {
     else -> "$bytes bytes"
 }
 
+fun Double.formatToHumanReadable(): String {
+    return when {
+        this >= 1000000000000000 -> String.format(
+            Locale.US,
+            "%.2f quadrillion",
+            this / 1000000000000000.0
+        )
+
+        this >= 1000000000000 -> String.format(Locale.US, "%.2f trillion", this / 1000000000000.0)
+        this >= 1000000000 -> String.format(Locale.US, "%.2f billion", this / 1000000000.0)
+        this >= 1000000 -> String.format(Locale.US, "%.2f million", this / 1000000.0)
+        else -> this.toString()
+    }
+}
+
+fun Long.formatToHumanReadable(): String {
+    return when {
+        this >= 1000000000000000 -> String.format(
+            Locale.US,
+            "%.2f quadrillion",
+            this / 1000000000000000.0
+        )
+
+        this >= 1000000000000 -> String.format(Locale.US, "%.2f trillion", this / 1000000000000.0)
+        this >= 1000000000 -> String.format(Locale.US, "%.2f billion", this / 1000000000.0)
+        this >= 1000000 -> String.format(Locale.US, "%.2f million", this / 1000000.0)
+        else -> this.toString()
+    }
+}
+
 /**
  * Converts a Wikipedia URL language code (e.g. "en" in en.wikipedia.org for the English Wikipedia)
  * into its corresponding language name (e.g. "English" for en)