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

feat: implement Compose viewModel() function

Browse source
This commit is contained in:
andrekir 2023-03-22 17:59:59 -03:00
parent dfa25eb91e
commit 8e9b4cb273
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsItemList.kt
View file

@ -17,6 +17,7 @@ import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.lifecycle.viewmodel.compose.viewModel
import com.geeksville.mesh.ConfigProtos
import com.geeksville.mesh.ConfigProtos.Config.NetworkConfig
import com.geeksville.mesh.R
@ -34,7 +35,7 @@ import com.geeksville.mesh.ui.components.RegularPreference
import com.geeksville.mesh.ui.components.SwitchPreference
@Composable
fun DeviceSettingsItemList(viewModel: UIViewModel) {
fun DeviceSettingsItemList(viewModel: UIViewModel = viewModel()) {
val focusManager = LocalFocusManager.current
val hasWifi = viewModel.hasWifi()

3
app/src/main/java/com/geeksville/mesh/ui/ModuleSettingsItemList.kt
View file

@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType
import androidx.lifecycle.viewmodel.compose.viewModel
import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig
import com.geeksville.mesh.copy
import com.geeksville.mesh.model.UIViewModel
@ -27,7 +28,7 @@ import com.geeksville.mesh.ui.components.PreferenceFooter
import com.geeksville.mesh.ui.components.SwitchPreference
@Composable
fun ModuleSettingsItemList(viewModel: UIViewModel) {
fun ModuleSettingsItemList(viewModel: UIViewModel = viewModel()) {
val focusManager = LocalFocusManager.current
val connectionState by viewModel.connectionState.observeAsState()