Skip to content

Commit b3fc492

Browse files
maxrave-devmaxrave-dev
committed
feat: update icon usage to rounded variants and adjust padding for better layout consistency
1 parent 080c5eb commit b3fc492

4 files changed

Lines changed: 96 additions & 114 deletions

File tree

‎app/src/main/java/com/maxrave/simpmusic/ui/component/LyricsView.kt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ import androidx.compose.foundation.shape.CircleShape
2929
import androidx.compose.foundation.shape.RoundedCornerShape
3030
import androidx.compose.material.icons.Icons
3131
import androidx.compose.material.icons.automirrored.outlined.QueueMusic
32-
import androidx.compose.material.icons.filled.PauseCircle
33-
import androidx.compose.material.icons.filled.PlayCircle
34-
import androidx.compose.material.icons.filled.Repeat
35-
import androidx.compose.material.icons.filled.RepeatOne
36-
import androidx.compose.material.icons.filled.Shuffle
37-
import androidx.compose.material.icons.filled.SkipNext
38-
import androidx.compose.material.icons.filled.SkipPrevious
3932
import androidx.compose.material.icons.outlined.Info
33+
import androidx.compose.material.icons.rounded.PauseCircle
34+
import androidx.compose.material.icons.rounded.PlayCircle
35+
import androidx.compose.material.icons.rounded.Repeat
36+
import androidx.compose.material.icons.rounded.RepeatOne
37+
import androidx.compose.material.icons.rounded.Shuffle
38+
import androidx.compose.material.icons.rounded.SkipNext
39+
import androidx.compose.material.icons.rounded.SkipPrevious
4040
import androidx.compose.material3.Card
4141
import androidx.compose.material3.CardDefaults
4242
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -477,7 +477,7 @@ fun FullscreenLyricsSheet(
477477
.weight(1f)
478478
.fillMaxHeight()
479479
.fillMaxWidth()
480-
.padding(horizontal = 50.dp),
480+
.padding(horizontal = 24.dp),
481481
) {
482482
if (it) {
483483
screenDataState.lyricsData?.let { lyrics ->
@@ -504,7 +504,7 @@ fun FullscreenLyricsSheet(
504504
Modifier
505505
.padding(
506506
top = 15.dp,
507-
).padding(horizontal = 40.dp),
507+
).padding(horizontal = 20.dp),
508508
) {
509509
Box(
510510
modifier =
@@ -617,7 +617,7 @@ fun FullscreenLyricsSheet(
617617
Row(
618618
Modifier
619619
.fillMaxWidth()
620-
.padding(horizontal = 40.dp),
620+
.padding(horizontal = 20.dp),
621621
) {
622622
Text(
623623
text = formatDuration(timelineState.current, context),
@@ -647,7 +647,7 @@ fun FullscreenLyricsSheet(
647647
Modifier
648648
.fillMaxWidth()
649649
.height(96.dp)
650-
.padding(horizontal = 40.dp),
650+
.padding(horizontal = 20.dp),
651651
) {
652652
FilledTonalIconButton(
653653
colors =
@@ -668,14 +668,14 @@ fun FullscreenLyricsSheet(
668668
Crossfade(targetState = controllerState.isShuffle, label = "Shuffle Button") { isShuffle ->
669669
if (isShuffle) {
670670
Icon(
671-
imageVector = Icons.Filled.Shuffle,
671+
imageVector = Icons.Rounded.Shuffle,
672672
tint = seed, // Accent color when shuffle is ON
673673
contentDescription = "",
674674
modifier = Modifier.size(32.dp),
675675
)
676676
} else {
677677
Icon(
678-
imageVector = Icons.Filled.Shuffle,
678+
imageVector = Icons.Rounded.Shuffle,
679679
tint = Color.White, // White when shuffle is OFF
680680
contentDescription = "",
681681
modifier = Modifier.size(32.dp),
@@ -702,7 +702,7 @@ fun FullscreenLyricsSheet(
702702
},
703703
) {
704704
Icon(
705-
imageVector = Icons.Filled.SkipPrevious,
705+
imageVector = Icons.Rounded.SkipPrevious,
706706
tint = if (controllerState.isPreviousAvailable) Color.White else Color.Gray,
707707
contentDescription = "",
708708
modifier = Modifier.size(52.dp),
@@ -727,14 +727,14 @@ fun FullscreenLyricsSheet(
727727
Crossfade(targetState = controllerState.isPlaying) { isPlaying ->
728728
if (!isPlaying) {
729729
Icon(
730-
imageVector = Icons.Filled.PlayCircle,
730+
imageVector = Icons.Rounded.PlayCircle,
731731
tint = Color.White,
732732
contentDescription = "",
733733
modifier = Modifier.size(72.dp),
734734
)
735735
} else {
736736
Icon(
737-
imageVector = Icons.Filled.PauseCircle,
737+
imageVector = Icons.Rounded.PauseCircle,
738738
tint = Color.White,
739739
contentDescription = "",
740740
modifier = Modifier.size(72.dp),
@@ -761,7 +761,7 @@ fun FullscreenLyricsSheet(
761761
},
762762
) {
763763
Icon(
764-
imageVector = Icons.Filled.SkipNext,
764+
imageVector = Icons.Rounded.SkipNext,
765765
tint = if (controllerState.isNextAvailable) Color.White else Color.Gray,
766766
contentDescription = "",
767767
modifier = Modifier.size(52.dp),
@@ -787,7 +787,7 @@ fun FullscreenLyricsSheet(
787787
when (rs) {
788788
is RepeatState.None -> {
789789
Icon(
790-
imageVector = Icons.Filled.Repeat,
790+
imageVector = Icons.Rounded.Repeat,
791791
tint = Color.White,
792792
contentDescription = "",
793793
modifier = Modifier.size(32.dp),
@@ -796,7 +796,7 @@ fun FullscreenLyricsSheet(
796796

797797
RepeatState.All -> {
798798
Icon(
799-
imageVector = Icons.Filled.Repeat,
799+
imageVector = Icons.Rounded.Repeat,
800800
tint = seed,
801801
contentDescription = "",
802802
modifier = Modifier.size(32.dp),
@@ -805,7 +805,7 @@ fun FullscreenLyricsSheet(
805805

806806
RepeatState.One -> {
807807
Icon(
808-
imageVector = Icons.Filled.RepeatOne,
808+
imageVector = Icons.Rounded.RepeatOne,
809809
tint = seed,
810810
contentDescription = "",
811811
modifier = Modifier.size(32.dp),

‎app/src/main/java/com/maxrave/simpmusic/ui/screen/library/LibraryScreen.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ import com.maxrave.common.R
5353
import com.maxrave.domain.utils.LocalResource
5454
import com.maxrave.logger.Logger
5555
import com.maxrave.simpmusic.extension.copy
56-
import com.maxrave.simpmusic.extension.isScrollingUp
5756
import com.maxrave.simpmusic.ui.component.Chip
5857
import com.maxrave.simpmusic.ui.component.EndOfPage
5958
import com.maxrave.simpmusic.ui.component.GridLibraryPlaylist
@@ -156,7 +155,7 @@ fun LibraryScreen(
156155
innerPadding.copy(
157156
top = topAppBarHeight,
158157
),
159-
state = state
158+
state = state,
160159
) {
161160
item {
162161
LibraryTilingBox(navController)

0 commit comments

Comments
 (0)