Merge remote-tracking branch 'upstream/main' into r8

Closes #19

Co-authored-by: Roshan Varughese <40583749+Animeboynz@users.noreply.github.com>

.github/workflows/build_pull_request.yml

@@ -3,8 +3,8 @@ on:
   pull_request:
     paths-ignore:
       - '**.md'
-      - 'i18n/src/commonMain/resources/**/strings.xml'
-      - 'i18n/src/commonMain/resources/**/plurals.xml'
+      - 'i18n/src/commonMain/moko-resources/**/strings.xml'
+      - 'i18n/src/commonMain/moko-resources/**/plurals.xml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -38,7 +38,7 @@ jobs:
         uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Build app and run unit tests
-        run: ./gradlew detekt assembleStandardRelease testReleaseUnitTest
+        run: ./gradlew detekt assembleStandardRelease testReleaseUnitTest testStandardReleaseUnitTest
 
       - name: Upload APK
         uses: actions/upload-artifact@v4

.github/workflows/build_push.yml

@@ -36,7 +36,7 @@ jobs:
         uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Build app and run unit tests
-        run: ./gradlew detekt assembleStandardRelease testReleaseUnitTest
+        run: ./gradlew detekt assembleStandardRelease testReleaseUnitTest testStandardReleaseUnitTest
 
       - name: Upload APK
         uses: actions/upload-artifact@v4

app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt

@@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shadow
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.manga.components.MangaCover
@@ -42,15 +43,22 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.BadgeGroup
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.selectedBackground
+import tachiyomi.domain.manga.model.MangaCover as MangaCoverModel
 
 object CommonMangaItemDefaults {
     val GridHorizontalSpacer = 4.dp
     val GridVerticalSpacer = 4.dp
 
+    @Suppress("ConstPropertyName")
     const val BrowseFavoriteCoverAlpha = 0.34f
 }
 
-private val ContinueReadingButtonSize = 28.dp
+private val ContinueReadingButtonSizeSmall = 28.dp
+private val ContinueReadingButtonSizeLarge = 32.dp
+
+private val ContinueReadingButtonIconSizeSmall = 16.dp
+private val ContinueReadingButtonIconSizeLarge = 20.dp
+
 private val ContinueReadingButtonGridPadding = 6.dp
 private val ContinueReadingButtonListSpacing = 8.dp
 
@@ -62,7 +70,7 @@ private const val GridSelectedCoverAlpha = 0.76f
  */
 @Composable
 fun MangaCompactGridItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
     isSelected: Boolean = false,
@@ -96,10 +104,12 @@ fun MangaCompactGridItem(
                     )
                 } else if (onClickContinueReading != null) {
                     ContinueReadingButton(
+                        size = ContinueReadingButtonSizeLarge,
+                        iconSize = ContinueReadingButtonIconSizeLarge,
+                        onClick = onClickContinueReading,
                         modifier = Modifier
                             .padding(ContinueReadingButtonGridPadding)
                             .align(Alignment.BottomEnd),
-                        onClickContinueReading = onClickContinueReading,
                     )
                 }
             },
@@ -148,11 +158,13 @@ private fun BoxScope.CoverTextOverlay(
         )
         if (onClickContinueReading != null) {
             ContinueReadingButton(
+                size = ContinueReadingButtonSizeSmall,
+                iconSize = ContinueReadingButtonIconSizeSmall,
+                onClick = onClickContinueReading,
                 modifier = Modifier.padding(
                     end = ContinueReadingButtonGridPadding,
                     bottom = ContinueReadingButtonGridPadding,
                 ),
-                onClickContinueReading = onClickContinueReading,
             )
         }
     }
@@ -163,7 +175,7 @@ private fun BoxScope.CoverTextOverlay(
  */
 @Composable
 fun MangaComfortableGridItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
     title: String,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
@@ -194,10 +206,12 @@ fun MangaComfortableGridItem(
                 content = {
                     if (onClickContinueReading != null) {
                         ContinueReadingButton(
+                            size = ContinueReadingButtonSizeLarge,
+                            iconSize = ContinueReadingButtonIconSizeLarge,
+                            onClick = onClickContinueReading,
                             modifier = Modifier
                                 .padding(ContinueReadingButtonGridPadding)
                                 .align(Alignment.BottomEnd),
-                            onClickContinueReading = onClickContinueReading,
                         )
                     }
                 },
@@ -309,14 +323,14 @@ private fun GridItemSelectable(
 private fun Modifier.selectedOutline(
     isSelected: Boolean,
     color: Color,
-) = this then drawBehind { if (isSelected) drawRect(color = color) }
+) = drawBehind { if (isSelected) drawRect(color = color) }
 
 /**
  * Layout of list item.
  */
 @Composable
 fun MangaListItem(
-    coverData: tachiyomi.domain.manga.model.MangaCover,
+    coverData: MangaCoverModel,
     title: String,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
@@ -354,8 +368,10 @@ fun MangaListItem(
         BadgeGroup(content = badge)
         if (onClickContinueReading != null) {
             ContinueReadingButton(
-                modifier = Modifier.padding(start = ContinueReadingButtonListSpacing),
-                onClickContinueReading = onClickContinueReading,
+                size = ContinueReadingButtonSizeSmall,
+                iconSize = ContinueReadingButtonIconSizeSmall,
+                onClick = onClickContinueReading,
+                modifier = Modifier.padding(start = ContinueReadingButtonListSpacing)
             )
         }
     }
@@ -363,23 +379,25 @@ fun MangaListItem(
 
 @Composable
 private fun ContinueReadingButton(
+    size: Dp,
+    iconSize: Dp,
+    onClick: () -> Unit,
     modifier: Modifier = Modifier,
-    onClickContinueReading: () -> Unit,
 ) {
     Box(modifier = modifier) {
         FilledIconButton(
-            onClick = onClickContinueReading,
-            modifier = Modifier.size(ContinueReadingButtonSize),
+            onClick = onClick,
             shape = MaterialTheme.shapes.small,
             colors = IconButtonDefaults.filledIconButtonColors(
                 containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.9f),
                 contentColor = contentColorFor(MaterialTheme.colorScheme.primaryContainer),
             ),
+            modifier = Modifier.size(size)
         ) {
             Icon(
                 imageVector = Icons.Filled.PlayArrow,
                 contentDescription = stringResource(MR.strings.action_resume),
-                modifier = Modifier.size(16.dp),
+                modifier = Modifier.size(iconSize),
             )
         }
     }

app/src/test/java/mihon/core/migration/MigratorTest.kt

@@ -29,7 +29,7 @@ class MigratorTest {
     fun initilize() {
         migrationContext = MigrationContext(false)
         migrationJobFactory = spyk(MigrationJobFactory(migrationContext, CoroutineScope(Dispatchers.Main + Job())))
-        migrationCompletedListener = spyk<() -> Unit>({})
+        migrationCompletedListener = spyk<MigrationCompletedListener>(block = {})
         migrationStrategyFactory = spyk(MigrationStrategyFactory(migrationJobFactory, migrationCompletedListener))
     }
 

gradle/compose.versions.toml

@@ -8,6 +8,7 @@ bom = { group = "dev.chrisbanes.compose", name = "compose-bom", version.ref = "c
 foundation = { module = "androidx.compose.foundation:foundation" }
 animation = { module = "androidx.compose.animation:animation" }
 animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
+runtime = { module = "androidx.compose.runtime:runtime" }
 ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 ui-util = { module = "androidx.compose.ui:ui-util" }

gradle/libs.versions.toml

@@ -62,7 +62,7 @@ flexible-adapter-core = "com.github.arkon.FlexibleAdapter:flexible-adapter:c8013
 photoview = "com.github.chrisbanes:PhotoView:2.3.0"
 directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0"
 insetter = "dev.chrisbanes.insetter:insetter:0.6.1"
-compose-materialmotion = "io.github.fornewid:material-motion-compose-core:2.0.0"
+compose-materialmotion = "io.github.fornewid:material-motion-compose-core:2.0.1"
 compose-webview = "io.github.kevinnzou:compose-webview:0.33.6"
 compose-grid = "io.woong.compose.grid:grid:1.2.2"
 

source-api/build.gradle.kts

@@ -13,6 +13,9 @@ kotlin {
                 api(libs.injekt.core)
                 api(libs.rxjava)
                 api(libs.jsoup)
+
+                implementation(project.dependencies.platform(compose.bom))
+                implementation(compose.runtime)
             }
         }
         val androidMain by getting {

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/FilterList.kt

@@ -1,5 +1,8 @@
 package eu.kanade.tachiyomi.source.model
 
+import androidx.compose.runtime.Stable
+
+@Stable
 data class FilterList(val list: List<Filter<*>>) : List<Filter<*>> by list {
 
     constructor(vararg fs: Filter<*>) : this(if (fs.isNotEmpty()) fs.asList() else emptyList())