Use read only values for AweryTheme because they may be changed via AwerySettings,

Use Androidx navigation instead of voyager because of Predictive back gesture,
Move all state from CatalogPane to CatalogPaneState,
Shuffle feeds before loading,
Updated libraries,
Move an experience gathering into the MainRouteViewModel so that loaded feeds would be saved and reused during navigation,
Always use Lax mode for StrictMode

Signed-off-by: MrBoom <[email protected]>

Author: MrBoomDeveloper

app/build.gradle.kts

@@ -43,13 +43,7 @@ kotlin {
 				implementation(compose.foundation)
 				api(compose.components.resources)
 				api(libs.sonner)
-				
-				// Navigation
 				implementation(libs.androidx.navigation)
-				api(libs.voyager.navigator)
-				api(libs.voyager.screenmodel)
-				api(libs.voyager.tab.navigator)
-				api(libs.voyager.transitions)
 
 				// Adaptive layout
 				implementation(libs.adaptive)

app/src/androidMain/kotlin/com/mrboomdev/awery/MainActivity.kt

@@ -21,7 +21,7 @@ class MainActivity: ComponentActivity() {
 		super.onCreate(savedInstanceState)
 
 		val initialRoute = when {
-			else -> SplashRoute()
+			else -> SplashRoute
 		}
 
 		setContent {

ext/src/main/kotlin/com/mrboomdev/awery/ext/util/GlobalId.kt

@@ -21,6 +21,26 @@ value class GlobalId(val value: String) {
 	val managerId get() = parse(value)[0]
 	val sourceId get() = parse(value).getOrNull(1)
 	val itemId get() = parse(value).getOrNull(2)
+	
+	override fun toString() = buildString { 
+		append("{ \"manager_id\": \"")
+		append(managerId)
+		append("\"")
+		
+		sourceId?.let {
+			append(", \"source_id\": \"")
+			append(it)
+			append("\"")
+		}
+		
+		itemId?.let {
+			append(", \"item_id\": \"")
+			append(it)
+			append("\"")
+		}
+		
+		append(" }")
+	}
 
 	companion object {
 		fun parse(globalId: String) = globalId.split(";;;").let {

gradle/libs.versions.toml

@@ -1,20 +1,18 @@
 [versions]
 android-gradle-plugin = "8.7.3"
-androidx-adaptive = "1.0.0"
+androidx-adaptive = "1.1.0"
 kotlinx-serialization = "1.8.0"
 kotlin = "2.1.0"
-lifecycle-viewmodel-compose = "2.8.7"
 media3 = "1.5.1"
 markwon = "4.6.2"
-room = "2.7.0-rc01"
+room = "2.7.0-rc02"
 coil = "3.1.0"
 okhttp = "5.0.0-alpha.14"
-voyager-navigator = "1.1.0-beta02"
 
 [libraries]
 safeargsnext = { group = "ru.mrboomdev.safeargsnext", name = "safeargsnext", version = "1.0.1" }
-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.9.0" }
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.8.7" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.10.1" }
 balloon = { module = "com.github.skydoves:balloon", version = "1.6.11" }
 ebook-reader = { module = "com.github.VipulOG:ebook-reader", version = "0.1.6" }
 
@@ -25,14 +23,10 @@ androidx-splashscreen = { module = "androidx.core:core-splashscreen", version =
 androidx-shortcuts = { module = "androidx.core:core-google-shortcuts", version = "1.1.0" }
 androidx-browser = { module = "androidx.browser:browser", version = "1.8.0" }
 androidx-preference = { module = "androidx.preference:preference-ktx", version = "1.2.1" }
-androidx-webkit = { module = "androidx.webkit:webkit", version = "1.12.1" }
+androidx-webkit = { module = "androidx.webkit:webkit", version = "1.13.0" }
 material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
 hauler = { module = "app.futured.hauler:hauler", version = "5.0.0" }
 sonner = { module = "io.github.dokar3:sonner", version = "0.3.8" }
-voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager-navigator" }
-voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager-navigator" }
-voyager-tab-navigator = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager-navigator" }
-voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager-navigator" }
 xcrash = { module = "com.iqiyi.xcrash:xcrash-android-lib", version = "3.1.0" }
 leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
 
@@ -46,13 +40,14 @@ coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil"
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 
 # Compose
-compose-bom = { module = "androidx.compose:compose-bom", version = "2025.02.00" }
+compose-bom = { module = "androidx.compose:compose-bom", version = "2025.03.00" }
 compose-runtime = { module = "androidx.compose.runtime:runtime" }
 compose-foundation = { module = "androidx.compose.foundation:foundation" }
 compose-activity = { module = "androidx.activity:activity-compose", version = "1.10.1" }
-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0-alpha09" }
+compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0-alpha10" }
 compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha10"}
 
 # Database
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
@@ -98,10 +93,6 @@ okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.
 okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version = "4.12.0" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 
-# For removal (The same fucking thing. Delete later after voyager navigation would be done)
-androidx-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version = "2.8.0-alpha10"}
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.8" }
-
 [bundles]
 okhttp = ["okhttp", "okhttp-brotli", "okhttp-dnsoverhttps", "okhttp-logging"]
 

resources/src/commonMain/composeResources/drawable/logo_awery.png

@@ -60,12 +60,16 @@ kotlin {
 	jvm("desktop")
 
 	compilerOptions {
-		freeCompilerArgs = listOf("-Xexpect-actual-classes")
+		freeCompilerArgs = listOf(
+			"-Xexpect-actual-classes"
+		)
 	}
 
 	sourceSets {
 		all {
-			languageSettings.optIn("androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi")
+			languageSettings.optIn(
+				"androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi"
+			)
 		}
 
 		commonMain {
@@ -95,14 +99,8 @@ kotlin {
 				implementation(libs.compose.runtime)
 				implementation(libs.compose.ui)
 				implementation(libs.compose.foundation)
-				api(compose.components.resources)
-				
-				// Navigation
 				implementation(libs.androidx.navigation)
-				api(libs.voyager.navigator)
-				api(libs.voyager.screenmodel)
-				api(libs.voyager.tab.navigator)
-				api(libs.voyager.transitions)
+				api(compose.components.resources)
 
 				// Adaptive layout
 				implementation(libs.adaptive)

shared/build.gradle.kts

@@ -18,10 +18,8 @@ import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 import android.util.Log
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
 import com.google.android.material.color.DynamicColors
-import com.mrboomdev.awery.generated.*
 import com.mrboomdev.awery.shared.BuildConfig
 import com.mrboomdev.awery.utils.SerializableRequired
 import com.mrboomdev.awery.utils.tryOrTry
@@ -150,40 +148,8 @@ actual object Platform: ContextWrapper(null) {
 	 * Initialize platform-related stuff
 	 */
 	internal actual suspend fun platformInit() {
-		setupStrictMode()
-	}
-	
-	/**
-	 * Fuck you, Android. It's not my problem that some people do install A LOT of extensions,
-	 * so that app stops responding.
-	 */
-	private fun setupStrictMode() {
-		if(!BuildConfig.DEBUG) {
-			StrictMode.setThreadPolicy(ThreadPolicy.LAX)
-			StrictMode.setVmPolicy(VmPolicy.LAX)
-			return
-		}
-		
-		StrictMode.setThreadPolicy(
-			ThreadPolicy.Builder()
-			.detectCustomSlowCalls()
-			.detectNetwork()
-			.penaltyLog()
-			.penaltyDialog()
-			.build())
-		
-		StrictMode.setVmPolicy(
-			VmPolicy.Builder()
-			.detectActivityLeaks()
-			.detectLeakedRegistrationObjects()
-			.penaltyLog()
-			.apply {
-				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-					penaltyListener({ it.run() }) { violation ->
-						toast("An VM Policy has benn violated!")
-						Log.e(TAG, "An VM Policy has benn violated!", violation)
-					}
-				}
-			}.build())
+		// A lot of extensions do violate StrictMode, so we simply disable it.
+		StrictMode.setThreadPolicy(ThreadPolicy.LAX)
+		StrictMode.setVmPolicy(VmPolicy.LAX)
 	}
 }

shared/src/androidMain/kotlin/com/mrboomdev/awery/platform/Platform.android.kt

@@ -1,7 +1,6 @@
 package com.mrboomdev.awery.ui
 
 import androidx.compose.runtime.Composable
-import com.mrboomdev.awery.ui.routes.BaseRoute
 
 @Composable
 actual fun AweryRootImpl(content: @Composable () -> Unit) {

shared/src/androidMain/kotlin/com/mrboomdev/awery/ui/utils/ScreenModels.android.kt

@@ -1,6 +1,6 @@
 package com.mrboomdev.awery.ui.routes
 
-import kotlinx.serialization.Serializable
+import androidx.compose.runtime.Composable
 
-@Serializable
-actual class MainRoute : DefaultMainRoute()
+@Composable
+actual fun MainRoute.Content(viewModel: MainRouteViewModel) = DefaultMainRouteContent(viewModel)