Address some build warnings

2025-11-09 18:48:55 +01:00 · 2023-12-25 16:31:40 -05:00
parent 80d6d412f3
commit 2d7650537d
33 changed files with 102 additions and 144 deletions
--- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
@@ -27,6 +27,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import eu.kanade.core.preference.asToggleableState
 import eu.kanade.presentation.category.visualName
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.delay
 import tachiyomi.core.preference.CheckboxState
 import tachiyomi.domain.category.model.Category
@@ -39,7 +40,7 @@ import kotlin.time.Duration.Companion.seconds
 fun CategoryCreateDialog(
    onDismissRequest: () -> Unit,
    onCreate: (String) -> Unit,
-    categories: List<Category>,
+    categories: ImmutableList<Category>,
 ) {
    var name by remember { mutableStateOf("") }

@@ -98,7 +99,7 @@ fun CategoryCreateDialog(
 fun CategoryRenameDialog(
    onDismissRequest: () -> Unit,
    onRename: (String) -> Unit,
-    categories: List<Category>,
+    categories: ImmutableList<Category>,
    category: Category,
 ) {
    var name by remember { mutableStateOf(category.name) }
--- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt
+++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt
@@ -6,6 +6,7 @@ import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton
 import tachiyomi.presentation.core.i18n.stringResource
@@ -16,11 +17,13 @@ import tachiyomi.presentation.core.util.isScrollingUp
 fun CategoryFloatingActionButton(
    lazyListState: LazyListState,
    onCreate: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
    ExtendedFloatingActionButton(
        text = { Text(text = stringResource(MR.strings.action_add)) },
        icon = { Icon(imageVector = Icons.Outlined.Add, contentDescription = null) },
        onClick = onCreate,
        expanded = lazyListState.isScrollingUp() || lazyListState.isScrolledToEnd(),
+        modifier = modifier,
    )
 }
--- a/app/src/main/java/eu/kanade/presentation/components/DownloadDropdownMenu.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/DownloadDropdownMenu.kt
@@ -3,7 +3,9 @@ package eu.kanade.presentation.components
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import eu.kanade.presentation.manga.DownloadAction
+import kotlinx.collections.immutable.persistentListOf
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
@@ -13,18 +15,22 @@ fun DownloadDropdownMenu(
    expanded: Boolean,
    onDismissRequest: () -> Unit,
    onDownloadClicked: (DownloadAction) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
+    val options = persistentListOf(
+        DownloadAction.NEXT_1_CHAPTER to pluralStringResource(MR.plurals.download_amount, 1, 1),
+        DownloadAction.NEXT_5_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 5, 5),
+        DownloadAction.NEXT_10_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 10, 10),
+        DownloadAction.NEXT_25_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 25, 25),
+        DownloadAction.UNREAD_CHAPTERS to stringResource(MR.strings.download_unread),
+    )
+
    DropdownMenu(
        expanded = expanded,
        onDismissRequest = onDismissRequest,
+        modifier = modifier,
    ) {
-        listOfNotNull(
-            DownloadAction.NEXT_1_CHAPTER to pluralStringResource(MR.plurals.download_amount, 1, 1),
-            DownloadAction.NEXT_5_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 5, 5),
-            DownloadAction.NEXT_10_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 10, 10),
-            DownloadAction.NEXT_25_CHAPTERS to pluralStringResource(MR.plurals.download_amount, 25, 25),
-            DownloadAction.UNREAD_CHAPTERS to stringResource(MR.strings.download_unread),
-        ).map { (downloadAction, string) ->
+        options.map { (downloadAction, string) ->
            DropdownMenuItem(
                text = { Text(text = string) },
                onClick = {
--- a/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt
@@ -1,7 +1,10 @@
 package eu.kanade.presentation.components

+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowRight
 import androidx.compose.material.icons.outlined.RadioButtonChecked
@@ -22,12 +25,17 @@ import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.i18n.stringResource
 import androidx.compose.material3.DropdownMenu as ComposeDropdownMenu

+/**
+ * DropdownMenu but overlaps anchor and has width constraints to better
+ * match non-Compose implementation.
+ */
@Composable
 fun DropdownMenu(
    expanded: Boolean,
    onDismissRequest: () -> Unit,
    modifier: Modifier = Modifier,
    offset: DpOffset = DpOffset(8.dp, (-56).dp),
+    scrollState: ScrollState = rememberScrollState(),
    properties: PopupProperties = PopupProperties(focusable = true),
    content: @Composable ColumnScope.() -> Unit,
 ) {
@@ -36,6 +44,7 @@ fun DropdownMenu(
        onDismissRequest = onDismissRequest,
        modifier = modifier.sizeIn(minWidth = 196.dp, maxWidth = 196.dp),
        offset = offset,
+        scrollState = scrollState,
        properties = properties,
        content = content,
    )
@@ -45,6 +54,7 @@ fun DropdownMenu(
 fun RadioMenuItem(
    text: @Composable () -> Unit,
    isChecked: Boolean,
+    modifier: Modifier = Modifier,
    onClick: () -> Unit,
 ) {
    DropdownMenuItem(
@@ -64,6 +74,7 @@ fun RadioMenuItem(
                )
            }
        },
+        modifier = modifier,
    )
 }

@@ -71,25 +82,29 @@ fun RadioMenuItem(
 fun NestedMenuItem(
    text: @Composable () -> Unit,
    children: @Composable ColumnScope.(() -> Unit) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
    var nestedExpanded by remember { mutableStateOf(false) }
    val closeMenu = { nestedExpanded = false }

-    DropdownMenuItem(
-        text = text,
-        onClick = { nestedExpanded = true },
-        trailingIcon = {
-            Icon(
-                imageVector = Icons.AutoMirrored.Outlined.ArrowRight,
-                contentDescription = null,
-            )
-        },
-    )
+    Box {
+        DropdownMenuItem(
+            text = text,
+            onClick = { nestedExpanded = true },
+            trailingIcon = {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Outlined.ArrowRight,
+                    contentDescription = null,
+                )
+            },
+        )

-    DropdownMenu(
-        expanded = nestedExpanded,
-        onDismissRequest = closeMenu,
-    ) {
-        children(closeMenu)
+        DropdownMenu(
+            expanded = nestedExpanded,
+            onDismissRequest = closeMenu,
+            modifier = modifier,
+        ) {
+            children(closeMenu)
+        }
    }
 }
--- a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt
@@ -49,10 +49,10 @@ enum class ChapterDownloadAction {
@Composable
 fun ChapterDownloadIndicator(
    enabled: Boolean,
-    modifier: Modifier = Modifier,
    downloadStateProvider: () -> Download.State,
    downloadProgressProvider: () -> Int,
    onClick: (ChapterDownloadAction) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
    when (val downloadState = downloadStateProvider()) {
        Download.State.NOT_DOWNLOADED -> NotDownloadedIndicator(
@@ -109,10 +109,10 @@ private fun NotDownloadedIndicator(
@Composable
 private fun DownloadingIndicator(
    enabled: Boolean,
-    modifier: Modifier = Modifier,
    downloadState: Download.State,
    downloadProgressProvider: () -> Int,
    onClick: (ChapterDownloadAction) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
    var isMenuExpanded by remember { mutableStateOf(false) }
    Box(
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
@@ -182,7 +182,10 @@ private fun RowScope.Button(
    onClick: () -> Unit,
    content: (@Composable () -> Unit)? = null,
 ) {
-    val animatedWeight by animateFloatAsState(if (toConfirm) 2f else 1f)
+    val animatedWeight by animateFloatAsState(
+        targetValue = if (toConfirm) 2f else 1f,
+        label = "weight",
+    )
    Column(
        modifier = Modifier
            .size(48.dp)
--- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
@@ -20,7 +20,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.components.AppBar
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/Commons.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/Commons.kt
@@ -11,7 +11,6 @@ import tachiyomi.presentation.core.i18n.stringResource
 /**
 * Returns a string of categories name for settings subtitle
 */
-
@ReadOnlyComposable
@Composable
 fun getCategoriesLabel(
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
@@ -65,7 +65,6 @@ object SettingsLibraryScreen : SearchableSettings {
        allCategories: List<Category>,
        libraryPreferences: LibraryPreferences,
    ): Preference.PreferenceGroup {
-        val context = LocalContext.current
        val scope = rememberCoroutineScope()
        val userCategoriesCount = allCategories.filterNot(Category::isSystemCategory).size

@@ -76,7 +75,7 @@ object SettingsLibraryScreen : SearchableSettings {
        val ids = listOf(libraryPreferences.defaultCategory().defaultValue()) +
            allCategories.fastMap { it.id.toInt() }
        val labels = listOf(stringResource(MR.strings.default_category_summary)) +
-            allCategories.fastMap { it.visualName(context) }
+            allCategories.fastMap { it.visualName }

        return Preference.PreferenceGroup(
            title = stringResource(MR.strings.categories),
--- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/BasePreferenceWidget.kt
@@ -114,6 +114,7 @@ internal fun Modifier.highlightBackground(highlighted: Boolean): Modifier = comp
        } else {
            tween(200)
        },
+        label = "highlight",
    )
    Modifier.background(color = highlight)
 }