Pin feed card fix and removed extra theme color

metabrainz · Sep 24, 2024 · 6b5b0e4 · 6b5b0e4
1 parent 154b59c
commit 6b5b0e4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/album/AlbumScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/album/AlbumScreen.kt
@@ -208,7 +208,7 @@ private fun TrackListCard(
         .fillMaxWidth()
         .padding(23.dp)){
         Column {
-            Text("Tracklist", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
+            Text("Tracklist", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
             Spacer(modifier = Modifier.height(20.dp))
             trackList.map {
                 ListenCardSmall(trackName = it?.name ?: "", artists = it?.artists ?: listOf(), coverArtUrl = uiState.coverArt, goToArtistPage = {}){} 
@@ -241,7 +241,7 @@ private fun TopListenersCard(
         .fillMaxWidth()
         .padding(23.dp)){
         Column {
-            Text("Top listeners", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
+            Text("Top listeners", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
             Spacer(modifier = Modifier.height(20.dp))
             topListeners.map {
                 ArtistCard(artistName = it?.userName ?: "", listenCountLabel = formatNumber(it?.listenCount ?: 0)) {

diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/artist/ArtistScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/artist/ArtistScreen.kt
@@ -216,7 +216,7 @@ fun BioCard(
         .padding(23.dp)){
         Column {
             Row (horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
-                Text(header ?: "", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
+                Text(header ?: "", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 25.sp))
                 if(displayRadioButton){
                     LbRadioButton {
 
@@ -319,9 +319,9 @@ fun BioCard(
                                 .background(ListenBrainzTheme.colorScheme.followerCardColor)
                                 .padding(10.dp)) {
                                 Row {
-                                    Text(it.tag, color= ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
+                                    Text(it.tag, color= ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
                                     Spacer(modifier = Modifier.width(8.dp))
-                                    Text((it.count ?: 0).toString(), color= ListenBrainzTheme.colorScheme.textColor ,style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
+                                    Text((it.count ?: 0).toString(), color= ListenBrainzTheme.colorScheme.text ,style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
                                 }
                             }
                             Spacer(modifier = Modifier.width(10.dp))
@@ -337,9 +337,9 @@ fun BioCard(
                             .background(ListenBrainzTheme.colorScheme.followerCardColor)
                             .padding(10.dp)) {
                             Row {
-                                Text(it.tag, color= ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
+                                Text(it.tag, color= ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
                                 Spacer(modifier = Modifier.width(8.dp))
-                                Text((it.count ?: 0).toString(), color= ListenBrainzTheme.colorScheme.textColor ,style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
+                                Text((it.count ?: 0).toString(), color= ListenBrainzTheme.colorScheme.text ,style = MaterialTheme.typography.bodyMedium.copy(fontSize = 18.sp))
                             }
                         }
                         Spacer(modifier = Modifier.width(10.dp))
@@ -407,7 +407,7 @@ fun Links(
         .fillMaxWidth()
         .padding(23.dp)){
         Column {
-            Text("Links", color= ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 25.sp))
+            Text("Links", color= ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 25.sp))
             Row (modifier = Modifier
                 .horizontalScroll(rememberScrollState())
                 .padding(top = 10.dp)) {
@@ -505,7 +505,7 @@ private fun PopularTracks(
         .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
         .padding(start = 23.dp, end = 23.dp, top = 23.dp)){
         Column {
-            Text("Popular Tracks", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            Text("Popular Tracks", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
             Spacer(modifier = Modifier.height(20.dp))
             popularTracks.map {
                 ListenCardSmall(trackName = it?.recordingName ?: "", artists = it?.artists ?: listOf(
@@ -543,7 +543,7 @@ private fun AlbumsCard(
         .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
         .padding(23.dp)){
         Column {
-            Text(header, color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            Text(header, color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
             Row (modifier = Modifier
                 .horizontalScroll(rememberScrollState())
                 .padding(top = 20.dp)) {
@@ -603,7 +603,7 @@ private fun SimilarArtists(
         .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
         .padding(23.dp)){
         Column {
-            Text("Similar Artists", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            Text("Similar Artists", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
             Spacer(modifier = Modifier.height(20.dp))
             similarArtists.map {
                 ArtistCard(artistName = it?.name ?: "") {
@@ -641,7 +641,7 @@ private fun TopListenersCard(
         .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
         .padding(23.dp)) {
         Column {
-            Text("Top Listeners", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            Text("Top Listeners", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
             Spacer(modifier = Modifier.height(20.dp))
             topListeners.map { 
                 ArtistCard(artistName = it?.userName ?: "", listenCountLabel = formatNumber(it?.listenCount ?: 0)) {
@@ -683,7 +683,7 @@ fun ReviewsCard(
         .background(brush = ListenBrainzTheme.colorScheme.gradientBrush)
         .padding(23.dp)) {
         Column {
-            Text("Reviews", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            Text("Reviews", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
             if(reviews.isEmpty()){
                 Spacer(modifier = Modifier.height(10.dp))
                 Text("Be the first one to review this artist on CritiqueBrainz", color = app_bg_mid, style = MaterialTheme.typography.bodyMedium)

diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/profile/BaseProfileScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/profile/BaseProfileScreen.kt
@@ -163,7 +163,7 @@ fun BaseProfileScreen(
                                             else -> ""
                                         },
                                         style = ListenBrainzTheme.textStyles.chips,
-                                        color = ListenBrainzTheme.colorScheme.textColor
+                                        color = ListenBrainzTheme.colorScheme.text
                                     )
                                 },
                                 onClick = { currentTab.value = when (position) {

diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/profile/listens/ListensScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/profile/listens/ListensScreen.kt
@@ -259,7 +259,7 @@ fun ListensScreen(
                 }
                 item{
                     Spacer(modifier = Modifier.height(30.dp))
-                    Text("Recent Listens", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(start = 16.dp))
+                    Text("Recent Listens", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(start = 16.dp))
                     Spacer(modifier = Modifier.height(10.dp))
                 }
                 itemsIndexed(items = (when(recentListensCollapsibleState.value){
@@ -345,7 +345,7 @@ fun ListensScreen(
                             )){
                             Column {
                                 Spacer(modifier = Modifier.height(30.dp))
-                                Text("Your Compatibility", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(start = 16.dp))
+                                Text("Your Compatibility", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(start = 16.dp))
                                 Spacer(modifier = Modifier.height(10.dp))
                                 CompatibilityCard(compatibility = uiState.listensTabUiState.compatibility ?: 0f, uiState.listensTabUiState.similarArtists, goToArtistPage = goToArtistPage)
                             }
@@ -510,7 +510,9 @@ private fun BuildSimilarArtists(similarArtists: List<Artist>, onArtistClick: (St
                     withStyle(style = SpanStyle(color = lb_purple_night)) {
                         append(artist.artistName)
                     }
-                    pop()
+                    if (artist.artistMbid != null) {
+                        pop()
+                    }
                     if (index < similarArtists.size - 1) {
                         append(", ")
                     }
@@ -626,11 +628,11 @@ private fun SongsListened(username: String? , listenCount: Int?, isSelf: Boolean
                 true -> "You have listened to"
                 false -> "$username has listened to"
             }
-            , color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
+            , color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp))
         Spacer(modifier = Modifier.height(15.dp))
         HorizontalDivider(color = ListenBrainzTheme.colorScheme.dividerColor, modifier = Modifier.padding(start = 60.dp, end = 60.dp))
         Spacer(modifier = Modifier.height(15.dp))
-        Text(listenCount.toString(), color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp),  textAlign = TextAlign.Center)
+        Text(listenCount.toString(), color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp),  textAlign = TextAlign.Center)
         Text("songs so far", color = app_bg_mid, style = MaterialTheme.typography.bodyLarge, textAlign = TextAlign.Center)
         Spacer(modifier = Modifier.height(30.dp))
     }
@@ -648,14 +650,14 @@ private fun FollowersInformation(followersCount: Int?, followingCount: Int?){
             .fillMaxWidth()
             .padding(top = 30.dp, bottom = 30.dp)) {
             Column (horizontalAlignment = Alignment.CenterHorizontally) {
-                Text((followersCount ?:0).toString(), style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.textColor)
+                Text((followersCount ?:0).toString(), style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.text)
                 Spacer(modifier = Modifier.height(10.dp))
-                Text("Followers", style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.textColor)
+                Text("Followers", style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.text)
             }
             Column (horizontalAlignment = Alignment.CenterHorizontally) {
-                Text((followingCount ?: 0).toString(), style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.textColor)
+                Text((followingCount ?: 0).toString(), style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.text)
                 Spacer(modifier = Modifier.height(10.dp))
-                Text("Following", style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.textColor)
+                Text("Following", style = MaterialTheme.typography.bodyLarge, color = ListenBrainzTheme.colorScheme.text)
             }
         }
         Spacer(modifier = Modifier.height(10.dp))
@@ -689,7 +691,7 @@ private fun FollowersCard(followersCount: Int?, followingCount: Int?, followers:
     Column(modifier = Modifier.padding(start = 16.dp , top = 30.dp)) {
         Text(
             "Followers",
-            color = ListenBrainzTheme.colorScheme.textColor,
+            color = ListenBrainzTheme.colorScheme.text,
             style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp)
         )
         Spacer(modifier = Modifier.height(10.dp))
@@ -775,7 +777,7 @@ private fun FollowersCard(followersCount: Int?, followingCount: Int?, followers:
 @Composable
 private fun SimilarUsersCard(similarUsers: List<SimilarUser>, goToUserPage: (String?) -> Unit){
     Spacer(modifier = Modifier.height(20.dp))
-    Text("Similar Users", color = ListenBrainzTheme.colorScheme.textColor, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(horizontal = 16.dp))
+    Text("Similar Users", color = ListenBrainzTheme.colorScheme.text, style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp), modifier = Modifier.padding(horizontal = 16.dp))
     Spacer(modifier = Modifier.height(20.dp))
     similarUsers.mapIndexed{
         index , item ->

diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/profile/stats/StatsScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/profile/stats/StatsScreen.kt
@@ -356,7 +356,7 @@ fun StatsScreen(
 
                     }
                     else{
-                        Text("There are no statistics available for this user for this period", color = ListenBrainzTheme.colorScheme.textColor, modifier = Modifier.padding(start = 10.dp))
+                        Text("There are no statistics available for this user for this period", color = ListenBrainzTheme.colorScheme.text, modifier = Modifier.padding(start = 10.dp))
                     }
 
                 }

diff --git a/app/src/main/java/org/listenbrainz/android/ui/screens/profile/taste/TasteScreen.kt b/app/src/main/java/org/listenbrainz/android/ui/screens/profile/taste/TasteScreen.kt
@@ -259,7 +259,7 @@ fun TasteScreen(
                 Column {
                     Text(
                         text = "Pins",
-                        color = ListenBrainzTheme.colorScheme.textColor,
+                        color = ListenBrainzTheme.colorScheme.text,
                         style = MaterialTheme.typography.bodyLarge.copy(fontSize = 22.sp)
                     )
                     Spacer(modifier = Modifier.height(20.dp))
@@ -268,12 +268,13 @@ fun TasteScreen(
                         ListenCardSmall(
                             enableBlurbContent = true,
                             blurbContent = {
-                                Text(
-                                    ('"' + (recording.blurbContent
-                                        ?: "No content specified") + '"'),
-                                    color = ListenBrainzTheme.colorScheme.textColor,
-                                    modifier = Modifier.padding(8.dp)
-                                )
+                                if (!recording.blurbContent.isNullOrEmpty()) {
+                                    Text(
+                                        modifier = it,
+                                        text = recording.blurbContent,
+                                        color = ListenBrainzTheme.colorScheme.text,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .padding(

diff --git a/app/src/main/java/org/listenbrainz/android/ui/theme/Theme.kt b/app/src/main/java/org/listenbrainz/android/ui/theme/Theme.kt
@@ -64,7 +64,6 @@ data class ColorScheme(
     val placeHolderColor: Color,
     /** Used for User Pages **/
     val dividerColor: Color,
-    val textColor: Color,
     val songsListenedToBG: Color,
     val userPageGradient: Brush,
     val followerChipSelected: Color,
@@ -122,7 +121,6 @@ private val colorSchemeDark = ColorScheme(
     gradientBrush = brainzPlayerDarkGradientsBrush,
     placeHolderColor = Color(0xFF1E1E1E),
     dividerColor = app_bg_secondary_dark,
-    textColor = new_app_bg_light,
     songsListenedToBG = app_bg_dark,
     userPageGradient = Brush.verticalGradient(
         listOf(
@@ -161,7 +159,6 @@ private val colorSchemeLight = ColorScheme(
     gradientBrush = brainzPlayerLightGradientsBrush,
     placeHolderColor = Color(0xFFEBEBEB),
     dividerColor = app_bg_secondary_light,
-    textColor = app_bg_dark,
     songsListenedToBG = new_app_bg_light,
     userPageGradient = Brush.verticalGradient(
         listOf(
-Original file line number
+Diff line change
@@ Expand Up / @@ -356,7 +356,7 @@ fun StatsScreen( @@
                         }
                         else{
-                            Text("There are no statistics available for this user for this period", color = ListenBrainzTheme.colorScheme.textColor, modifier = Modifier.padding(start = 10.dp))
+                            Text("There are no statistics available for this user for this period", color = ListenBrainzTheme.colorScheme.text, modifier = Modifier.padding(start = 10.dp))
                         }
                     }
@@ Expand Down @@