nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

code review fixes:

Browse Source 
1. options.isNotEmpty().also → if guard
  2. Hardcoded English strings in FeedGroup enum
  3. Hardcoded accessibility label
  4. Raw 14.sp literals (×6) → replaced with Font14SP theme constant
  5. Raw 12.sp literal → replaced with Font12SP theme constant
  6. Modifier.size(20.dp) → replaced with existing Size20Modifier theme constant
This commit is contained in:
davotoula
2026-03-20 14:30:07 +01:00
parent f15b7620df
commit 620f8dbf10
3 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/TextSpinner.kt
+5 -7
View File
@@ -156,13 +156,11 @@ private fun BaseTextSpinner(
) )
} }
if (optionsShowing) { if (optionsShowing && options.isNotEmpty()) {
options.isNotEmpty().also { SpinnerSelectionDialog(options = options, onDismiss = { optionsShowing = false }) {
SpinnerSelectionDialog(options = options, onDismiss = { optionsShowing = false }) { currentText = options[it].title
currentText = options[it].title optionsShowing = false
optionsShowing = false onSelect(it)
onSelect(it)
}
} }
} }
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/FeedFilterSpinner.kt
+41 -40
View File
@@ -34,18 +34,17 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ViewList
import androidx.compose.material.icons.automirrored.outlined.VolumeOff
import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.ExpandMore
import androidx.compose.material.icons.outlined.Groups import androidx.compose.material.icons.outlined.Groups
import androidx.compose.material.icons.outlined.LocationOn import androidx.compose.material.icons.outlined.LocationOn
import androidx.compose.material.icons.outlined.Person import androidx.compose.material.icons.outlined.Person
import androidx.compose.material.icons.outlined.Public import androidx.compose.material.icons.outlined.Public
import androidx.compose.material.icons.outlined.SensorDoor import androidx.compose.material.icons.outlined.SensorDoor
import androidx.compose.material.icons.outlined.ViewList
import androidx.compose.material.icons.outlined.VolumeOff
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
@@ -93,6 +92,8 @@ import com.vitorpamplona.amethyst.ui.screen.RelayName
import com.vitorpamplona.amethyst.ui.screen.ResourceName import com.vitorpamplona.amethyst.ui.screen.ResourceName
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.stringRes import com.vitorpamplona.amethyst.ui.stringRes
import com.vitorpamplona.amethyst.ui.theme.Font12SP
import com.vitorpamplona.amethyst.ui.theme.Font14SP
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.placeholderText import com.vitorpamplona.amethyst.ui.theme.placeholderText
@@ -139,6 +140,8 @@ fun FeedFilterSpinner(
stringRes(R.string.feed_filter_select_an_option, selectAnOption) stringRes(R.string.feed_filter_select_an_option, selectAnOption)
} }
val openDropdownLabel = stringRes(R.string.open_dropdown_menu)
Box( Box(
modifier = modifier, modifier = modifier,
contentAlignment = Alignment.Center, contentAlignment = Alignment.Center,
@@ -156,7 +159,7 @@ fun FeedFilterSpinner(
Text( Text(
text = stringRes(R.string.lack_location_permissions), text = stringRes(R.string.lack_location_permissions),
fontSize = 12.sp, fontSize = Font12SP,
lineHeight = 12.sp, lineHeight = 12.sp,
) )
} else { } else {
@@ -171,7 +174,7 @@ fun FeedFilterSpinner(
Row { Row {
Text( Text(
text = "(${myLocation.geoHash})", text = "(${myLocation.geoHash})",
fontSize = 12.sp, fontSize = Font12SP,
lineHeight = 12.sp, lineHeight = 12.sp,
) )
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
@@ -181,7 +184,7 @@ fun FeedFilterSpinner(
) { cityName -> ) { cityName ->
Text( Text(
text = "($cityName)", text = "($cityName)",
fontSize = 12.sp, fontSize = Font12SP,
lineHeight = 12.sp, lineHeight = 12.sp,
) )
} }
@@ -190,7 +193,7 @@ fun FeedFilterSpinner(
LocationState.LocationResult.LackPermission -> { LocationState.LocationResult.LackPermission -> {
Text( Text(
text = stringRes(R.string.lack_location_permissions), text = stringRes(R.string.lack_location_permissions),
fontSize = 12.sp, fontSize = Font12SP,
lineHeight = 12.sp, lineHeight = 12.sp,
) )
} }
@@ -198,7 +201,7 @@ fun FeedFilterSpinner(
LocationState.LocationResult.Loading -> { LocationState.LocationResult.Loading -> {
Text( Text(
text = stringRes(R.string.loading_location), text = stringRes(R.string.loading_location),
fontSize = 12.sp, fontSize = Font12SP,
lineHeight = 12.sp, lineHeight = 12.sp,
) )
} }
@@ -226,7 +229,7 @@ fun FeedFilterSpinner(
}.semantics { }.semantics {
role = Role.DropdownList role = Role.DropdownList
stateDescription = accessibilityDescription stateDescription = accessibilityDescription
onClick(label = "Open feed filter menu") { onClick(label = openDropdownLabel) {
optionsShowing = true optionsShowing = true
return@onClick true return@onClick true
} }
@@ -234,20 +237,18 @@ fun FeedFilterSpinner(
) )
} }
if (optionsShowing) { if (optionsShowing && options.isNotEmpty()) {
options.isNotEmpty().also { GroupedFeedFilterDialog(
GroupedFeedFilterDialog( title = explainer,
title = explainer, options = options,
options = options, onDismiss = { optionsShowing = false },
onDismiss = { optionsShowing = false }, onSelect = {
onSelect = { selected = options[it]
selected = options[it] optionsShowing = false
optionsShowing = false onSelect(it)
onSelect(it) },
}, ) {
) { RenderOption(it.name, accountViewModel)
RenderOption(it.name, accountViewModel)
}
} }
} }
} }
@@ -260,18 +261,18 @@ fun RenderOption(
when (option) { when (option) {
is GeoHashName -> { is GeoHashName -> {
LoadCityName(option.geoHashTag) { LoadCityName(option.geoHashTag) {
Text(text = "/g/$it", fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurface) Text(text = "/g/$it", fontSize = Font14SP, color = MaterialTheme.colorScheme.onSurface)
} }
} }
is HashtagName -> { is HashtagName -> {
Text(text = option.name(), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurface) Text(text = option.name(), fontSize = Font14SP, color = MaterialTheme.colorScheme.onSurface)
} }
is ResourceName -> { is ResourceName -> {
Text( Text(
text = stringRes(id = option.resourceId), text = stringRes(id = option.resourceId),
fontSize = 14.sp, fontSize = Font14SP,
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
) )
} }
@@ -295,19 +296,19 @@ fun RenderOption(
} }
} }
Text(text = name, fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurface) Text(text = name, fontSize = Font14SP, color = MaterialTheme.colorScheme.onSurface)
} }
is CommunityName -> { is CommunityName -> {
val it by observeNote(option.note, accountViewModel) val it by observeNote(option.note, accountViewModel)
Text(text = "/n/${((it.note as? AddressableNote)?.dTag() ?: "")}", fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurface) Text(text = "/n/${((it.note as? AddressableNote)?.dTag() ?: "")}", fontSize = Font14SP, color = MaterialTheme.colorScheme.onSurface)
} }
is RelayName -> { is RelayName -> {
Text( Text(
text = option.name(), text = option.name(),
fontSize = 14.sp, fontSize = Font14SP,
color = MaterialTheme.colorScheme.onSurface, color = MaterialTheme.colorScheme.onSurface,
) )
} }
@@ -321,12 +322,12 @@ private data class IndexedFeedDefinition(
) )
private enum class FeedGroup( private enum class FeedGroup(
val label: String, @param:androidx.annotation.StringRes val labelRes: Int,
) { ) {
FEEDS("Feeds"), FEEDS(R.string.feed_group_feeds),
HASHTAGS("Hashtags"), HASHTAGS(R.string.feed_group_hashtags),
COMMUNITIES("Communities"), COMMUNITIES(R.string.feed_group_communities),
LISTS("Lists"), LISTS(R.string.feed_group_lists),
} }
private fun groupFeedDefinitions(options: ImmutableList<FeedDefinition>): Map<FeedGroup, List<IndexedFeedDefinition>> { private fun groupFeedDefinitions(options: ImmutableList<FeedDefinition>): Map<FeedGroup, List<IndexedFeedDefinition>> {
@@ -375,7 +376,7 @@ private fun GroupedFeedFilterDialog(
if (!items.isNullOrEmpty()) { if (!items.isNullOrEmpty()) {
item { item {
GroupSection( GroupSection(
label = group.label, label = stringRes(group.labelRes),
items = items, items = items,
isChipLayout = group == FeedGroup.HASHTAGS, isChipLayout = group == FeedGroup.HASHTAGS,
onSelect = onSelect, onSelect = onSelect,
@@ -406,7 +407,7 @@ private fun GroupSection(
Column { Column {
Text( Text(
text = label.uppercase(), text = label.uppercase(),
fontSize = 12.sp, fontSize = Font12SP,
letterSpacing = 0.8.sp, letterSpacing = 0.8.sp,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
@@ -448,7 +449,7 @@ private fun GroupSection(
) { ) {
FeedIcon( FeedIcon(
item = entry.item, item = entry.item,
modifier = Modifier.size(20.dp), modifier = Size20Modifier,
) )
Spacer(modifier = Modifier.padding(start = 12.dp)) Spacer(modifier = Modifier.padding(start = 12.dp))
Column(modifier = Modifier.weight(1f)) { onRenderItem(entry.item) } Column(modifier = Modifier.weight(1f)) { onRenderItem(entry.item) }
@@ -487,7 +488,7 @@ private fun FeedIcon(
} }
is TopFilter.MuteList -> { is TopFilter.MuteList -> {
Icons.Outlined.VolumeOff Icons.AutoMirrored.Outlined.VolumeOff
} }
is TopFilter.Chess -> { is TopFilter.Chess -> {
@@ -495,7 +496,7 @@ private fun FeedIcon(
} }
is TopFilter.PeopleList -> { is TopFilter.PeopleList -> {
Icons.Outlined.ViewList Icons.AutoMirrored.Outlined.ViewList
} }
else -> { else -> {
@@ -503,7 +504,7 @@ private fun FeedIcon(
is GeoHashName -> Icons.Outlined.LocationOn is GeoHashName -> Icons.Outlined.LocationOn
is RelayName -> Icons.Outlined.SensorDoor is RelayName -> Icons.Outlined.SensorDoor
is CommunityName -> Icons.Outlined.Groups is CommunityName -> Icons.Outlined.Groups
is PeopleListName -> Icons.Outlined.ViewList is PeopleListName -> Icons.AutoMirrored.Outlined.ViewList
else -> Icons.Outlined.Person else -> Icons.Outlined.Person
} }
} }
amethyst/src/main/res/values/strings.xml
+4
View File
@@ -1546,6 +1546,10 @@
<string name="my_lists">My Lists</string> <string name="my_lists">My Lists</string>
<string name="people_list_label">Users</string> <string name="people_list_label">Users</string>
<string name="select_list_to_filter">Select an option to filter the feed</string> <string name="select_list_to_filter">Select an option to filter the feed</string>
<string name="feed_group_feeds">Feeds</string>
<string name="feed_group_hashtags">Hashtags</string>
<string name="feed_group_communities">Communities</string>
<string name="feed_group_lists">Lists</string>
<string name="temporary_account">Log off on device lock</string> <string name="temporary_account">Log off on device lock</string>
<string name="private_message">Private Message</string> <string name="private_message">Private Message</string>