meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: hoist SnackbarHost to Scaffold

Browse source
This commit is contained in:
andrekir 2023-07-18 18:28:49 -03:00
parent 2f078113fa
commit f27ae8feba
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View file

@ -9,6 +9,7 @@ import android.view.ViewGroup
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
@ -21,6 +22,7 @@ import androidx.compose.material.LocalContentAlpha
import androidx.compose.material.LocalContentColor
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedTextField
import androidx.compose.material.Scaffold
import androidx.compose.material.SnackbarHost
import androidx.compose.material.SnackbarHostState
import androidx.compose.material.Text
@ -99,8 +101,23 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
return ComposeView(requireContext()).apply {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
val scope = rememberCoroutineScope()
val snackbarHostState = remember { SnackbarHostState() }
AppCompatTheme {
ChannelScreen(model)
Scaffold(
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
) { paddingValues ->
Box(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues),
) {
ChannelScreen(model) { text ->
scope.launch { snackbarHostState.showSnackbar(text) }
}
}
}
}
}
}
@ -108,14 +125,14 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
}
@Composable
fun ChannelScreen(viewModel: UIViewModel = viewModel()) {
fun ChannelScreen(
viewModel: UIViewModel = viewModel(),
showSnackbar: (String) -> Unit = {},
) {
val context = LocalContext.current
val focusManager = LocalFocusManager.current
val clipboardManager = LocalClipboardManager.current
val scope = rememberCoroutineScope()
val snackbarHostState = remember { SnackbarHostState() }
val connectionState by viewModel.connectionState.observeAsState()
val connected = connectionState == MeshService.ConnectionState.CONNECTED
val enabled = connected && !viewModel.isManaged
@ -177,9 +194,7 @@ fun ChannelScreen(viewModel: UIViewModel = viewModel()) {
channelSet = channels.protobuf // Throw away user edits
// Tell the user to try again
scope.launch {
snackbarHostState.showSnackbar(context.getString(R.string.radio_sleeping))
}
showSnackbar(context.getString(R.string.radio_sleeping))
}
}
@ -405,7 +420,6 @@ fun ChannelScreen(viewModel: UIViewModel = viewModel()) {
}
}
}
SnackbarHost(hostState = snackbarHostState)
}
@Preview(showBackground = true)