Skip to content
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

Jump to bottom

BP Revamp (Cleanup and Part-2) #395

Merged
merged 6 commits into from
Jun 5, 2024
Merged

BP Revamp (Cleanup and Part-2) #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b6f9a3
Rectified play button issue
pranavkonidena Apr 23, 2024
8120e30
Added play buttons for album overview page
pranavkonidena May 7, 2024
512994c
Added play functionality in artist overview screen
pranavkonidena May 8, 2024
5a1eb18
Completed UI for overview pages, have to implement 3dot menu
pranavkonidena May 8, 2024
ea0c433
Added play next in artist overview
pranavkonidena May 17, 2024
59574bf
Dropdown added in recents screen
pranavkonidena May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/listenbrainz/android/model/Playable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package org.listenbrainz.android.model
data class Playable(
val type: PlayableType,
val id: Long,
val songs: List<Song> = emptyList(),
var songs: List<Song> = emptyList(),
var currentSongIndex : Int,
var seekTo: Long = 0L
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/listenbrainz/android/ui/components/BrainzPlayerActivityCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import coil.compose.AsyncImage
import org.listenbrainz.android.R

@Composable
fun BrainzPlayerActivityCards(icon: String, errorIcon : Int, title: String, artist : String,modifier : Modifier = Modifier) {
fun BrainzPlayerActivityCards(icon: String, errorIcon : Int, title: String, subtitle : String,modifier : Modifier = Modifier) {
Box(
modifier = modifier
.padding(4.dp)
Expand Down Expand Up @@ -74,7 +74,7 @@ fun BrainzPlayerActivityCards(icon: String, errorIcon : Int, title: String, arti
.padding(start = 15.dp)
) {
Text(
text = artist,
text = subtitle,
fontSize = 17.sp,
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Left,
Expand Down
37 changes: 37 additions & 0 deletions app/src/main/java/org/listenbrainz/android/ui/components/BrainzPlayerDropDownMenu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.listenbrainz.android.ui.components

import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable


@Composable
fun BrainzPlayerDropDownMenu(
expanded : Boolean ,
onDismiss : () -> Unit = {},
onAddToNewPlaylist : () -> Unit = {},
onAddToExistingPlaylist : () -> Unit = {},
onPlayNext : () -> Unit = {},
onAddToQueue : () -> Unit = {},
){
DropdownMenu(expanded = expanded, onDismissRequest = onDismiss) {
DropdownMenuItem(onClick = {
onAddToNewPlaylist()
onDismiss()
}, text = {Text(text = "Add to new playlist")})
DropdownMenuItem(onClick = {
onAddToExistingPlaylist()
onDismiss()
}, text = {Text(text = "Add to existing playlist")})
DropdownMenuItem(onClick = {
onPlayNext()
onDismiss()
}, text = {Text(text = "Play next")})
DropdownMenuItem(onClick = {
onAddToQueue()
onDismiss()
}, text = {Text(text = "Add to queue")})
}

}
15 changes: 2 additions & 13 deletions app/src/main/java/org/listenbrainz/android/ui/components/BrainzPlayerListenCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,25 @@
package org.listenbrainz.android.ui.components

import android.content.res.Configuration.UI_MODE_NIGHT_YES
import androidx.annotation.DrawableRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.FilterQuality
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
import coil.request.ImageRequest
Expand Down Expand Up @@ -82,9 +72,8 @@ fun BrainzPlayerListenCard(
Box(modifier = Modifier
.fillMaxWidth(0.275f)
.align(Alignment.CenterEnd)){
DropdownButton (modifier = Modifier.align(Alignment.Center)) {

}
DropdownButton (modifier = Modifier.align(Alignment.Center), onDropdownIconClick = onDropdownIconClick)
if(dropDownState) dropDown()
PlayButton (modifier = Modifier.align(Alignment.CenterEnd)) {
onPlayIconClick()
}
Expand Down