Add Namicomi support for external chapters on MD (#1188)

Changed DO and DON'T for bug repports to a link with the issue template.

README.md

@@ -88,9 +88,7 @@ Please make sure to read the full guidelines. Your issue may be closed without w
 * If it could be device-dependent, try reproducing on another device (if possible)
 * Don't group unrelated requests into one issue
 
-DO: https://github.com/tachiyomiorg/tachiyomi/issues/24 https://github.com/tachiyomiorg/tachiyomi/issues/71
+Use the [issue forms](https://github.com/jobobby04/TachiyomiSY/issues/new/choose) to submit a bug.
-
-DON'T: https://github.com/tachiyomiorg/tachiyomi/issues/75
 
 </details>
 

app/build.gradle.kts

@@ -29,7 +29,7 @@ android {
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi.sy"
 
-        versionCode = 67
+        versionCode = 68
         versionName = "1.10.5"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -155,7 +155,6 @@ dependencies {
     implementation(compose.activity)
     implementation(compose.foundation)
     implementation(compose.material3.core)
-    implementation(compose.material.core)
     implementation(compose.material.icons)
     implementation(compose.animation)
     implementation(compose.animation.graphics)

app/proguard-rules.pro

@@ -47,6 +47,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/components/AdaptiveSheet.kt

@@ -7,8 +7,6 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
@@ -23,7 +21,6 @@ import tachiyomi.presentation.core.components.AdaptiveSheet as AdaptiveSheetImpl
 @Composable
 fun NavigatorAdaptiveSheet(
     screen: Screen,
-    tonalElevation: Dp = 1.dp,
     enableSwipeDismiss: (Navigator) -> Boolean = { true },
     onDismissRequest: () -> Unit,
 ) {
@@ -31,7 +28,6 @@ fun NavigatorAdaptiveSheet(
         screen = screen,
         content = { sheetNavigator ->
             AdaptiveSheet(
-                tonalElevation = tonalElevation,
                 enableSwipeDismiss = enableSwipeDismiss(sheetNavigator),
                 onDismissRequest = onDismissRequest,
             ) {
@@ -73,7 +69,6 @@ fun NavigatorAdaptiveSheet(
 fun AdaptiveSheet(
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier,
-    tonalElevation: Dp = 1.dp,
     enableSwipeDismiss: Boolean = true,
     content: @Composable () -> Unit,
 ) {
@@ -86,7 +81,6 @@ fun AdaptiveSheet(
         AdaptiveSheetImpl(
             modifier = modifier,
             isTabletUi = isTabletUi,
-            tonalElevation = tonalElevation,
             enableSwipeDismiss = enableSwipeDismiss,
             onDismissRequest = onDismissRequest,
         ) {

app/src/main/java/eu/kanade/presentation/components/AppBar.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.TextFieldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Close
@@ -21,6 +20,7 @@ import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PlainTooltip
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TooltipBox
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.TopAppBar
@@ -312,7 +312,7 @@ fun SearchToolbar(
                 visualTransformation = visualTransformation,
                 interactionSource = interactionSource,
                 decorationBox = { innerTextField ->
-                    TextFieldDefaults.TextFieldDecorationBox(
+                    TextFieldDefaults.DecorationBox(
                         value = searchQuery,
                         innerTextField = innerTextField,
                         enabled = true,
@@ -331,6 +331,7 @@ fun SearchToolbar(
                                 ),
                             )
                         },
+                        container = {},
                     )
                 },
             )

app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt

@@ -58,6 +58,7 @@ fun TabbedDialog(
                 PrimaryTabRow(
                     modifier = Modifier.weight(1f),
                     selectedTabIndex = pagerState.currentPage,
+                    containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
                     divider = {},
                 ) {
                     tabTitles.fastForEachIndexed { index, tab ->

app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt

@@ -89,7 +89,7 @@ fun MangaBottomActionMenu(
         Surface(
             modifier = modifier,
             shape = MaterialTheme.shapes.large.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize),
-            tonalElevation = 3.dp,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
         ) {
             val haptic = LocalHapticFeedback.current
             val confirm = remember { mutableStateListOf(false, false, false, false, false, false, false) }
@@ -251,7 +251,7 @@ fun LibraryBottomActionMenu(
         Surface(
             modifier = modifier,
             shape = MaterialTheme.shapes.large.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize),
-            tonalElevation = 3.dp,
+            color = MaterialTheme.colorScheme.surfaceContainerHigh,
         ) {
             val haptic = LocalHapticFeedback.current
             val confirm =

app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt

@@ -223,13 +223,12 @@ fun AppThemePreviewItem(
             contentAlignment = Alignment.BottomCenter,
         ) {
             Surface(
-                tonalElevation = 3.dp,
+                color = MaterialTheme.colorScheme.surfaceContainer,
             ) {
                 Row(
                     modifier = Modifier
                         .height(32.dp)
                         .fillMaxWidth()
-                        .background(MaterialTheme.colorScheme.surfaceVariant)
                         .padding(horizontal = 8.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {

app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt

@@ -43,9 +43,7 @@ fun ReaderPageActionsDialog(
     var useExtraPage by remember { mutableStateOf(false) }
     // SY <--
 
-    AdaptiveSheet(
+    AdaptiveSheet(onDismissRequest = onDismissRequest) {
-        onDismissRequest = onDismissRequest,
-    ) {
         Column(modifier = Modifier.padding(vertical = 16.dp)) {
             Row(
                 horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),

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,6 +24,12 @@ internal abstract class BaseColorScheme {
             onBackground = Color.White,
             surface = Color.Black,
             onSurface = Color.White,
+            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/GreenAppleColorScheme.kt

@@ -19,53 +19,77 @@ internal object GreenAppleColorScheme : BaseColorScheme() {
 
     override val darkScheme = darkColorScheme(
         primary = Color(0xFF7ADB8F),
-        onPrimary = Color(0xFF003915),
+        onPrimary = Color(0xFF003917),
-        primaryContainer = Color(0xFF005322),
+        primaryContainer = Color(0xFF017737),
-        onPrimaryContainer = Color(0xFF96F8A9),
+        onPrimaryContainer = Color(0xFFFFFFFF),
-        inversePrimary = Color(0xFF006D2F),
+        secondary = Color(0xFF7ADB8F), // Unread badge
-        secondary = Color(0xFF7ADB8F),
+        onSecondary = Color(0xFF003917), // Unread badge text
-        onSecondary = Color(0xFF003915),
+        secondaryContainer = Color(0xFF017737), // Navigation bar selector pill & progress indicator (remaining)
-        secondaryContainer = Color(0xFF005322),
+        onSecondaryContainer = Color(0xFFFFFFFF), // Navigation bar selected icon
-        onSecondaryContainer = Color(0xFF96F8A9),
+        tertiary = Color(0xFFFFB3AC), // Downloaded badge
-        tertiary = Color(0xFFFFB3AA),
+        onTertiary = Color(0xFF680008), // Downloaded badge text
-        onTertiary = Color(0xFF680006),
+        tertiaryContainer = Color(0xFFC7282A),
-        tertiaryContainer = Color(0xFF93000D),
+        onTertiaryContainer = Color(0xFFFFFFFF),
-        onTertiaryContainer = Color(0xFFFFDAD5),
+        error = Color(0xFFFFB4AB),
-        background = Color(0xFF1A1C19),
+        onError = Color(0xFF690005),
-        onBackground = Color(0xFFE1E3DD),
+        errorContainer = Color(0xFF93000A),
-        surface = Color(0xFF1A1C19),
+        onErrorContainer = Color(0xFFFFDAD6),
-        onSurface = Color(0xFFE1E3DD),
+        background = Color(0xFF0F1510),
-        surfaceVariant = Color(0xFF414941),
+        onBackground = Color(0xFFDFE4DB),
-        onSurfaceVariant = Color(0xFFC1C8BE),
+        surface = Color(0xFF0F1510),
-        surfaceTint = Color(0xFF7ADB8F),
+        onSurface = Color(0xFFDFE4DB),
-        inverseSurface = Color(0xFFE1E3DD),
+        surfaceVariant = Color(0xFF3F493F), // Navigation bar background (ThemePrefWidget)
-        inverseOnSurface = Color(0xFF1A1C19),
+        onSurfaceVariant = Color(0xFFBECABC),
-        outline = Color(0xFF8B9389),
+        outline = Color(0xFF889487),
+        outlineVariant = Color(0xFF3F493F),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFFDFE4DB),
+        inverseOnSurface = Color(0xFF2C322C),
+        inversePrimary = Color(0xFF006D32),
+        surfaceDim = Color(0xFF0F1510),
+        surfaceBright = Color(0xFF353B35),
+        surfaceContainerLowest = Color(0xFF0A0F0B),
+        surfaceContainerLow = Color(0xFF181D18),
+        surfaceContainer = Color(0xFF1C211C), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF262B26),
+        surfaceContainerHighest = Color(0xFF313630),
     )
 
     override val lightScheme = lightColorScheme(
-        primary = Color(0xFF006D2F),
+        primary = Color(0xFF005927),
         onPrimary = Color(0xFFFFFFFF),
-        primaryContainer = Color(0xFF96F8A9),
+        primaryContainer = Color(0xFF188140),
-        onPrimaryContainer = Color(0xFF002109),
+        onPrimaryContainer = Color(0xFFFFFFFF),
+        secondary = Color(0xFF005927), // Unread badge
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
+        secondaryContainer = Color(0xFF97f7a9), // Navigation bar selector pill & progress indicator (remaining)
+        onSecondaryContainer = Color(0xFF000000), // Navigation bar selected icon
+        tertiary = Color(0xFF9D0012), // Downloaded badge
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
+        tertiaryContainer = Color(0xFFD33131),
+        onTertiaryContainer = Color(0xFFFFFFFF),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
+        background = Color(0xFFF6FBF2),
+        onBackground = Color(0xFF181D18),
+        surface = Color(0xFFF6FBF2),
+        onSurface = Color(0xFF181D18),
+        surfaceVariant = Color(0xFFDAE6D7), // Navigation bar background (ThemePrefWidget)
+        onSurfaceVariant = Color(0xFF3F493F),
+        outline = Color(0xFF6F7A6E),
+        outlineVariant = Color(0xFFBECABC),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF2C322C),
+        inverseOnSurface = Color(0xFFEDF2E9),
         inversePrimary = Color(0xFF7ADB8F),
-        secondary = Color(0xFF006D2F),
+        surfaceDim = Color(0xFFD6DCD3),
-        onSecondary = Color(0xFFFFFFFF),
+        surfaceBright = Color(0xFFF6FBF2),
-        secondaryContainer = Color(0xFF96F8A9),
+        surfaceContainerLowest = Color(0xFFFFFFFF),
-        onSecondaryContainer = Color(0xFF002109),
+        surfaceContainerLow = Color(0xFFF0F5EC),
-        tertiary = Color(0xFFB91D22),
+        surfaceContainer = Color(0xFFEAEFE6), // Navigation bar background
-        onTertiary = Color(0xFFFFFFFF),
+        surfaceContainerHigh = Color(0xFFE4EAE1),
-        tertiaryContainer = Color(0xFFFFDAD5),
+        surfaceContainerHighest = Color(0xFFDFE4DB),
-        onTertiaryContainer = Color(0xFF410003),
-        background = Color(0xFFFBFDF7),
-        onBackground = Color(0xFF1A1C19),
-        surface = Color(0xFFFBFDF7),
-        onSurface = Color(0xFF1A1C19),
-        surfaceVariant = Color(0xFFDDE5DA),
-        onSurfaceVariant = Color(0xFF414941),
-        surfaceTint = Color(0xFF006D2F),
-        inverseSurface = Color(0xFF2F312E),
-        inverseOnSurface = Color(0xFFF0F2EC),
-        outline = Color(0xFF717970),
     )
 }

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

@@ -18,53 +18,77 @@ internal object LavenderColorScheme : BaseColorScheme() {
 
     override val darkScheme = darkColorScheme(
         primary = Color(0xFFA177FF),
-        onPrimary = Color(0xFF111129),
+        onPrimary = Color(0xFF3D0090),
         primaryContainer = Color(0xFFA177FF),
-        onPrimaryContainer = Color(0xFF111129),
+        onPrimaryContainer = Color(0xFFFFFFFF),
-        inversePrimary = Color(0xFF006D2F),
+        secondary = Color(0xFFA177FF), // Unread badge
-        secondary = Color(0xFFA177FF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        onSecondary = Color(0xFF111129),
+        secondaryContainer = Color(0xFF423271), // Navigation bar selector pill & progress indicator (remaining)
-        secondaryContainer = Color(0xFFA177FF),
+        onSecondaryContainer = Color(0xFFA177FF), // Navigation bar selected icon
-        onSecondaryContainer = Color(0xFF111129),
+        tertiary = Color(0xFFCDBDFF), // Downloaded badge
-        tertiary = Color(0xFF5E25E1),
+        onTertiary = Color(0xFF360096), // Downloaded badge text
-        onTertiary = Color(0xFFE8E8E8),
+        tertiaryContainer = Color(0xFF5512D8),
-        tertiaryContainer = Color(0xFF111129),
+        onTertiaryContainer = Color(0xFFEFE6FF),
-        onTertiaryContainer = Color(0xFFDEE8FF),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
         background = Color(0xFF111129),
-        onBackground = Color(0xFFDEE8FF),
+        onBackground = Color(0xFFE7E0EC),
         surface = Color(0xFF111129),
-        onSurface = Color(0xFFDEE8FF),
+        onSurface = Color(0xFFE7E0EC),
-        surfaceVariant = Color(0x2CB6B6B6),
+        surfaceVariant = Color(0xFF3D2F6B), // Navigation bar background (ThemePrefWidget)
-        onSurfaceVariant = Color(0xFFE8E8E8),
+        onSurfaceVariant = Color(0xFFCBC3D6),
-        surfaceTint = Color(0xFFA177FF),
+        outline = Color(0xFF958E9F),
-        inverseSurface = Color(0xFF221247),
+        outlineVariant = Color(0xFF4A4453),
-        inverseOnSurface = Color(0xFFDEE8FF),
+        scrim = Color(0xFF000000),
-        outline = Color(0xA8905FFF),
+        inverseSurface = Color(0xFFE7E0EC),
+        inverseOnSurface = Color(0xFF322F38),
+        inversePrimary = Color(0xFF6D41C8),
+        surfaceDim = Color(0xFF111129),
+        surfaceBright = Color(0xFF3B3841),
+        surfaceContainerLowest = Color(0xFF15132d),
+        surfaceContainerLow = Color(0xFF171531),
+        surfaceContainer = Color(0xFF1D193B), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF241f41),
+        surfaceContainerHighest = Color(0xFF282446),
     )
 
     override val lightScheme = lightColorScheme(
-        primary = Color(0xFF7B46AF),
+        primary = Color(0xFF6D41C8),
-        onPrimary = Color(0xFFEDE2FF),
+        onPrimary = Color(0xFFFFFFFF),
         primaryContainer = Color(0xFF7B46AF),
-        onPrimaryContainer = Color(0xFFEDE2FF),
+        onPrimaryContainer = Color(0xFF130038),
-        inversePrimary = Color(0xFFD6BAFF),
+        secondary = Color(0xFF7B46AF), // Unread badge
-        secondary = Color(0xFF7B46AF),
+        onSecondary = Color(0xFFEDE2FF), // Unread badge text
-        onSecondary = Color(0xFFEDE2FF),
+        secondaryContainer = Color(0xFFC9B0E6), // Navigation bar selector pill & progress indicator (remaining)
-        secondaryContainer = Color(0xFF7B46AF),
+        onSecondaryContainer = Color(0xFF7B46AF), // Navigation bar selector icon
-        onSecondaryContainer = Color(0xFFEDE2FF),
+        tertiary = Color(0xFFEDE2FF), // Downloaded badge
-        tertiary = Color(0xFFEDE2FF),
+        onTertiary = Color(0xFF7B46AF), // Downloaded badge text
-        onTertiary = Color(0xFF7B46AF),
+        tertiaryContainer = Color(0xFF6D3BF0),
-        tertiaryContainer = Color(0xFFEDE2FF),
+        onTertiaryContainer = Color(0xFFFFFFFF),
-        onTertiaryContainer = Color(0xFF7B46AF),
+        error = Color(0xFFBA1A1A),
+        onError = Color(0xFFFFFFFF),
+        errorContainer = Color(0xFFFFDAD6),
+        onErrorContainer = Color(0xFF410002),
         background = Color(0xFFEDE2FF),
-        onBackground = Color(0xFF1B1B22),
+        onBackground = Color(0xFF1D1A22),
         surface = Color(0xFFEDE2FF),
-        onSurface = Color(0xFF1B1B22),
+        onSurface = Color(0xFF1D1A22),
-        surfaceVariant = Color(0xFFB9B0CC),
+        surfaceVariant = Color(0xFFE4D5F8), // Navigation bar background (ThemePrefWidget)
-        onSurfaceVariant = Color(0xD849454E),
+        onSurfaceVariant = Color(0xFF4A4453),
-        surfaceTint = Color(0xFF7B46AF),
+        outline = Color(0xFF7B7485),
-        inverseSurface = Color(0xFF313033),
+        outlineVariant = Color(0xFFCBC3D6),
-        inverseOnSurface = Color(0xFFF3EFF4),
+        scrim = Color(0xFF000000),
-        outline = Color(0xFF7B46AF),
+        inverseSurface = Color(0xFF322F38),
+        inverseOnSurface = Color(0xFFF5EEFA),
+        inversePrimary = Color(0xFFA177FF),
+        surfaceDim = Color(0xFFDED7E3),
+        surfaceBright = Color(0xFFEDE2FF),
+        surfaceContainerLowest = Color(0xFFDACCEC),
+        surfaceContainerLow = Color(0xFFDED0F1),
+        surfaceContainer = Color(0xFFE4D5F8), // Navigation bar background
+        surfaceContainerHigh = Color(0xFFEADCFD),
+        surfaceContainerHighest = Color(0xFFEEE2FF),
     )
 }

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

@@ -23,24 +23,29 @@ internal object MidnightDuskColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFBD1C5C),
         onPrimaryContainer = Color(0xFFFFFFFF),
         inversePrimary = Color(0xFFF02475),
-        secondary = Color(0xFFF02475),
+        secondary = Color(0xFFF02475), // Unread badge
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFF16151D), // Unread badge text
-        secondaryContainer = Color(0xFFF02475),
+        secondaryContainer = Color(0xFF66183C), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFFFFFFFF),
+        onSecondaryContainer = Color(0xFFF02475), // Navigation bar selector icon
-        tertiary = Color(0xFF55971C),
+        tertiary = Color(0xFF55971C), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFF16151D), // Downloaded badge text
         tertiaryContainer = Color(0xFF386412),
         onTertiaryContainer = Color(0xFFE5E1E5),
         background = Color(0xFF16151D),
         onBackground = Color(0xFFE5E1E5),
         surface = Color(0xFF16151D),
         onSurface = Color(0xFFE5E1E5),
-        surfaceVariant = Color(0xFF524346),
+        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(
@@ -49,23 +54,28 @@ internal object MidnightDuskColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFFFD9E1),
         onPrimaryContainer = Color(0xFF3F0017),
         inversePrimary = Color(0xFFFFB1C4),
-        secondary = Color(0xFFBB0054),
+        secondary = Color(0xFFBB0054), // Unread badge
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        secondaryContainer = Color(0xFFFFD9E1),
+        secondaryContainer = Color(0xFFEFBAD4), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF3F0017),
+        onSecondaryContainer = Color(0xFFD1377C), // Navigation bar selector icon
-        tertiary = Color(0xFF006638),
+        tertiary = Color(0xFF006638), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
         tertiaryContainer = Color(0xFF00894b),
         onTertiaryContainer = Color(0xFF2D1600),
         background = Color(0xFFFFFBFF),
         onBackground = Color(0xFF1C1B1F),
         surface = Color(0xFFFFFBFF),
         onSurface = Color(0xFF1C1B1F),
-        surfaceVariant = Color(0xFFF3DDE0),
+        surfaceVariant = Color(0xFFF9E6F1), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF524346),
         surfaceTint = Color(0xFFBB0054),
         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

@@ -17,19 +17,19 @@ internal object NordColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF88C0D0),
         onPrimaryContainer = Color(0xFF2E3440),
         inversePrimary = Color(0xFF397E91),
-        secondary = Color(0xFF81A1C1),
+        secondary = Color(0xFF81A1C1), // Unread badge
-        onSecondary = Color(0xFF2E3440),
+        onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1),
+        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF2E3440),
+        onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
-        tertiary = Color(0xFF5E81AC),
+        tertiary = Color(0xFF5E81AC), // Downloaded badge
-        onTertiary = Color(0xFF000000),
+        onTertiary = Color(0xFF000000), // Downloaded badge text
         tertiaryContainer = Color(0xFF5E81AC),
         onTertiaryContainer = Color(0xFF000000),
         background = Color(0xFF2E3440),
         onBackground = Color(0xFFECEFF4),
-        surface = Color(0xFF3B4252),
+        surface = Color(0xFF2E3440),
         onSurface = Color(0xFFECEFF4),
-        surfaceVariant = Color(0xFF2E3440),
+        surfaceVariant = Color(0xFF414C5C), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFECEFF4),
         surfaceTint = Color(0xFF88C0D0),
         inverseSurface = Color(0xFFD8DEE9),
@@ -39,6 +39,11 @@ internal object NordColorScheme : BaseColorScheme() {
         onError = Color(0xFF2E3440),
         errorContainer = Color(0xFFBF616A),
         onErrorContainer = Color(0xFF000000),
+        surfaceContainerLowest = Color(0xFF373F4D),
+        surfaceContainerLow = Color(0xFF3E4756),
+        surfaceContainer = Color(0xFF414C5C),
+        surfaceContainerHigh = Color(0xFF4E5766),
+        surfaceContainerHighest = Color(0xFF505968), // Navigation bar background
     )
 
     override val lightScheme = lightColorScheme(
@@ -47,19 +52,19 @@ internal object NordColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF5E81AC),
         onPrimaryContainer = Color(0xFF000000),
         inversePrimary = Color(0xFF8CA8CD),
-        secondary = Color(0xFF81A1C1),
+        secondary = Color(0xFF81A1C1), // Unread badge
-        onSecondary = Color(0xFF2E3440),
+        onSecondary = Color(0xFF2E3440), // Unread badge text
-        secondaryContainer = Color(0xFF81A1C1),
+        secondaryContainer = Color(0xFF81A1C1), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF2E3440),
+        onSecondaryContainer = Color(0xFF2E3440), // Navigation bar selector icon
-        tertiary = Color(0xFF88C0D0),
+        tertiary = Color(0xFF88C0D0), // Downloaded badge
-        onTertiary = Color(0xFF2E3440),
+        onTertiary = Color(0xFF2E3440), // Downloaded badge text
         tertiaryContainer = Color(0xFF88C0D0),
         onTertiaryContainer = Color(0xFF2E3440),
         background = Color(0xFFECEFF4),
         onBackground = Color(0xFF2E3440),
         surface = Color(0xFFE5E9F0),
         onSurface = Color(0xFF2E3440),
-        surfaceVariant = Color(0xFFffffff),
+        surfaceVariant = Color(0xFFDAE0EA), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF2E3440),
         surfaceTint = Color(0xFF5E81AC),
         inverseSurface = Color(0xFF3B4252),
@@ -68,5 +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

@@ -18,54 +18,78 @@ import androidx.compose.ui.graphics.Color
 internal object StrawberryColorScheme : BaseColorScheme() {
 
     override val darkScheme = darkColorScheme(
-        primary = Color(0xFFFFB2B9),
+        primary = Color(0xFFFFB2B8),
-        onPrimary = Color(0xFF67001B),
+        onPrimary = Color(0xFF67001D),
-        primaryContainer = Color(0xFF91002A),
+        primaryContainer = Color(0xFFD53855),
-        onPrimaryContainer = Color(0xFFFFDADD),
+        onPrimaryContainer = Color(0xFFFFFFFF),
-        inversePrimary = Color(0xFFB61E40),
+        secondary = Color(0xFFED4A65), // Unread badge
-        secondary = Color(0xFFFFB2B9),
+        onSecondary = Color(0xFF201A1A), // Unread badge text
-        onSecondary = Color(0xFF67001B),
+        secondaryContainer = Color(0xFF91002A), // Navigation bar selector pill & progress indicator (remaining)
-        secondaryContainer = Color(0xFF91002A),
+        onSecondaryContainer = Color(0xFFFFFFFF), // Navigation bar selector icon
-        onSecondaryContainer = Color(0xFFFFDADD),
+        tertiary = Color(0xFFE8C08E), // Downloaded badge
-        tertiary = Color(0xFFE8C08E),
+        onTertiary = Color(0xFF201A1A), // Downloaded badge text
-        onTertiary = Color(0xFF432C06),
+        tertiaryContainer = Color(0xFF775930),
-        tertiaryContainer = Color(0xFF5D421B),
+        onTertiaryContainer = Color(0xFFFFF7F1),
-        onTertiaryContainer = Color(0xFFFFDDB1),
+        error = Color(0xFFFFB4AB),
+        onError = Color(0xFF690005),
+        errorContainer = Color(0xFF93000A),
+        onErrorContainer = Color(0xFFFFDAD6),
         background = Color(0xFF201A1A),
-        onBackground = Color(0xFFECDFDF),
+        onBackground = Color(0xFFF7DCDD),
         surface = Color(0xFF201A1A),
-        onSurface = Color(0xFFECDFDF),
+        onSurface = Color(0xFFF7DCDD),
-        surfaceVariant = Color(0xFF534344),
+        surfaceVariant = Color(0xFF322727), // Navigation bar background (ThemePrefWidget)
-        onSurfaceVariant = Color(0xFFD7C1C2),
+        onSurfaceVariant = Color(0xFFE1BEC0),
-        surfaceTint = Color(0xFFFFB2B9),
+        outline = Color(0xFFA9898B),
-        inverseSurface = Color(0xFFECDFDF),
+        outlineVariant = Color(0xFF594042),
-        inverseOnSurface = Color(0xFF201A1A),
+        scrim = Color(0xFF000000),
-        outline = Color(0xFFA08C8D),
+        inverseSurface = Color(0xFFF7DCDD),
+        inverseOnSurface = Color(0xFF3D2C2D),
+        inversePrimary = Color(0xFFB61F40),
+        surfaceDim = Color(0xFF1D1011),
+        surfaceBright = Color(0xFF463536),
+        surfaceContainerLowest = Color(0xFF2C2222),
+        surfaceContainerLow = Color(0xFF302525),
+        surfaceContainer = Color(0xFF322727), // Navigation bar background
+        surfaceContainerHigh = Color(0xFF3C2F2F),
+        surfaceContainerHighest = Color(0xFF463737),
     )
 
     override val lightScheme = lightColorScheme(
-        primary = Color(0xFFB61E40),
+        primary = Color(0xFFA10833),
         onPrimary = Color(0xFFFFFFFF),
-        primaryContainer = Color(0xFFFFDADD),
+        primaryContainer = Color(0xFFD53855),
-        onPrimaryContainer = Color(0xFF40000D),
+        onPrimaryContainer = Color(0xFFFFFFFF),
-        inversePrimary = Color(0xFFFFB2B9),
+        secondary = Color(0xFFA10833), // Unread badge
-        secondary = Color(0xFFB61E40),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        onSecondary = Color(0xFFFFFFFF),
+        secondaryContainer = Color(0xFFD53855), // Navigation bar selector pill & progress indicator (remaining)
-        secondaryContainer = Color(0xFFFFDADD),
+        onSecondaryContainer = Color(0xFFF6EAED), // Navigation bar selector icon
-        onSecondaryContainer = Color(0xFF40000D),
+        tertiary = Color(0xFF5F441D), // Downloaded badge
-        tertiary = Color(0xFF775930),
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
-        onTertiary = Color(0xFFFFFFFF),
+        tertiaryContainer = Color(0xFF87683D),
-        tertiaryContainer = Color(0xFFFFDDB1),
+        onTertiaryContainer = Color(0xFFFFFFFF),
-        onTertiaryContainer = Color(0xFF2A1800),
+        error = Color(0xFFBA1A1A),
-        background = Color(0xFFFCFCFC),
+        onError = Color(0xFFFFFFFF),
-        onBackground = Color(0xFF201A1A),
+        errorContainer = Color(0xFFFFDAD6),
-        surface = Color(0xFFFCFCFC),
+        onErrorContainer = Color(0xFF410002),
-        onSurface = Color(0xFF201A1A),
+        background = Color(0xFFFAFAFA),
-        surfaceVariant = Color(0xFFF4DDDD),
+        onBackground = Color(0xFF261819),
-        onSurfaceVariant = Color(0xFF534344),
+        surface = Color(0xFFFAFAFA),
-        surfaceTint = Color(0xFFB61E40),
+        onSurface = Color(0xFF261819),
-        inverseSurface = Color(0xFF362F2F),
+        surfaceVariant = Color(0xFFF6EAED), // Navigation bar background (ThemePrefWidget)
-        inverseOnSurface = Color(0xFFFBEDED),
+        onSurfaceVariant = Color(0xFF594042),
-        outline = Color(0xFF857374),
+        outline = Color(0xFF8D7071),
+        outlineVariant = Color(0xFFE1BEC0),
+        scrim = Color(0xFF000000),
+        inverseSurface = Color(0xFF3D2C2D),
+        inverseOnSurface = Color(0xFFFFECED),
+        inversePrimary = Color(0xFFFFB2B8),
+        surfaceDim = Color(0xFFEED4D5),
+        surfaceBright = Color(0xFFFFF8F7),
+        surfaceContainerLowest = Color(0xFFF7DCDD),
+        surfaceContainerLow = Color(0xFFFDE2E3),
+        surfaceContainer = Color(0xFFF6EAED), // Navigation bar background
+        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),
+        secondary = Color(0xFFB0C6FF), // Unread badge
-        onSecondary = Color(0xFF002D6E),
+        onSecondary = Color(0xFF002D6E), // Unread badge text
-        secondaryContainer = Color(0xFF00429B),
+        secondaryContainer = Color(0xFF00429B), // Navigation bar selector pill & pro
-        onSecondaryContainer = Color(0xFFD9E2FF),
+        onSecondaryContainer = Color(0xFFD9E2FF), // Navigation bar selector icon
-        tertiary = Color(0xFF7ADC77),
+        tertiary = Color(0xFF7ADC77), // Downloaded badge
-        onTertiary = Color(0xFF003909),
+        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),
+        secondary = Color(0xFF0058CA), // Unread badge
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        secondaryContainer = Color(0xFFD9E2FF),
+        secondaryContainer = Color(0xFFD9E2FF), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF001945),
+        onSecondaryContainer = Color(0xFF001945), // Navigation bar selector icon
-        tertiary = Color(0xFF006E1B),
+        tertiary = Color(0xFF006E1B), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        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

@@ -23,24 +23,29 @@ internal object TakoColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFF3B375),
         onPrimaryContainer = Color(0xFF38294E),
         inversePrimary = Color(0xFF84531E),
-        secondary = Color(0xFFF3B375),
+        secondary = Color(0xFFF3B375), // Unread badge
-        onSecondary = Color(0xFF38294E),
+        onSecondary = Color(0xFF38294E), // Unread badge text
-        secondaryContainer = Color(0xFFF3B375),
+        secondaryContainer = Color(0xFF5C4D4B), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF38294E),
+        onSecondaryContainer = Color(0xFFF3B375), // Navigation bar selector icon
-        tertiary = Color(0xFF66577E),
+        tertiary = Color(0xFF66577E), // Downloaded badge
-        onTertiary = Color(0xFFF3B375),
+        onTertiary = Color(0xFFF3B375), // Downloaded badge text
         tertiaryContainer = Color(0xFF4E4065),
         onTertiaryContainer = Color(0xFFEDDCFF),
         background = Color(0xFF21212E),
         onBackground = Color(0xFFE3E0F2),
         surface = Color(0xFF21212E),
         onSurface = Color(0xFFE3E0F2),
-        surfaceVariant = Color(0xFF49454E),
+        surfaceVariant = Color(0xFF2A2A3C), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFCBC4CE),
         surfaceTint = Color(0xFF66577E),
         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(
@@ -49,23 +54,28 @@ internal object TakoColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF66577E),
         onPrimaryContainer = Color(0xFFF3B375),
         inversePrimary = Color(0xFFD6BAFF),
-        secondary = Color(0xFF66577E),
+        secondary = Color(0xFF66577E), // Unread badge
-        onSecondary = Color(0xFFF3B375),
+        onSecondary = Color(0xFFF3B375), // Unread badge text
-        secondaryContainer = Color(0xFF66577E),
+        secondaryContainer = Color(0xFFC8BED0), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFFF3B375),
+        onSecondaryContainer = Color(0xFF66577E), // Navigation bar selector icon
-        tertiary = Color(0xFFF3B375),
+        tertiary = Color(0xFFF3B375), // Downloaded badge
-        onTertiary = Color(0xFF574360),
+        onTertiary = Color(0xFF574360), // Downloaded badge text
         tertiaryContainer = Color(0xFFFDD6B0),
         onTertiaryContainer = Color(0xFF221437),
         background = Color(0xFFF7F5FF),
         onBackground = Color(0xFF1B1B22),
         surface = Color(0xFFF7F5FF),
         onSurface = Color(0xFF1B1B22),
-        surfaceVariant = Color(0xFFE8E0EB),
+        surfaceVariant = Color(0xFFE8E0EB), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF49454E),
         surfaceTint = Color(0xFF66577E),
         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

@@ -15,24 +15,29 @@ internal object TealTurqoiseColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF40E0D0),
         onPrimaryContainer = Color(0xFF000000),
         inversePrimary = Color(0xFF008080),
-        secondary = Color(0xFF40E0D0),
+        secondary = Color(0xFF40E0D0), // Unread badge
-        onSecondary = Color(0xFF000000),
+        onSecondary = Color(0xFF000000), // Unread badge text
-        secondaryContainer = Color(0xFF18544E),
+        secondaryContainer = Color(0xFF18544E), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF40E0D0),
+        onSecondaryContainer = Color(0xFF40E0D0), // Navigation bar selector icon
-        tertiary = Color(0xFFBF1F2F),
+        tertiary = Color(0xFFBF1F2F), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
         tertiaryContainer = Color(0xFF200508),
         onTertiaryContainer = Color(0xFFBF1F2F),
         background = Color(0xFF202125),
         onBackground = Color(0xFFDFDEDA),
         surface = Color(0xFF202125),
         onSurface = Color(0xFFDFDEDA),
-        surfaceVariant = Color(0xFF3F4947),
+        surfaceVariant = Color(0xFF233133), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFDFDEDA),
         surfaceTint = Color(0xFF40E0D0),
         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(
@@ -41,23 +46,28 @@ internal object TealTurqoiseColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF008080),
         onPrimaryContainer = Color(0xFFFFFFFF),
         inversePrimary = Color(0xFF40E0D0),
-        secondary = Color(0xFF008080),
+        secondary = Color(0xFF008080), // Unread badge text
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        secondaryContainer = Color(0xFFBFDFDF),
+        secondaryContainer = Color(0xFFCFE5E4), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF008080),
+        onSecondaryContainer = Color(0xFF008080), // Navigation bar selector icon
-        tertiary = Color(0xFFFF7F7F),
+        tertiary = Color(0xFFFF7F7F), // Downloaded badge
-        onTertiary = Color(0xFF000000),
+        onTertiary = Color(0xFF000000), // Downloaded badge text
         tertiaryContainer = Color(0xFF2A1616),
         onTertiaryContainer = Color(0xFFFF7F7F),
         background = Color(0xFFFAFAFA),
         onBackground = Color(0xFF050505),
         surface = Color(0xFFFAFAFA),
         onSurface = Color(0xFF050505),
-        surfaceVariant = Color(0xFFDAE5E2),
+        surfaceVariant = Color(0xFFEBF3F1), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF050505),
         surfaceTint = Color(0xFFBFDFDF),
         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

@@ -22,24 +22,29 @@ internal object TidalWaveColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF004d61),
         onPrimaryContainer = Color(0xFFb8eaff),
         inversePrimary = Color(0xFFa12b03),
-        secondary = Color(0xFF5ed4fc),
+        secondary = Color(0xFF5ed4fc), // Unread badge
-        onSecondary = Color(0xFF003544),
+        onSecondary = Color(0xFF003544), // Unread badge text
-        secondaryContainer = Color(0xFF004d61),
+        secondaryContainer = Color(0xFF004d61), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFFb8eaff),
+        onSecondaryContainer = Color(0xFFb8eaff), // Navigation bar selector icon
-        tertiary = Color(0xFF92f7bc),
+        tertiary = Color(0xFF92f7bc), // Downloaded badge
-        onTertiary = Color(0xFF001c3b),
+        onTertiary = Color(0xFF001c3b), // Downloaded badge text
         tertiaryContainer = Color(0xFFc3fada),
         onTertiaryContainer = Color(0xFF78ffd6),
         background = Color(0xFF001c3b),
         onBackground = Color(0xFFd5e3ff),
         surface = Color(0xFF001c3b),
         onSurface = Color(0xFFd5e3ff),
-        surfaceVariant = Color(0xFF40484c),
+        surfaceVariant = Color(0xFF082b4b), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFbfc8cc),
         surfaceTint = Color(0xFF5ed4fc),
         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(
@@ -48,23 +53,28 @@ internal object TidalWaveColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFB4D4DF),
         onPrimaryContainer = Color(0xFF001f28),
         inversePrimary = Color(0xFFff987f),
-        secondary = Color(0xFF006780),
+        secondary = Color(0xFF006780), // Unread badge
-        onSecondary = Color(0xFFffffff),
+        onSecondary = Color(0xFFffffff), // Unread badge text
-        secondaryContainer = Color(0xFFb8eaff),
+        secondaryContainer = Color(0xFF9AE1FF), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF001f28),
+        onSecondaryContainer = Color(0xFF001f28), // Navigation bar selector icon
-        tertiary = Color(0xFF92f7bc),
+        tertiary = Color(0xFF92f7bc), // Downloaded badge
-        onTertiary = Color(0xFF001c3b),
+        onTertiary = Color(0xFF001c3b), // Downloaded badge text
         tertiaryContainer = Color(0xFFc3fada),
         onTertiaryContainer = Color(0xFF78ffd6),
         background = Color(0xFFfdfbff),
         onBackground = Color(0xFF001c3b),
         surface = Color(0xFFfdfbff),
         onSurface = Color(0xFF001c3b),
-        surfaceVariant = Color(0xFFdce4e8),
+        surfaceVariant = Color(0xFFe8eff5), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF40484c),
         surfaceTint = Color(0xFF006780),
         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

@@ -17,24 +17,29 @@ internal object YinYangColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFFFFFFF),
         onPrimaryContainer = Color(0xFF000000),
         inversePrimary = Color(0xFFCECECE),
-        secondary = Color(0xFFFFFFFF),
+        secondary = Color(0xFFFFFFFF), // Unread badge
-        onSecondary = Color(0xFF5A5A5A),
+        onSecondary = Color(0xFF5A5A5A), // Unread badge text
-        secondaryContainer = Color(0xFF717171),
+        secondaryContainer = Color(0xFF717171), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFFE4E4E4),
+        onSecondaryContainer = Color(0xFFE4E4E4), // Navigation bar selector icon
-        tertiary = Color(0xFF000000),
+        tertiary = Color(0xFF000000), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
         tertiaryContainer = Color(0xFF00419E),
         onTertiaryContainer = Color(0xFFD8E2FF),
         background = Color(0xFF1E1E1E),
         onBackground = Color(0xFFE6E6E6),
         surface = Color(0xFF1E1E1E),
         onSurface = Color(0xFFE6E6E6),
-        surfaceVariant = Color(0xFF4E4E4E),
+        surfaceVariant = Color(0xFF313131), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFD1D1D1),
         surfaceTint = Color(0xFFFFFFFF),
         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(
@@ -43,23 +48,28 @@ internal object YinYangColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF000000),
         onPrimaryContainer = Color(0xFFFFFFFF),
         inversePrimary = Color(0xFFA6A6A6),
-        secondary = Color(0xFF000000),
+        secondary = Color(0xFF000000), // Unread badge
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        secondaryContainer = Color(0xFFDDDDDD),
+        secondaryContainer = Color(0xFFDDDDDD), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF0C0C0C),
+        onSecondaryContainer = Color(0xFF0C0C0C), // Navigation bar selector icon
-        tertiary = Color(0xFFFFFFFF),
+        tertiary = Color(0xFFFFFFFF), // Downloaded badge
-        onTertiary = Color(0xFF000000),
+        onTertiary = Color(0xFF000000), // Downloaded badge text
         tertiaryContainer = Color(0xFFD8E2FF),
         onTertiaryContainer = Color(0xFF001947),
         background = Color(0xFFFDFDFD),
         onBackground = Color(0xFF222222),
         surface = Color(0xFFFDFDFD),
         onSurface = Color(0xFF222222),
-        surfaceVariant = Color(0xFFEDEDED),
+        surfaceVariant = Color(0xFFE8E8E8), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF515151),
         surfaceTint = Color(0xFF000000),
         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

@@ -23,24 +23,29 @@ internal object YotsubaColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFF862200),
         onPrimaryContainer = Color(0xFFFFDBCF),
         inversePrimary = Color(0xFFAE3200),
-        secondary = Color(0xFFFFB59D),
+        secondary = Color(0xFFFFB59D), // Unread badge
-        onSecondary = Color(0xFF5F1600),
+        onSecondary = Color(0xFF5F1600), // Unread badge text
-        secondaryContainer = Color(0xFF862200),
+        secondaryContainer = Color(0xFF862200), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFFFFDBCF),
+        onSecondaryContainer = Color(0xFFFFDBCF), // Navigation bar selector icon
-        tertiary = Color(0xFFD7C68D),
+        tertiary = Color(0xFFD7C68D), // Downloaded badge
-        onTertiary = Color(0xFF3A2F05),
+        onTertiary = Color(0xFF3A2F05), // Downloaded badge text
         tertiaryContainer = Color(0xFF524619),
         onTertiaryContainer = Color(0xFFF5E2A7),
         background = Color(0xFF211A18),
         onBackground = Color(0xFFEDE0DD),
         surface = Color(0xFF211A18),
         onSurface = Color(0xFFEDE0DD),
-        surfaceVariant = Color(0xFF53433F),
+        surfaceVariant = Color(0xFF332723), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFFD8C2BC),
         surfaceTint = Color(0xFFFFB59D),
         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(
@@ -49,23 +54,28 @@ internal object YotsubaColorScheme : BaseColorScheme() {
         primaryContainer = Color(0xFFFFDBCF),
         onPrimaryContainer = Color(0xFF3B0A00),
         inversePrimary = Color(0xFFFFB59D),
-        secondary = Color(0xFFAE3200),
+        secondary = Color(0xFFAE3200), // Unread badge
-        onSecondary = Color(0xFFFFFFFF),
+        onSecondary = Color(0xFFFFFFFF), // Unread badge text
-        secondaryContainer = Color(0xFFFFDBCF),
+        secondaryContainer = Color(0xFFEBCDC2), // Navigation bar selector pill & progress indicator (remaining)
-        onSecondaryContainer = Color(0xFF3B0A00),
+        onSecondaryContainer = Color(0xFF3B0A00), // Navigation bar selector icon
-        tertiary = Color(0xFF6B5E2F),
+        tertiary = Color(0xFF6B5E2F), // Downloaded badge
-        onTertiary = Color(0xFFFFFFFF),
+        onTertiary = Color(0xFFFFFFFF), // Downloaded badge text
         tertiaryContainer = Color(0xFFF5E2A7),
         onTertiaryContainer = Color(0xFF231B00),
         background = Color(0xFFFCFCFC),
         onBackground = Color(0xFF211A18),
         surface = Color(0xFFFCFCFC),
         onSurface = Color(0xFF211A18),
-        surfaceVariant = Color(0xFFF5DED8),
+        surfaceVariant = Color(0xFFF6EBE7), // Navigation bar background (ThemePrefWidget)
         onSurfaceVariant = Color(0xFF53433F),
         surfaceTint = Color(0xFFAE3200),
         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),
     )
 }

app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt

@@ -186,7 +186,7 @@ private fun TrackInfoItem(
             modifier = Modifier
                 .padding(top = 12.dp)
                 .clip(MaterialTheme.shapes.medium)
-                .background(MaterialTheme.colorScheme.surface)
+                .background(MaterialTheme.colorScheme.surfaceContainerHighest)
                 .padding(8.dp)
                 .clip(RoundedCornerShape(6.dp)),
         ) {

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt

@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import exh.log.xLogE
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.drop
@@ -35,6 +36,7 @@ import uy.kohesive.injekt.api.get
  * and retrieved through dependency injection. You can use this class to queue new chapters or query
  * downloaded chapters.
  */
+@OptIn(DelicateCoroutinesApi::class)
 class DownloadManager(
     private val context: Context,
     private val provider: DownloadProvider = Injekt.get(),

app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt

@@ -21,6 +21,7 @@ import exh.util.DataSaver
 import exh.util.DataSaver.Companion.getImage
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
@@ -76,6 +77,7 @@ import java.util.zip.ZipOutputStream
  *
  * Its queue contains the list of chapters to download.
  */
+@OptIn(DelicateCoroutinesApi::class)
 class Downloader(
     private val context: Context,
     private val provider: DownloadProvider,

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt

@@ -27,6 +27,7 @@ import eu.kanade.tachiyomi.util.system.cancelNotification
 import eu.kanade.tachiyomi.util.system.getBitmapOrNull
 import eu.kanade.tachiyomi.util.system.notificationBuilder
 import eu.kanade.tachiyomi.util.system.notify
+import kotlinx.coroutines.DelicateCoroutinesApi
 import tachiyomi.core.common.Constants
 import tachiyomi.core.common.i18n.pluralStringResource
 import tachiyomi.core.common.i18n.stringResource
@@ -41,6 +42,7 @@ import uy.kohesive.injekt.api.get
 import java.math.RoundingMode
 import java.text.NumberFormat
 
+@OptIn(DelicateCoroutinesApi::class)
 class LibraryUpdateNotifier(
     private val context: Context,
 

app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt

@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.util.system.getParcelableExtraCompat
 import eu.kanade.tachiyomi.util.system.notificationManager
 import eu.kanade.tachiyomi.util.system.toShareIntent
 import eu.kanade.tachiyomi.util.system.toast
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import tachiyomi.core.common.Constants
 import tachiyomi.core.common.util.lang.launchIO
@@ -41,6 +42,7 @@ import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
  * Pending Broadcasts should be made from here.
  * NOTE: Use local broadcasts if possible.
  */
+@OptIn(DelicateCoroutinesApi::class)
 class NotificationReceiver : BroadcastReceiver() {
 
     private val getManga: GetManga by injectLazy()

app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncDataJob.kt

@@ -45,7 +45,7 @@ class SyncDataJob(private val context: Context, workerParams: WorkerParameters)
         } catch (e: Exception) {
             logcat(LogPriority.ERROR, e)
             notifier.showSyncError(e.message)
-            Result.failure()
+            Result.success() // try again next time
         } finally {
             context.cancelNotification(Notifications.ID_RESTORE_PROGRESS)
         }

app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt

@@ -153,7 +153,7 @@ class SyncManager(
         }
 
         // Stop the sync early if the remote backup is null or empty
-        if (remoteBackup.backupManga?.size == 0) {
+        if (remoteBackup.backupManga.size == 0) {
             notifier.showSyncError("No data found on remote server.")
             return
         }

app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt

@@ -31,6 +31,7 @@ import exh.md.handlers.FollowsHandler
 import exh.md.handlers.MangaHandler
 import exh.md.handlers.MangaHotHandler
 import exh.md.handlers.MangaPlusHandler
+import exh.md.handlers.NamicomiHandler
 import exh.md.handlers.PageHandler
 import exh.md.handlers.SimilarHandler
 import exh.md.network.MangaDexLoginHelper
@@ -123,6 +124,9 @@ class MangaDex(delegate: HttpSource, val context: Context) :
     private val mangaHotHandler by lazy {
         MangaHotHandler(network.client, network.defaultUserAgentProvider())
     }
+    private val namicomiHandler by lazy {
+        NamicomiHandler(network.client, network.defaultUserAgentProvider())
+    }
     private val pageHandler by lazy {
         PageHandler(
             headers,
@@ -132,6 +136,7 @@ class MangaDex(delegate: HttpSource, val context: Context) :
             bilibiliHandler,
             azukHandler,
             mangaHotHandler,
+            namicomiHandler,
             trackPreferences,
             mdList,
         )

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt

@@ -56,9 +56,7 @@ fun SourceFilterDialog(
 ) {
     val updateFilters = { onUpdate(filters) }
 
-    AdaptiveSheet(
+    AdaptiveSheet(onDismissRequest = onDismissRequest) {
-        onDismissRequest = onDismissRequest,
-    ) {
         LazyColumn {
             stickyHeader {
                 Row(

app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt

@@ -13,6 +13,7 @@ import exh.util.DataSaver
 import exh.util.DataSaver.Companion.getImage
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
@@ -31,6 +32,7 @@ import kotlin.math.min
 /**
  * Loader used to load chapters from an online source.
  */
+@OptIn(DelicateCoroutinesApi::class)
 internal class HttpPageLoader(
     private val chapter: ReaderChapter,
     private val source: HttpSource,

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt

@@ -28,7 +28,8 @@ class WebtoonRecyclerView @JvmOverloads constructor(
     private var atFirstPosition = false
     private var halfWidth = 0
     private var halfHeight = 0
-    private var originalHeight = 0
+    var originalHeight = 0
+        private set
     private var heightSet = false
     private var firstVisibleItemPosition = 0
     private var lastVisibleItemPosition = 0

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt

@@ -124,7 +124,7 @@ class WebtoonViewer(
             recycler.getLocationInWindow(viewPositionRelativeToWindow)
             val pos = PointF(
                 (event.rawX - viewPosition[0] + viewPositionRelativeToWindow[0]) / recycler.width,
-                (event.rawY - viewPosition[1] + viewPositionRelativeToWindow[1]) / recycler.height,
+                (event.rawY - viewPosition[1] + viewPositionRelativeToWindow[1]) / recycler.originalHeight,
             )
             when (config.navigator.getAction(pos)) {
                 NavigationRegion.MENU -> activity.toggleMenu()

app/src/main/java/exh/eh/EHentaiUpdateWorker.kt

@@ -61,14 +61,14 @@ class EHentaiUpdateWorker(private val context: Context, workerParams: WorkerPara
     override suspend fun doWork(): Result {
         return try {
             if (requiresWifiConnection(preferences) && !context.isConnectedToWifi()) {
-                Result.failure()
+                Result.success() // retry again later
             } else {
                 startUpdating()
                 logger.d("Update job completed!")
                 Result.success()
             }
         } catch (e: Exception) {
-            Result.failure()
+            Result.success() // retry again later
         }
     }
 

app/src/main/java/exh/md/handlers/NamicomiHandler.kt

@@ -0,0 +1,49 @@
+package exh.md.handlers
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.awaitSuccess
+import eu.kanade.tachiyomi.source.model.Page
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class NamicomiHandler(currentClient: OkHttpClient, userAgent: String) {
+    private val apiUrl = "https://api.namicomi.com"
+
+    private val headers = Headers.Builder()
+        .add("User-Agent", userAgent)
+        .build()
+
+    val client: OkHttpClient = currentClient
+
+    suspend fun fetchPageList(externalUrl: String, dataSaver: Boolean): List<Page> {
+        val chapterId = externalUrl.substringBefore("?").substringAfterLast("/")
+        val request =
+            GET(
+                "$apiUrl/images/chapter/$chapterId?newQualities=true",
+                headers,
+            )
+        return pageListParse(client.newCall(request).awaitSuccess(), chapterId, dataSaver)
+    }
+
+    private fun pageListParse(response: Response, chapterId: String, dataSaver: Boolean): List<Page> {
+        val data = Json.parseToJsonElement(response.body.string()).jsonObject["data"]!!
+        val baseUrl = data.jsonObject["baseUrl"]!!.jsonPrimitive.content
+        val hash = data.jsonObject["hash"]!!.jsonPrimitive.content
+
+        /* Available quality levels: source, high, medium, low */
+        val quality = if(dataSaver) "low" else "high"
+
+        return data
+            .jsonObject[quality]!!
+            .jsonArray.mapIndexed { index, element ->
+                val fileName = element.jsonObject["filename"]!!.jsonPrimitive.content
+                val url = "$baseUrl/chapter/$chapterId/$hash/$quality/$fileName"
+                Page(index, url, url)
+            }
+    }
+}

app/src/main/java/exh/md/handlers/PageHandler.kt

@@ -27,6 +27,7 @@ class PageHandler(
     private val bilibiliHandler: BilibiliHandler,
     private val azukiHandler: AzukiHandler,
     private val mangaHotHandler: MangaHotHandler,
+    private val namicomiHandler: NamicomiHandler,
     private val preferences: TrackPreferences,
     private val mdList: MdList,
 ) {
@@ -54,6 +55,10 @@ class PageHandler(
                     chapter.scanlator.equals("mangahot", true) -> mangaHotHandler.fetchPageList(
                         chapterResponse.data.attributes.externalUrl,
                     )
+                    chapter.scanlator.equals("namicomi", true) -> namicomiHandler.fetchPageList(
+                        chapterResponse.data.attributes.externalUrl,
+                        dataSaver = dataSaver,
+                    )
                     else -> throw Exception("${chapter.scanlator} not supported")
                 }
             } else {
@@ -122,6 +127,9 @@ class PageHandler(
             page.imageUrl?.contains("mangahot", true) == true -> {
                 mangaHotHandler.client.newCachelessCallWithProgress(GET(page.imageUrl!!, mangaHotHandler.headers), page)
             }
+            page.imageUrl?.contains("namicomi", true) == true -> {
+                mangaHotHandler.client.newCachelessCallWithProgress(GET(page.imageUrl!!, mangaHotHandler.headers), page)
+            }
             else -> null
         }
     }

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/JavaScriptEngine.kt

@@ -7,7 +7,7 @@ import tachiyomi.core.common.util.lang.withIOContext
 /**
  * Util for evaluating JavaScript in sources.
  */
-@Suppress("UNUSED", "UNCHECKED_CAST")
+@Suppress("UNUSED", "UNCHECKED_CAST", "UNUSED_PARAMETER")
 class JavaScriptEngine(context: Context) {
 
     /**

core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt

@@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil
 import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import eu.kanade.tachiyomi.util.system.toast
+import kotlinx.coroutines.DelicateCoroutinesApi
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -48,6 +49,7 @@ abstract class WebViewInterceptor(
 
     abstract fun intercept(chain: Interceptor.Chain, request: Request, response: Response): Response
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
         val response = chain.proceed(request)

core/common/src/main/kotlin/tachiyomi/core/common/util/lang/RxCoroutineBridge.kt

@@ -3,6 +3,7 @@ package tachiyomi.core.common.util.lang
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
@@ -64,7 +65,7 @@ private suspend fun <T> Observable<T>.awaitOne(): T = suspendCancellableCoroutin
 internal fun <T> CancellableContinuation<T>.unsubscribeOnCancellation(sub: Subscription) =
     invokeOnCancellation { sub.unsubscribe() }
 
-@OptIn(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class)
 fun <T> runAsObservable(
     backpressureMode: Emitter.BackpressureMode = Emitter.BackpressureMode.NONE,
     block: suspend () -> T,

gradle/androidx.versions.toml

@@ -1,13 +1,13 @@
 [versions]
-agp_version = "8.4.0"
+agp_version = "8.4.1"
-lifecycle_version = "2.7.0"
+lifecycle_version = "2.8.1"
-paging_version = "3.2.1"
+paging_version = "3.3.0"
 
 [libraries]
 gradle = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
 
-annotation = "androidx.annotation:annotation:1.7.1"
+annotation = "androidx.annotation:annotation:1.8.0"
-appcompat = "androidx.appcompat:appcompat:1.6.1"
+appcompat = "androidx.appcompat:appcompat:1.7.0"
 biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 corektx = "androidx.core:core-ktx:1.13.1"
@@ -26,8 +26,8 @@ paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "pag
 paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging_version" }
 
 benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.4"
-test-ext = "androidx.test.ext:junit-ktx:1.2.0-alpha04"
+test-ext = "androidx.test.ext:junit-ktx:1.2.0-rc01"
-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-alpha04"
+test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-rc01"
 test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 
 [bundles]

gradle/compose.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-compiler = "1.5.12"
+compiler = "1.5.14"
 # 2024.04.00-alpha01 has several bugs with the new animateItem() modifier
 compose-bom = "2024.03.00-alpha02"
 accompanist = "0.35.0-alpha"
@@ -19,9 +19,6 @@ ui-util = { module = "androidx.compose.ui:ui-util" }
 material3-core = { module = "androidx.compose.material3:material3" }
 material-icons = { module = "androidx.compose.material:material-icons-extended" }
 
-# Some components aren't available in Material3
-material-core = { module = "androidx.compose.material:material" }
-
 glance = "androidx.glance:glance-appwidget:1.0.0"
 
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }

gradle/kotlinx.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin_version = "1.9.23"
+kotlin_version = "1.9.24"
 serialization_version = "1.6.3"
 xml_serialization_version = "0.86.3"
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-aboutlib_version = "11.1.4"
+aboutlib_version = "11.2.1"
 leakcanary = "2.14"
 moko = "0.23.0"
 okhttp_version = "5.0.0-alpha.12"
@@ -14,7 +14,7 @@ detektCompose = "0.3.12"
 [libraries]
 desugar = "com.android.tools:desugar_jdk_libs:2.0.4"
 android-shortcut-gradle = "com.github.zellius:android-shortcut-gradle-plugin:0.1.2"
-google-services-gradle = "com.google.gms:google-services:4.4.1"
+google-services-gradle = "com.google.gms:google-services:4.4.2"
 
 rxjava = "io.reactivex:rxjava:1.3.8"
 
@@ -32,7 +32,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 
 disklrucache = "com.jakewharton:disklrucache:2.0.2"
 unifile = "com.github.tachiyomiorg:unifile:e0def6b3dc"
-common-compress = "org.apache.commons:commons-compress:1.26.1"
+common-compress = "org.apache.commons:commons-compress:1.26.2"
 junrar = "com.github.junrar:junrar:7.5.5"
 zip4j = "net.lingala.zip4j:zip4j:2.11.5"
 
@@ -60,7 +60,7 @@ natural-comparator = "com.github.gpanther:java-nat-sort:natural-comparator-1.1"
 richtext-commonmark = { module = "com.halilibo.compose-richtext:richtext-commonmark", version.ref = "richtext" }
 richtext-m3 = { module = "com.halilibo.compose-richtext:richtext-ui-material3", version.ref = "richtext" }
 
-material = "com.google.android.material:material:1.11.0"
+material = "com.google.android.material:material:1.12.0"
 flexible-adapter-core = "com.github.arkon.FlexibleAdapter:flexible-adapter:c8013533"
 photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0"
@@ -76,7 +76,7 @@ moko-gradle = { module = "dev.icerock.moko:resources-generator", version.ref = "
 
 logcat = "com.squareup.logcat:logcat:0.1"
 
-firebase-analytics = "com.google.firebase:firebase-analytics:22.0.0"
+firebase-analytics = "com.google.firebase:firebase-analytics:22.0.1"
 
 aboutLibraries-gradle = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlib_version" }
 aboutLibraries-compose = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlib_version" }
@@ -94,8 +94,8 @@ 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"
+mockk = "io.mockk:mockk:1.13.11"
 
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
 voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

i18n-sy/src/commonMain/resources/MR/fr/strings.xml

@@ -134,7 +134,6 @@
     <string name="data_saver_image_format_summary_on">La taille du fichier Jpeg est considérablement plus petite que Webp (ce qui signifie que plus de données sont économisées), mais cela fait également perdre plus de qualité aux images. \n Actuellement compresse en Jpeg</string>
     <string name="data_saver_image_format_summary_off">La taille du fichier Jpeg est considérablement plus petite que celle de Webp (ce qui signifie que plus de données sont économisées), mais cela fait également perdre plus de qualité aux images. \n. Actuellement compresse en Webp</string>
     <string name="data_saver_color_bw">Convertir en noir et blanc</string>
-    <string name="data_saver_server">Serveur proxy Bandwidth Hero</string>
     <string name="data_saver_server_summary">Mettez ici l\'URL du serveur Bandwidth Hero Proxy</string>
 
     <!-- Log Level -->

i18n-sy/src/commonMain/resources/MR/in/strings.xml

@@ -139,7 +139,6 @@
     <string name="data_saver_image_format_summary_on">Ukuran file Jpeg jauh lebih kecil daripada Webp (artinya lebih banyak menghemat data), tetapi itu juga membuat kualitas gambar menjadi lebih buruk.\nSaat ini kompres ke Jpeg</string>
     <string name="data_saver_image_format_summary_off">Ukuran file Jpeg jauh lebih kecil daripada Webp (artinya lebih banyak menghemat data), tetapi itu juga membuat kualitas gambar menjadi lebih buruk.\nSaat ini kompres ke Webp</string>
     <string name="data_saver_color_bw">Konversi ke Hitam Putih</string>
-    <string name="data_saver_server">Server Bandwidth Hero Proxy</string>
     <string name="data_saver_server_summary">Masukkan url server Bandwidth Hero Proxy disini</string>
     <string name="clear_db_exclude_read">Abaikab manga yang sudah dibaca</string>
 

i18n-sy/src/commonMain/resources/MR/pt-rBR/strings.xml

@@ -138,7 +138,6 @@
     <string name="data_saver_image_format_summary_on">O tamanho do arquivo Jpeg é notavelmente menor que o Webp (ou seja, mais dados são salvos), mas também faz as imagens perderem mais qualidade.\nAtual: comprimindo em Jpeg</string>
     <string name="data_saver_image_format_summary_off">O tamanho do arquivo Jpeg é notavelmente menor que o Webp (ou seja, mais dados são salvos), mas também faz as imagens perderem mais qualidade.\nAtual: comprimindo em Webp</string>
     <string name="data_saver_color_bw">Converter em Preto e Branco</string>
-    <string name="data_saver_server">Servidor Bandwidth Hero Proxy</string>
     <string name="data_saver_server_summary">Insira a url do servidor Bandwidth Hero Proxy aqui</string>
     <string name="clear_db_exclude_read">Manter mangás com capítulos lidos</string>
 

i18n-sy/src/commonMain/resources/MR/zh-rTW/strings.xml

@@ -496,7 +496,6 @@
     <string name="launching_app">應用程式啟動中……</string>
     <string name="error_with_reason">錯誤：%1$s</string>
     <string name="could_not_open_entry">無法開啟此作品：\n\n%1$s</string>
-    <string name="entry_id_is_null">作品 ID 為空！</string>
     <string name="loading_entry">作品載入中……</string>
 
     <!-- Page previews -->
@@ -612,7 +611,6 @@
 
     <!-- Similar -->
     <string name="similar">與 %1$s 相似</string>
-    <string name="similar_no_results">相似作品未找到</string>
 
     <!-- MangaDex relations-->
     <string name="relation_similar">相似</string>

presentation-core/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
     implementation(compose.activity)
     implementation(compose.foundation)
     implementation(compose.material3.core)
-    implementation(compose.material.core)
     implementation(compose.material.icons)
     implementation(compose.animation)
     implementation(compose.animation.graphics)

presentation-core/src/main/java/tachiyomi/presentation/core/components/AdaptiveSheet.kt

@@ -38,7 +38,6 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.Velocity
 import androidx.compose.ui.unit.dp
@@ -53,7 +52,6 @@ private val sheetAnimationSpec = tween<Float>(durationMillis = 350)
 @Composable
 fun AdaptiveSheet(
     isTabletUi: Boolean,
-    tonalElevation: Dp,
     enableSwipeDismiss: Boolean,
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier,
@@ -97,7 +95,7 @@ fun AdaptiveSheet(
                     .padding(vertical = 16.dp)
                     .then(modifier),
                 shape = MaterialTheme.shapes.extraLarge,
-                tonalElevation = tonalElevation,
+                color = MaterialTheme.colorScheme.surfaceContainerHigh,
                 content = {
                     BackHandler(enabled = alpha > 0f, onBack = internalOnDismissRequest)
                     content()
@@ -178,7 +176,7 @@ fun AdaptiveSheet(
                     .navigationBarsPadding()
                     .statusBarsPadding(),
                 shape = MaterialTheme.shapes.extraLarge,
-                tonalElevation = tonalElevation,
+                color = MaterialTheme.colorScheme.surfaceContainerHigh,
                 content = {
                     BackHandler(
                         enabled = anchoredDraggableState.targetValue == 0,

presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt

@@ -10,7 +10,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 
@@ -18,9 +17,8 @@ import androidx.compose.ui.unit.dp
 fun Pill(
     text: String,
     modifier: Modifier = Modifier,
-    color: Color = MaterialTheme.colorScheme.background,
+    color: Color = MaterialTheme.colorScheme.surfaceContainerHigh,
-    contentColor: Color = MaterialTheme.colorScheme.onBackground,
+    contentColor: Color = MaterialTheme.colorScheme.onSurface,
-    elevation: Dp = 1.dp,
     fontSize: TextUnit = LocalTextStyle.current.fontSize,
 ) {
     Surface(
@@ -29,7 +27,6 @@ fun Pill(
         shape = MaterialTheme.shapes.extraLarge,
         color = color,
         contentColor = contentColor,
-        tonalElevation = elevation,
     ) {
         Box(
             modifier = Modifier

presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.material.ContentAlpha
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDownward
 import androidx.compose.material.icons.filled.ArrowUpward
@@ -57,6 +56,8 @@ object SettingsItemsPaddings {
     val Vertical = 10.dp
 }
 
+private const val DisabledContentAlpha = 0.38f
+
 @Composable
 fun HeadingItem(labelRes: StringResource) {
     HeadingItem(stringResource(labelRes))
@@ -282,7 +283,7 @@ fun TriStateItem(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.large),
     ) {
-        val stateAlpha = if (enabled && onClick != null) 1f else ContentAlpha.disabled
+        val stateAlpha = if (enabled && onClick != null) 1f else DisabledContentAlpha
 
         Icon(
             imageVector = when (state) {
@@ -295,7 +296,7 @@ fun TriStateItem(
                 MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = stateAlpha)
             } else {
                 when (onClick) {
-                    null -> MaterialTheme.colorScheme.onSurface.copy(alpha = ContentAlpha.disabled)
+                    null -> MaterialTheme.colorScheme.onSurface.copy(alpha = DisabledContentAlpha)
                     else -> MaterialTheme.colorScheme.primary
                 }
             },

presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Button.kt

@@ -100,7 +100,6 @@ fun Button(
     val containerColor = colors.containerColor(enabled).value
     val contentColor = colors.contentColor(enabled).value
     val shadowElevation = elevation?.shadowElevation(enabled, interactionSource)?.value ?: 0.dp
-    val tonalElevation = elevation?.tonalElevation(enabled, interactionSource)?.value ?: 0.dp
 
     Surface(
         onClick = onClick,
@@ -109,7 +108,6 @@ fun Button(
         shape = shape,
         color = containerColor,
         contentColor = contentColor,
-        tonalElevation = tonalElevation,
         shadowElevation = shadowElevation,
         border = border,
         interactionSource = interactionSource,