Load and show an feed,

Multiplatform logger,
Updated libraries,
Don't apply insets padding to the appbar in landscape mode,
Show extension icons in the search

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

Author: MrBoomDeveloper

ext/src/main/kotlin/com/mrboomdev/awery/ext/data/CatalogFeed.kt

@@ -1,23 +1,21 @@
 package com.mrboomdev.awery.ext.data
 
+import kotlinx.serialization.Contextual
 import java.io.Serializable
 
+@kotlinx.serialization.Serializable
 class CatalogFeed(
 	val managerId: String? = null,
 	val sourceId: String? = null,
 	val feedId: String? = null,
 	val title: String,
-	val style: Style = Style.UNSPECIFIED,
+	val style: Style = Style.ROW,
 	val hideIfEmpty: Boolean = false,
-	val filters: List<Setting>? = null
+	val filters: List<@Contextual Setting>? = null
 ): Serializable {
-	class Loaded(
-		val feed: CatalogFeed,
-		val items: CatalogSearchResults<CatalogMedia>? = null,
-		val throwable: Throwable? = null
-	): Serializable
-
-	enum class Style {
-		UNSPECIFIED, SLIDER, ROW, GRID
+	sealed interface Style {
+		data object SLIDER: Style
+		data object ROW: Style
+		data object COLUMN: Style
 	}
 }

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

@@ -1,3 +1,3 @@
 package com.mrboomdev.awery.ext.util
 
-abstract class Image
+interface Image

gradle/libs.versions.toml

@@ -6,8 +6,8 @@ kotlin = "2.1.0"
 lifecycle-viewmodel-compose = "2.8.7"
 media3 = "1.5.1"
 markwon = "4.6.2"
-room = "2.7.0-beta01"
-coil = "3.0.4"
+room = "2.7.0-rc01"
+coil = "3.1.0"
 okhttp = "5.0.0-alpha.14"
 voyager-navigator = "1.1.0-beta02"
 
@@ -49,8 +49,8 @@ coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version
 compose-bom = { module = "androidx.compose:compose-bom", version = "2025.02.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.0" }
-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0-alpha08" }
+compose-activity = { module = "androidx.activity:activity-compose", version = "1.10.1" }
+compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0-alpha09" }
 compose-ui = { group = "androidx.compose.ui", name = "ui" }
 compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 
@@ -100,7 +100,7 @@ okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", ver
 
 # 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.7" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version = "2.8.8" }
 
 [bundles]
 okhttp = ["okhttp", "okhttp-brotli", "okhttp-dnsoverhttps", "okhttp-logging"]

shared/build.gradle.kts

@@ -7,7 +7,6 @@ import com.mrboomdev.awery.gradle.ProjectVersion.getGitCommitHash
 import com.mrboomdev.awery.gradle.generatedConfigurationsDirectory
 import com.mrboomdev.awery.gradle.settings.GenerateSettingsTask
 import com.mrboomdev.awery.gradle.settings.generatedSettingsDirectory
-import com.mrboomdev.awery.gradle.util.plusAssign
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -78,16 +77,15 @@ kotlin {
 				// Core
 				implementation(projects.resources)
 				implementation(projects.ext)
+				
+				// Language extensions
+				implementation(libs.kotlinx.serialization.json)
 				implementation(kotlin("reflect"))
 
 				// Yomi
 				implementation(libs.bundles.yomi)
 				implementation(libs.bundles.okhttp)
 
-				// Data
-				implementation(libs.kotlinx.serialization.json)
-				implementation(libs.lifecycle.viewmodel.compose)
-				
 				// Database
 				implementation(libs.room.runtime)
 				implementation("androidx.sqlite:sqlite:2.4.0")
@@ -114,6 +112,7 @@ kotlin {
 				// Components
 				implementation(libs.compose.material3)
 				implementation(libs.coil.compose)
+				implementation(libs.coil.network.okhttp)
 				api(libs.sonner)
 			}
 		}
@@ -126,6 +125,7 @@ kotlin {
 			implementation(libs.androidx.preference)
 			implementation(libs.quickjs.android)
 			implementation(libs.bundles.exoplayer)
+			implementation("com.google.accompanist:accompanist-drawablepainter:0.37.2")
 		}
 
 		@OptIn(ExperimentalKotlinGradlePluginApi::class)

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

@@ -1,7 +1,31 @@
 package com.mrboomdev.awery.platform
 
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
-import coil3.compose.asPainter
-import coil3.asImage as asCoilImage
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.graphics.drawable.toDrawable
+import com.google.accompanist.drawablepainter.rememberDrawablePainter
+import com.mrboomdev.awery.ext.util.Image
 
-fun Drawable.asImage() = PlatformImage(asCoilImage().asPainter(Platform))
+actual class PlatformImage private constructor(
+	private val drawable: Drawable?,
+	private val bitmap: Bitmap?
+): Image {
+	constructor(drawable: Drawable): this(drawable, null)
+	
+	@Composable
+	actual fun rememberPainter(): Painter {
+		if(drawable != null) {
+			return rememberDrawablePainter(drawable)
+		}
+		
+		if(bitmap != null) {
+			val context = LocalContext.current
+			return rememberDrawablePainter(bitmap.toDrawable(context.resources))
+		}
+		
+		throw UnsupportedOperationException("Cannot create an painter!")
+	}
+}

shared/src/androidMain/kotlin/com/mrboomdev/awery/sources/yomi/YomiManager.kt

@@ -13,13 +13,15 @@ import com.mrboomdev.awery.ext.source.Context
 import com.mrboomdev.awery.ext.source.Source
 import com.mrboomdev.awery.ext.source.SourcesManager
 import com.mrboomdev.awery.ext.util.GlobalId
+import com.mrboomdev.awery.ext.util.Image
 import com.mrboomdev.awery.ext.util.PendingTask
 import com.mrboomdev.awery.ext.util.Progress
 import com.mrboomdev.awery.ext.util.exceptions.ExtensionInstallException
 import com.mrboomdev.awery.platform.Platform
 import com.mrboomdev.awery.platform.Platform.toast
+import com.mrboomdev.awery.platform.PlatformImage
 import com.mrboomdev.awery.sources.ExtensionsManager.isEnabled
-import com.mrboomdev.awery.ui.utils.UniqueIdGenerator
+import com.mrboomdev.awery.utils.UniqueIdGenerator
 import com.mrboomdev.awery.utils.generateRequestCode
 import dalvik.system.PathClassLoader
 import eu.kanade.tachiyomi.network.NetworkHelper
@@ -160,7 +162,9 @@ abstract class YomiManager<S>(
 				if(appLabel.startsWith(appLabelPrefix)) {
 					return@let appLabel.substring(appLabelPrefix.length).trim { it <= ' ' }
 				} else appLabel
-			}.toString()
+			}.toString(),
+			
+			icon = PlatformImage(packageInfo.applicationInfo!!.loadIcon(Platform.packageManager))
 		)
 	}
 
@@ -203,6 +207,7 @@ abstract class YomiManager<S>(
 
 	@Throws(IllegalArgumentException::class)
 	abstract fun createSourceWrapper(
+		icon: Image,
 		label: String,
 		isNsfw: Boolean,
 		packageInfo: PackageInfo,

shared/src/androidMain/kotlin/com/mrboomdev/awery/sources/yomi/aniyomi/AniyomiManager.kt

@@ -2,8 +2,7 @@ package com.mrboomdev.awery.sources.yomi.aniyomi
 
 import android.content.pm.PackageInfo
 import com.mrboomdev.awery.ext.constants.AgeRating
-import com.mrboomdev.awery.platform.Platform
-import com.mrboomdev.awery.platform.asImage
+import com.mrboomdev.awery.ext.util.Image
 import com.mrboomdev.awery.sources.yomi.YomiManager
 import eu.kanade.tachiyomi.animesource.AnimeSource
 import eu.kanade.tachiyomi.animesource.AnimeSourceFactory
@@ -55,6 +54,7 @@ class AniyomiManager: YomiManager<AnimeSource>(
 
 	@Throws(IllegalArgumentException::class)
 	override fun createSourceWrapper(
+		icon: Image,
 		label: String,
 		isNsfw: Boolean,
 		packageInfo: PackageInfo,
@@ -68,11 +68,7 @@ class AniyomiManager: YomiManager<AnimeSource>(
 			manager = this,
 			exception = exception,
 			name = selectedSource?.name ?: label,
-
-			icon = Platform.packageManager.let { pm ->
-				packageInfo.applicationInfo!!.loadIcon(pm).asImage()
-			},
-
+			icon = icon,
 			ageRating = if(isNsfw) {
 				AgeRating.NSFW
 			} else null

shared/src/androidMain/kotlin/com/mrboomdev/awery/sources/yomi/tachiyomi/TachiyomiManager.kt

@@ -2,8 +2,7 @@ package com.mrboomdev.awery.sources.yomi.tachiyomi
 
 import android.content.pm.PackageInfo
 import com.mrboomdev.awery.ext.constants.AgeRating
-import com.mrboomdev.awery.platform.Platform
-import com.mrboomdev.awery.platform.asImage
+import com.mrboomdev.awery.ext.util.Image
 import com.mrboomdev.awery.sources.yomi.YomiManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
@@ -54,6 +53,7 @@ class TachiyomiManager: YomiManager<Source>(
 	}
 
 	override fun createSourceWrapper(
+		icon: Image,
 		label: String,
 		isNsfw: Boolean,
 		packageInfo: PackageInfo,
@@ -67,11 +67,7 @@ class TachiyomiManager: YomiManager<Source>(
 			manager = this,
 			exception = exception,
 			name = selectedSource?.name ?: label,
-
-			icon = Platform.packageManager.let { pm ->
-				packageInfo.applicationInfo!!.loadIcon(pm).asImage()
-			},
-
+			icon = icon,
 			ageRating = if(isNsfw) {
 				AgeRating.NSFW
 			} else null

shared/src/androidMain/kotlin/com/mrboomdev/awery/utils/ActivityUtils.kt

@@ -11,7 +11,6 @@ import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
-import com.mrboomdev.awery.ui.utils.UniqueIdGenerator
 import java.util.WeakHashMap
 
 private val backPressedCallbacks = WeakHashMap<() -> Unit, Any>()

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

@@ -0,0 +1,17 @@
+package com.mrboomdev.awery.utils
+
+import android.util.Log
+
+actual class Logger actual constructor(private val tag: String) {
+	actual fun d(message: String, t: Throwable?) { 
+		Log.d(tag, message, t)
+	}
+	
+	actual fun w(message: String, t: Throwable?) {
+		Log.w(tag, message, t)
+	}
+	
+	actual fun e(message: String, t: Throwable?) {
+		Log.e(tag, message, t)
+	}
+}