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

fix(community): improvements to community list and detail

Browse Source
This commit is contained in:
Diego Beraldin 2023-08-15 18:03:50 +02:00
parent 9787bc533f
commit 2b9dfa799b
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/communitydetail/CommunityDetailScreen.kt
View File

@ -299,38 +299,40 @@ class CommunityDetailScreen(
},
style = MaterialTheme.typography.headlineSmall,
)
Button(
modifier = Modifier
.align(Alignment.CenterHorizontally)
.padding(top = Spacing.m),
onClick = {
when (community.subscribed) {
true -> model.reduce(CommunityDetailMviModel.Intent.Unsubscribe)
false -> model.reduce(CommunityDetailMviModel.Intent.Subscribe)
else -> Unit
}
},
) {
Row(
horizontalArrangement = Arrangement.spacedBy(Spacing.s),
verticalAlignment = Alignment.CenterVertically,
if (!isOnOtherInstance) {
Button(
modifier = Modifier
.align(Alignment.CenterHorizontally)
.padding(top = Spacing.m),
onClick = {
when (community.subscribed) {
true -> model.reduce(CommunityDetailMviModel.Intent.Unsubscribe)
false -> model.reduce(CommunityDetailMviModel.Intent.Subscribe)
else -> Unit
}
},
) {
Image(
imageVector = when (community.subscribed) {
true -> Icons.Default.Check
false -> Icons.Default.AddCircle
else -> Icons.Default.MoreHoriz
},
contentDescription = null,
colorFilter = ColorFilter.tint(color = MaterialTheme.colorScheme.onPrimary),
)
Text(
text = when (community.subscribed) {
true -> stringResource(MR.strings.community_button_subscribed)
false -> stringResource(MR.strings.community_button_subscribe)
else -> stringResource(MR.strings.community_button_pending)
},
)
Row(
horizontalArrangement = Arrangement.spacedBy(Spacing.s),
verticalAlignment = Alignment.CenterVertically,
) {
Image(
imageVector = when (community.subscribed) {
true -> Icons.Default.Check
false -> Icons.Default.AddCircle
else -> Icons.Default.MoreHoriz
},
contentDescription = null,
colorFilter = ColorFilter.tint(color = MaterialTheme.colorScheme.onPrimary),
)
Text(
text = when (community.subscribed) {
true -> stringResource(MR.strings.community_button_subscribed)
false -> stringResource(MR.strings.community_button_subscribe)
else -> stringResource(MR.strings.community_button_pending)
},
)
}
}
}
}

6
feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/communitylist/CommunityListViewModel.kt
View File

@ -85,7 +85,11 @@ class CommunityListViewModel(
val items = communityRepository.getSubscribed(
auth = auth,
).filter {
it.name.contains(searchText)
if (searchText.isNotBlank()) {
it.name.contains(searchText)
} else {
true
}
}
currentPage++
mvi.updateState {