diff --git a/README.md b/README.md
index b8f04e12..23dfb0b5 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ Licensed under GPL-2.0, the same licence as upstream (see [LICENSE](LICENSE)).
Wolfskin is an Android TV client for one household. It is released through Forgejo releases on this repo, and it tracks upstream by merging each upstream release tag.
-The app uses Wolfskin launcher artwork and a lilac-on-`#07070a` theme by default on a fresh install. Existing theme choices and all upstream colour themes remain available under Settings → App theme. Settings → About credits and links to Wholphin by damontecres.
-
---
# Wholphin - an OSS Android TV client for Jellyfin
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index cb6c15c6..606329c9 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
- Wolfskin (Debug)
+ Wholphin (Debug)
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
index dfc380e1..87623e5e 100644
Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
index a872d3be..62f0e39b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
@@ -63,7 +63,7 @@ import com.github.damontecres.wholphin.ui.nav.Destination
import com.github.damontecres.wholphin.ui.playback.PlayExternalViewModel
import com.github.damontecres.wholphin.ui.showToast
import com.github.damontecres.wholphin.ui.theme.WholphinTheme
-import com.github.damontecres.wholphin.ui.theme.colors.WolfskinThemeColors
+import com.github.damontecres.wholphin.ui.theme.colors.PurpleThemeColors
import com.github.damontecres.wholphin.ui.util.ProvideLocalClock
import com.github.damontecres.wholphin.util.DebugLogTree
import com.github.damontecres.wholphin.util.ExceptionHandler
@@ -230,7 +230,7 @@ class MainActivity : AppCompatActivity() {
viewModel.appStart(intent)
setContent {
- MaterialTheme(colorScheme = WolfskinThemeColors.darkScheme) {
+ MaterialTheme(colorScheme = PurpleThemeColors.darkScheme) {
Surface(Modifier.fillMaxSize()) {
val userPreferences by userPreferencesService.flow.collectAsState(null)
if (userPreferences == null) {
diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
index a9d0f11e..4213fe94 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
@@ -506,7 +506,7 @@ sealed interface AppPreference {
val ThemeColors =
AppChoicePreference(
title = R.string.app_theme,
- defaultValue = AppThemeColors.WOLFSKIN,
+ defaultValue = AppThemeColors.PURPLE,
getter = { it.interfacePreferences.appThemeColors },
setter = { prefs, value ->
prefs.updateInterfacePreferences { appThemeColors = value }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/WatchedIcon.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/WatchedIcon.kt
index 17649be9..ce8952a7 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/WatchedIcon.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/WatchedIcon.kt
@@ -41,7 +41,6 @@ fun WatchedIconBackground(): Color =
when (LocalTheme.current) {
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
- AppThemeColors.WOLFSKIN,
AppThemeColors.BLUE,
AppThemeColors.GREEN,
AppThemeColors.ORANGE,
@@ -56,8 +55,6 @@ fun WatchedIconBackground(): Color =
@Composable
fun WatchedIconColor(): Color =
when (LocalTheme.current) {
- AppThemeColors.WOLFSKIN -> MaterialTheme.colorScheme.onPrimary
-
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
AppThemeColors.BLUE,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/SliderBar.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/SliderBar.kt
index f2addcd8..9021e213 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/SliderBar.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/SliderBar.kt
@@ -143,7 +143,6 @@ fun sliderActiveColor(focused: Boolean): Color {
return when (theme) {
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
- AppThemeColors.WOLFSKIN,
AppThemeColors.BLUE,
AppThemeColors.GREEN,
AppThemeColors.ORANGE,
@@ -180,7 +179,6 @@ fun sliderInactiveColor(focused: Boolean): Color {
return when (theme) {
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
- AppThemeColors.WOLFSKIN,
-> {
MaterialTheme.colorScheme.border
.copy(alpha = .25f)
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
index 17906fe2..efbf1a4b 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
@@ -769,7 +769,6 @@ fun navItemColor(
when (theme) {
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
- AppThemeColors.WOLFSKIN,
AppThemeColors.BLUE,
AppThemeColors.GREEN,
AppThemeColors.ORANGE,
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferencesContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferencesContent.kt
index a21405c2..d95d5aba 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferencesContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/PreferencesContent.kt
@@ -271,9 +271,6 @@ fun PreferencesContent(
.fillMaxWidth()
.padding(top = 8.dp, bottom = 4.dp),
)
- if (group.title == R.string.about) {
- WolfskinAbout()
- }
}
val groupPreferences =
group.preferences +
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/SwitchPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/SwitchPreference.kt
index 43e213ea..daf6fa07 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/SwitchPreference.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/SwitchPreference.kt
@@ -70,7 +70,6 @@ fun SwitchColors(): SwitchColors {
return when (theme) {
AppThemeColors.UNRECOGNIZED,
AppThemeColors.PURPLE,
- AppThemeColors.WOLFSKIN,
AppThemeColors.BLUE,
-> {
SwitchDefaults.colors()
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/WolfskinAbout.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/WolfskinAbout.kt
deleted file mode 100644
index a0814180..00000000
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/WolfskinAbout.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.damontecres.wholphin.ui.preferences
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.Text
-import com.github.damontecres.wholphin.R
-import com.github.damontecres.wholphin.ui.components.TextButton
-
-/** Fork identity and a focusable link to the upstream project. */
-@Composable
-fun WolfskinAbout() {
- val uriHandler = LocalUriHandler.current
- val upstreamUrl = stringResource(R.string.wolfskin_upstream_url)
- Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
- Text(
- text = stringResource(R.string.app_name_long),
- style = MaterialTheme.typography.headlineMedium,
- )
- TextButton(onClick = { uriHandler.openUri(upstreamUrl) }) {
- Text(stringResource(R.string.wolfskin_upstream_credit))
- }
- }
-}
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/theme/Theme.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/theme/Theme.kt
index 8cce37e5..8ae95b25 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/theme/Theme.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/theme/Theme.kt
@@ -13,10 +13,9 @@ import com.github.damontecres.wholphin.ui.theme.colors.OledThemeColors
import com.github.damontecres.wholphin.ui.theme.colors.OrangeThemeColors
import com.github.damontecres.wholphin.ui.theme.colors.PurpleThemeColors
import com.github.damontecres.wholphin.ui.theme.colors.RedThemeColors
-import com.github.damontecres.wholphin.ui.theme.colors.WolfskinThemeColors
val LocalTheme =
- compositionLocalOf { AppThemeColors.WOLFSKIN }
+ compositionLocalOf { AppThemeColors.PURPLE }
fun getThemeColors(appThemeColors: AppThemeColors): ThemeColors =
when (appThemeColors) {
@@ -28,14 +27,13 @@ fun getThemeColors(appThemeColors: AppThemeColors): ThemeColors =
AppThemeColors.BOLD_BLUE -> BoldBlueThemeColors
AppThemeColors.RED -> RedThemeColors
AppThemeColors.BROWN -> BrownThemeColors
- AppThemeColors.WOLFSKIN -> WolfskinThemeColors
- AppThemeColors.UNRECOGNIZED -> WolfskinThemeColors
+ AppThemeColors.UNRECOGNIZED -> PurpleThemeColors
}
@Composable
fun WholphinTheme(
darkTheme: Boolean = true,
- appThemeColors: AppThemeColors = AppThemeColors.WOLFSKIN,
+ appThemeColors: AppThemeColors = AppThemeColors.PURPLE,
content: @Composable () -> Unit,
) {
val themeColors = getThemeColors(appThemeColors)
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/theme/colors/WolfskinThemeColors.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/theme/colors/WolfskinThemeColors.kt
deleted file mode 100644
index ee0a77b5..00000000
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/theme/colors/WolfskinThemeColors.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.damontecres.wholphin.ui.theme.colors
-
-import androidx.compose.ui.graphics.Color
-import com.github.damontecres.wholphin.ui.theme.ThemeColors
-
-/** Lilac accents on near-black surfaces, with upstream Purple available separately. */
-val WolfskinThemeColors =
- object : ThemeColors {
- private val background = Color(0xFF07070A)
- private val lilac = Color(0xFFD2BCFF)
- private val onLilac = Color(0xFF241334)
- private val container = Color(0xFF382A49)
- private val onContainer = Color(0xFFEADCFF)
- private val surfaceVariant = Color(0xFF24202D)
-
- override val lightSchemeMaterial = PurpleThemeColors.lightSchemeMaterial
- override val lightScheme = PurpleThemeColors.lightScheme
-
- override val darkSchemeMaterial =
- PurpleThemeColors.darkSchemeMaterial.copy(
- primary = lilac,
- onPrimary = onLilac,
- primaryContainer = container,
- onPrimaryContainer = onContainer,
- secondary = lilac,
- onSecondary = onLilac,
- secondaryContainer = container,
- onSecondaryContainer = onContainer,
- tertiary = lilac,
- onTertiary = onLilac,
- tertiaryContainer = container,
- onTertiaryContainer = onContainer,
- background = background,
- surface = background,
- surfaceVariant = surfaceVariant,
- inversePrimary = Color(0xFF705090),
- )
-
- override val darkScheme =
- PurpleThemeColors.darkScheme.copy(
- primary = lilac,
- onPrimary = onLilac,
- primaryContainer = container,
- onPrimaryContainer = onContainer,
- secondary = lilac,
- onSecondary = onLilac,
- secondaryContainer = container,
- onSecondaryContainer = onContainer,
- tertiary = lilac,
- onTertiary = onLilac,
- tertiaryContainer = container,
- onTertiaryContainer = onContainer,
- background = background,
- surface = background,
- surfaceVariant = surfaceVariant,
- inversePrimary = Color(0xFF705090),
- border = lilac.copy(alpha = .75f),
- )
- }
diff --git a/app/src/main/proto/WholphinDataStore.proto b/app/src/main/proto/WholphinDataStore.proto
index 0c3b5cb3..38f6099c 100644
--- a/app/src/main/proto/WholphinDataStore.proto
+++ b/app/src/main/proto/WholphinDataStore.proto
@@ -123,7 +123,6 @@ enum AppThemeColors {
OLED_BLACK = 5;
RED = 6;
BROWN = 7;
- WOLFSKIN = 8;
}
enum EdgeStyle{
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_banner.xml b/app/src/main/res/mipmap-anydpi-v26/ic_banner.xml
index ec3f55e3..4c5f707b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_banner.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_banner.xml
@@ -1,4 +1,9 @@
-
+
+
+
+
+
+
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index 4ac23262..5b7669dc 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
index de1628cc..8e05a03a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index df5faba9..e6a5972a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index 415cf194..f44d1093 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
index d9df942a..9e9214e8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index dea8ff64..3766935e 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_banner.png b/app/src/main/res/mipmap-xhdpi/ic_banner.png
index ee42b91e..4fa742db 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_banner.png and b/app/src/main/res/mipmap-xhdpi/ic_banner.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_banner_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_banner_foreground.png
index ee42b91e..52b72c47 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_banner_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_banner_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 924b40eb..ce75a196 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
index e218f8bd..22298ad1 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 40674eff..3f7c7e29 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 6f5be441..e5cef34d 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
index 8c1935c7..fafcb4f1 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 48a4e286..5c1a8e36 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index 1cf49fb6..90341396 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
index afc41a8b..dbe5821e 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 122a33e0..2ef5c7d0 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d71123be..7de6e9ac 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -489,8 +489,8 @@
Vyplnit
Vyplnit šířku
Vyplnit výšku
- Výchozí předvolba Wolfskin
- Wolfskin kompaktní
+ Výchozí předvolba Wholphin
+ Wholphin kompaktní
Obrázky náhledů seriálů
Obrázky náhledů epizod
Nejnižší
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a6efeb91..870d8c85 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -538,8 +538,8 @@
Fyld
Fyld bredde
Fyld højde
- Wolfskin-standard
- Wolfskin kompakt
+ Wholphin-standard
+ Wholphin kompakt
Seriens miniaturebilleder
Episode-miniaturebilleder
Laveste
@@ -637,7 +637,7 @@
Vælg alle
Adskil typer
Foretræk logoer som titler
- Wolfskin er opdateret til %s
+ Wholphin er opdateret til %s
Fjern fra Fortsæt med at se
Fjern serien fra Næste
Vis serier fjernet fra Næste
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f4523d02..3d745172 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -511,8 +511,8 @@
Animieren
Breite ausfüllen
Höhe ausfüllen
- Wolfskin Standard
- Wolfskin Kompakt
+ Wholphin Standard
+ Wholphin Kompakt
Niedrigste
Niedrig
Mittel
@@ -580,7 +580,7 @@
Fortfahren
Verschiedene Arten
Bevorzugt Logo statt Titel anzeigen
- Wolfskin aktualisiert auf %s
+ Wholphin aktualisiert auf %s
Von \"Weiterschauen\" entfernen
Serie aus \"Als Nächstes anschauen\" entfernen
Mehr anzeigen
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 696ad927..0dbe1e87 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -599,7 +599,7 @@
Eliminar de la cola
Separar por tipos
Preferir logotipos para los títulos
- Wolfskin se ha actualizado a la versión %s
+ Wholphin se ha actualizado a la versión %s
Ver más
Descubrir series
Descubrir películas
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 8fc29c91..168b914e 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -535,8 +535,8 @@
Täida
Täida laiuses
Täida kõrguses
- Wolfskini vaikeseadistus
- Wolfskini kompaktne vaade
+ Wholphini vaikeseadistus
+ Wholphini kompaktne vaade
Sarja pisipildid
Osa pisipildid
Vaikseim
@@ -580,7 +580,7 @@
Jätka
Eraldi tüübid
Pealkirjade puhul eelista logode kuvamist
- Wolfskin on uuendatud versioonini %s
+ Wholphin on uuendatud versioonini %s
Eemalda „Jätka vaatamist“ valikust
Eemalda sari valikust „Järgmisena esitamisel“
Vaata sarja, mis sai eemaldatud valikust „Järgmisena esitamisel“
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 898f8a10..4d7506ed 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -507,8 +507,8 @@
Remplir
Largeur de remplissage
Hauteur de remplissage
- Wolfskin Par défaut
- Wolfskin Compact
+ Wholphin Par défaut
+ Wholphin Compact
Images miniatures de la série
Images miniatures de l\'épisode
Le plus bas
@@ -599,7 +599,7 @@
Suivant
Séparer par types
Préférer les logos pour les titres
- Wolfskin a été mis à jour vers la version %s
+ Wholphin a été mis à jour vers la version %s
Voir plus
Parcourir les séries
Parcourir les films
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1eb5b58b..b056a7be 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -593,8 +593,8 @@
Ispuni
Ispuni širinu
Ispuni visinu
- Wolfskin zadani
- Wolfskin zbijeni
+ Wholphin zadani
+ Wholphin zbijeni
Slike sličica serije
Slike sličica epizoda
Najniža
@@ -653,7 +653,7 @@
Odaberi sve
Odvojene vrste
Preferiraj prikaz logotipa za naslove
- Wolfskin ažuriran na %s
+ Wholphin ažuriran na %s
Ukloni iz \"Nastavi gledanje\"
Ukloni seriju iz \"Slijedi\"
Prikaži serije uklonjene iz \"Slijedi\"
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d6f20d4b..f3c0a00c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -465,8 +465,8 @@
Foto
Sertakan jenis
Tampilkan gambar untuk jenis item
- Wolfskin Bawaan
- Wolfskin Ringkas
+ Wholphin Bawaan
+ Wholphin Ringkas
Gambar Thumbnail Seri
Gambar Thumbnail Episode
Terendah
@@ -561,7 +561,7 @@
Pisahkan jenis
Buka artis
Buka album
- Wolfskin diperbarui ke %s
+ Wholphin diperbarui ke %s
Hapus dari \"Lanjutkan menonton\"
Hapus seri dari \"Berikutnya\"
Lihat seri yang dihapus dari \"Berikutnya\"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fb5f37ce..7e347b2d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -489,8 +489,8 @@
Riempi
Riempi larghezza
Riempi altezza
- Wolfskin predefinito
- Wolfskin Compatto
+ Wholphin predefinito
+ Wholphin Compatto
Immagini miniatura serie
Immagini miniatura episodio
Minimo
@@ -599,7 +599,7 @@
Continua
Tipi separati
Preferisci mostrare i loghi per i titoli
- Wolfskin aggiornato a %s
+ Wholphin aggiornato a %s
Rimuovi da Continua a guardare
Rimuovi serie da Prossimo
Visualizza serie rimosse da Prossimo
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index fe4ce431..a4191206 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -517,8 +517,8 @@
מתיחה לתצוגה
מתיחה לרוחב
מתיחה לגובה
- ברירת המחדל של Wolfskin
- Wolfskin קומפקטי
+ ברירת המחדל של Wholphin
+ Wholphin קומפקטי
תמונות־ממוזערות של סדרה
תמונות־ממוזערות של פרק
כחול עז
@@ -594,7 +594,7 @@
בחר הכול
סוגים נפרדים
העדף להציג לוגו על פני כותרת
- Wolfskin עודכן ל־%s
+ Wholphin עודכן ל־%s
מחק מהמשך צפייה
מחק סדרה מ־\"הבא בתור\"
הצג סדרות שנמחקו מ־\"הבא בתור\"
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c8066cec..9e26efcc 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -483,8 +483,8 @@
Fyll
Fyll bredde
Fyll høyde
- Wolfskin Standard
- Wolfskin Kompakt
+ Wholphin Standard
+ Wholphin Kompakt
Serieminiatyrbilder
Episodeminiatyrbilder
Lavest
@@ -573,7 +573,7 @@
Velg alle
Seperate typer
Foretrekk å vise logoer for titler
- Wolfskin oppdatert til %s
+ Wholphin oppdatert til %s
Fjern fra fortsett å se
Fjern serier fra neste
Vis serier fjernet fra neste
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1e4891ba..2d6bd0c4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -480,8 +480,8 @@
Vullen
Vulbreedte
Vulhoogte
- Wolfskin standaard
- Wolfskin compact
+ Wholphin standaard
+ Wholphin compact
Laag
Middel
Hoog
@@ -603,7 +603,7 @@
Experimentele instellingen inschakelen?
Experimentele instellingen
- Wolfskin is geüpdatet naar %s
+ Wholphin is geüpdatet naar %s
Laatst afgespeeld
Direct afspelen met de ingebouwde ExoPlayer
Ondertitels inbranden/transcoderen op de server
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index eb7a6fe7..55e08a8d 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -478,8 +478,8 @@
Fyll
Fyll breidde
Fyll høgde
- Wolfskin-standard
- Wolfskin-kompakt
+ Wholphin-standard
+ Wholphin-kompakt
Miniatyrbilete for seriar
Miniatyrbilete for episodar
Lågast
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 83247c34..a208aeb6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -386,8 +386,8 @@
Wypełnij
Pełna szerokość
Pełna wysokość
- Domyślny Wolfskin
- Kompaktowy Wolfskin
+ Domyślny Wholphin
+ Kompaktowy Wholphin
Miniatury seriali
Zdjęcie odcinków
Najniższa
@@ -576,7 +576,7 @@
Wybierz wszystkie
Oddzielne typy
Wyświetlanie logo zamiast tytułu
- Wolfskin zaktualizowany do %s
+ Wholphin zaktualizowany do %s
Usuń z Kontynuuj oglądanie
Usuń serial z Następnie
Zobacz serię usuniętą z Następnie
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index af1e0d9f..e42abda3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -498,8 +498,8 @@
Preencher
Preencher largura
Preencher altura
- Padrão do Wolfskin
- Wolfskin Compacto
+ Padrão do Wholphin
+ Wholphin Compacto
Prévia das imagens das séries
Prévias das imagens do episódio
Mais baixo
@@ -605,7 +605,7 @@
Selecionar todos
Tipos separados
Preferir a exibição de logos para títulos
- Wolfskin atualizado para %s
+ Wholphin atualizado para %s
Remover de continuar assistindo
Remover série de a seguir
Ver séries removidas de a seguir
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d65ac309..02e92e10 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -507,8 +507,8 @@
Preencher
Preencher largura
Preencher altura
- Padrão do Wolfskin
- Wolfskin Compacto
+ Padrão do Wholphin
+ Wholphin Compacto
Imagens em miniatura da série
Imagens em miniatura do episódio
Mínimo
@@ -599,7 +599,7 @@
Continuar
Separar por tipos
Prefiro mostrar logótipos nos títulos
- Wolfskin foi atualizado para %s
+ Wholphin foi atualizado para %s
Remover de «Continuar a ver»
Remover série do «Continuar a ver»
Ver séries removidas do «Continuar a ver»
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f7cc6e4c..1c2321e9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -605,8 +605,8 @@
Растянуть
По ширине
По высоте
- Wolfskin по умолчанию
- Wolfskin компактный
+ Wholphin по умолчанию
+ Wholphin компактный
Миниатюры сериалов
Миниатюры эпизодов
Самая низкая
@@ -683,7 +683,7 @@
Продолжить
Разделять по типам
Показывать логотипы вместо текстовых названий
- Wolfskin обновлён до версии %s
+ Wholphin обновлён до версии %s
Убрать из «Продолжить просмотр»
Убрать сериал из «Далее»
Показать сериалы, убранные из «Далее»
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index bc78a1f8..95f777c1 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -526,8 +526,8 @@
Vyplniť
Vyplniť na šírku
Vyplniť na výšku
- Wolfskin predvolené
- Wolfskin kompaktné
+ Wholphin predvolené
+ Wholphin kompaktné
Náhľadové obrázky seriálov
Náhľadové obrázky epizód
Náhľad
@@ -662,7 +662,7 @@
Pokračovať
Oddeliť typy
Uprednostniť zobrazovanie log namiesto názvov
- Wolfskin bol aktualizovaný na verziu %s
+ Wholphin bol aktualizovaný na verziu %s
Odstrániť z Pokračovať v pozeraní
Odstrániť seriál zo sekcie Nasleduje
Zobraziť seriály odstránené zo sekcie Nasleduje
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 5711dac1..46ec0b68 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -600,7 +600,7 @@
Izberi vse
Ločene vrste
Prikazuj logotipe za naslove
- Wolfskin posodobljen na %s
+ Wholphin posodobljen na %s
Odstrani iz nadaljevanja gledanja
Odstrani serijo iz nadaljevanja gledanja
Ogled serije, odstranjene iz naslednjega gledanja
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3b71517a..474d685a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -424,8 +424,8 @@
Välj rader och bilder på startsidan
Är du säker på att du vill radera detta objekt?
Upptäck
- Wolfskin Kompakt
- Wolfskin Standard
+ Wholphin Kompakt
+ Wholphin Standard
Visningsförinställningar
Inbyggda förinställningar för att snabbt styla alla rader
Avsnittsminiatyrer
@@ -595,7 +595,7 @@
Vilka typer av objekt ska bilder visas för
Låten har text
Visa omslag till album
- Wolfskin har uppdaterats till %s
+ Wholphin har uppdaterats till %s
Senast visat
Huvudkatalog
Populäritet
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 2ccccbae..c544add8 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -465,8 +465,8 @@
ยืดเต็มจอ
ยืดตามความกว้าง
ยืดตามความสูง
- Wolfskin ค่าเริ่มต้น
- Wolfskin คอมแพค
+ Wholphin ค่าเริ่มต้น
+ Wholphin คอมแพค
ภาพขนาดย่อของซีรี่ส์
ภาพขนาดย่อของตอน
เบาสุด
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f591c3fb..b05abfd0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -480,8 +480,8 @@
Doldur
Genişliği Doldur
Yüksekliği Doldur
- Wolfskin Varsayılan
- Wolfskin Kompakt
+ Wholphin Varsayılan
+ Wholphin Kompakt
Dizi Küçük Resimleri
Bölüm Küçük Resimleri
En Düşük
@@ -589,7 +589,7 @@
Devam et
Farklı türler
Başlık yerine logo göster
- Wolfskin %s sürümüne güncellendi
+ Wholphin %s sürümüne güncellendi
Daha fazla göster
Dizileri Keşfet
Filmleri Keşfet
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0c0c9727..6b518809 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -567,7 +567,7 @@
Заповнити
Заповнити по ширині
Заповнити по висоті
- Wolfskin за замовчуванням
+ Wholphin за замовчуванням
Мініатюри серіалів
Мініатюри серій
Найнижча
@@ -655,7 +655,7 @@
Вибрати все
Розділяти типи
Надавати перевагу логотипам для назв
- Wolfskin оновлено до %s
+ Wholphin оновлено до %s
Видалити з «Продовжити перегляд»
Видалити серіал з «Далі»
Переглянути серіали, видалені з «Далі»
@@ -686,5 +686,5 @@
Томати
Сортування
Розділити на окремі рядки
- Wolfskin компактний
+ Wholphin компактний
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 07b57d8e..e36dc507 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -453,8 +453,8 @@
填充
填充宽度
填充高度
- Wolfskin 默认
- Wolfskin 紧凑
+ Wholphin 默认
+ Wholphin 紧凑
剧集缩略图
分集缩略图
紫色
@@ -561,7 +561,7 @@
继续
分离类型
优先显示标题图标
- Wolfskin 已更新至 %s
+ Wholphin 已更新至 %s
查看更多
发现电视节目
发现电影
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7c10daab..622f5463 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -482,8 +482,8 @@
優先使用 MPV
僅 HDR 使用 ExoPlayer 播放
我的最愛的 %s
- Wolfskin 預設樣式
- Wolfskin 緊湊樣式
+ Wholphin 預設樣式
+ Wholphin 緊湊樣式
劇集縮圖樣式
單集縮圖樣式
海報 (2:3)
@@ -561,7 +561,7 @@
即時混播
依類型分開顯示
優先顯示圖像標題
- Wolfskin 已更新至 %s
+ Wholphin 已更新至 %s
查看更多
探索電視劇
探索電影
diff --git a/app/src/main/res/values/ic_banner_background.xml b/app/src/main/res/values/ic_banner_background.xml
new file mode 100644
index 00000000..e0e3446a
--- /dev/null
+++ b/app/src/main/res/values/ic_banner_background.xml
@@ -0,0 +1,4 @@
+
+
+ #000B25
+
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 933396c0..ffea1b18 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #07070a
+ #101010
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b8a3578..dd87f6da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
- Wolfskin
- Wolfskin
+ Wholphin
+ Wholphin
About
Active Recordings
@@ -587,8 +587,8 @@
Fill
Fill width
Fill height
- Wolfskin Default
- Wolfskin Compact
+ Wholphin Default
+ Wholphin Compact
Series Thumb images
Episode Thumbnail images
@@ -620,7 +620,6 @@
- @string/black
- @string/red
- @string/brown
- - @string/wolfskin_theme
Ignore
@@ -809,7 +808,7 @@
Select all
Separate types
Prefer showing logos for titles
- Wolfskin updated to %s
+ Wholphin updated to %s
Remove from continue watching
Remove series from next up
View series removed from next up
diff --git a/app/src/main/res/values/wolfskin.xml b/app/src/main/res/values/wolfskin.xml
deleted file mode 100644
index 2aca4d36..00000000
--- a/app/src/main/res/values/wolfskin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- Wolfskin
- based on Wholphin by damontecres
- https://github.com/damontecres/Wholphin
-
diff --git a/app/src/test/java/com/github/damontecres/wholphin/ui/WolfskinThemeColorsTest.kt b/app/src/test/java/com/github/damontecres/wholphin/ui/WolfskinThemeColorsTest.kt
deleted file mode 100644
index 3ef4ad20..00000000
--- a/app/src/test/java/com/github/damontecres/wholphin/ui/WolfskinThemeColorsTest.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.damontecres.wholphin.ui
-
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.luminance
-import com.github.damontecres.wholphin.ui.theme.colors.WolfskinThemeColors
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-/** Normal and focused TV text must remain readable on the fork's dark palette. */
-class WolfskinThemeColorsTest {
- @Test
- fun darkPaletteHasReadableNormalAndFocusedText() {
- val television = WolfskinThemeColors.darkScheme
- val material = WolfskinThemeColors.darkSchemeMaterial
- val textAndBackgrounds =
- listOf(
- television.onBackground to television.background,
- television.onSurface to television.surface,
- television.onSurfaceVariant to television.surfaceVariant,
- television.onPrimary to television.primary,
- television.onPrimaryContainer to television.primaryContainer,
- television.onSecondary to television.secondary,
- television.onSecondaryContainer to television.secondaryContainer,
- television.onTertiary to television.tertiary,
- television.onTertiaryContainer to television.tertiaryContainer,
- material.onBackground to material.background,
- material.onSurface to material.surface,
- material.onPrimary to material.primary,
- material.onPrimaryContainer to material.primaryContainer,
- )
- textAndBackgrounds.forEach { (text, background) ->
- assertReadable(text, background)
- }
- }
-
- private fun assertReadable(text: Color, background: Color) {
- val textLuminance = text.luminance()
- val backgroundLuminance = background.luminance()
- val contrast =
- (maxOf(textLuminance, backgroundLuminance) + .05f) /
- (minOf(textLuminance, backgroundLuminance) + .05f)
- assertTrue("Text contrast $contrast is below 4.5:1", contrast >= 4.5f)
- }
-}