diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt index 6334a517..b25f26c2 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt @@ -209,7 +209,7 @@ fun MangaListingBottomSheet( state = listState, contentPadding = rememberInsetsPaddingValues(LocalWindowInsets.current.navigationBars) ) { - itemsIndexed(mangaListing.entries) { index, entry -> + itemsIndexed(mangaListing.entries, key = { _, entry -> entry.itemID }) { index, entry -> Row( modifier = Modifier .clickable { diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/Reader.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/Reader.kt index 919205b0..0865e21a 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/Reader.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/Reader.kt @@ -18,6 +18,7 @@ package xyz.quaver.pupil.sources.manatoki.composable +import android.util.Log import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi @@ -29,6 +30,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyListItemInfo import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* @@ -252,6 +254,7 @@ fun Reader(navController: NavController) { Offset(sheetSize.width/2, targetItem.size/2f) ) + emit(interaction) emit(PressInteraction.Release(interaction)) } diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/viewmodel/SearchViewModel.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/viewmodel/SearchViewModel.kt index 7b050ae3..ddecc9f8 100644 --- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/viewmodel/SearchViewModel.kt +++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/viewmodel/SearchViewModel.kt @@ -170,7 +170,7 @@ class SearchViewModel(app: Application) : AndroidViewModel(app), DIAware { if (publish.isNotEmpty()) args.add("publish=$publish") if (jaum.isNotEmpty()) args.add("jaum=$jaum") if (tag.isNotEmpty()) args.add("tag=${tag.keys.joinToString(",")}") - if (sst.isNotEmpty()) args.add("sst=$sst") + if (sst.isNotEmpty()) args.add("sst=$sst&sod=desc") if (stx.isNotEmpty()) args.add("stx=$stx") if (artist.isNotEmpty()) args.add("artist=$artist")