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

Feed: Move to callbacks architecture #517

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Feed: Move to callbacks architecture #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions app/src/main/java/org/listenbrainz/android/model/feed/FeedCallbacks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.listenbrainz.android.model.feed

import androidx.compose.runtime.Immutable

@Immutable
data class FeedCallbacks(
val onScrollToTop: (suspend () -> Unit) -> Unit,
val onDeleteOrHide: (event: FeedEvent, eventType: FeedEventType, parentUser: String) -> Unit,
val onErrorShown: () -> Unit,
val onRecommend: (event: FeedEvent) -> Unit,
val onPersonallyRecommend: (event: FeedEvent, users: List<String>, blurbContent: String) -> Unit,
val onReview: (event: FeedEvent, entityType: ReviewEntityType, blurbContent: String, rating: Int?, locale: String) -> Unit,
val onPin: (event: FeedEvent, blurbContent: String?) -> Unit,
val searchFollower: (String) -> Unit,
val isCritiqueBrainzLinked: suspend () -> Boolean?,
val onPlay: (event: FeedEvent) -> Unit,
val goToUserPage: (String) -> Unit,
val goToArtistPage: (String) -> Unit
)
156 changes: 70 additions & 86 deletions app/src/main/java/org/listenbrainz/android/ui/screens/feed/FeedScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import kotlinx.coroutines.flow.flow
import org.listenbrainz.android.model.Metadata
import org.listenbrainz.android.model.feed.FeedCallbacks
import org.listenbrainz.android.model.feed.FeedEvent
import org.listenbrainz.android.model.feed.FeedEventType
import org.listenbrainz.android.model.feed.FeedListenArtist
Expand Down Expand Up @@ -91,32 +92,36 @@ fun FeedScreen(
FeedScreen(
uiState = uiState,
scrollToTopState = scrollToTopState,
onScrollToTop = onScrollToTop,
onDeleteOrHide = { event, eventType, parentUser ->
viewModel.hideOrDeleteEvent(event, eventType, parentUser)
},
onErrorShown = { viewModel.clearErrorFlow() },
recommendTrack = { event ->
socialViewModel.recommend(event.metadata)
},
personallyRecommendTrack = { event, users, blurbContent ->
socialViewModel.personallyRecommend(event.metadata, users, blurbContent)
},
review = { event, type, blurbContent, rating, locale ->
socialViewModel.review(event.metadata, type, blurbContent, rating, locale)
},
pin = { event, blurbContent ->
socialViewModel.pin(event.metadata, blurbContent)
},
searchFollower = { query ->
viewModel.searchUser(query)
},
isCritiqueBrainzLinked = viewModel::isCritiqueBrainzLinked,
onPlay = { event ->
viewModel.play(event)
},
goToUserPage = goToUserPage,
goToArtistPage = goToArtistPage
callbacks = remember {
FeedCallbacks(
onScrollToTop = onScrollToTop,
onDeleteOrHide = { event, eventType, parentUser ->
viewModel.hideOrDeleteEvent(event, eventType, parentUser)
},
onErrorShown = { viewModel.clearErrorFlow() },
onRecommend = { event ->
socialViewModel.recommend(event.metadata)
},
onPersonallyRecommend = { event, users, blurbContent ->
socialViewModel.personallyRecommend(event.metadata, users, blurbContent)
},
onReview = { event, type, blurbContent, rating, locale ->
socialViewModel.review(event.metadata, type, blurbContent, rating, locale)
},
onPin = { event, blurbContent ->
socialViewModel.pin(event.metadata, blurbContent)
},
searchFollower = { query ->
viewModel.searchUser(query)
},
isCritiqueBrainzLinked = viewModel::isCritiqueBrainzLinked,
onPlay = { event ->
viewModel.play(event)
},
goToUserPage = goToUserPage,
goToArtistPage = goToArtistPage
)
}
)
}

Expand All @@ -126,18 +131,7 @@ fun FeedScreen(
fun FeedScreen(
uiState: FeedUiState,
scrollToTopState: Boolean,
onScrollToTop: (suspend () -> Unit) -> Unit,
onDeleteOrHide: (event: FeedEvent, eventType: FeedEventType, parentUser: String) -> Unit,
onErrorShown: () -> Unit,
recommendTrack: (event: FeedEvent) -> Unit,
personallyRecommendTrack: (event: FeedEvent, users: List<String>, blurbContent: String) -> Unit,
review: (event: FeedEvent, entityType: ReviewEntityType, blurbContent: String, rating: Int?, locale: String) -> Unit,
pin: (event: FeedEvent, blurbContent: String?) -> Unit,
searchFollower: (String) -> Unit,
isCritiqueBrainzLinked: suspend () -> Boolean?,
onPlay: (event: FeedEvent) -> Unit,
goToUserPage: (String) -> Unit,
goToArtistPage: (String) -> Unit
callbacks: FeedCallbacks,
) {
val myFeedPagingData = uiState.myFeedState.eventList.collectAsLazyPagingItems()
val myFeedListState = rememberLazyListState()
Expand Down Expand Up @@ -175,7 +169,7 @@ fun FeedScreen(
)

LaunchedEffect(scrollToTopState){
onScrollToTop {
callbacks.onScrollToTop {
when (pagerState.currentPage){
0 -> {
myFeedListState.scrollToItem(0)
Expand Down Expand Up @@ -218,8 +212,8 @@ fun FeedScreen(
listState = myFeedListState,
pagingData = myFeedPagingData,
uiState = uiState.myFeedState,
onDeleteOrHide = onDeleteOrHide,
recommendTrack = recommendTrack,
onDeleteOrHide = callbacks.onDeleteOrHide,
recommendTrack = callbacks.onRecommend,
personallyRecommendTrack = { index ->
dialogsState.activateDialog(
Dialog.PERSONAL_RECOMMENDATION,
Expand All @@ -238,15 +232,15 @@ fun FeedScreen(
FeedDialogBundleKeys.feedDialogBundle(0, index)
)
},
onPlay = onPlay,
goToUserPage = goToUserPage,
goToArtistPage = goToArtistPage
onPlay = callbacks.onPlay,
goToUserPage = callbacks.goToUserPage,
goToArtistPage = callbacks.goToArtistPage
)

1 -> FollowListens(
listState = followListensListState,
pagingData = followListensPagingData,
recommendTrack = recommendTrack,
recommendTrack = callbacks.onRecommend,
personallyRecommendTrack = { index ->
dialogsState.activateDialog(
Dialog.PERSONAL_RECOMMENDATION,
Expand All @@ -265,14 +259,14 @@ fun FeedScreen(
FeedDialogBundleKeys.feedDialogBundle(1, index)
)
},
onPlay = onPlay,
goToArtistPage = goToArtistPage
onPlay = callbacks.onPlay,
goToArtistPage = callbacks.goToArtistPage
)

2 -> SimilarListens(
listState = similarListensListState,
pagingData = similarListensPagingData,
recommendTrack = recommendTrack,
recommendTrack = callbacks.onRecommend,
personallyRecommendTrack = { index ->
dialogsState.activateDialog(
Dialog.PERSONAL_RECOMMENDATION,
Expand All @@ -291,14 +285,14 @@ fun FeedScreen(
FeedDialogBundleKeys.feedDialogBundle(2, index)
)
},
onPlay = onPlay,
goToArtistPage = goToArtistPage
onPlay = callbacks.onPlay,
goToArtistPage = callbacks.goToArtistPage
)
}
}

Column(Modifier.fillMaxWidth()) {
ErrorBar(error = uiState.error, onErrorShown = onErrorShown)
ErrorBar(error = uiState.error, onErrorShown = callbacks.onErrorShown)
NavigationChips(
chips = remember {
listOf(
Expand Down Expand Up @@ -334,12 +328,8 @@ fun FeedScreen(
else -> similarListensPagingData
}
},
onPin = pin,
callbacks = callbacks,
searchUserResult = uiState.searchResult,
searchUsers = searchFollower,
onPersonallyRecommend = personallyRecommendTrack,
isCritiqueBrainzLinked = isCritiqueBrainzLinked,
onReview = review
)

}
Expand All @@ -351,11 +341,7 @@ private fun Dialogs(
currentEventIndex: Int?,
pagingSource: LazyPagingItems<FeedUiEventItem>,
searchUserResult: List<String>,
onPin: (event: FeedEvent, blurbContent: String) -> Unit,
searchUsers: (String) -> Unit,
onPersonallyRecommend: (event: FeedEvent, users: List<String>, blurbContent: String) -> Unit,
isCritiqueBrainzLinked: suspend () -> Boolean?,
onReview: (event: FeedEvent, type: ReviewEntityType, blurbContent: String, rating: Int?, locale: String) -> Unit
callbacks: FeedCallbacks
) {
when (currentDialog){
Dialog.NONE -> Unit
Expand All @@ -367,7 +353,7 @@ private fun Dialogs(
artistName = metadata?.trackMetadata?.artistName ?: return,
onDismiss = deactivateDialog,
onSubmit = { blurbContent ->
onPin(pagingSource[currentEventIndex]?.event!!, blurbContent)
callbacks.onPin(pagingSource[currentEventIndex]?.event!!, blurbContent)
}
)
}
Expand All @@ -378,9 +364,9 @@ private fun Dialogs(
?: metadata?.entityName ?: return,
onDismiss = deactivateDialog,
searchResult = searchUserResult,
searchUsers = searchUsers,
searchUsers = callbacks.searchFollower,
onSubmit = { users, blurbContent ->
onPersonallyRecommend(pagingSource[currentEventIndex]?.event!!, users, blurbContent)
callbacks.onPersonallyRecommend(pagingSource[currentEventIndex]?.event!!, users, blurbContent)
}
)
}
Expand All @@ -389,14 +375,14 @@ private fun Dialogs(
ReviewDialog(
trackName = metadata?.trackMetadata?.trackName
?: if (metadata?.entityType == ReviewEntityType.RECORDING.code) metadata.entityName else return,
artistName = metadata?.trackMetadata?.artistName
?: if (metadata?.entityType == ReviewEntityType.ARTIST.code) metadata.entityName else null,
releaseName = metadata?.trackMetadata?.releaseName
?: if (metadata?.entityType == ReviewEntityType.RELEASE_GROUP.code) metadata.entityName else null,
artistName = metadata.trackMetadata?.artistName
?: if (metadata.entityType == ReviewEntityType.ARTIST.code) metadata.entityName else null,
releaseName = metadata.trackMetadata?.releaseName
?: if (metadata.entityType == ReviewEntityType.RELEASE_GROUP.code) metadata.entityName else null,
onDismiss = deactivateDialog,
isCritiqueBrainzLinked = isCritiqueBrainzLinked,
isCritiqueBrainzLinked = callbacks.isCritiqueBrainzLinked,
onSubmit = { type, blurbContent, rating, locale ->
onReview(pagingSource[currentEventIndex]?.event!!, type, blurbContent, rating, locale)
callbacks.onReview(pagingSource[currentEventIndex]?.event!!, type, blurbContent, rating, locale)
}
)
}
Expand Down Expand Up @@ -487,16 +473,13 @@ private fun MyFeed(
goToUserPage = goToUserPage,
goToArtistPage = goToArtistPage
)

}
}

}

item {
PagerRearLoadingIndicator(pagingData)
}

}
}

Expand Down Expand Up @@ -848,20 +831,21 @@ private fun FeedScreenPreview() {
})
),
scrollToTopState = false,
onScrollToTop = {},
onDeleteOrHide = {_,_,_ -> },
onErrorShown = {},
recommendTrack = {},
personallyRecommendTrack = {_,_,_ -> },
review = {_,_,_,_,_ ->},
pin = {_,_ ->},
searchFollower = {},
isCritiqueBrainzLinked = {true},
onPlay = {},
goToUserPage = {},
goToArtistPage = {}
callbacks = FeedCallbacks(
onScrollToTop = {},
onDeleteOrHide = {_,_,_ -> },
onErrorShown = {},
onRecommend = {},
onPersonallyRecommend = {_,_,_ -> },
onReview = {_,_,_,_,_ ->},
onPin = {_,_ ->},
searchFollower = {},
isCritiqueBrainzLinked = {true},
onPlay = {},
goToUserPage = {},
goToArtistPage = {}
),
)
}

}
}
Loading