Fixed crash when trying to open global filters settings,

Show more info on the media screen,
Show "NoInfo" block if no info was found

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

Author: MrBoomDeveloper

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

@@ -1,5 +1,11 @@
 package com.mrboomdev.awery.ext.data
 import com.mrboomdev.awery.ext.constants.AgeRating
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_BANNER
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_DESCRIPTION
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_EPISODES
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_POSTER
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_RATINGS
+import com.mrboomdev.awery.ext.data.CatalogMedia.Companion.EXTRA_TYPE
 import com.mrboomdev.awery.ext.util.GlobalId
 import kotlinx.serialization.json.Json
 import java.io.Serial
@@ -46,39 +52,6 @@ class CatalogMedia(
 	enum class Type {
 		MUSIC, VIDEO, POST, MOVIE, BOOK
 	}
-	
-	inline val status: Status?
-		get() = extras[EXTRA_STATUS]?.uppercase()?.let {
-			try { Status.valueOf(it) } catch(_: Throwable) { null } 
-		}
-	
-	inline val type: Type?
-		get() = when(extras[EXTRA_TYPE]?.lowercase()) {
-			"movie", "tv" -> Type.MOVIE
-			"book", "comic" -> Type.BOOK
-			"post" -> Type.POST
-			"video" -> Type.VIDEO
-			"music" -> Type.MUSIC
-			else -> null
-		}
-	
-	inline val authors: Array<String>?
-		get() = extras[EXTRA_AUTHORS]?.let {
-			Json.decodeFromString(it)
-		}
-	
-	inline val tags: Array<CatalogTag>?
-		get() = extras[EXTRA_TAGS]?.let {
-			Json.decodeFromString(it)
-		}
-	
-	inline val genres: Array<String>?
-		get() = extras[EXTRA_GENRES]?.let { 
-			Json.decodeFromString(it)
-		}
-	
-	inline val ageRating: AgeRating?
-		get() = extras[EXTRA_AGE_RATING]?.let { AgeRating.match(it) }
 
 	companion object {
 		@Serial

resources/src/commonMain/composeResources/drawable/ic_collections_bookmark_filled.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="#ffffff">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M212.77,744.23L212.77,85L872,85L872,744.23L212.77,744.23ZM89,868L89,221.08L147.39,221.08L147.39,809.61L735.92,809.61L735.92,868L89,868ZM563.38,143.39L563.38,417.08L656.31,361.46L748.23,417.08L748.23,143.39L563.38,143.39Z"/>
 </vector>

resources/src/commonMain/composeResources/drawable/ic_collections_bookmark_outlined.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="#ffffff">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="#ffffff"
       android:pathData="M271.15,685.84L813.61,685.84L813.61,143.39L748.23,143.39L748.23,417.08L656.31,361.46L563.38,417.08L563.38,143.39L271.15,143.39L271.15,685.84ZM212.77,744.23L212.77,85L872,85L872,744.23L212.77,744.23ZM89,868L89,221.08L147.39,221.08L147.39,809.61L735.92,809.61L735.92,868L89,868ZM271.15,143.39L271.15,143.39L271.15,685.84L271.15,685.84L271.15,143.39ZM563.38,417.08L563.38,417.08L656.31,361.46L748.23,417.08L748.23,417.08L656.31,361.46L563.38,417.08Z"/>
 </vector>

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

@@ -4,6 +4,8 @@ import com.mrboomdev.awery.ext.data.CatalogMedia
 import com.mrboomdev.awery.ext.util.createGlobalId
 import com.mrboomdev.awery.sources.yomi.YomiSource
 import com.mrboomdev.awery.utils.arrayOfNotNull
+import com.mrboomdev.awery.utils.genres
+import com.mrboomdev.awery.utils.status
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
 

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

@@ -4,6 +4,8 @@ import com.mrboomdev.awery.ext.data.CatalogMedia
 import com.mrboomdev.awery.ext.util.createGlobalId
 import com.mrboomdev.awery.sources.yomi.YomiSource
 import com.mrboomdev.awery.utils.arrayOfNotNull
+import com.mrboomdev.awery.utils.genres
+import com.mrboomdev.awery.utils.status
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource

shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/components/StateBox.kt

@@ -0,0 +1,37 @@
+package com.mrboomdev.awery.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun StateBox(
+	modifier: Modifier = Modifier,
+	title: String,
+	message: String
+) {
+	Column(
+		modifier = modifier,
+		horizontalAlignment = Alignment.CenterHorizontally
+	) {
+		Text(
+			fontWeight = FontWeight.SemiBold,
+			textAlign = TextAlign.Center,
+			style = MaterialTheme.typography.headlineMedium,
+			text = title
+		)
+		
+		Text(
+			modifier = Modifier.padding(12.dp),
+			textAlign = TextAlign.Center,
+			text = message
+		)
+	}
+}

shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/pane/FeedsPane.kt

@@ -29,7 +29,6 @@ import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.mrboomdev.awery.ext.data.CatalogFeed
@@ -40,6 +39,7 @@ import com.mrboomdev.awery.sources.LoadedFeed
 import com.mrboomdev.awery.sources.loadAll
 import com.mrboomdev.awery.sources.processFeeds
 import com.mrboomdev.awery.ui.components.SmallCard
+import com.mrboomdev.awery.ui.components.StateBox
 import com.mrboomdev.awery.ui.utils.ScrollFixer
 import com.mrboomdev.awery.ui.utils.only
 import com.mrboomdev.awery.utils.UniqueIdGenerator
@@ -207,17 +207,10 @@ fun FeedsPane(
 						FeedsPaneLoadingState.Loading -> CircularProgressIndicator()
 
 						FeedsPaneLoadingState.End -> {
-							Text(
-								fontWeight = FontWeight.SemiBold,
-								textAlign = TextAlign.Center,
-								style = MaterialTheme.typography.headlineMedium,
-								text = stringResource(Res.string.you_reached_end)
-							)
-							
-							Text(
-								modifier = Modifier.padding(12.dp),
-								textAlign = TextAlign.Center,
-								text = stringResource(Res.string.you_reached_end_description)
+							StateBox(
+								modifier = Modifier.fillMaxWidth(),
+								title = stringResource(Res.string.you_reached_end),
+								message = stringResource(Res.string.you_reached_end_description)
 							)
 						}
 					}