view model fix
This commit is contained in:
parent
c66a1159c5
commit
fc3d599689
@ -50,8 +50,8 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.ModalDrawerSheet
|
import androidx.compose.material3.ModalDrawerSheet
|
||||||
import androidx.compose.material3.ModalNavigationDrawer
|
import androidx.compose.material3.ModalNavigationDrawer
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.Switch
|
import androidx.compose.material3.Switch
|
||||||
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.material3.VerticalDivider
|
import androidx.compose.material3.VerticalDivider
|
||||||
import androidx.compose.material3.rememberDrawerState
|
import androidx.compose.material3.rememberDrawerState
|
||||||
@ -75,11 +75,10 @@ import androidx.compose.ui.text.style.TextOverflow
|
|||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
|
||||||
import coil3.compose.AsyncImage
|
import coil3.compose.AsyncImage
|
||||||
import com.mob.utsmyanmar.R
|
import com.mob.utsmyanmar.R
|
||||||
import com.mob.utsmyanmar.ui.components.appbar.AppBar
|
import com.mob.utsmyanmar.ui.components.appbar.AppBar
|
||||||
import com.mob.utsmyanmar.ui.device_info.DeviceInfoViewModel
|
import com.mob.utsmyanmar.ui.device_info.DeviceInfoUiState
|
||||||
import com.mob.utsmyanmar.ui.preview.P2Preview
|
import com.mob.utsmyanmar.ui.preview.P2Preview
|
||||||
import com.mob.utsmyanmar.ui.preview.P3Preview
|
import com.mob.utsmyanmar.ui.preview.P3Preview
|
||||||
import com.mob.utsmyanmar.ui.theme.Color
|
import com.mob.utsmyanmar.ui.theme.Color
|
||||||
@ -99,13 +98,8 @@ fun DashboardScreen2(
|
|||||||
onNavigateAction: (String) -> Unit = {},
|
onNavigateAction: (String) -> Unit = {},
|
||||||
onNavigateNotifications: () -> Unit = {},
|
onNavigateNotifications: () -> Unit = {},
|
||||||
dashboardUiState: DashboardUiState = DashboardUiState(),
|
dashboardUiState: DashboardUiState = DashboardUiState(),
|
||||||
deviceInfoViewModel: DeviceInfoViewModel = viewModel()
|
deviceInfo: DeviceInfoUiState = DeviceInfoUiState()
|
||||||
) {
|
) {
|
||||||
val deviceInfo by deviceInfoViewModel.uiState.collectAsState()
|
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
|
||||||
deviceInfoViewModel.loadDeviceInfo()
|
|
||||||
}
|
|
||||||
|
|
||||||
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
|
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
@ -114,7 +108,7 @@ fun DashboardScreen2(
|
|||||||
var activeHostAction by remember { mutableStateOf("Log-On") }
|
var activeHostAction by remember { mutableStateOf("Log-On") }
|
||||||
var isHostActionRunning by remember { mutableStateOf(false) }
|
var isHostActionRunning by remember { mutableStateOf(false) }
|
||||||
var dialogMessage by remember { mutableStateOf("") }
|
var dialogMessage by remember { mutableStateOf("") }
|
||||||
var reversalEnabled by remember { mutableStateOf(SystemParamsOperation.getInstance().isReversalOn) }
|
var reversalEnabled by remember { mutableStateOf(runCatching { SystemParamsOperation.getInstance().isReversalOn }.getOrDefault(false)) }
|
||||||
|
|
||||||
val isOnline = true
|
val isOnline = true
|
||||||
|
|
||||||
@ -324,7 +318,7 @@ fun DashboardScreen2(
|
|||||||
title = "Reversal", subTitle = "Enable / Disable Reversal",
|
title = "Reversal", subTitle = "Enable / Disable Reversal",
|
||||||
onClick = {
|
onClick = {
|
||||||
reversalEnabled = !reversalEnabled
|
reversalEnabled = !reversalEnabled
|
||||||
SystemParamsOperation.getInstance().setReversalFlag(reversalEnabled)
|
runCatching { SystemParamsOperation.getInstance().setReversalFlag(reversalEnabled) }
|
||||||
},
|
},
|
||||||
leadingIcon = {
|
leadingIcon = {
|
||||||
Icon(
|
Icon(
|
||||||
@ -338,7 +332,7 @@ fun DashboardScreen2(
|
|||||||
checked = reversalEnabled,
|
checked = reversalEnabled,
|
||||||
onCheckedChange = { isChecked ->
|
onCheckedChange = { isChecked ->
|
||||||
reversalEnabled = isChecked
|
reversalEnabled = isChecked
|
||||||
SystemParamsOperation.getInstance().setReversalFlag(isChecked)
|
runCatching { SystemParamsOperation.getInstance().setReversalFlag(isChecked) }
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
@ -384,6 +378,7 @@ fun DashboardScreen2(
|
|||||||
|
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
|
//body start
|
||||||
Scaffold(
|
Scaffold(
|
||||||
containerColor = Color.IvoryBeige, topBar = {
|
containerColor = Color.IvoryBeige, topBar = {
|
||||||
AppBar(
|
AppBar(
|
||||||
@ -857,19 +852,13 @@ private val previewTransactions = listOf(
|
|||||||
TrnxRecord(5L, "Settlement", "MMK 0", "----", "06/08 18:00", isVoided = false, isApproved = true),
|
TrnxRecord(5L, "Settlement", "MMK 0", "----", "06/08 18:00", isVoided = false, isApproved = true),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@P3Preview
|
||||||
@P2Preview
|
@P2Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun PreviewDashboardScreen2() {
|
fun PreviewDashboardScreen2() {
|
||||||
DashboardScreen2(dashboardUiState = DashboardUiState(previewTransactions))
|
DashboardScreen2(dashboardUiState = DashboardUiState(previewTransactions))
|
||||||
}
|
}
|
||||||
|
|
||||||
@P3Preview
|
|
||||||
@Composable
|
|
||||||
fun PreviewDashboardScreen3() {
|
|
||||||
DashboardScreen2(dashboardUiState = DashboardUiState(previewTransactions))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun PreviewItem() {
|
fun PreviewItem() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user