Skip to content

Commit b501706

Browse files
shub39shub39
committed
🔧 updated changelog and palette picker
1 parent 31c6c01 commit b501706

File tree

9 files changed

+94
-67
lines changed

9 files changed

+94
-67
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 5.7.1
4+
- Fixed auto lyrics fetching issues
5+
- Fixed miscellaneous song sync bugs
6+
- Updated Lyrics Customisation UI
7+
- Updated Share Cards UI
8+
39
## 5.7.0
410
- Added support for TTML (Syllable Synced) Lyrics
511
- Improved Synced Lyrics Animation

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ plugins {
2525
}
2626

2727
val appName = "Rush"
28-
val appVersionName = "5.7.0"
29-
val appVersionCode = 5700
28+
val appVersionName = "5.7.1"
29+
val appVersionCode = 5710
3030

3131
val publicGeniusApiToken = "\"qLSDtgIqHgzGNjOFUmdOxJKGJOg5RIAPzOKTfrs7rNxqYXwfdSh9HTHMJUs2X27Y\""
3232

‎app/src/main/assets/changelog.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
[
2+
{
3+
"version": "5.7.1",
4+
"changes": [
5+
"Fixed auto lyrics fetching issues",
6+
"Fixed miscellaneous song sync bugs",
7+
"Updated Lyrics Customisation UI",
8+
"Updated Share Cards UI"
9+
]
10+
},
211
{
312
"version": "5.7.0",
413
"changes": [

‎app/src/main/java/com/shub39/rush/presentation/ListItemExt.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ private const val endCornerRadius = 16
2929

3030
@Composable
3131
fun listItemColors(): ListItemColors {
32-
return ListItemDefaults.colors(containerColor = MaterialTheme.colorScheme.surfaceContainerHighest)
32+
return ListItemDefaults.colors(
33+
containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
34+
)
3335
}
3436

3537
fun leadingItemShape(): Shape =

‎app/src/main/java/com/shub39/rush/presentation/components/ListItemCard.kt‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (C) 2026 Shubham Gorai
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
*/
117
package com.shub39.rush.presentation.components
218

319
import androidx.compose.foundation.layout.Column
@@ -17,16 +33,9 @@ fun ListItemCard(
1733
modifier: Modifier = Modifier,
1834
shape: Shape = RoundedCornerShape(4.dp),
1935
colors: CardColors = CardDefaults.cardColors(),
20-
content: @Composable (ColumnScope.() -> Unit)
36+
content: @Composable (ColumnScope.() -> Unit),
2137
) {
22-
Card(
23-
modifier = modifier,
24-
shape = shape,
25-
colors = colors,
26-
) {
27-
Column(
28-
modifier = Modifier.padding(16.dp),
29-
content = content
30-
)
38+
Card(modifier = modifier, shape = shape, colors = colors) {
39+
Column(modifier = Modifier.padding(16.dp), content = content)
3140
}
32-
}
41+
}

‎app/src/main/java/com/shub39/rush/presentation/components/ListSelect.kt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ import androidx.compose.material3.Text
2727
import androidx.compose.material3.ToggleButton
2828
import androidx.compose.material3.ToggleButtonDefaults
2929
import androidx.compose.runtime.Composable
30-
import androidx.compose.ui.Alignment
3130
import androidx.compose.ui.Modifier
32-
import androidx.compose.ui.text.style.TextAlign
3331
import androidx.compose.ui.unit.dp
3432

3533
/**
@@ -55,14 +53,8 @@ fun <T> ListSelect(
5553
labelProvider: @Composable (T) -> Unit,
5654
modifier: Modifier = Modifier,
5755
) {
58-
Column(
59-
modifier = modifier.fillMaxWidth(),
60-
verticalArrangement = Arrangement.spacedBy(8.dp),
61-
) {
62-
Text(
63-
text = title,
64-
style = MaterialTheme.typography.titleMedium,
65-
)
56+
Column(modifier = modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) {
57+
Text(text = title, style = MaterialTheme.typography.titleMedium)
6658

6759
FlowRow {
6860
options.forEach { option ->

‎app/src/main/java/com/shub39/rush/presentation/lyrics/component/customisation/LyricsCustomisationSettings.kt‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.height
2626
import androidx.compose.foundation.layout.padding
2727
import androidx.compose.foundation.lazy.LazyListScope
2828
import androidx.compose.material3.ExperimentalMaterial3Api
29-
import androidx.compose.material3.HorizontalDivider
3029
import androidx.compose.material3.Icon
3130
import androidx.compose.material3.IconButton
3231
import androidx.compose.material3.IconButtonDefaults
@@ -72,16 +71,14 @@ fun LazyListScope.lyricsCustomisationSettings(
7271
item {
7372
Column(
7473
verticalArrangement = Arrangement.spacedBy(2.dp),
75-
modifier = Modifier.padding(horizontal = 16.dp)
74+
modifier = Modifier.padding(horizontal = 16.dp),
7675
) {
7776
Text(
7877
text = stringResource(R.string.looks),
79-
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded())
78+
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded()),
8079
)
8180
Spacer(modifier = Modifier.height(8.dp))
82-
ListItemCard(
83-
shape = leadingItemShape()
84-
) {
81+
ListItemCard(shape = leadingItemShape()) {
8582
ListSelect(
8683
title = stringResource(R.string.lyrics_background),
8784
options = allBackgrounds,
@@ -107,21 +104,19 @@ fun LazyListScope.lyricsCustomisationSettings(
107104
headlineContent = {
108105
Text(
109106
text = stringResource(R.string.blur_synced),
110-
modifier = Modifier.weight(1f)
107+
modifier = Modifier.weight(1f),
111108
)
112109
},
113110
trailingContent = {
114111
Switch(
115112
checked = state.blurSyncedLyrics,
116113
onCheckedChange = { onAction(LyricsPageAction.OnBlurSyncedChange(it)) },
117114
)
118-
}
115+
},
119116
)
120117
}
121118

122-
ListItemCard(
123-
shape = endItemShape()
124-
) {
119+
ListItemCard(shape = endItemShape()) {
125120
ListSelect(
126121
title = stringResource(R.string.card_color),
127122
options = CardColors.entries.toList(),
@@ -177,11 +172,11 @@ fun LazyListScope.lyricsCustomisationSettings(
177172
item {
178173
Column(
179174
verticalArrangement = Arrangement.spacedBy(2.dp),
180-
modifier = Modifier.padding(horizontal = 16.dp)
175+
modifier = Modifier.padding(horizontal = 16.dp),
181176
) {
182177
Text(
183178
text = stringResource(R.string.text),
184-
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded())
179+
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded()),
185180
)
186181
Spacer(modifier = Modifier.height(8.dp))
187182
ListItemCard(shape = leadingItemShape()) {
@@ -250,11 +245,11 @@ fun LazyListScope.lyricsCustomisationSettings(
250245
item {
251246
Column(
252247
verticalArrangement = Arrangement.spacedBy(2.dp),
253-
modifier = Modifier.padding(horizontal = 16.dp)
248+
modifier = Modifier.padding(horizontal = 16.dp),
254249
) {
255250
Text(
256251
text = stringResource(R.string.others),
257-
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded())
252+
style = MaterialTheme.typography.titleLarge.copy(fontFamily = flexFontRounded()),
258253
)
259254
Spacer(modifier = Modifier.height(8.dp))
260255

‎app/src/main/java/com/shub39/rush/presentation/lyrics/section/LyricsCustomisationPage.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,13 @@ private fun AudioPermissionDialog(
389389
@Composable
390390
private fun Preview() {
391391
var state by remember {
392-
mutableStateOf(LyricsPageState(cardColors = CardColors.CUSTOM, sync = true, lyricsBackground = LyricsBackground.ALBUM_ART))
392+
mutableStateOf(
393+
LyricsPageState(
394+
cardColors = CardColors.CUSTOM,
395+
sync = true,
396+
lyricsBackground = LyricsBackground.ALBUM_ART,
397+
)
398+
)
393399
}
394400

395401
val waveData =

‎app/src/main/java/com/shub39/rush/presentation/setting/section/LookAndFeelPage.kt‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import androidx.compose.material3.IconButtonDefaults
4646
import androidx.compose.material3.LinearWavyProgressIndicator
4747
import androidx.compose.material3.ListItem
4848
import androidx.compose.material3.MaterialShapes
49-
import androidx.compose.material3.MaterialTheme
5049
import androidx.compose.material3.MediumFlexibleTopAppBar
5150
import androidx.compose.material3.Scaffold
5251
import androidx.compose.material3.Switch
@@ -89,9 +88,9 @@ import com.shub39.rush.presentation.middleItemShape
8988
import com.shub39.rush.presentation.setting.SettingsPageAction
9089
import com.shub39.rush.presentation.setting.SettingsPageState
9190
import com.shub39.rush.presentation.toFontRes
91+
import com.shub39.rush.presentation.toFullName
9292
import com.shub39.rush.presentation.toMPaletteStyle
9393
import com.shub39.rush.presentation.toStringRes
94-
import java.util.Locale
9594

9695
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
9796
@Composable
@@ -181,11 +180,7 @@ fun LookAndFeelPage(
181180
onAction(SettingsPageAction.OnThemeSwitch(appTheme))
182181
},
183182
modifier = Modifier.weight(1f),
184-
colors =
185-
ToggleButtonDefaults.toggleButtonColors(
186-
containerColor =
187-
MaterialTheme.colorScheme.surfaceContainerLow
188-
),
183+
colors = ToggleButtonDefaults.tonalToggleButtonColors(),
189184
) {
190185
Text(
191186
text = stringResource(appTheme.toStringRes()),
@@ -265,22 +260,10 @@ fun LookAndFeelPage(
265260
onCheckedChange = {
266261
onAction(SettingsPageAction.OnFontChange(font))
267262
},
268-
colors =
269-
ToggleButtonDefaults.toggleButtonColors(
270-
containerColor =
271-
MaterialTheme.colorScheme.surfaceContainerLow
272-
),
263+
colors = ToggleButtonDefaults.tonalToggleButtonColors(),
273264
) {
274265
Text(
275-
text =
276-
font.name
277-
.lowercase()
278-
.replaceFirstChar {
279-
if (it.isLowerCase())
280-
it.titlecase(Locale.getDefault())
281-
else it.toString()
282-
}
283-
.replace("_", " "),
266+
text = font.toFullName(),
284267
fontFamily =
285268
font.toFontRes()?.let { FontFamily(Font(it)) }
286269
?: FontFamily.Default,
@@ -381,22 +364,47 @@ fun LookAndFeelPage(
381364
Box(
382365
modifier =
383366
Modifier.size(50.dp)
384-
.background(
385-
color = scheme.tertiary,
386-
shape =
387-
if (selected) MaterialShapes.VerySunny.toShape()
388-
else CircleShape,
367+
.clip(
368+
if (selected) MaterialShapes.VerySunny.toShape()
369+
else CircleShape
389370
)
390371
.clickable {
391372
onAction(SettingsPageAction.OnPaletteChange(style))
392373
},
393374
contentAlignment = Alignment.Center,
394375
) {
376+
Column(modifier = Modifier.matchParentSize()) {
377+
Row {
378+
Box(
379+
modifier =
380+
Modifier.size(25.dp)
381+
.background(color = scheme.primary)
382+
)
383+
Box(
384+
modifier =
385+
Modifier.size(25.dp)
386+
.background(color = scheme.tertiary)
387+
)
388+
}
389+
Row {
390+
Box(
391+
modifier =
392+
Modifier.size(25.dp)
393+
.background(color = scheme.secondary)
394+
)
395+
Box(
396+
modifier =
397+
Modifier.size(25.dp)
398+
.background(color = scheme.onSurface)
399+
)
400+
}
401+
}
402+
395403
if (selected) {
396404
Icon(
397405
painter = painterResource(R.drawable.check),
398406
contentDescription = null,
399-
tint = scheme.onTertiary,
407+
tint = scheme.onPrimary,
400408
)
401409
}
402410
}

0 commit comments

Comments
 (0)