Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
refactor: use consistent icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@SuhasDissa
SuhasDissa committed Dec 16, 2023
1 parent 8135bbe commit 03747fb
Show file tree
Hide file tree
Showing 15 changed files with 99 additions and 99 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/components/NavDrawerContent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.rounded.MusicNote
import androidx.compose.material.icons.rounded.Settings
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalDrawerSheet
Expand Down Expand Up @@ -83,7 +83,7 @@ fun NavDrawerContent(
NavigationDrawerItem(
icon = {
Icon(
imageVector = Icons.Default.Settings,
imageVector = Icons.Rounded.Settings,
contentDescription = null
)
},
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/components/SongCard.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.rounded.BarChart
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -202,7 +202,7 @@ private fun SongCardCompactPreview() {
artist = "Artist Name",
TrailingContent = {
IconButton(onClick = { /*TODO*/ }) {
Icons.Default.PlayArrow
Icons.Rounded.PlayArrow
}
},
onClickVideoCard = {}
Expand Down
30 changes: 15 additions & 15 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/components/SongSettingsSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.FavoriteBorder
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.QueueMusic
import androidx.compose.material.icons.filled.QueuePlayNext
import androidx.compose.material.icons.rounded.Delete
import androidx.compose.material.icons.rounded.Favorite
import androidx.compose.material.icons.rounded.FavoriteBorder
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.QueueMusic
import androidx.compose.material.icons.rounded.QueuePlayNext
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -114,33 +114,33 @@ fun SongSettingsSheet(
favouriteState = !favouriteState
}) {
if (favouriteState) {
Icon(Icons.Default.Favorite, contentDescription = null)
Icon(Icons.Rounded.Favorite, contentDescription = null)
} else {
Icon(Icons.Default.FavoriteBorder, contentDescription = null)
Icon(Icons.Rounded.FavoriteBorder, contentDescription = null)
}
}
}
}
}
Column(Modifier.padding(vertical = 16.dp)) {
SheetSettingItem(
icon = Icons.Default.PlayArrow,
icon = Icons.Rounded.PlayArrow,
description = R.string.play_song,
onClick = {
playerViewModel.playSong(song)
onDismissRequest()
}
)
SheetSettingItem(
icon = Icons.Default.QueuePlayNext,
icon = Icons.Rounded.QueuePlayNext,
description = R.string.play_next,
onClick = {
playerViewModel.playNext(song)
onDismissRequest()
}
)
SheetSettingItem(
icon = Icons.Default.QueueMusic,
icon = Icons.Rounded.QueueMusic,
description = R.string.enqueue_song,
onClick = {
playerViewModel.enqueueSong(song)
Expand All @@ -149,7 +149,7 @@ fun SongSettingsSheet(
)
if (!song.isLocal) {
SheetSettingItem(
icon = Icons.Default.Delete,
icon = Icons.Rounded.Delete,
description = R.string.delete_song,
onClick = {
songViewModel.removeSong(song)
Expand Down Expand Up @@ -216,7 +216,7 @@ fun SongSettingsSheetSearchPage(
}
Column(Modifier.padding(vertical = 16.dp)) {
SheetSettingItem(
icon = Icons.Default.PlayArrow,
icon = Icons.Rounded.PlayArrow,
description = R.string.play_song,
onClick = {
playerViewModel.playSong(song)
Expand All @@ -227,7 +227,7 @@ fun SongSettingsSheetSearchPage(
}
)
SheetSettingItem(
icon = Icons.Default.QueuePlayNext,
icon = Icons.Rounded.QueuePlayNext,
description = R.string.play_next,
onClick = {
playerViewModel.playNext(song)
Expand All @@ -238,7 +238,7 @@ fun SongSettingsSheetSearchPage(
}
)
SheetSettingItem(
icon = Icons.Default.QueueMusic,
icon = Icons.Rounded.QueueMusic,
description = R.string.enqueue_song,
onClick = {
playerViewModel.enqueueSong(song)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/screens/home/HomeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.rounded.Menu
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.Card
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.DrawerValue
Expand Down Expand Up @@ -97,7 +97,7 @@ fun HomeScreen(
}
}) {
Icon(
imageVector = Icons.Default.Menu,
imageVector = Icons.Rounded.Menu,
contentDescription = "Open Navigation Drawer"
)
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fun HomeScreen(
Spacer(Modifier.weight(1f))
Icon(
modifier = Modifier.padding(8.dp),
imageVector = Icons.Default.Search,
imageVector = Icons.Rounded.Search,
contentDescription = null
)
}
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/screens/music/LocalMusicScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Shuffle
import androidx.compose.material.icons.filled.Sort
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.Shuffle
import androidx.compose.material.icons.rounded.Sort
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -125,7 +125,7 @@ fun LocalMusicScreen(
playerViewModel.playSongs(localSongViewModel.songs)
}) {
Icon(
imageVector = Icons.Default.PlayArrow,
imageVector = Icons.Rounded.PlayArrow,
contentDescription = stringResource(R.string.play_all)
)
}
Expand All @@ -137,7 +137,7 @@ fun LocalMusicScreen(
playerViewModel.playSongs(localSongViewModel.songs, shuffle = true)
}) {
Icon(
imageVector = Icons.Default.Shuffle,
imageVector = Icons.Rounded.Shuffle,
contentDescription = stringResource(R.string.shuffle)
)
}
Expand All @@ -160,7 +160,7 @@ fun LocalMusicScreen(
) {
Text(text = stringResource(R.string.sort_order))
Spacer(modifier = Modifier.width(6.dp))
Icon(imageVector = Icons.Default.Sort, contentDescription = null)
Icon(imageVector = Icons.Rounded.Sort, contentDescription = null)
}
SongListView(
songs = localSongViewModel.songs,
Expand Down
40 changes: 20 additions & 20 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/screens/player/FullScreenPlayer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.FavoriteBorder
import androidx.compose.material.icons.filled.Pause
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.QueueMusic
import androidx.compose.material.icons.filled.Repeat
import androidx.compose.material.icons.filled.RepeatOn
import androidx.compose.material.icons.filled.RepeatOneOn
import androidx.compose.material.icons.filled.SkipNext
import androidx.compose.material.icons.filled.SkipPrevious
import androidx.compose.material.icons.rounded.ExpandMore
import androidx.compose.material.icons.rounded.Favorite
import androidx.compose.material.icons.rounded.FavoriteBorder
import androidx.compose.material.icons.rounded.MoreVert
import androidx.compose.material.icons.rounded.Pause
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.QueueMusic
import androidx.compose.material.icons.rounded.Repeat
import androidx.compose.material.icons.rounded.RepeatOn
import androidx.compose.material.icons.rounded.RepeatOneOn
import androidx.compose.material.icons.rounded.SkipNext
import androidx.compose.material.icons.rounded.SkipPrevious
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.CircularProgressIndicator
Expand Down Expand Up @@ -175,7 +175,7 @@ fun FullScreenPlayer(
view.playSoundEffect(SoundEffectConstants.CLICK)
showQueueSheet = true
}) {
Icon(Icons.Default.QueueMusic, stringResource(R.string.show_queue))
Icon(Icons.Rounded.QueueMusic, stringResource(R.string.show_queue))
}
}
}
Expand Down Expand Up @@ -228,9 +228,9 @@ fun PlayerController(
favouriteState = !favouriteState
}, enabled = !isLocal) {
if (favouriteState) {
Icon(Icons.Default.Favorite, contentDescription = null)
Icon(Icons.Rounded.Favorite, contentDescription = null)
} else {
Icon(Icons.Default.FavoriteBorder, contentDescription = null)
Icon(Icons.Rounded.FavoriteBorder, contentDescription = null)
}
}
ElevatedCard(
Expand All @@ -243,7 +243,7 @@ fun PlayerController(
view.playSoundEffect(SoundEffectConstants.CLICK)
playerViewModel.seekPrevious()
}) {
Icon(Icons.Default.SkipPrevious, contentDescription = null)
Icon(Icons.Rounded.SkipPrevious, contentDescription = null)
}
}
ElevatedCard(
Expand All @@ -268,15 +268,15 @@ fun PlayerController(

PlayerState.Play -> {
Icon(
Icons.Default.Pause,
Icons.Rounded.Pause,
modifier = Modifier.size(36.dp),
contentDescription = stringResource(R.string.pause)
)
}

PlayerState.Pause -> {
Icon(
Icons.Default.PlayArrow,
Icons.Rounded.PlayArrow,
modifier = Modifier.size(36.dp),
contentDescription = stringResource(R.string.play)
)
Expand All @@ -294,7 +294,7 @@ fun PlayerController(
view.playSoundEffect(SoundEffectConstants.CLICK)
playerViewModel.seekNext()
}) {
Icon(Icons.Default.SkipNext, contentDescription = null)
Icon(Icons.Rounded.SkipNext, contentDescription = null)
}
}
var repeatState by remember {
Expand All @@ -309,7 +309,7 @@ fun PlayerController(
controller.repeatMode = repeatState.mode
}) {
Icon(
Icons.Default.Repeat,
Icons.Rounded.Repeat,
contentDescription = stringResource(R.string.repeat_off)
)
}
Expand All @@ -322,7 +322,7 @@ fun PlayerController(
controller.repeatMode = repeatState.mode
}) {
Icon(
Icons.Default.RepeatOn,
Icons.Rounded.RepeatOn,
contentDescription = stringResource(R.string.repeat_all)
)
}
Expand All @@ -335,7 +335,7 @@ fun PlayerController(
controller.repeatMode = repeatState.mode
}) {
Icon(
Icons.Default.RepeatOneOn,
Icons.Rounded.RepeatOneOn,
contentDescription = stringResource(R.string.repeat_one)
)
}
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/screens/player/MiniPlayer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Pause
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.SkipNext
import androidx.compose.material.icons.rounded.Pause
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.SkipNext
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -108,14 +108,14 @@ fun MiniPlayer(

PlayerState.Play -> {
Icon(
Icons.Default.Pause,
Icons.Rounded.Pause,
contentDescription = stringResource(R.string.pause)
)
}

PlayerState.Pause -> {
Icon(
Icons.Default.PlayArrow,
Icons.Rounded.PlayArrow,
contentDescription = stringResource(R.string.play)
)
}
Expand All @@ -126,7 +126,7 @@ fun MiniPlayer(
playerViewModel.seekNext()
}) {
Icon(
Icons.Default.SkipNext,
Icons.Rounded.SkipNext,
contentDescription = stringResource(R.string.skip_next)
)
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/suhasdissa/vibeyou/ui/screens/player/Queue.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Clear
import androidx.compose.material.icons.rounded.Clear
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -81,7 +81,7 @@ fun Queue(
queueItems = queueItems.toMutableList().apply { remove(queue) }
}) {
Icon(
Icons.Default.Clear,
Icons.Rounded.Clear,
stringResource(R.string.remove_item_from_queue)
)
}
Expand Down
Loading

0 comments on commit 03747fb

Please sign in to comment.