Skip to content

Commit

Permalink
Change swipe range
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxrave-dev
maxrave-dev committed Apr 27, 2024
1 parent 80ffb83 commit 49a9e04
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 24 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/maxrave/simpmusic/ui/component/ModalBottomSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ fun CheckBoxActionButton(
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(horizontal = 20.dp)
modifier = Modifier.padding(horizontal = 20.dp).fillMaxWidth()
) {
Box(Modifier.padding(12.dp)) {
HeartCheckBox(checked = stateChecked)
Expand Down
70 changes: 47 additions & 23 deletions app/src/main/java/com/maxrave/simpmusic/ui/screen/MiniPlayer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@ package com.maxrave.simpmusic.ui.screen
// or just
import android.graphics.drawable.GradientDrawable
import android.util.Log
import androidx.compose.animation.Crossfade
import androidx.compose.animation.Animatable
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.MarqueeAnimationMode
import androidx.compose.foundation.background
import androidx.compose.foundation.basicMarquee
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.detectHorizontalDragGestures
import androidx.compose.foundation.gestures.detectVerticalDragGestures
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -37,11 +43,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -58,7 +62,6 @@ import androidx.core.graphics.ColorUtils
import androidx.lifecycle.viewModelScope
import androidx.media3.common.MediaItem
import androidx.media3.common.util.UnstableApi
import androidx.wear.compose.material3.ripple
import com.maxrave.simpmusic.R
import com.maxrave.simpmusic.ui.component.HeartCheckBox
import com.maxrave.simpmusic.ui.component.PlayPauseButton
Expand Down Expand Up @@ -104,8 +107,8 @@ fun MiniPlayer(
)

var palette by rememberPaletteState(null)
val (background, setBackground) = rememberSaveable {
mutableIntStateOf(0x000000)
val background = remember {
Animatable(Color(0x000000))
}

val offsetX = remember { Animatable(initialValue = 0f) }
Expand Down Expand Up @@ -179,32 +182,32 @@ fun MiniPlayer(
gd.alpha = 150
val bg =
ColorUtils.setAlphaComponent(startColor, 255)
setBackground(bg)
background.animateTo(Color(bg))
}
}

ElevatedCard(
elevation = CardDefaults.elevatedCardElevation(10.dp),
colors = CardDefaults.elevatedCardColors(
containerColor = Color(background),
containerColor = background.value,
),
modifier = Modifier
.fillMaxHeight()
.offset { IntOffset(0, offsetY.value.roundToInt()) }
.clickable(
onClick = onClick,
indication = ripple(),
interactionSource = remember { MutableInteractionSource() }
)
.pointerInput(Unit) {
detectVerticalDragGestures(
onDragStart = {
},
onVerticalDrag = { change: PointerInputChange, dragAmount: Float ->
coroutineScope.launch {
change.consume()
offsetY.animateTo(offsetY.value + dragAmount)
Log.w("MiniPlayer", "Dragged ${offsetY.value}")
if (offsetY.value + dragAmount > 0) {
coroutineScope.launch {
change.consume()
offsetY.animateTo(offsetY.value + dragAmount)
Log.w("MiniPlayer", "Dragged ${offsetY.value}")
}
}
},
onDragCancel = {
Expand Down Expand Up @@ -251,21 +254,21 @@ fun MiniPlayer(
onDragCancel = {
Log.w("MiniPlayer", "Drag Cancelled")
coroutineScope.launch {
if (offsetX.value > 250) {
sharedViewModel.onUIEvent(UIEvent.Next)
} else if (offsetX.value < -120) {
if (offsetX.value > 200) {
sharedViewModel.onUIEvent(UIEvent.Previous)
} else if (offsetX.value < -120) {
sharedViewModel.onUIEvent(UIEvent.Next)
}
offsetX.animateTo(0f)
}
},
onDragEnd = {
Log.w("MiniPlayer", "Drag Ended")
coroutineScope.launch {
if (offsetX.value > 250) {
sharedViewModel.onUIEvent(UIEvent.Next)
} else if (offsetX.value < -120) {
if (offsetX.value > 200) {
sharedViewModel.onUIEvent(UIEvent.Previous)
} else if (offsetX.value < -120) {
sharedViewModel.onUIEvent(UIEvent.Next)
}
offsetX.animateTo(0f)
}
Expand Down Expand Up @@ -298,8 +301,29 @@ fun MiniPlayer(
),
)
Spacer(modifier = Modifier.width(10.dp))
Crossfade(targetState = mediaItem, modifier = Modifier.weight(1F)) {
if (it != MediaItem.EMPTY) {
AnimatedContent(
targetState = mediaItem,
modifier = Modifier.weight(1F),
transitionSpec = {
// Compare the incoming number with the previous number.
if (targetState != initialState) {
// If the target number is larger, it slides up and fades in
// while the initial (smaller) number slides up and fades out.
(slideInHorizontally { width -> width } + fadeIn()).togetherWith(
slideOutHorizontally { width -> +width } + fadeOut())
} else {
// If the target number is smaller, it slides down and fades in
// while the initial number slides down and fades out.
(slideInHorizontally { width -> +width } + fadeIn()).togetherWith(
slideOutHorizontally { width -> width } + fadeOut())
}.using(
// Disable clipping since the faded slide-in/out should
// be displayed out of bounds.
SizeTransform(clip = false)
)
}
) { target ->
if (target != MediaItem.EMPTY) {
Column {
Text(
text = (mediaItem.mediaMetadata.title ?: "").toString(),
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/maxrave/simpmusic/viewModel/SharedViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ class SharedViewModel
}

fun loadMore() {
// Separate local and remote data
// Local Add Prefix to PlaylistID to differentiate between local and remote
// Local: LC-PlaylistID
val continuation = Queue.getContinuation()
Log.w("Check loadMore", continuation.toString())
if (continuation != null) {
Expand Down

0 comments on commit 49a9e04

Please sign in to comment.