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

enhancement: increase spacing between actions in top bar; closes #52

Browse Source
This commit is contained in:
Diego Beraldin 2023-10-08 20:54:45 +02:00
parent b5a43c3b6d
commit c7671dca3e
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ class CommunityDetailScreen(
contentDescription = null,
colorFilter = ColorFilter.tint(color = MaterialTheme.colorScheme.onBackground),
)
Spacer(Modifier.width(Spacing.s))
Spacer(Modifier.width(Spacing.m))
}
// sort button

62
feature-home/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/home/postlist/PostsTopBar.kt
View File

@ -3,9 +3,10 @@ package com.github.diegoberaldin.raccoonforlemmy.feature.home.postlist
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.ExperimentalMaterial3Api
@ -94,36 +95,35 @@ internal fun PostsTopBar(
}
},
actions = {
Row {
val additionalLabel = when (sortType) {
SortType.Top.Day -> stringResource(MR.strings.home_sort_type_top_day_short)
SortType.Top.Month -> stringResource(MR.strings.home_sort_type_top_month_short)
SortType.Top.Past12Hours -> stringResource(MR.strings.home_sort_type_top_12_hours_short)
SortType.Top.Past6Hours -> stringResource(MR.strings.home_sort_type_top_6_hours_short)
SortType.Top.PastHour -> stringResource(MR.strings.home_sort_type_top_hour_short)
SortType.Top.Week -> stringResource(MR.strings.home_sort_type_top_week_short)
SortType.Top.Year -> stringResource(MR.strings.home_sort_type_top_year_short)
else -> ""
}
if (additionalLabel.isNotEmpty()) {
Text(
text = buildString {
append("(")
append(additionalLabel)
append(")")
}
)
}
if (sortType != null) {
Image(
modifier = Modifier.onClick {
onSelectSortType?.invoke()
},
imageVector = sortType.toIcon(),
contentDescription = null,
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
)
}
val additionalLabel = when (sortType) {
SortType.Top.Day -> stringResource(MR.strings.home_sort_type_top_day_short)
SortType.Top.Month -> stringResource(MR.strings.home_sort_type_top_month_short)
SortType.Top.Past12Hours -> stringResource(MR.strings.home_sort_type_top_12_hours_short)
SortType.Top.Past6Hours -> stringResource(MR.strings.home_sort_type_top_6_hours_short)
SortType.Top.PastHour -> stringResource(MR.strings.home_sort_type_top_hour_short)
SortType.Top.Week -> stringResource(MR.strings.home_sort_type_top_week_short)
SortType.Top.Year -> stringResource(MR.strings.home_sort_type_top_year_short)
else -> ""
}
if (additionalLabel.isNotEmpty()) {
Text(
text = buildString {
append("(")
append(additionalLabel)
append(")")
}
)
Spacer(modifier = Modifier.width(Spacing.s))
}
if (sortType != null) {
Image(
modifier = Modifier.onClick {
onSelectSortType?.invoke()
},
imageVector = sortType.toIcon(),
contentDescription = null,
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
)
}
},
)

2
feature-profile/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/profile/main/ProfileMainScreen.kt
View File

@ -109,7 +109,7 @@ internal object ProfileMainScreen : Tab {
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground),
)
Spacer(modifier = Modifier.width(Spacing.s))
Spacer(modifier = Modifier.width(Spacing.m))
Image(
modifier = Modifier.onClick {

2
feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreTopBar.kt
View File

@ -107,7 +107,7 @@ internal fun ExploreTopBar(
append(")")
}
)
Spacer(modifier = Modifier.width(Spacing.xs))
Spacer(modifier = Modifier.width(Spacing.s))
}
Image(

2
feature-search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/multicommunity/detail/MultiCommunityScreen.kt
View File

@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material.DismissDirection
@ -135,6 +136,7 @@ class MultiCommunityScreen(
append(")")
}
)
Spacer(modifier = Modifier.width(Spacing.s))
}
if (sortType != null) {
Image(