Skip to content

Issue #116 #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmdparsa-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Issue #116 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/src/main/java/com/demonlab/lune/tools/PlaybackManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,29 @@ class PlaybackManager private constructor(private val context: Context) {
}
}

fun addToQueue(song: Song) {
val current = currentSong
if (current == null || activePlaylist.isEmpty()) {
play(song)
return
}
val exists = activePlaylist.any { it.id == song.id }
if (exists) {
reorderQueueForSong(song, moveToFront = false)
} else {
val mutable = activePlaylist.toMutableList()
mutable.add(song)
activePlaylist = mutable

if (isShuffle && shuffledIndices.isNotEmpty()) {
val newIndex = activePlaylist.size - 1
val mutableShuffle = shuffledIndices.toMutableList()
mutableShuffle.add(newIndex)
shuffledIndices = mutableShuffle
}
}
}

fun reorderQueueForSong(song: Song, moveToFront: Boolean) {
val current = currentSong ?: return
if (moveToFront) {
Expand Down
24 changes: 24 additions & 0 deletions app/src/main/java/com/demonlab/lune/tools/SettingsManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,30 @@ class SettingsManager(context: Context) {
get() = prefs.getInt("swipe_up_action", 0)
set(value) = prefs.edit().putInt("swipe_up_action", value).apply()

private val _isTrackSwipeEnabled = mutableStateOf(prefs.getBoolean("is_track_swipe_enabled", true))
var isTrackSwipeEnabled: Boolean
get() = _isTrackSwipeEnabled.value
set(value) {
_isTrackSwipeEnabled.value = value
prefs.edit().putBoolean("is_track_swipe_enabled", value).apply()
}

var trackSwipeRightAction: Int
get() = prefs.getInt("track_swipe_right_action", 0)
set(value) = prefs.edit().putInt("track_swipe_right_action", value).apply()

var trackSwipeLeftAction: Int
get() = prefs.getInt("track_swipe_left_action", 1)
set(value) = prefs.edit().putInt("track_swipe_left_action", value).apply()

private val _progressIndicatorStyle = mutableStateOf(prefs.getInt("progress_indicator_style", 0))
var progressIndicatorStyle: Int
get() = _progressIndicatorStyle.value
set(value) {
_progressIndicatorStyle.value = value
prefs.edit().putInt("progress_indicator_style", value).apply()
}

var dailyListeningTime: Long
get() = prefs.getLong("daily_listening_time", 0L)
set(value) = prefs.edit().putLong("daily_listening_time", value).apply()
Expand Down
127 changes: 126 additions & 1 deletion app/src/main/java/com/demonlab/lune/ui/activities/ControlsCustomizationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.demonlab.lune.tools.PlaybackManager
import com.demonlab.lune.tools.SettingsManager
import com.demonlab.lune.ui.components.AppBlurBackdrop
import com.demonlab.lune.ui.player.ReusableSkipIcon
import com.demonlab.lune.ui.player.WaveformBarsProgressIndicator
import com.demonlab.lune.ui.theme.LuneTheme
import com.demonlab.lune.ui.theme.getControlsPrimaryColor
import com.demonlab.lune.ui.utils.bounceClick
Expand Down Expand Up @@ -85,7 +86,7 @@ class ControlsCustomizationActivity : ComponentActivity() {
}
}

@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun ControlsCustomizationScreen(
onBack: () -> Unit,
Expand All @@ -105,6 +106,7 @@ fun ControlsCustomizationScreen(
var isControlsFilled by remember { mutableStateOf(settingsManager.isControlsFilled) }
var useCustomControlsColor by remember { mutableStateOf(settingsManager.useCustomControlsColor) }
var controlsColorPalette by remember { mutableIntStateOf(settingsManager.controlsColorPalette) }
var progressIndicatorStyle by remember { mutableIntStateOf(settingsManager.progressIndicatorStyle) }

val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()

Expand Down Expand Up @@ -263,6 +265,64 @@ fun ControlsCustomizationScreen(
MaterialTheme.colorScheme.onPrimary
}

// Mock Seeker
val seekerColor = if (useCustomControlsColor) activePrimary else if (hasBlurBackground) Color.White else MaterialTheme.colorScheme.primary
val seekerTrackColor = if (useCustomControlsColor) activePrimary.copy(alpha = 0.25f) else if (hasBlurBackground) Color.White.copy(alpha = 0.25f) else MaterialTheme.colorScheme.surfaceVariant

when (progressIndicatorStyle) {
1 -> {
LinearProgressIndicator(
progress = { 0.45f },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
color = seekerColor,
trackColor = seekerTrackColor
)
}
2 -> {
WaveformBarsProgressIndicator(
progress = 0.45f,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
color = seekerColor,
trackColor = seekerTrackColor
)
}
else -> {
LinearWavyProgressIndicator(
progress = { 0.45f },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
color = seekerColor,
trackColor = seekerTrackColor,
amplitude = { 1f }
)
}
}

Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(top = 6.dp, bottom = 20.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = "1:24",
style = MaterialTheme.typography.labelSmall,
color = if (hasBlurBackground) Color.White.copy(alpha = 0.7f) else MaterialTheme.colorScheme.onSurfaceVariant
)
Text(
text = "3:10",
style = MaterialTheme.typography.labelSmall,
color = if (hasBlurBackground) Color.White.copy(alpha = 0.7f) else MaterialTheme.colorScheme.onSurfaceVariant
)
}

// Mock Player Bar
Row(
modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
Expand Down Expand Up @@ -444,6 +504,71 @@ fun ControlsCustomizationScreen(

Spacer(modifier = Modifier.height(16.dp))

// Progress Indicator Style Selection
SettingsSection(title = stringResource(R.string.progress_indicator_style)) {
Surface(
modifier = Modifier.fillMaxWidth().padding(vertical = 1.dp),
shape = RoundedCornerShape(28.dp),
color = if (hasBlurBackground) (if (isDarkTheme) Color.White.copy(alpha = 0.09f) else Color.Black.copy(alpha = 0.22f)) else MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f),
tonalElevation = if (hasBlurBackground) 0.dp else 1.dp
) {
Row(
modifier = Modifier.fillMaxWidth().padding(20.dp),
horizontalArrangement = Arrangement.SpaceEvenly,
verticalAlignment = Alignment.CenterVertically
) {
val progressStyles = listOf(
Triple(0, stringResource(R.string.progress_style_wavy), Icons.Default.Waves),
Triple(1, stringResource(R.string.progress_style_slider), Icons.Default.LinearScale),
Triple(2, stringResource(R.string.progress_style_bars), Icons.Default.Equalizer)
)

progressStyles.forEach { (index, label, icon) ->
val isSelected = progressIndicatorStyle == index

Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.bounceClick()
.clickable {
progressIndicatorStyle = index
settingsManager.progressIndicatorStyle = index
}
) {
Surface(
shape = CircleShape,
color = if (isSelected) {
if (hasBlurBackground) Color.White.copy(alpha = 0.25f) else MaterialTheme.colorScheme.primaryContainer
} else {
if (hasBlurBackground) Color.White.copy(alpha = 0.10f) else MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f)
},
border = BorderStroke(2.dp, if (isSelected) (if (hasBlurBackground) Color.White else MaterialTheme.colorScheme.primary) else Color.Transparent),
modifier = Modifier.size(72.dp)
) {
Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) {
Icon(
imageVector = icon,
contentDescription = label,
tint = if (isSelected) (if (hasBlurBackground) Color.White else MaterialTheme.colorScheme.primary) else (if (hasBlurBackground) Color.White.copy(alpha = 0.7f) else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f)),
modifier = Modifier.size(32.dp)
)
}
}
Spacer(modifier = Modifier.height(8.dp))
Text(
text = label,
style = MaterialTheme.typography.labelMedium,
fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal,
color = if (isSelected) (if (hasBlurBackground) Color.White else MaterialTheme.colorScheme.primary) else (if (hasBlurBackground) Color.White.copy(alpha = 0.75f) else MaterialTheme.colorScheme.onSurfaceVariant)
)
}
}
}
}
}

Spacer(modifier = Modifier.height(16.dp))

// Switches
SettingsSection(title = stringResource(R.string.categories)) {
SettingsPreferenceItem(
Expand Down
Loading