Skip to content

Commit

Permalink
Move follow button and musicbrainz button to listens screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@07jasjeet
07jasjeet committed Dec 28, 2024
1 parent e1bb131 commit 503a9f4
Show file tree
Hide file tree
Showing 3 changed files with 151 additions and 125 deletions.
67 changes: 67 additions & 0 deletions app/src/main/java/org/listenbrainz/android/ui/components/MusicBrainzButton.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package org.listenbrainz.android.ui.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.OpenInNew
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import org.listenbrainz.android.R
import org.listenbrainz.android.ui.theme.new_app_bg_light

@Composable
fun MusicBrainzButton(onClick: () -> Unit) {
IconButton(
onClick = onClick, modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFF353070))
.width(140.dp)
.height(30.dp)
) {
Row(modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp)) {
Icon(
painter = painterResource(id = R.drawable.musicbrainz_logo),
contentDescription = "",
modifier = Modifier
.width(20.dp)
.height(30.dp),
tint = Color.Unspecified
)
Spacer(modifier = Modifier.width(5.dp))
Text(
"MusicBrainz",
color = new_app_bg_light,
style = MaterialTheme.typography.bodyMedium
)
Spacer(modifier = Modifier.width(5.dp))
Icon(
imageVector = Icons.AutoMirrored.Filled.OpenInNew,
contentDescription = "",
tint = new_app_bg_light,
modifier = Modifier
.width(30.dp)
.height(20.dp)
)
}
}
}
114 changes: 0 additions & 114 deletions app/src/main/java/org/listenbrainz/android/ui/screens/profile/BaseProfileScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,8 @@ fun BaseProfileScreen(
goToUserPage: (String?) -> Unit,
) {
val pagerState = rememberPagerState { ProfileScreenTab.entries.size }
val isLoggedInUser = uiState.isSelf
val uriHandler = LocalUriHandler.current
var mbOpeningErrorState by remember {
mutableStateOf<String?>(null)
}

val scope = rememberCoroutineScope()

LaunchedEffect(mbOpeningErrorState) {
if (mbOpeningErrorState != null) {
snackbarState.showSnackbar("Some Error Occurred", duration = SnackbarDuration.Short)
}
}

Box(modifier = Modifier.fillMaxSize()) {
AnimatedVisibility(
visible = uiState.listensTabUiState.isLoading,
Expand Down Expand Up @@ -203,42 +191,6 @@ fun BaseProfileScreen(
}
}


Row(
modifier = Modifier
.align(Alignment.End)
.padding(end = 20.dp, bottom = 4.dp)
) {
if (pagerState.currentPage == ProfileScreenTab.LISTENS.index) {
when (isLoggedInUser) {
true -> AddListensButton()
false ->
FollowButton(
modifier = Modifier,
isFollowedState = uiState.listensTabUiState.isFollowing,
onClick = {
if (uiState.listensTabUiState.isFollowing) {
onUnfollowClick(username ?: "")
} else {
onFollowClick(username ?: "")
}
}
)
}
Spacer(modifier = Modifier.width(10.dp))
MusicBrainzButton {
try {
uriHandler.openUri(Constants.MB_BASE_URL + "user/${username}")
} catch (e: RuntimeException) {
mbOpeningErrorState = e.message
} catch (e: Exception) {
mbOpeningErrorState = e.message
}
}
}
}


HorizontalPager(
state = pagerState,
beyondViewportPageCount = 1,
Expand Down Expand Up @@ -279,69 +231,3 @@ fun BaseProfileScreen(
}
}
}


@Composable
private fun AddListensButton() {
IconButton(
onClick = { /*TODO*/ }, modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFF353070))
.width(110.dp)
.height(30.dp)
) {
Row(modifier = Modifier.padding(all = 4.dp)) {
Icon(
imageVector = Icons.Default.Add,
contentDescription = "",
tint = new_app_bg_light,
modifier = Modifier
.width(10.dp)
.height(20.dp)
)
Spacer(modifier = Modifier.width(5.dp))
Text(
"Add Listens",
color = new_app_bg_light,
style = MaterialTheme.typography.bodyMedium
)
}
}
}

@Composable
private fun MusicBrainzButton(onClick: () -> Unit) {
IconButton(
onClick = onClick, modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFF353070))
.width(140.dp)
.height(30.dp)
) {
Row(modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp)) {
Icon(
painter = painterResource(id = R.drawable.musicbrainz_logo),
contentDescription = "",
modifier = Modifier
.width(20.dp)
.height(30.dp),
tint = Color.Unspecified
)
Spacer(modifier = Modifier.width(5.dp))
Text(
"MusicBrainz",
color = new_app_bg_light,
style = MaterialTheme.typography.bodyMedium
)
Spacer(modifier = Modifier.width(5.dp))
Icon(
imageVector = Icons.AutoMirrored.Filled.OpenInNew,
contentDescription = "",
tint = new_app_bg_light,
modifier = Modifier
.width(30.dp)
.height(20.dp)
)
}
}
}
95 changes: 84 additions & 11 deletions app/src/main/java/org/listenbrainz/android/ui/screens/profile/listens/ListensScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SnackbarDefaults
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.SnackbarVisuals
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
Expand All @@ -39,8 +41,6 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -49,7 +49,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.platform.UriHandler
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
Expand All @@ -58,7 +57,6 @@ import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import kotlinx.coroutines.launch
import org.listenbrainz.android.R
import org.listenbrainz.android.model.Listen
import org.listenbrainz.android.model.Metadata
Expand All @@ -70,24 +68,23 @@ import org.listenbrainz.android.model.user.Artist
import org.listenbrainz.android.ui.components.ErrorBar
import org.listenbrainz.android.ui.components.FollowButton
import org.listenbrainz.android.ui.components.ListenCardSmallDefault
import org.listenbrainz.android.ui.components.MusicBrainzButton
import org.listenbrainz.android.ui.components.SimilarUserCard
import org.listenbrainz.android.ui.components.SuccessBar
import org.listenbrainz.android.ui.components.dialogs.Dialog
import org.listenbrainz.android.ui.components.dialogs.PersonalRecommendationDialog
import org.listenbrainz.android.ui.components.dialogs.PinDialog
import org.listenbrainz.android.ui.components.dialogs.ReviewDialog
import org.listenbrainz.android.ui.components.dialogs.rememberDialogsState
import org.listenbrainz.android.ui.screens.feed.FeedUiState
import org.listenbrainz.android.ui.screens.profile.ProfileUiState
import org.listenbrainz.android.ui.screens.settings.PreferencesUiState
import org.listenbrainz.android.ui.theme.ListenBrainzTheme
import org.listenbrainz.android.ui.theme.app_bg_mid
import org.listenbrainz.android.ui.theme.compatibilityMeterColor
import org.listenbrainz.android.ui.theme.lb_purple
import org.listenbrainz.android.ui.theme.lb_purple_night
import org.listenbrainz.android.ui.theme.new_app_bg_light
import org.listenbrainz.android.util.Constants
import org.listenbrainz.android.util.Utils.getCoverArtUrl
import org.listenbrainz.android.viewmodel.FeedViewModel
import org.listenbrainz.android.viewmodel.ListensViewModel
import org.listenbrainz.android.viewmodel.SocialViewModel
import org.listenbrainz.android.viewmodel.UserViewModel
Expand Down Expand Up @@ -179,7 +176,7 @@ fun ListensScreen(
socialUiState: SocialUiState,
onErrorShown: () -> Unit,
onMessageShown: () -> Unit,
onFollowButtonClick: (String?, Boolean) -> Unit,
onFollowButtonClick: (username: String?, status: Boolean) -> Unit,
goToArtistPage: (String) -> Unit,
goToUserPage: (String?) -> Unit,
) {
Expand Down Expand Up @@ -213,6 +210,54 @@ fun ListensScreen(
state = listState,
modifier = Modifier.testTag("listensScreenScrollableContainer")
) {
item {
Box(modifier = Modifier.fillMaxWidth()) {
Row(
modifier = Modifier
.align(Alignment.CenterEnd)
.padding(end = 20.dp, bottom = 4.dp)
) {
if (uiState.isSelf) {
AddListensButton()
} else {
FollowButton(
modifier = Modifier,
isFollowedState = uiState.listensTabUiState.isFollowing,
onClick = {
if (uiState.listensTabUiState.isFollowing) {
onFollowButtonClick(username ?: "", false)
} else {
onFollowButtonClick(username ?: "", true)
}
}
)
}

Spacer(modifier = Modifier.width(10.dp))

val uriHandler = LocalUriHandler.current
var mbOpeningErrorState by remember {
mutableStateOf<String?>(null)
}

LaunchedEffect(mbOpeningErrorState) {
if (mbOpeningErrorState != null) {
snackbarState.showSnackbar("Some Error Occurred", duration = SnackbarDuration.Short)
}
}

MusicBrainzButton {
try {
uriHandler.openUri(Constants.MB_BASE_URL + "user/${username}")
} catch (e: RuntimeException) {
mbOpeningErrorState = e.message
} catch (e: Exception) {
mbOpeningErrorState = e.message
}
}
}
}
}
item {
SongsListened(
username = username,
Expand Down Expand Up @@ -866,6 +911,34 @@ private fun FollowCard(
}
}

@Composable
private fun AddListensButton() {
IconButton(
onClick = { /*TODO*/ }, modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFF353070))
.width(110.dp)
.height(30.dp)
) {
Row(modifier = Modifier.padding(all = 4.dp)) {
Icon(
imageVector = Icons.Default.Add,
contentDescription = "",
tint = new_app_bg_light,
modifier = Modifier
.width(10.dp)
.height(20.dp)
)
Spacer(modifier = Modifier.width(5.dp))
Text(
"Add Listens",
color = new_app_bg_light,
style = MaterialTheme.typography.bodyMedium
)
}
}
}


@Preview
@Composable
Expand Down

0 comments on commit 503a9f4

Please sign in to comment.