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

Adjusting elevation borders

Browse Source
This commit is contained in:
Vitor Pamplona
2026-04-06 15:07:08 -04:00
parent 8a64e218b8
commit 2b200538f0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/AllRelayListScreen.kt
-3
View File
@@ -47,7 +47,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.R
@@ -331,8 +330,6 @@ fun MappedAllRelayListView(
Modifier Modifier
.fillMaxSize() .fillMaxSize()
.padding( .padding(
start = 10.dp,
end = 10.dp,
top = pad.calculateTopPadding(), top = pad.calculateTopPadding(),
bottom = pad.calculateBottomPadding(), bottom = pad.calculateBottomPadding(),
).consumeWindowInsets(pad) ).consumeWindowInsets(pad)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoClickableRow.kt
+2 -1
View File
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer 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.size import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.DragIndicator import androidx.compose.material.icons.filled.DragIndicator
@@ -112,7 +113,7 @@ fun BasicRelaySetupInfoClickableRow(
modifier = modifier, modifier = modifier,
) { ) {
if (dragState != null && index >= 0) { if (dragState != null && index >= 0) {
val handleModifier = Modifier.size(24.dp).relayDragHandle(index, dragState) val handleModifier = Modifier.height(24.dp).relayDragHandle(index, dragState)
Icon( Icon(
Icons.Default.DragIndicator, Icons.Default.DragIndicator,
contentDescription = stringRes(R.string.relay_reorder), contentDescription = stringRes(R.string.relay_reorder),
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoDialog.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import com.vitorpamplona.amethyst.model.nip11RelayInfo.Nip11CachedRetriever
import com.vitorpamplona.amethyst.ui.navigation.navs.INav import com.vitorpamplona.amethyst.ui.navigation.navs.INav
import com.vitorpamplona.amethyst.ui.navigation.routes.Route import com.vitorpamplona.amethyst.ui.navigation.routes.Route
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding import com.vitorpamplona.amethyst.ui.theme.HorzHalfVertPadding
@Composable @Composable
fun BasicRelaySetupInfoDialog( fun BasicRelaySetupInfoDialog(
@@ -45,7 +45,7 @@ fun BasicRelaySetupInfoDialog(
onDelete = onDelete, onDelete = onDelete,
onClick = { nav.nav(Route.RelayInfo(item.relay.url)) }, onClick = { nav.nav(Route.RelayInfo(item.relay.url)) },
nip11CachedRetriever = nip11CachedRetriever, nip11CachedRetriever = nip11CachedRetriever,
modifier = HalfVertPadding, modifier = HorzHalfVertPadding,
index = index, index = index,
dragState = dragState, dragState = dragState,
countResult = countResult, countResult = countResult,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
+2
View File
@@ -155,6 +155,8 @@ val HalfVertPadding = Modifier.padding(vertical = 5.dp)
val HorzPadding = Modifier.padding(horizontal = 10.dp) val HorzPadding = Modifier.padding(horizontal = 10.dp)
val VertPadding = Modifier.padding(vertical = 10.dp) val VertPadding = Modifier.padding(vertical = 10.dp)
val HorzHalfVertPadding = Modifier.padding(horizontal = 10.dp, vertical = 5.dp)
val DoubleHorzPadding = Modifier.padding(horizontal = 20.dp) val DoubleHorzPadding = Modifier.padding(horizontal = 20.dp)
val DoubleVertPadding = Modifier.padding(vertical = 20.dp) val DoubleVertPadding = Modifier.padding(vertical = 20.dp)