Oopsie

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/build_pull_request.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2

.github/workflows/build_push.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
@@ -83,7 +83,7 @@ jobs:
 
       - name: Create Release
         if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon'
-        uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # v2.0.4
+        uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2.0.5
         with:
           tag_name: ${{ env.VERSION_TAG }}
           name: Mihon ${{ env.VERSION_TAG }}

app/proguard-rules.pro

@@ -44,6 +44,10 @@
 -dontnote rx.internal.util.PlatformDependent
 ##---------------End: proguard configuration for RxJava 1.x  ----------
 
+##---------------Begin: proguard configuration for okhttp  ----------
+-keepclasseswithmembers class okhttp3.MultipartBody$Builder { *; }
+##---------------End: proguard configuration for okhttp  ----------
+
 ##---------------Begin: proguard configuration for kotlinx.serialization  ----------
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.** # core serialization annotations

app/src/main/java/eu/kanade/presentation/theme/colorscheme/BaseColorScheme.kt

@@ -8,6 +8,12 @@ internal abstract class BaseColorScheme {
     abstract val darkScheme: ColorScheme
     abstract val lightScheme: ColorScheme
 
+    // Cannot be pure black as there's content scrolling behind it
+    // https://m3.material.io/components/navigation-bar/guidelines#90615a71-607e-485e-9e09-778bfc080563
+    private val surfaceContainer = Color(0xFF0C0C0C)
+    private val surfaceContainerHigh = Color(0xFF131313)
+    private val surfaceContainerHighest = Color(0xFF1B1B1B)
+
     fun getColorScheme(isDark: Boolean, isAmoled: Boolean): ColorScheme {
         if (!isDark) return lightScheme
 
@@ -18,11 +24,12 @@ internal abstract class BaseColorScheme {
             onBackground = Color.White,
             surface = Color.Black,
             onSurface = Color.White,
-
-            // Cannot be pure black as there's content scrolling behind it
-            // https://m3.material.io/components/navigation-bar/guidelines#90615a71-607e-485e-9e09-778bfc080563
-            surfaceVariant = Color(0xFF0A0A0A),   // Navigation bar background (ThemePrefWidget)
-            surfaceContainer = Color(0xFF0A0A0A), // Navigation bar background
+            surfaceVariant = surfaceContainer, // Navigation bar background (ThemePrefWidget)
+            surfaceContainerLowest = surfaceContainer,
+            surfaceContainerLow = surfaceContainer,
+            surfaceContainer = surfaceContainer, // Navigation bar background
+            surfaceContainerHigh = surfaceContainerHigh,
+            surfaceContainerHighest = surfaceContainerHighest,
         )
     }
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/LavenderColorScheme.kt

@@ -47,11 +47,11 @@ internal object LavenderColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFF6D41C8),
         surfaceDim = Color(0xFF111129),
         surfaceBright = Color(0xFF3B3841),
-        surfaceContainerLowest = Color(0xFF0F0D15),
-        surfaceContainerLow = Color(0xFF1D1A22),
+        surfaceContainerLowest = Color(0xFF15132d),
+        surfaceContainerLow = Color(0xFF171531),
         surfaceContainer = Color(0xFF1D193B), // Navigation bar background
-        surfaceContainerHigh = Color(0xFF2C2831),
-        surfaceContainerHighest = Color(0xFF37333C),
+        surfaceContainerHigh = Color(0xFF241f41),
+        surfaceContainerHighest = Color(0xFF282446),
     )
 
     override val lightScheme = lightColorScheme(
@@ -85,10 +85,10 @@ internal object LavenderColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFFA177FF),
         surfaceDim = Color(0xFFDED7E3),
         surfaceBright = Color(0xFFEDE2FF),
-        surfaceContainerLowest = Color(0xFFFFFFFF),
-        surfaceContainerLow = Color(0xFFF8F1FD),
+        surfaceContainerLowest = Color(0xFFDACCEC),
+        surfaceContainerLow = Color(0xFFDED0F1),
         surfaceContainer = Color(0xFFE4D5F8), // Navigation bar background
-        surfaceContainerHigh = Color(0xFFEDE6F2),
-        surfaceContainerHighest = Color(0xFFE7E0EC),
-        )
+        surfaceContainerHigh = Color(0xFFEADCFD),
+        surfaceContainerHighest = Color(0xFFEEE2FF),
+    )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/MidnightDuskColorScheme.kt

@@ -25,7 +25,7 @@ internal object MidnightDuskColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFFF02475),
         secondary = Color(0xFFF02475), // Unread badge
         onSecondary = Color(0xFF16151D), // Unread badge text
-        secondaryContainer = Color(0xFF801D4A), // Navigation bar selector pill & progress indicator (remaining)
+        secondaryContainer = Color(0xFF66183C), // Navigation bar selector pill & progress indicator (remaining)
         onSecondaryContainer = Color(0xFFF02475), // Navigation bar selector icon
         tertiary = Color(0xFF55971C), // Downloaded badge
         onTertiary = Color(0xFF16151D), // Downloaded badge text
@@ -35,13 +35,17 @@ internal object MidnightDuskColorScheme : BaseColorScheme() {
         onBackground = Color(0xFFE5E1E5),
         surface = Color(0xFF16151D),
         onSurface = Color(0xFFE5E1E5),
-        surfaceVariant = Color(0xFF591A38), // Navigation bar background (ThemePrefWidget)
+        surfaceVariant = Color(0xFF281624), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFD6C1C4),
         surfaceTint = Color(0xFFF02475),
         inverseSurface = Color(0xFF333043),
         inverseOnSurface = Color(0xFFFFFFFF),
         outline = Color(0xFF9F8C8F),
+        surfaceContainerLowest = Color(0xFF221320),
+        surfaceContainerLow = Color(0xFF251522),
         surfaceContainer = Color(0xFF281624), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF2D1C2A),
+        surfaceContainerHighest = Color(0xFF2F1F2C),
     )
 
     override val lightScheme = lightColorScheme(
@@ -68,6 +72,10 @@ internal object MidnightDuskColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF313033),
         inverseOnSurface = Color(0xFFF4F0F4),
         outline = Color(0xFF847376),
+        surfaceContainerLowest = Color(0xFFDAC0CD),
+        surfaceContainerLow = Color(0xFFE8D1DD),
         surfaceContainer = Color(0xFFF9E6F1), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFFCF3F8),
+        surfaceContainerHighest = Color(0xFFFEF9FC),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/NordColorScheme.kt

@@ -39,7 +39,11 @@ internal object NordColorScheme : BaseColorScheme() {
         onError = Color(0xFF2E3440),
         errorContainer = Color(0xFFBF616A),
         onErrorContainer = Color(0xFF000000),
-        surfaceContainer = Color(0xFF414C5C), // Navigation bar background
+        surfaceContainerLowest = Color(0xFF373F4D),
+        surfaceContainerLow = Color(0xFF3E4756),
+        surfaceContainer = Color(0xFF414C5C),
+        surfaceContainerHigh = Color(0xFF4E5766),
+        surfaceContainerHighest = Color(0xFF505968), // Navigation bar background
     )
 
     override val lightScheme = lightColorScheme(
@@ -69,6 +73,10 @@ internal object NordColorScheme : BaseColorScheme() {
         onError = Color(0xFFECEFF4),
         errorContainer = Color(0xFFBF616A),
         onErrorContainer = Color(0xFF000000),
+        surfaceContainerLowest = Color(0xFFD1D7E0),
+        surfaceContainerLow = Color(0xFFD6DCE6),
         surfaceContainer = Color(0xFFDAE0EA), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFE9EDF3),
+        surfaceContainerHighest = Color(0xFFF2F4F8),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/StrawberryColorScheme.kt

@@ -48,11 +48,11 @@ internal object StrawberryColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFFB61F40),
         surfaceDim = Color(0xFF1D1011),
         surfaceBright = Color(0xFF463536),
-        surfaceContainerLowest = Color(0xFF170B0C),
-        surfaceContainerLow = Color(0xFF261819),
+        surfaceContainerLowest = Color(0xFF2C2222),
+        surfaceContainerLow = Color(0xFF302525),
         surfaceContainer = Color(0xFF322727), // Navigation bar background
-        surfaceContainerHigh = Color(0xFF362627),
-        surfaceContainerHighest = Color(0xFF413132),
+        surfaceContainerHigh = Color(0xFF3C2F2F),
+        surfaceContainerHighest = Color(0xFF463737),
     )
 
     override val lightScheme = lightColorScheme(
@@ -86,11 +86,10 @@ internal object StrawberryColorScheme : BaseColorScheme() {
         inversePrimary = Color(0xFFFFB2B8),
         surfaceDim = Color(0xFFEED4D5),
         surfaceBright = Color(0xFFFFF8F7),
-        surfaceContainerLowest = Color(0xFFFFFFFF),
-        surfaceContainerLow = Color(0xFFFFF0F0),
+        surfaceContainerLowest = Color(0xFFF7DCDD),
+        surfaceContainerLow = Color(0xFFFDE2E3),
         surfaceContainer = Color(0xFFF6EAED), // Navigation bar background
-        surfaceContainerHigh = Color(0xFFFDE2E3),
-        surfaceContainerHighest = Color(0xFFF7DCDD),
-
-        )
+        surfaceContainerHigh = Color(0xFFFFF0F0),
+        surfaceContainerHighest = Color(0xFFFFFFFF),
+    )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/TachiyomiColorScheme.kt

@@ -22,19 +22,19 @@ internal object TachiyomiColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF00429B),
         onPrimaryContainer = Color(0xFFD9E2FF),
         inversePrimary = Color(0xFF0058CA),
-        secondary = Color(0xFFB0C6FF),
-        onSecondary = Color(0xFF002D6E),
-        secondaryContainer = Color(0xFF00429B),
-        onSecondaryContainer = Color(0xFFD9E2FF),
-        tertiary = Color(0xFF7ADC77),
-        onTertiary = Color(0xFF003909),
+        secondary = Color(0xFFB0C6FF), // Unread badge
+        onSecondary = Color(0xFF002D6E), // Unread badge text
+        secondaryContainer = Color(0xFF00429B), // Navigation bar selector pill & pro
+        onSecondaryContainer = Color(0xFFD9E2FF), // Navigation bar selector icon
+        tertiary = Color(0xFF7ADC77), // Downloaded badge
+        onTertiary = Color(0xFF003909), // Downloaded badge text
         tertiaryContainer = Color(0xFF005312),
         onTertiaryContainer = Color(0xFF95F990),
         background = Color(0xFF1B1B1F),
         onBackground = Color(0xFFE3E2E6),
         surface = Color(0xFF1B1B1F),
         onSurface = Color(0xFFE3E2E6),
-        surfaceVariant = Color(0xFF44464F),
+        surfaceVariant = Color(0xFF211F26), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFC5C6D0),
         surfaceTint = Color(0xFFB0C6FF),
         inverseSurface = Color(0xFFE3E2E6),
@@ -45,6 +45,11 @@ internal object TachiyomiColorScheme : BaseColorScheme() {
         onErrorContainer = Color(0xFFFFDAD6),
         outline = Color(0xFF8F9099),
         outlineVariant = Color(0xFF44464F),
+        surfaceContainerLowest = Color(0xFF1A181D),
+        surfaceContainerLow = Color(0xFF1E1C22),
+        surfaceContainer = Color(0xFF211F26), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF292730),
+        surfaceContainerHighest = Color(0xFF302E38),
     )
 
     override val lightScheme = lightColorScheme(
@@ -53,19 +58,19 @@ internal object TachiyomiColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFD9E2FF),
         onPrimaryContainer = Color(0xFF001945),
         inversePrimary = Color(0xFFB0C6FF),
-        secondary = Color(0xFF0058CA),
-        onSecondary = Color(0xFFFFFFFF),
-        secondaryContainer = Color(0xFFD9E2FF),
-        onSecondaryContainer = Color(0xFF001945),
-        tertiary = Color(0xFF006E1B),
-        onTertiary = Color(0xFFFFFFFF),
+        secondary = Color(0xFF0058CA), // Unread badge
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
+        secondaryContainer = Color(0xFFD9E2FF), // Navigation bar selector pill & progress indicator (remaining)
+        onSecondaryContainer = Color(0xFF001945), // Navigation bar selector icon
+        tertiary = Color(0xFF006E1B), // Downloaded badge
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
         tertiaryContainer = Color(0xFF95F990),
         onTertiaryContainer = Color(0xFF002203),
         background = Color(0xFFFEFBFF),
         onBackground = Color(0xFF1B1B1F),
         surface = Color(0xFFFEFBFF),
         onSurface = Color(0xFF1B1B1F),
-        surfaceVariant = Color(0xFFE1E2EC),
+        surfaceVariant = Color(0xFFF3EDF7), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF44464F),
         surfaceTint = Color(0xFF0058CA),
         inverseSurface = Color(0xFF303034),
@@ -76,5 +81,10 @@ internal object TachiyomiColorScheme : BaseColorScheme() {
         onErrorContainer = Color(0xFF410002),
         outline = Color(0xFF757780),
         outlineVariant = Color(0xFFC5C6D0),
+        surfaceContainerLowest = Color(0xFFF5F1F8),
+        surfaceContainerLow = Color(0xFFF7F2FA),
+        surfaceContainer = Color(0xFFF3EDF7), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFFCF7FF),
+        surfaceContainerHighest = Color(0xFFFCF7FF),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/TakoColorScheme.kt

@@ -41,7 +41,11 @@ internal object TakoColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFFE5E1E6),
         inverseOnSurface = Color(0xFF1B1B1E),
         outline = Color(0xFF958F99),
+        surfaceContainerLowest = Color(0xFF20202E),
+        surfaceContainerLow = Color(0xFF262636),
         surfaceContainer = Color(0xFF2A2A3C), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF303044),
+        surfaceContainerHighest = Color(0xFF36364D),
     )
 
     override val lightScheme = lightColorScheme(
@@ -68,6 +72,10 @@ internal object TakoColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF313033),
         inverseOnSurface = Color(0xFFF3EFF4),
         outline = Color(0xFF7A757E),
+        surfaceContainerLowest = Color(0xFFD7D0DA),
+        surfaceContainerLow = Color(0xFFDFD8E2),
         surfaceContainer = Color(0xFFE8E0EB), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFEEE6F1),
+        surfaceContainerHighest = Color(0xFFF7EEFA),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/TealTurqoiseColorScheme.kt

@@ -33,7 +33,11 @@ internal object TealTurqoiseColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFFDFDEDA),
         inverseOnSurface = Color(0xFF202125),
         outline = Color(0xFF899391),
+        surfaceContainerLowest = Color(0xFF202C2E),
+        surfaceContainerLow = Color(0xFF222F31),
         surfaceContainer = Color(0xFF233133), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF28383A),
+        surfaceContainerHighest = Color(0xFF2F4244),
     )
 
     override val lightScheme = lightColorScheme(
@@ -60,6 +64,10 @@ internal object TealTurqoiseColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF050505),
         inverseOnSurface = Color(0xFFFAFAFA),
         outline = Color(0xFF6F7977),
+        surfaceContainerLowest = Color(0xFFE1E9E7),
+        surfaceContainerLow = Color(0xFFE6EEEC),
         surfaceContainer = Color(0xFFEBF3F1), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFF0F8F6),
+        surfaceContainerHighest = Color(0xFFF7FFFD),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/TidalWaveColorScheme.kt

@@ -40,7 +40,11 @@ internal object TidalWaveColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFFffe3c4),
         inverseOnSurface = Color(0xFF001c3b),
         outline = Color(0xFF8a9296),
+        surfaceContainerLowest = Color(0xFF072642),
+        surfaceContainerLow = Color(0xFF072947),
         surfaceContainer = Color(0xFF082b4b), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF093257),
+        surfaceContainerHighest = Color(0xFF0A3861),
     )
 
     override val lightScheme = lightColorScheme(
@@ -67,6 +71,10 @@ internal object TidalWaveColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF020400),
         inverseOnSurface = Color(0xFFffe3c4),
         outline = Color(0xFF70787c),
+        surfaceContainerLowest = Color(0xFFe2e8ec),
+        surfaceContainerLow = Color(0xFFe5ecf1),
         surfaceContainer = Color(0xFFe8eff5), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFedf4fA),
+        surfaceContainerHighest = Color(0xFFf5faff),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/YinYangColorScheme.kt

@@ -35,7 +35,11 @@ internal object YinYangColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFFE6E6E6),
         inverseOnSurface = Color(0xFF1E1E1E),
         outline = Color(0xFF999999),
+        surfaceContainerLowest = Color(0xFF2A2A2A),
+        surfaceContainerLow = Color(0xFF2D2D2D),
         surfaceContainer = Color(0xFF313131), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF383838),
+        surfaceContainerHighest = Color(0xFF3F3F3F),
     )
 
     override val lightScheme = lightColorScheme(
@@ -62,6 +66,10 @@ internal object YinYangColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF333333),
         inverseOnSurface = Color(0xFFF4F4F4),
         outline = Color(0xFF838383),
+        surfaceContainerLowest = Color(0xFFCFCFCF),
+        surfaceContainerLow = Color(0xFFDADADA),
         surfaceContainer = Color(0xFFE8E8E8), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFECECEC),
+        surfaceContainerHighest = Color(0xFFEFEFEF),
     )
 }

app/src/main/java/eu/kanade/presentation/theme/colorscheme/YotsubaColorScheme.kt

@@ -41,7 +41,11 @@ internal object YotsubaColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFFEDE0DD),
         inverseOnSurface = Color(0xFF211A18),
         outline = Color(0xFFA08C87),
+        surfaceContainerLowest = Color(0xFF2E221F),
+        surfaceContainerLow = Color(0xFF312521),
         surfaceContainer = Color(0xFF332723), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF413531),
+        surfaceContainerHighest = Color(0xFF4C403D),
     )
 
     override val lightScheme = lightColorScheme(
@@ -68,6 +72,10 @@ internal object YotsubaColorScheme : BaseColorScheme() {
         inverseSurface = Color(0xFF362F2D),
         inverseOnSurface = Color(0xFFFBEEEB),
         outline = Color(0xFF85736E),
+        surfaceContainerLowest = Color(0xFFECE3E0),
+        surfaceContainerLow = Color(0xFFF1E7E4),
         surfaceContainer = Color(0xFFF6EBE7), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFFAF4F2),
+        surfaceContainerHighest = Color(0xFFFBF6F4),
     )
 }

gradle/kotlinx.versions.toml

@@ -9,7 +9,7 @@ gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "
 
 immutables = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
 
-coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.8.0" }
+coroutines-bom = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-bom", version = "1.8.1" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" }
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android" }
 coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava" }

gradle/libs.versions.toml

@@ -91,7 +91,7 @@ sqldelight-dialects-sql = { module = "app.cash.sqldelight:sqlite-3-38-dialect",
 sqldelight-gradle = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
 
 junit = "org.junit.jupiter:junit-jupiter:5.10.2"
-kotest-assertions = "io.kotest:kotest-assertions-core:5.8.1"
+kotest-assertions = "io.kotest:kotest-assertions-core:5.9.0"
 mockk = "io.mockk:mockk:1.13.10"
 
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }