Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history 
1. Fix currently playing song UI
2. Fixed dropdown and and reused code for same.
3. Removed unnecessary BrainzPlayerListenCard
  • Loading branch information
@07jasjeet
07jasjeet committed Jan 26, 2025
1 parent 8fb6336 commit 7e7cc61
Show file tree
Hide file tree
Showing 24 changed files with 242 additions and 395 deletions.
143 changes: 0 additions & 143 deletions app/src/main/java/org/listenbrainz/android/ui/components/BrainzPlayerListenCard.kt
View file

This file was deleted.

79 changes: 62 additions & 17 deletions app/src/main/java/org/listenbrainz/android/ui/components/ListenCardSmall.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,17 @@ fun ListenCardSmall(
coverArtUrl: String?,
listenCount: Int? = null,
@DrawableRes errorAlbumArt: Int = R.drawable.ic_coverartarchive_logo_no_text,
enableDropdownIcon: Boolean = false,
onDropdownIconClick: () -> Unit = {},
dropDown: @Composable () -> Unit = {},
dropDown: @Composable (() -> Unit)? = null,
enableTrailingContent: Boolean = false,
trailingContent: @Composable (modifier: Modifier) -> Unit = {},
blurbContent: @Composable (ColumnScope.(modifier: Modifier) -> Unit)? = null,
color: Color = ListenBrainzTheme.colorScheme.level1,
isPlaying: Boolean = false,
color: Color = if (isPlaying) {
ListenBrainzTheme.colorScheme.level2
} else {
ListenBrainzTheme.colorScheme.level1
},
titleColor: Color = ListenBrainzTheme.colorScheme.listenText,
subtitleColor: Color = titleColor.copy(alpha = 0.7f),
goToArtistPage: (String) -> Unit,
Expand All @@ -94,7 +98,8 @@ fun ListenCardSmall(
contentAlignment = Alignment.CenterStart
) {

val (mainContentFraction, trailingContentFraction, dropDownButtonFraction) = remember(enableDropdownIcon, enableTrailingContent) {
val (mainContentFraction, trailingContentFraction, dropDownButtonFraction) = remember(dropDown != null, enableTrailingContent) {
val enableDropdownIcon = dropDown != null
when {
enableDropdownIcon && enableTrailingContent -> Triple(0.60f, 0.80f, 0.20f) // 0.20f (0.08f in whole) for dropdown and 0.80f (0.32f in whole) for trailing content
enableDropdownIcon && !enableTrailingContent -> Triple(0.92f, 0f, 1f) // 0.10f for dropdown
Expand Down Expand Up @@ -153,7 +158,7 @@ fun ListenCardSmall(
}

// Dropdown Icon
if (enableDropdownIcon) {
if (dropDown != null) {
DropdownButton(
modifier = Modifier
.fillMaxWidth(dropDownButtonFraction)
Expand All @@ -177,24 +182,68 @@ fun ListenCardSmall(
}
}

@Suppress("NOTHING_TO_INLINE")
@Composable
inline fun ListenCardSmallDefault(
fun ListenCardSmall(
modifier: Modifier = Modifier,
trackName: String,
artist: String,
coverArtUrl: String?,
listenCount: Int? = null,
@DrawableRes errorAlbumArt: Int = R.drawable.ic_coverartarchive_logo_no_text,
onDropdownIconClick: () -> Unit = {},
dropDown: @Composable () -> Unit = {},
enableTrailingContent: Boolean = false,
trailingContent: @Composable (modifier: Modifier) -> Unit = {},
blurbContent: @Composable (ColumnScope.(modifier: Modifier) -> Unit)? = null,
isPlaying: Boolean = false,
color: Color = if (isPlaying) {
ListenBrainzTheme.colorScheme.level2
} else {
ListenBrainzTheme.colorScheme.level1
},
titleColor: Color = ListenBrainzTheme.colorScheme.listenText,
subtitleColor: Color = titleColor.copy(alpha = 0.7f),
goToArtistPage: (String) -> Unit,
onClick: () -> Unit,
) {
ListenCardSmall(
modifier = modifier,
trackName = trackName,
artists = listOf(FeedListenArtist(artist, null, "")),
coverArtUrl = coverArtUrl,
listenCount = listenCount,
errorAlbumArt = errorAlbumArt,
onDropdownIconClick = onDropdownIconClick,
dropDown = dropDown,
enableTrailingContent = enableTrailingContent,
trailingContent = trailingContent,
blurbContent = blurbContent,
isPlaying = isPlaying,
color = color,
titleColor = titleColor,
subtitleColor = subtitleColor,
goToArtistPage = goToArtistPage,
onClick = onClick
)
}

@Composable
fun ListenCardSmallDefault(
modifier: Modifier = Modifier,
metadata: Metadata,
coverArtUrl: String?,
listenCount: Int? = null,
@DrawableRes errorAlbumArt: Int = R.drawable.ic_coverartarchive_logo_no_text,
enableTrailingContent: Boolean = false,
noinline trailingContent: @Composable (modifier: Modifier) -> Unit = {},
noinline blurbContent: @Composable (ColumnScope.(modifier: Modifier) -> Unit)? = null,
trailingContent: @Composable (modifier: Modifier) -> Unit = {},
blurbContent: @Composable (ColumnScope.(modifier: Modifier) -> Unit)? = null,
color: Color = ListenBrainzTheme.colorScheme.level1,
titleColor: Color = ListenBrainzTheme.colorScheme.listenText,
subtitleColor: Color = titleColor.copy(alpha = 0.7f),
noinline onDropdownError: suspend CoroutineScope.(error: ResponseError) -> Unit,
noinline onDropdownSuccess: suspend CoroutineScope.(message: String) -> Unit,
noinline goToArtistPage: (String) -> Unit,
noinline onClick: () -> Unit,
onDropdownError: suspend CoroutineScope.(error: ResponseError) -> Unit,
onDropdownSuccess: suspend CoroutineScope.(message: String) -> Unit,
goToArtistPage: (String) -> Unit,
onClick: () -> Unit,
) {
metadata.trackMetadata?.let {
var isDropdownExpanded by remember { mutableStateOf(false) }
Expand All @@ -208,7 +257,6 @@ inline fun ListenCardSmallDefault(
coverArtUrl = coverArtUrl,
listenCount = listenCount,
errorAlbumArt = errorAlbumArt,
enableDropdownIcon = true,
onDropdownIconClick = {
isDropdownExpanded = !isDropdownExpanded
},
Expand Down Expand Up @@ -331,7 +379,6 @@ private fun ListenCardSmallPreview() {
trackName = "Title",
artists = listOf(FeedListenArtist("Artist", "", "")),
coverArtUrl = "",
enableDropdownIcon = true,
enableTrailingContent = true,
trailingContent = { modifier ->
Column(modifier = modifier) {
Expand All @@ -357,7 +404,6 @@ private fun ListenCardSmallNoBlurbContentPreview() {
trackName = "Title",
artists = listOf(FeedListenArtist("Artist", "", "")),
coverArtUrl = "",
enableDropdownIcon = true,
enableTrailingContent = true,
trailingContent = { modifier ->
Column(modifier = modifier) {
Expand All @@ -378,7 +424,6 @@ private fun ListenCardSmallSimplePreview() {
trackName = "Title",
artists = listOf(FeedListenArtist("Artist", "", "")),
coverArtUrl = "",
enableDropdownIcon = true,
enableTrailingContent = false,
goToArtistPage = {},
) {}
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/AlbumScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ fun OnAlbumClickScreen(albumID: Long) {
artists = listOf(FeedListenArtist(it.artist, null, "")),
coverArtUrl = it.albumArt,
errorAlbumArt = R.drawable.ic_erroralbumart,
enableDropdownIcon = true,
goToArtistPage = {},
onDropdownIconClick = {
albumCardMoreOptionsDropMenuExpanded = albumSongs.indexOf(it)
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/ArtistScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,6 @@ fun OnArtistClickScreen(artistID: String, navigateToAlbum: (id: Long) -> Unit) {
artists = listOf(FeedListenArtist(it.artist, null, "")),
coverArtUrl = it.albumArt,
errorAlbumArt = R.drawable.ic_erroralbumart,
enableDropdownIcon = true,
onDropdownIconClick = {
artistCardMoreOptionsDropMenuExpanded = artistSongs.indexOf(it)
},
Expand Down
2 changes: 0 additions & 2 deletions .../main/java/org/listenbrainz/android/ui/screens/brainzplayer/BrainzPlayerBackDropScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import androidx.compose.material.Checkbox
import androidx.compose.material.CheckboxDefaults
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.Icon
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.RepeatOn
Expand All @@ -60,7 +59,6 @@ import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
Expand Down
Loading

0 comments on commit 7e7cc61

Please sign in to comment.