Merge branch 'main' into manga_url_field

mihonapp · Mar 11, 2024 · 4f47c36 · 4f47c36
2 parents 9bf6a2e + 4ae9dbe
commit 4f47c36
Show file tree

Hide file tree

Showing 48 changed files with 447 additions and 354 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId = "app.mihon"
 
-        versionCode = 5
+        versionCode = 6
         versionName = "0.16.4"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -284,7 +284,7 @@ tasks {
             "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
             "-opt-in=androidx.compose.animation.ExperimentalAnimationApi",
             "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
-            "-opt-in=coil.annotation.ExperimentalCoilApi",
+            "-opt-in=coil3.annotation.ExperimentalCoilApi",
             "-opt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi",
             "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
             "-opt-in=kotlinx.coroutines.FlowPreview",
@@ -304,6 +304,12 @@ tasks {
                     project.layout.buildDirectory.dir("compose_metrics").get().asFile.absolutePath,
             )
         }
+
+        // https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.9
+        kotlinOptions.freeCompilerArgs += listOf(
+            "-P",
+            "plugin:androidx.compose.compiler.plugins.kotlin:nonSkippingGroupOptimization=true",
+        )
     }
 }
 

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.res.imageResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.core.graphics.drawable.toBitmap
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import eu.kanade.domain.source.model.icon
 import eu.kanade.presentation.util.rememberResourceBitmapPainter
 import eu.kanade.tachiyomi.R

diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
@@ -29,7 +30,6 @@ import androidx.compose.ui.util.fastForEachIndexed
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.launch
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.HorizontalPager
 import tachiyomi.presentation.core.components.material.TabText
 import tachiyomi.presentation.core.i18n.stringResource
 
@@ -78,9 +78,8 @@ fun TabbedDialog(
                 modifier = Modifier.animateContentSize(),
                 state = pagerState,
                 verticalAlignment = Alignment.Top,
-            ) { page ->
-                content(page)
-            }
+                pageContent = { page -> content(page) }
+            )
         }
     }
 }

diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryTabRow
@@ -24,7 +25,6 @@ import dev.icerock.moko.resources.StringResource
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.launch
-import tachiyomi.presentation.core.components.HorizontalPager
 import tachiyomi.presentation.core.components.material.Scaffold
 import tachiyomi.presentation.core.components.material.TabText
 import tachiyomi.presentation.core.i18n.stringResource

diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -22,7 +23,6 @@ import eu.kanade.tachiyomi.ui.library.LibraryItem
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.library.model.LibraryManga
 import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.HorizontalPager
 import tachiyomi.presentation.core.screens.EmptyScreen
 import tachiyomi.presentation.core.util.plus
 

diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt
@@ -2,7 +2,6 @@ package eu.kanade.presentation.manga.components
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -24,8 +23,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.hapticfeedback.HapticFeedback
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.painterResource
@@ -91,6 +91,7 @@ private fun NotDownloadedIndicator(
             .size(IconButtonTokens.StateLayerSize)
             .commonClickable(
                 enabled = enabled,
+                hapticFeedback = LocalHapticFeedback.current,
                 onLongClick = { onClick(ChapterDownloadAction.START_NOW) },
                 onClick = { onClick(ChapterDownloadAction.START) },
             )
@@ -120,6 +121,7 @@ private fun DownloadingIndicator(
             .size(IconButtonTokens.StateLayerSize)
             .commonClickable(
                 enabled = enabled,
+                hapticFeedback = LocalHapticFeedback.current,
                 onLongClick = { onClick(ChapterDownloadAction.CANCEL) },
                 onClick = { isMenuExpanded = true },
             ),
@@ -136,6 +138,8 @@ private fun DownloadingIndicator(
                 modifier = IndicatorModifier,
                 color = strokeColor,
                 strokeWidth = IndicatorStrokeWidth,
+                trackColor = Color.Transparent,
+                strokeCap = StrokeCap.Butt,
             )
         } else {
             val animatedProgress by animateFloatAsState(
@@ -153,6 +157,9 @@ private fun DownloadingIndicator(
                 modifier = IndicatorModifier,
                 color = strokeColor,
                 strokeWidth = IndicatorSize / 2,
+                trackColor = Color.Transparent,
+                strokeCap = StrokeCap.Butt,
+                gapSize = 0.dp,
             )
         }
         DropdownMenu(expanded = isMenuExpanded, onDismissRequest = { isMenuExpanded = false }) {
@@ -192,6 +199,7 @@ private fun DownloadedIndicator(
             .size(IconButtonTokens.StateLayerSize)
             .commonClickable(
                 enabled = enabled,
+                hapticFeedback = LocalHapticFeedback.current,
                 onLongClick = { isMenuExpanded = true },
                 onClick = { isMenuExpanded = true },
             ),
@@ -226,6 +234,7 @@ private fun ErrorIndicator(
             .size(IconButtonTokens.StateLayerSize)
             .commonClickable(
                 enabled = enabled,
+                hapticFeedback = LocalHapticFeedback.current,
                 onLongClick = { onClick(ChapterDownloadAction.START) },
                 onClick = { onClick(ChapterDownloadAction.START) },
             ),
@@ -242,26 +251,23 @@ private fun ErrorIndicator(
 
 private fun Modifier.commonClickable(
     enabled: Boolean,
+    hapticFeedback: HapticFeedback,
     onLongClick: () -> Unit,
     onClick: () -> Unit,
-) = composed {
-    val haptic = LocalHapticFeedback.current
-
-    Modifier.combinedClickable(
-        enabled = enabled,
-        onLongClick = {
-            onLongClick()
-            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-        },
-        onClick = onClick,
-        role = Role.Button,
-        interactionSource = remember { MutableInteractionSource() },
-        indication = ripple(
-            bounded = false,
-            radius = IconButtonTokens.StateLayerSize / 2,
-        ),
-    )
-}
+) = this.combinedClickable(
+    enabled = enabled,
+    onLongClick = {
+        onLongClick()
+        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+    },
+    onClick = onClick,
+    role = Role.Button,
+    interactionSource = null,
+    indication = ripple(
+        bounded = false,
+        radius = IconButtonTokens.StateLayerSize / 2,
+    ),
+)
 
 private val IndicatorSize = 26.dp
 private val IndicatorPadding = 2.dp