Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-09 04:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: multi community behaviour (#627)

Browse Source 
closes #206; closes #207
This commit is contained in:
Diego Beraldin 2024-03-24 22:54:31 +01:00 committed by GitHub
parent c99ee290b2
commit f3b8edaf43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityItem.kt
View File

@ -52,6 +52,7 @@ fun CommunityItem(
community: CommunityModel,
modifier: Modifier = Modifier,
small: Boolean = false,
noPadding: Boolean = false,
autoLoadImages: Boolean = true,
preferNicknames: Boolean = true,
showSubscribers: Boolean = false,
@ -71,7 +72,13 @@ fun CommunityItem(
var optionsMenuOpen by remember { mutableStateOf(false) }
Row(
modifier = modifier.padding(Spacing.s),
modifier = modifier.then(
if (noPadding) {
Modifier
} else {
Modifier.padding(Spacing.s)
}
),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Spacing.xs),
) {

14
unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsScreen.kt
View File

@ -253,7 +253,7 @@ class ManageSubscriptionsScreen : Screen {
) {
Text(
text = LocalXmlStrings.current.manageSubscriptionsHeaderMulticommunities,
style = MaterialTheme.typography.headlineSmall,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground,
)
Spacer(modifier = Modifier.weight(1f))
@ -293,7 +293,7 @@ class ManageSubscriptionsScreen : Screen {
)
this += Option(
OptionId.Delete,
LocalXmlStrings.current.communityActionUnsubscribe,
LocalXmlStrings.current.commentActionDelete,
)
},
onOptionSelected = rememberCallbackArgs(model) { optionId ->
@ -322,7 +322,7 @@ class ManageSubscriptionsScreen : Screen {
) {
Text(
text = LocalXmlStrings.current.manageSubscriptionsHeaderSubscriptions,
style = MaterialTheme.typography.headlineSmall,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onBackground,
)
}
@ -361,16 +361,12 @@ class ManageSubscriptionsScreen : Screen {
onOptionSelected = rememberCallbackArgs(model) { optionId ->
when (optionId) {
OptionId.Unsubscribe -> {
model.reduce(
ManageSubscriptionsMviModel.Intent.Unsubscribe(community.id),
)
model.reduce(ManageSubscriptionsMviModel.Intent.Unsubscribe(community.id))
}
OptionId.Favorite -> {
model.reduce(
ManageSubscriptionsMviModel.Intent.ToggleFavorite(
community.id
)
ManageSubscriptionsMviModel.Intent.ToggleFavorite(community.id)
)
}

1
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityMviModel.kt
View File

@ -28,6 +28,7 @@ interface MultiCommunityMviModel :
data class UiState(
val currentUserId: Int? = null,
val initial: Boolean = true,
val refreshing: Boolean = false,
val loading: Boolean = false,
val canFetchMore: Boolean = true,

11
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
View File

@ -105,9 +105,7 @@ class MultiCommunityScreen(
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
override fun Content() {
val model = getScreenModel<MultiCommunityMviModel>(parameters = {
parametersOf(communityId)
})
val model = getScreenModel<MultiCommunityMviModel>(parameters = { parametersOf(communityId) })
val uiState by model.uiState.collectAsState()
val topAppBarState = rememberTopAppBarState()
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(topAppBarState)
@ -287,8 +285,9 @@ class MultiCommunityScreen(
}
}
items(
uiState.posts,
{ it.id.toString() + (it.updateDate ?: it.publishDate) }) { post ->
items = uiState.posts,
key = { it.id.toString() + (it.updateDate ?: it.publishDate) },
) { post ->
LaunchedEffect(post.id) {
if (settings.markAsReadWhileScrolling && !post.read) {
model.reduce(MultiCommunityMviModel.Intent.MarkAsRead(post.id))
@ -578,7 +577,7 @@ class MultiCommunityScreen(
}
}
if (uiState.posts.isEmpty() && !uiState.loading) {
if (uiState.posts.isEmpty() && !uiState.initial) {
item {
Text(
modifier = Modifier.fillMaxWidth().padding(top = Spacing.xs),

14
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityViewModel.kt
View File

@ -89,6 +89,9 @@ class MultiCommunityViewModel(
notificationCenter.subscribe(NotificationCenterEvent.CopyText::class).onEach {
emitEffect(MultiCommunityMviModel.Effect.TriggerCopy(it.value))
}.launchIn(this)
identityRepository.isLogged.onEach { logged ->
updateState { it.copy(isLogged = logged ?: false) }
}.launchIn(this)
if (uiState.value.currentUserId == null) {
val auth = identityRepository.authToken.value.orEmpty()
@ -106,7 +109,7 @@ class MultiCommunityViewModel(
)
}
paginator.setCommunities(uiState.value.community.communityIds)
refresh()
refresh(initial = true)
}
}
}
@ -143,9 +146,7 @@ class MultiCommunityViewModel(
if (intent.feedback) {
hapticFeedback.vibrate()
}
toggleUpVote(
post = uiState.value.posts.first { it.id == intent.id },
)
toggleUpVote(post = uiState.value.posts.first { it.id == intent.id })
}
MultiCommunityMviModel.Intent.ClearRead -> clearRead()
@ -163,10 +164,10 @@ class MultiCommunityViewModel(
}
}
private fun refresh() {
private fun refresh(initial: Boolean = false) {
hideReadPosts = false
paginator.reset()
updateState { it.copy(canFetchMore = true, refreshing = true) }
updateState { it.copy(canFetchMore = true, refreshing = true, initial = initial) }
loadNextPage()
}
@ -221,6 +222,7 @@ class MultiCommunityViewModel(
loading = false,
canFetchMore = canFetchMore,
refreshing = false,
initial = newPosts.isEmpty(),
)
}
}

19
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt
View File

@ -273,8 +273,14 @@ class MultiCommunityEditorScreen(
}
Spacer(modifier = Modifier.height(Spacing.s))
Column {
Text(text = LocalXmlStrings.current.multiCommunityEditorCommunities)
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = Spacing.s),
) {
Text(
text = LocalXmlStrings.current.multiCommunityEditorCommunities
)
// search field
TextField(
@ -314,8 +320,9 @@ class MultiCommunityEditorScreen(
)
}
LazyColumn(
modifier = Modifier.fillMaxWidth()
.padding(horizontal = Spacing.m)
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = Spacing.s)
.weight(1f),
verticalArrangement = Arrangement.spacedBy(Spacing.xxs),
) {
@ -326,8 +333,10 @@ class MultiCommunityEditorScreen(
verticalAlignment = Alignment.CenterVertically,
) {
CommunityItem(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.weight(1f)
.background(MaterialTheme.colorScheme.background),
noPadding = true,
community = community,
preferNicknames = uiState.preferNicknames,
)

2
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorViewModel.kt
View File

@ -105,7 +105,7 @@ class MultiCommunityEditorViewModel(
private fun filterCommunities(): List<Pair<CommunityModel, Boolean>> {
val searchText = uiState.value.searchText
val res = if (searchText.isNotEmpty()) {
communities.filter { it.first.name.contains(searchText) }
communities.filter { it.first.name.contains(other = searchText, ignoreCase = true) }
} else {
communities
}

2
unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/utils/DefaultMultiCommunityPaginator.kt
View File

@ -40,5 +40,5 @@ class DefaultMultiCommunityPaginator(
addAll(elements)
}
}
}.sortedBy { it.publishDate }
}.sortedByDescending { it.publishDate }
}