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

Feat: BP Revamp in LB-Android Part 1 (Completed Overview Screens) #382

Merged
merged 18 commits into from
Apr 15, 2024
Merged

Feat: BP Revamp in LB-Android Part 1 (Completed Overview Screens) #382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d9bebaa
Initial commit in BP revamp , decoupled search for BP
pranavkonidena Mar 2, 2024
82ddd9c
Removed unnecessary comments
pranavkonidena Mar 2, 2024
05f87e4
Added overview screen
pranavkonidena Mar 3, 2024
d9142f8
Added lastListenedTo field in SongDAO, recently played working as exp…
pranavkonidena Mar 6, 2024
4eca379
Add Playedtoday, PlayedThisWeek in Dao and recent_overview screen
pranavkonidena Mar 8, 2024
2dec4c7
Fix display of artist's tracks
pranavkonidena Mar 21, 2024
0f64def
Add songs overview and albums overview screen
pranavkonidena Mar 21, 2024
a745196
Add gradient to overview screens
pranavkonidena Mar 22, 2024
2e1cca4
Completed Room Migration
pranavkonidena Mar 25, 2024
0691fe0
Fixed DAO tests
pranavkonidena Mar 25, 2024
c9ce746
Add conditional to migration
pranavkonidena Mar 26, 2024
7199ea6
Light Theme added
pranavkonidena Mar 27, 2024
a73178e
Add conditional to migration in tests
pranavkonidena Mar 27, 2024
c45459b
Add listen card component for BP, integrate play button in songs screen
pranavkonidena Apr 1, 2024
29afe2e
Fix out of bounds exception
pranavkonidena Apr 2, 2024
fb069eb
Fix wrong usage of songs instead of albums
pranavkonidena Apr 2, 2024
e1c725f
Use take for getting first 5 items in list
pranavkonidena Apr 3, 2024
4183f84
Change Local player to player, make song primary text
pranavkonidena Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/listenbrainz/android/model/AppNavigationItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import androidx.annotation.DrawableRes
import org.listenbrainz.android.R

sealed class AppNavigationItem(val route: String, @DrawableRes val iconUnselected: Int, @DrawableRes val iconSelected: Int, val title: String) {
object BrainzPlayer : AppNavigationItem("brainzplayer", R.drawable.player_unselected, R.drawable.player_selected, "Local Player")
object BrainzPlayer : AppNavigationItem("brainzplayer", R.drawable.player_unselected, R.drawable.player_selected, "Player")
object Explore : AppNavigationItem("explore", R.drawable.explore_unselected, R.drawable.explore_selected, "Explore")
object Profile : AppNavigationItem("profile", R.drawable.profile_unselected, R.drawable.profile_selected, "Profile")
object Feed : AppNavigationItem("feed", R.drawable.feed_unselected, R.drawable.feed_selected, "Feed")
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/OverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ private fun RecentlyPlayedOverview(
if (song.title != "") {
BrainzPlayerActivityCards(icon = song.albumArt,
errorIcon = R.drawable.ic_artist,
title = song.title,
artist = song.artist,
title = song.artist,
artist = song.title,
modifier = Modifier
.clickable {
brainzPlayerViewModel.changePlayable(
Expand Down Expand Up @@ -201,8 +201,8 @@ private fun AlbumsOverview(
if(album.title != ""){
BrainzPlayerActivityCards(icon = album.albumArt,
errorIcon = R.drawable.ic_artist,
title = album.title,
artist = album.artist,
title = album.artist,
artist = album.title,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks wrong to me now. Passing the album title as the artist field name. We should rename the parameters to something more generic

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pranavkonidena I am merging this PR rn since we are doing a cleanup. Please fix this in the next PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright @akshaaatt ! Thanks will make sure these are fixed in the next PR

)
}
else{
Expand Down
15 changes: 0 additions & 15 deletions app/src/main/java/org/listenbrainz/android/ui/screens/brainzplayer/SongsOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
package org.listenbrainz.android.ui.screens.brainzplayer

import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.content.res.ResourcesCompat
import androidx.hilt.navigation.compose.hiltViewModel
import org.listenbrainz.android.R
import org.listenbrainz.android.model.Album
import org.listenbrainz.android.model.Artist
import org.listenbrainz.android.model.Song
import org.listenbrainz.android.ui.components.BrainzPlayerListenCard
import org.listenbrainz.android.ui.components.ListenCardSmall
import org.listenbrainz.android.ui.theme.ListenBrainzTheme
import org.listenbrainz.android.viewmodel.ArtistViewModel

@Composable
fun SongsOverviewScreen(
Expand Down Expand Up @@ -69,7 +55,6 @@ fun SongsOverviewScreen(
var coverArt: String? = null
coverArt = songsStarting[startingLetter]!![j - 1].albumArt
BrainzPlayerListenCard(title = songsStarting[startingLetter]!![j - 1].title, subTitle = songsStarting[startingLetter]!![j - 1].artist, coverArtUrl = coverArt){
Log.v("pranav", song.title)
onPlayIconClick(song,songsStarting[startingLetter]!!)
}
}
Expand Down
Loading