mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 08:20:51 +00:00
Layout improvements for the relay screen
This commit is contained in:
parent
e178ff988d
commit
3333fdc237
@ -28,9 +28,9 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
|
import androidx.compose.material3.OutlinedButton
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TopAppBar
|
import androidx.compose.material3.TopAppBar
|
||||||
@ -53,6 +53,7 @@ import com.vitorpamplona.amethyst.ui.actions.SaveButton
|
|||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
||||||
import com.vitorpamplona.amethyst.ui.theme.FeedPadding
|
import com.vitorpamplona.amethyst.ui.theme.FeedPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.MinHorzSpacer
|
import com.vitorpamplona.amethyst.ui.theme.MinHorzSpacer
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
|
||||||
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
|
||||||
import com.vitorpamplona.amethyst.ui.theme.grayText
|
import com.vitorpamplona.amethyst.ui.theme.grayText
|
||||||
|
|
||||||
@ -232,7 +233,7 @@ fun AllRelayListView(
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ResetKind3Relays(postViewModel: Kind3RelayListViewModel) {
|
fun ResetKind3Relays(postViewModel: Kind3RelayListViewModel) {
|
||||||
Button(
|
OutlinedButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
postViewModel.deleteAll()
|
postViewModel.deleteAll()
|
||||||
Constants.defaultRelays.forEach { postViewModel.addRelay(it) }
|
Constants.defaultRelays.forEach { postViewModel.addRelay(it) }
|
||||||
@ -245,7 +246,7 @@ fun ResetKind3Relays(postViewModel: Kind3RelayListViewModel) {
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ResetSearchRelays(postViewModel: SearchRelayListViewModel) {
|
fun ResetSearchRelays(postViewModel: SearchRelayListViewModel) {
|
||||||
Button(
|
OutlinedButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
postViewModel.deleteAll()
|
postViewModel.deleteAll()
|
||||||
Constants.defaultSearchRelaySet.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it)) }
|
Constants.defaultSearchRelaySet.forEach { postViewModel.addRelay(BasicRelaySetupInfo(it)) }
|
||||||
@ -285,7 +286,7 @@ fun SettingsCategoryWithButton(
|
|||||||
action: @Composable () -> Unit,
|
action: @Composable () -> Unit,
|
||||||
modifier: Modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
|
modifier: Modifier = Modifier.padding(top = 24.dp, bottom = 8.dp),
|
||||||
) {
|
) {
|
||||||
Row(modifier) {
|
Row(modifier, horizontalArrangement = RowColSpacing) {
|
||||||
Column(modifier = Modifier.weight(1f)) {
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
Text(
|
Text(
|
||||||
text = title,
|
text = title,
|
||||||
|
Loading…
Reference in New Issue
Block a user