diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt index a9809aa..ca9f396 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt @@ -44,7 +44,6 @@ import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.core.view.WindowCompat @@ -75,7 +74,6 @@ import it.vfsfitvnm.vimusic.utils.getEnum import it.vfsfitvnm.vimusic.utils.intent import it.vfsfitvnm.vimusic.utils.listener import it.vfsfitvnm.vimusic.utils.preferences -import it.vfsfitvnm.vimusic.utils.rememberHapticFeedback import it.vfsfitvnm.vimusic.utils.thumbnailRoundnessKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -301,7 +299,6 @@ class MainActivity : ComponentActivity() { LocalShimmerTheme provides shimmerTheme, LocalPlayerServiceBinder provides binder, LocalMenuState provides rememberMenuState(), - LocalHapticFeedback provides rememberHapticFeedback(), LocalPlayerAwarePaddingValues provides playerAwarePaddingValues ) { when (val uri = uri) { diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt index 948e966..25e37e8 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt @@ -26,8 +26,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex @@ -80,22 +78,15 @@ fun LocalPlaylistScreen(playlistId: Long) { globalRoutes() host { - val hapticFeedback = LocalHapticFeedback.current - val menuState = LocalMenuState.current - - val binder = LocalPlayerServiceBinder.current val (colorPalette, typography) = LocalAppearance.current + val menuState = LocalMenuState.current + val binder = LocalPlayerServiceBinder.current val thumbnailSize = Dimensions.thumbnails.song.px val reorderingState = rememberReorderingState( lazyListState = lazyListState, key = playlistWithSongs.songs, - onDragStart = { - hapticFeedback.performHapticFeedback( - HapticFeedbackType.LongPress - ) - }, onDragEnd = { fromIndex, toIndex -> transaction { if (fromIndex > toIndex) { diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt index 9d5f4da..eab9fd2 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt @@ -33,9 +33,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp @@ -70,9 +68,8 @@ fun CurrentPlaylistView( onGlobalRouteEmitted: () -> Unit, modifier: Modifier = Modifier, ) { - val binder = LocalPlayerServiceBinder.current - val hapticFeedback = LocalHapticFeedback.current val (colorPalette, typography) = LocalAppearance.current + val binder = LocalPlayerServiceBinder.current val layoutDirection = LocalLayoutDirection.current binder?.player ?: return @@ -86,11 +83,6 @@ fun CurrentPlaylistView( val reorderingState = rememberReorderingState( lazyListState = rememberLazyListState(initialFirstVisibleItemIndex = mediaItemIndex), key = windows, - onDragStart = { - hapticFeedback.performHapticFeedback( - HapticFeedbackType.LongPress - ) - }, onDragEnd = { fromIndex, toIndex -> binder.player.moveMediaItem(fromIndex, toIndex) }, diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/rememberHapticFeedback.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/rememberHapticFeedback.kt deleted file mode 100644 index 0965b67..0000000 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/rememberHapticFeedback.kt +++ /dev/null @@ -1,24 +0,0 @@ -package it.vfsfitvnm.vimusic.utils - -import android.view.HapticFeedbackConstants -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.hapticfeedback.HapticFeedback -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.platform.LocalView - -@Composable -fun rememberHapticFeedback(): HapticFeedback { - val view = LocalView.current - - return remember { - object : HapticFeedback { - override fun performHapticFeedback(hapticFeedbackType: HapticFeedbackType) { - view.performHapticFeedback( - HapticFeedbackConstants.LONG_PRESS, - HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING - ) - } - } - } -}