Test build latest changes

app/build.gradle.kts

@@ -30,8 +30,8 @@ android {
     defaultConfig {
         applicationId = "app.komikku"
 
-        versionCode = 71
-        versionName = "1.12.2"
+        versionCode = 72
+        versionName = "1.13.0"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

app/src/beta/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher">#c837ab</color>
+</resources>

app/src/debug/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher">#ffe680</color>
+</resources>

app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt

@@ -23,7 +23,7 @@ class SourcePreferences(
 
     fun disabledSources() = preferenceStore.getStringSet("hidden_catalogues", emptySet())
 
-    fun pinnedSources() = preferenceStore.getStringSet("pinned_catalogues", emptySet())
+    fun pinnedSources() = preferenceStore.getStringSet(pinnedSourcesPrefKey, emptySet())
 
     fun lastUsedSource() = preferenceStore.getLong(
         Preference.appStateKey("last_catalogue_source"),
@@ -107,3 +107,5 @@ class SourcePreferences(
     fun relatedMangas() = preferenceStore.getBoolean("related_mangas", true)
     // KMK <--
 }
+
+const val pinnedSourcesPrefKey = "pinned_catalogues"

app/src/main/java/eu/kanade/presentation/browse/FeedOrderScreen.kt

@@ -3,13 +3,20 @@ package eu.kanade.presentation.browse
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.browse.components.FeedOrderListItem
 import eu.kanade.tachiyomi.ui.browse.feed.FeedScreenState
+import sh.calvin.reorderable.ReorderableItem
+import sh.calvin.reorderable.rememberReorderableLazyListState
 import tachiyomi.domain.source.model.FeedSavedSearch
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
@@ -22,39 +29,53 @@ import tachiyomi.presentation.core.util.plus
 fun FeedOrderScreen(
     state: FeedScreenState,
     onClickDelete: (FeedSavedSearch) -> Unit,
-    onClickMoveUp: (FeedSavedSearch) -> Unit,
-    onClickMoveDown: (FeedSavedSearch) -> Unit,
+    changeOrder: (FeedSavedSearch, Int) -> Unit,
 ) {
     when {
         state.isLoading -> LoadingScreen()
-        state.isEmpty -> EmptyScreen(
+        state.isEmpty || state.items.isNullOrEmpty() -> EmptyScreen(
             stringRes = MR.strings.empty_screen,
         )
 
         else -> {
             val lazyListState = rememberLazyListState()
-            val feeds = state.items ?: emptyList()
+            val feeds = state.items
+
+            var reorderableList by remember { mutableStateOf(feeds) }
+            val reorderableLazyColumnState = rememberReorderableLazyListState(lazyListState) { from, to ->
+                reorderableList = reorderableList.toMutableList().apply {
+                    changeOrder(reorderableList[from.index].feed, to.index - from.index)
+                    add(to.index, removeAt(from.index))
+                }
+            }
+
+            LaunchedEffect(feeds) {
+                if (!reorderableLazyColumnState.isAnyItemDragging) {
+                    reorderableList = feeds
+                }
+            }
+
             LazyColumn(
                 state = lazyListState,
                 contentPadding = topSmallPaddingValues +
                     PaddingValues(horizontal = MaterialTheme.padding.medium),
                 verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
             ) {
-                itemsIndexed(
-                    items = feeds,
-                    key = { _, feed -> "feed-${feed.feed.id}" },
-                ) { index, feed ->
-                    FeedOrderListItem(
-                        modifier = Modifier.animateItem(),
-                        title = feed.title,
-                        canMoveUp = index != 0,
-                        canMoveDown = index != feeds.lastIndex,
-                        onMoveUp = { onClickMoveUp(feed.feed) },
-                        onMoveDown = { onClickMoveDown(feed.feed) },
-                        onDelete = { onClickDelete(feed.feed) },
-                    )
+                items(
+                    items = reorderableList,
+                    key = { it.feed.key },
+                ) { feed ->
+                    ReorderableItem(reorderableLazyColumnState, feed.feed.key) {
+                        FeedOrderListItem(
+                            modifier = Modifier.animateItem(),
+                            title = feed.title,
+                            onDelete = { onClickDelete(feed.feed) },
+                        )
+                    }
                 }
             }
         }
     }
 }
+
+internal val FeedSavedSearch.key get() = "feed-$id"

app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt

@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.AlertDialog
@@ -75,7 +75,7 @@ fun FeedScreen(
     onClickSavedSearch: (SavedSearch, CatalogueSource) -> Unit,
     onClickSource: (CatalogueSource) -> Unit,
     // KMK -->
-    onLongClickFeed: (FeedItemUI, Boolean, Boolean) -> Unit,
+    onLongClickFeed: (FeedItemUI) -> Unit,
     // KMK <--
     onClickManga: (Manga) -> Unit,
     // KMK -->
@@ -113,21 +113,17 @@ fun FeedScreen(
                 ) {
                     // KMK -->
                     val feeds = state.items.orEmpty()
-                    itemsIndexed(
+                    items(
                         items = feeds,
-                        key = { _, it -> "feed-${it.feed.id}" },
-                    ) { index, item ->
+                        key = { it.feed.key },
+                    ) { item ->
                         // KMK <--
                         GlobalSearchResultItem(
                             title = item.title,
                             subtitle = item.subtitle,
                             onLongClick = {
                                 // KMK -->
-                                onLongClickFeed(
-                                    item,
-                                    index != 0,
-                                    index != feeds.lastIndex,
-                                )
+                                onLongClickFeed(item)
                                 // KMK <--
                             },
                             onClick = {

app/src/main/java/eu/kanade/presentation/browse/SourceFeedOrderScreen.kt

@@ -3,18 +3,25 @@ package eu.kanade.presentation.browse
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.SortByAlpha
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import eu.kanade.presentation.browse.components.FeedOrderListItem
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedState
 import kotlinx.collections.immutable.persistentListOf
+import sh.calvin.reorderable.ReorderableItem
+import sh.calvin.reorderable.rememberReorderableLazyListState
 import tachiyomi.domain.source.model.FeedSavedSearch
 import tachiyomi.i18n.MR
 import tachiyomi.i18n.kmk.KMR
@@ -30,8 +37,7 @@ import tachiyomi.presentation.core.util.plus
 fun SourceFeedOrderScreen(
     state: SourceFeedState,
     onClickDelete: (FeedSavedSearch) -> Unit,
-    onClickMoveUp: (FeedSavedSearch) -> Unit,
-    onClickMoveDown: (FeedSavedSearch) -> Unit,
+    changeOrder: (FeedSavedSearch, Int) -> Unit,
     onClickSortAlphabetically: () -> Unit,
     navigateUp: (() -> Unit)? = null,
 ) {
@@ -68,25 +74,38 @@ fun SourceFeedOrderScreen(
                 val lazyListState = rememberLazyListState()
                 val feeds = state.items
                     .filterIsInstance<SourceFeedUI.SourceSavedSearch>()
+
+                var reorderableList by remember { mutableStateOf(feeds) }
+                val reorderableLazyColumnState = rememberReorderableLazyListState(lazyListState) { from, to ->
+                    reorderableList = reorderableList.toMutableList().apply {
+                        changeOrder(reorderableList[from.index].feed, to.index - from.index)
+                        add(to.index, removeAt(from.index))
+                    }
+                }
+
+                LaunchedEffect(feeds) {
+                    if (!reorderableLazyColumnState.isAnyItemDragging) {
+                        reorderableList = feeds
+                    }
+                }
+
                 LazyColumn(
                     state = lazyListState,
                     contentPadding = paddingValues + topSmallPaddingValues +
                         PaddingValues(horizontal = MaterialTheme.padding.medium),
                     verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
                 ) {
-                    itemsIndexed(
-                        items = feeds,
-                        key = { _, feed -> "feed-${feed.feed.id}" },
-                    ) { index, feed ->
-                        FeedOrderListItem(
-                            modifier = Modifier.animateItem(),
-                            title = feed.title,
-                            canMoveUp = index != 0,
-                            canMoveDown = index != feeds.lastIndex,
-                            onMoveUp = { onClickMoveUp(feed.feed) },
-                            onMoveDown = { onClickMoveDown(feed.feed) },
-                            onDelete = { onClickDelete(feed.feed) },
-                        )
+                    items(
+                        items = reorderableList,
+                        key = { it.feed.key },
+                    ) { feed ->
+                        ReorderableItem(reorderableLazyColumnState, feed.feed.key) {
+                            FeedOrderListItem(
+                                modifier = Modifier.animateItem(),
+                                title = feed.title,
+                                onDelete = { onClickDelete(feed.feed) },
+                            )
+                        }
                     }
                 }
             }

app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt

@@ -2,7 +2,7 @@ package eu.kanade.presentation.browse
 
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material3.TopAppBarScrollBehavior
@@ -94,7 +94,7 @@ fun SourceFeedScreen(
     onClickSavedSearch: (SavedSearch) -> Unit,
     // KMK -->
     // onClickDelete: (FeedSavedSearch) -> Unit,
-    onLongClickFeed: (SourceFeedUI.SourceSavedSearch, Boolean, Boolean) -> Unit,
+    onLongClickFeed: (SourceFeedUI.SourceSavedSearch) -> Unit,
     // KMK <--
     onClickManga: (Manga) -> Unit,
     onClickSearch: (String) -> Unit,
@@ -200,7 +200,7 @@ fun SourceFeedList(
     onClickSavedSearch: (SavedSearch) -> Unit,
     // KMK -->
     // onClickDelete: (FeedSavedSearch) -> Unit,
-    onLongClickFeed: (SourceFeedUI.SourceSavedSearch, Boolean, Boolean) -> Unit,
+    onLongClickFeed: (SourceFeedUI.SourceSavedSearch) -> Unit,
     // KMK <--
     onClickManga: (Manga) -> Unit,
     // KMK -->
@@ -212,10 +212,10 @@ fun SourceFeedList(
         contentPadding = paddingValues + topSmallPaddingValues,
     ) {
         // KMK -->
-        itemsIndexed(
+        items(
             items,
-            key = { _, it -> "source-feed-${it.id}" },
-        ) { index, item ->
+            key = { "source-feed-${it.id}" },
+        ) { item ->
             // KMK <--
             GlobalSearchResultItem(
                 modifier = Modifier.animateItem(),
@@ -231,11 +231,7 @@ fun SourceFeedList(
                 onLongClick = if (item is SourceFeedUI.SourceSavedSearch) {
                     {
                         // KMK -->
-                        onLongClickFeed(
-                            item,
-                            index != items.size - items.filterIsInstance<SourceFeedUI.SourceSavedSearch>().size,
-                            index != items.lastIndex,
-                        )
+                        onLongClickFeed(item)
                         // KMK <--
                     }
                 } else {