From f4bd57315a3dbf35f5975233980304fa66807718 Mon Sep 17 00:00:00 2001 From: Riztard Date: Fri, 4 Nov 2022 16:15:42 +0700 Subject: [PATCH] simplify --- .../browse/components/BrowseSourceComfortableGrid.kt | 6 +----- .../browse/components/BrowseSourceCompactGrid.kt | 6 +----- .../presentation/browse/components/BrowseSourceList.kt | 9 +-------- .../ui/browse/source/browse/BrowseSourceController.kt | 4 ++++ 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt index fbd9b14fb7..b1315b1ed6 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.getValue -import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -84,10 +83,7 @@ fun BrowseSourceComfortableGridItem( Badge(text = stringResource(R.string.in_library)) } }, - onLongClick = { - onLongClick() - haptic.performHapticFeedback(HapticFeedbackType.LongPress) - }, + onLongClick = onLongClick, onClick = onClick, ) } diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt index b6d72c42a1..5f32ae575e 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.getValue -import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -84,10 +83,7 @@ private fun BrowseSourceCompactGridItem( Badge(text = stringResource(R.string.in_library)) } }, - onLongClick = { - onLongClick() - haptic.performHapticFeedback(HapticFeedbackType.LongPress) - }, + onLongClick = onLongClick, onClick = onClick, ) } diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt index 741e89a80f..ebb712998f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt @@ -4,8 +4,6 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.getValue -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.paging.LoadState @@ -61,8 +59,6 @@ fun BrowseSourceListItem( onClick: () -> Unit = {}, onLongClick: () -> Unit = onClick, ) { - val haptic = LocalHapticFeedback.current - MangaListItem( title = manga.title, coverData = MangaCover( @@ -78,10 +74,7 @@ fun BrowseSourceListItem( Badge(text = stringResource(R.string.in_library)) } }, - onLongClick = { - onLongClick() - haptic.performHapticFeedback(HapticFeedbackType.LongPress) - }, + onLongClick = onLongClick, onClick = onClick, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 2966713e04..b58a372b05 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -5,7 +5,9 @@ import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalHapticFeedback import androidx.core.os.bundleOf import eu.kanade.domain.source.model.Source import eu.kanade.presentation.browse.BrowseSourceScreen @@ -50,6 +52,7 @@ open class BrowseSourceController(bundle: Bundle) : override fun ComposeContent() { val scope = rememberCoroutineScope() val context = LocalContext.current + val haptic = LocalHapticFeedback.current BrowseSourceScreen( presenter = presenter, @@ -64,6 +67,7 @@ open class BrowseSourceController(bundle: Bundle) : duplicateManga != null -> presenter.dialog = Dialog.AddDuplicateManga(manga, duplicateManga) else -> presenter.addFavorite(manga) } + haptic.performHapticFeedback(HapticFeedbackType.LongPress) } }, onWebViewClick = f@{