sp9unb
/
meshtastic-android
sforkowany z mirror/meshtastic-android
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

refactor: use OutlinedButton for radio configs

master
andrekir 2023-05-16 17:47:20 -03:00
rodzic c3ab3c5ae9
commit ab5f1ffac1
1 zmienionych plików z 2 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
Wyświetl plik

@ -9,11 +9,8 @@ import android.view.ViewGroup
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.StringRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@ -31,6 +28,7 @@ import androidx.compose.material.Card
import androidx.compose.material.ContentAlpha
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.twotone.KeyboardArrowRight
@ -44,7 +42,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.ViewCompositionStrategy
@ -743,12 +740,10 @@ fun NavButton(@StringRes title: Int, enabled: Boolean, onClick: () -> Unit) {
)
Column {
val borderColor = if (isSystemInDarkTheme()) Color.DarkGray else Color.Unspecified
Spacer(modifier = Modifier.height(4.dp))
Button(
OutlinedButton(
modifier = Modifier
.fillMaxWidth()
.border(BorderStroke(1.dp, borderColor), shape = MaterialTheme.shapes.medium)
.height(48.dp),
enabled = enabled,
onClick = { showDialog = true },