fix android tv banner size

DatL4g · DatL4g · commit f6c5fdd96f1c · 2025-07-17T03:45:15.000+02:00
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
     <application
         android:icon="@mipmap/ic_channel"
-        android:banner="@mipmap/ic_banner"
+        android:banner="@drawable/ic_banner"
         android:label="Mimasu"
         android:supportsRtl="true"
         android:appCategory="video"
diff --git a/composeApp/src/androidMain/kotlin/dev/datlag/mimasu/App.kt b/composeApp/src/androidMain/kotlin/dev/datlag/mimasu/App.kt
@@ -13,19 +13,23 @@ import com.appmattus.certificatetransparency.BasicAndroidCTLogger
 import com.appmattus.certificatetransparency.cache.AndroidDiskCache
 import com.appmattus.certificatetransparency.installCertificateTransparencyProvider
 import com.google.android.gms.net.CronetProviderInstaller
+import dev.datlag.mimasu.core.Virtual
 import dev.datlag.mimasu.firebase.config.FirebaseRemoteConfigService
 import dev.datlag.mimasu.module.NetworkModule
 import dev.datlag.mimasu.ui.AppInitializer
 import dev.datlag.mimasu.ui.other.Network
 import dev.datlag.tooling.Platform
+import dev.datlag.tooling.compose.TargetIO
 import dev.datlag.tooling.compose.ioDispatcher
 import dev.datlag.tooling.compose.launchIO
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.initialize
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.bindSingleton
@@ -92,7 +96,7 @@ class App : MultiDexApplication(), DIAware {
         }
 
         val config by di.instance<FirebaseRemoteConfigService>()
-        applicationScope.launchIO {
+        applicationScope.launch(Dispatchers.Virtual ?: Dispatchers.TargetIO) {
             Network.fetchConfig(config)
         }
     }
diff --git a/composeApp/src/androidMain/res/drawable-hdpi/ic_banner.png b/composeApp/src/androidMain/res/drawable-hdpi/ic_banner.png
diff --git a/composeApp/src/androidMain/res/drawable-mdpi/ic_banner.png b/composeApp/src/androidMain/res/drawable-mdpi/ic_banner.png
diff --git a/composeApp/src/androidMain/res/drawable-xhdpi/ic_banner.png b/composeApp/src/androidMain/res/drawable-xhdpi/ic_banner.png
diff --git a/composeApp/src/androidMain/res/drawable-xxhdpi/ic_banner.png b/composeApp/src/androidMain/res/drawable-xxhdpi/ic_banner.png
diff --git a/composeApp/src/androidMain/res/drawable-xxxhdpi/ic_banner.png b/composeApp/src/androidMain/res/drawable-xxxhdpi/ic_banner.png
diff --git a/composeApp/src/androidMain/res/drawable/ic_banner.xml b/composeApp/src/androidMain/res/drawable/ic_banner.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/ic_launcher_background" />
+    </item>
+    <item android:drawable="@drawable/ic_banner_foreground" />
+</layer-list>
diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_banner.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_banner.xml
diff --git a/composeApp/src/commonMain/composeResources/values-de/strings.xml b/composeApp/src/commonMain/composeResources/values-de/strings.xml
@@ -142,16 +142,4 @@
     <string name="update_extension_dialog_cancel">Abbrechen</string>
 
     <string name="feature_temporarily_disabled">Funktion vorübergehend deaktiviert.</string>
-
-    <string name="fetch_title">App wird vorbereitet</string>
-    <string name="fetch_description">Wir richten alles für dich ein. Das dauert nur einen Moment.</string>
-    <string name="fetch_loading_data">Deine Daten werden geladen.</string>
-    <string name="fetch_connecting_services">Stellt Verbindung zu Diensten her.</string>
-    <string name="fetch_initialize_app">Initialisiert und startet App.</string>
-
-    <string name="config_fail_initialize_title">Fehler bei Initialisierung</string>
-    <string name="config_fail_config_title">Fehler bei Konfiguration</string>
-    <string name="config_fail_description">Wir konnten die App nicht starten. Bitte versuche es später erneut oder melde dieses Verhalten auf GitHub.</string>
-    <string name="config_fail_data">Deine Daten konnten nicht geladen werden.</string>
-    <string name="config_fail_connecting_services">Verbindung zu Diensten fehlgeschlagen.</string>
 </resources>
diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml
@@ -135,16 +135,4 @@
     <string name="account_verification_check">Check Status</string>
 
     <string name="feature_temporarily_disabled">Feature temporarily disabled.</string>
-
-    <string name="fetch_title">App is getting ready</string>
-    <string name="fetch_description">We are setting everything up for you. This will only take a moment.</string>
-    <string name="fetch_loading_data">Your data is being loaded.</string>
-    <string name="fetch_connecting_services">Connecting to services.</string>
-    <string name="fetch_initialize_app">Initializing and starting app.</string>
-
-    <string name="config_fail_initialize_title">Initialization Failure</string>
-    <string name="config_fail_config_title">Configuration Failure</string>
-    <string name="config_fail_description">We were unable to start the app. Please try again later or report this behavior on GitHub.</string>
-    <string name="config_fail_data">Could not load your data.</string>
-    <string name="config_fail_connecting_services">Could not connect to services.</string>
 </resources>
diff --git a/composeTV/src/commonMain/kotlin/dev/datlag/mimasu/tv/TVApp.kt b/composeTV/src/commonMain/kotlin/dev/datlag/mimasu/tv/TVApp.kt
@@ -17,6 +17,8 @@ import dev.datlag.mimasu.tv.ui.theme.getDarkScheme
 import dev.datlag.mimasu.tv.ui.theme.getLightScheme
 import dev.datlag.mimasu.ui.LaunchedVirtualIO
 import dev.datlag.mimasu.ui.LocalDarkMode
+import dev.datlag.mimasu.ui.custom.FailureConfigState
+import dev.datlag.mimasu.ui.custom.FetchConfigState
 import dev.datlag.mimasu.ui.other.Network
 import dev.datlag.mimasu.ui.theme.Colors
 import dev.datlag.mimasu.ui.viewmodel.accountViewModel
@@ -55,8 +57,8 @@ fun TVApp(
                 }
 
                 when (val current = config) {
-                    is Network.Config.Fetching -> { }
-                    is Network.Config.Failure -> { }
+                    is Network.Config.Fetching -> FetchConfigState()
+                    is Network.Config.Failure -> FailureConfigState(current)
                     is Network.Config.Success -> Navigation(appImage)
                 }
             }
diff --git a/ui/src/androidMain/kotlin/dev/datlag/mimasu/ui/common/ExtendPlatform.android.kt b/ui/src/androidMain/kotlin/dev/datlag/mimasu/ui/common/ExtendPlatform.android.kt
@@ -2,6 +2,7 @@ package dev.datlag.mimasu.ui.common
 
 import android.app.Activity
 import android.app.ActivityManager
+import android.content.ClipData
 import android.content.Context
 import android.content.ContextWrapper
 import android.os.Build
@@ -11,6 +12,7 @@ import androidx.annotation.OptIn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ClipEntry
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
@@ -266,4 +268,6 @@ fun VideoViewModel.WatchType?.asMediaMetaData(): MediaMetadata {
         .setGenre(this?.genre)
         .setAlbumTitle(this?.albumTitle)
         .build()
-}
+}
+
+actual fun clipEntryOf(text: String): ClipEntry = ClipEntry(ClipData.newPlainText(null, text))
diff --git a/ui/src/commonMain/composeResources/values-de/strings.xml b/ui/src/commonMain/composeResources/values-de/strings.xml
@@ -27,4 +27,16 @@
 
     <string name="error_state_text">Etwas ist schiefgelaufen, bitte versuche es später noch einmal.</string>
     <string name="error_state_with_throwable_text">Etwas ist schiefgelaufen und wurde gemeldet, bitte versuche es später noch einmal.</string>
+
+    <string name="fetch_title">App wird vorbereitet</string>
+    <string name="fetch_description">Wir richten alles für dich ein. Das dauert nur einen Moment.</string>
+    <string name="fetch_loading_data">Deine Daten werden geladen.</string>
+    <string name="fetch_connecting_services">Stellt Verbindung zu Diensten her.</string>
+    <string name="fetch_initialize_app">Initialisiert und startet App.</string>
+
+    <string name="config_fail_initialize_title">Fehler bei Initialisierung</string>
+    <string name="config_fail_config_title">Fehler bei Konfiguration</string>
+    <string name="config_fail_description">Wir konnten die App nicht starten. Bitte versuche es später erneut oder melde dieses Verhalten auf GitHub.</string>
+    <string name="config_fail_data">Deine Daten konnten nicht geladen werden.</string>
+    <string name="config_fail_connecting_services">Verbindung zu Diensten fehlgeschlagen.</string>
 </resources>
diff --git a/ui/src/commonMain/composeResources/values/strings.xml b/ui/src/commonMain/composeResources/values/strings.xml
@@ -28,4 +28,16 @@
 
     <string name="error_state_text">Something went wrong, please try again later.</string>
     <string name="error_state_with_throwable_text">Something went wrong and got reported, please try again later.</string>
+
+    <string name="fetch_title">App is getting ready</string>
+    <string name="fetch_description">We are setting everything up for you. This will only take a moment.</string>
+    <string name="fetch_loading_data">Your data is being loaded.</string>
+    <string name="fetch_connecting_services">Connecting to services.</string>
+    <string name="fetch_initialize_app">Initializing and starting app.</string>
+
+    <string name="config_fail_initialize_title">Initialization Failure</string>
+    <string name="config_fail_config_title">Configuration Failure</string>
+    <string name="config_fail_description">We were unable to start the app. Please try again later or report this behavior on GitHub.</string>
+    <string name="config_fail_data">Could not load your data.</string>
+    <string name="config_fail_connecting_services">Could not connect to services.</string>
 </resources>
diff --git a/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/common/ExtendPlatform.kt b/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/common/ExtendPlatform.kt
@@ -1,6 +1,7 @@
 package dev.datlag.mimasu.ui.common
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.ClipEntry
 import dev.datlag.mimasu.firebase.auth.provider.github.GitHubAuthParams
 import dev.datlag.mimasu.firebase.auth.provider.google.GoogleAuthParams
 import kotlinx.datetime.LocalDate
@@ -29,4 +30,6 @@ fun LocalDate?.formatMedium(
 ): String? = this.formatMedium(
     fallbackFormat = stringResource(fallbackFormat),
     fallbackValue = fallbackValue
-)
+)
+
+expect fun clipEntryOf(text: String): ClipEntry
diff --git a/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/custom/FailureConfigState.kt b/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/custom/FailureConfigState.kt
@@ -13,22 +13,28 @@ import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ClipEntry
+import androidx.compose.ui.platform.LocalClipboard
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import dev.datlag.mimasu.composeapp.generated.resources.Res
-import dev.datlag.mimasu.composeapp.generated.resources.config_fail_config_title
-import dev.datlag.mimasu.composeapp.generated.resources.config_fail_connecting_services
-import dev.datlag.mimasu.composeapp.generated.resources.config_fail_data
-import dev.datlag.mimasu.composeapp.generated.resources.config_fail_description
-import dev.datlag.mimasu.composeapp.generated.resources.config_fail_initialize_title
 import dev.datlag.mimasu.core.Constants
 import dev.datlag.mimasu.ui.UiRes
+import dev.datlag.mimasu.ui.common.clipEntryOf
+import dev.datlag.mimasu.ui.config_fail_config_title
+import dev.datlag.mimasu.ui.config_fail_connecting_services
+import dev.datlag.mimasu.ui.config_fail_data
+import dev.datlag.mimasu.ui.config_fail_description
+import dev.datlag.mimasu.ui.config_fail_initialize_title
 import dev.datlag.mimasu.ui.github
 import dev.datlag.mimasu.ui.other.Network
 import dev.datlag.tooling.Platform
+import dev.datlag.tooling.compose.launchMain
+import dev.datlag.tooling.compose.platform.PlatformCard
+import dev.datlag.tooling.compose.platform.PlatformText
 import dev.datlag.tooling.compose.platform.typography
 import org.jetbrains.compose.resources.stringResource
 
@@ -44,31 +50,39 @@ fun FailureConfigState(
         verticalArrangement = Arrangement.aligned(Alignment.CenterVertically)
     ) {
         item {
-            Text(
+            PlatformText(
                 modifier = Modifier.fillParentMaxWidth().padding(horizontal = 16.dp),
                 text = when (state) {
-                    is Network.Config.Failure.Initialize -> stringResource(Res.string.config_fail_initialize_title)
-                    is Network.Config.Failure.Fetching -> stringResource(Res.string.config_fail_config_title)
+                    is Network.Config.Failure.Initialize -> stringResource(UiRes.string.config_fail_initialize_title)
+                    is Network.Config.Failure.Fetching -> stringResource(UiRes.string.config_fail_config_title)
                 },
                 style = Platform.typography().headlineMedium,
                 textAlign = TextAlign.Center
             )
         }
         item {
-            Text(
+            PlatformText(
                 modifier = Modifier.fillParentMaxWidth().padding(vertical = 32.dp, horizontal = 16.dp),
-                text = stringResource(Res.string.config_fail_description),
+                text = stringResource(UiRes.string.config_fail_description),
                 textAlign = TextAlign.Center,
                 softWrap = true
             )
         }
         (state as? Network.Config.Failure.Fetching)?.throwable?.message?.ifBlank { null }?.let { message ->
             item {
-                ElevatedCard(
+                val clipboardManager = LocalClipboard.current
+                val scope = rememberCoroutineScope()
+
+                PlatformCard(
+                    onClick = {
+                        scope.launchMain {
+                            clipboardManager.setClipEntry(clipEntryOf(message))
+                        }
+                    },
                     modifier = Modifier.fillParentMaxWidth().padding(vertical = 32.dp, horizontal = 16.dp)
                 ) {
                     SelectionContainer {
-                        Text(
+                        PlatformText(
                             modifier = Modifier.fillMaxWidth().padding(16.dp),
                             textAlign = TextAlign.Center,
                             softWrap = true,
@@ -89,7 +103,7 @@ fun FailureConfigState(
                     name = MaterialSymbols.CLOUD_OFF,
                     contentDescription = null,
                 )
-                Text(text = stringResource(Res.string.config_fail_data))
+                PlatformText(text = stringResource(UiRes.string.config_fail_data))
             }
         }
         item {
@@ -102,7 +116,7 @@ fun FailureConfigState(
                     name = MaterialSymbols.WARNING,
                     contentDescription = null
                 )
-                Text(text = stringResource(Res.string.config_fail_connecting_services))
+                PlatformText(text = stringResource(UiRes.string.config_fail_connecting_services))
             }
         }
         item {
diff --git a/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/custom/FetchConfigState.kt b/ui/src/commonMain/kotlin/dev/datlag/mimasu/ui/custom/FetchConfigState.kt
@@ -14,13 +14,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import dev.datlag.mimasu.composeapp.generated.resources.Res
-import dev.datlag.mimasu.composeapp.generated.resources.fetch_connecting_services
-import dev.datlag.mimasu.composeapp.generated.resources.fetch_description
-import dev.datlag.mimasu.composeapp.generated.resources.fetch_initialize_app
-import dev.datlag.mimasu.composeapp.generated.resources.fetch_loading_data
-import dev.datlag.mimasu.composeapp.generated.resources.fetch_title
+import dev.datlag.mimasu.ui.UiRes
+import dev.datlag.mimasu.ui.fetch_connecting_services
+import dev.datlag.mimasu.ui.fetch_description
+import dev.datlag.mimasu.ui.fetch_initialize_app
+import dev.datlag.mimasu.ui.fetch_loading_data
+import dev.datlag.mimasu.ui.fetch_title
 import dev.datlag.tooling.Platform
+import dev.datlag.tooling.compose.platform.PlatformText
 import dev.datlag.tooling.compose.platform.typography
 import org.jetbrains.compose.resources.stringResource
 
@@ -34,17 +35,17 @@ fun FetchConfigState() {
         verticalArrangement = Arrangement.aligned(Alignment.CenterVertically)
     ) {
         item {
-            Text(
+            PlatformText(
                 modifier = Modifier.fillParentMaxWidth().padding(horizontal = 16.dp),
-                text = stringResource(Res.string.fetch_title),
+                text = stringResource(UiRes.string.fetch_title),
                 style = Platform.typography().headlineMedium,
                 textAlign = TextAlign.Center
             )
         }
         item {
-            Text(
+            PlatformText(
                 modifier = Modifier.fillParentMaxWidth().padding(vertical = 32.dp, horizontal = 16.dp),
-                text = stringResource(Res.string.fetch_description),
+                text = stringResource(UiRes.string.fetch_description),
                 textAlign = TextAlign.Center,
                 softWrap = true
             )
@@ -59,7 +60,7 @@ fun FetchConfigState() {
                     name = MaterialSymbols.CLOUD_DOWNLOAD,
                     contentDescription = null,
                 )
-                Text(text = stringResource(Res.string.fetch_loading_data))
+                PlatformText(text = stringResource(UiRes.string.fetch_loading_data))
             }
         }
         item {
@@ -72,7 +73,7 @@ fun FetchConfigState() {
                     name = MaterialSymbols.SETTINGS_ETHERNET,
                     contentDescription = null,
                 )
-                Text(text = stringResource(Res.string.fetch_connecting_services))
+                PlatformText(text = stringResource(UiRes.string.fetch_connecting_services))
             }
         }
         item {
@@ -85,7 +86,7 @@ fun FetchConfigState() {
                     name = MaterialSymbols.PLAY_CIRCLE,
                     contentDescription = null,
                 )
-                Text(text = stringResource(Res.string.fetch_initialize_app))
+                PlatformText(text = stringResource(UiRes.string.fetch_initialize_app))
             }
         }
     }
