diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt index 085b117..af121fe 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt @@ -11,10 +11,10 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width @@ -25,9 +25,6 @@ import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* -import androidx.compose.material3.* -import androidx.compose.runtime.* import androidx.compose.material.icons.filled.AccountBalanceWallet import androidx.compose.material.icons.filled.BarChart import androidx.compose.material.icons.filled.Check @@ -42,18 +39,19 @@ import androidx.compose.material.icons.filled.SwapHoriz import androidx.compose.material.icons.filled.Sync import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button -import androidx.compose.material3.IconButton import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.DrawerValue import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalDrawerSheet import androidx.compose.material3.ModalNavigationDrawer import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.Switch import androidx.compose.material3.TextButton import androidx.compose.material3.VerticalDivider import androidx.compose.material3.rememberDrawerState @@ -117,6 +115,7 @@ fun DashboardScreen2( var activeHostAction by remember { mutableStateOf("Log-On") } var isHostActionRunning by remember { mutableStateOf(false) } var dialogMessage by remember { mutableStateOf("") } + var reversalEnabled by remember { mutableStateOf(SystemParamsOperation.getInstance().isReversalOn) } val isOnline = true @@ -322,6 +321,29 @@ fun DashboardScreen2( }, trailingIcon = {}, ) + Item( + title = "Reversal", subTitle = "Enable / Disable Reversal", + onClick = { + reversalEnabled = !reversalEnabled + SystemParamsOperation.getInstance().setReversalFlag(reversalEnabled) + }, + leadingIcon = { + Icon( + Icons.Default.Sync, + contentDescription = "icon", + tint = Color.LegacyRed + ) + }, + trailingIcon = { + Switch( + checked = reversalEnabled, + onCheckedChange = { isChecked -> + reversalEnabled = isChecked + SystemParamsOperation.getInstance().setReversalFlag(isChecked) + } + ) + }, + ) Text( text = "System Management", @@ -329,27 +351,6 @@ fun DashboardScreen2( modifier = Modifier.padding(horizontal = 16.dp) ) - var switchChecked by remember { mutableStateOf(SystemParamsOperation.getInstance().isReversalOn) } - DrawerItem( - title = "Reversal On/Off", - icon = Icons.Default.Sync, - showSwitch = true, - isChecked = switchChecked, - onCheckedChange = { isChecked -> - switchChecked = isChecked - SystemParamsOperation.getInstance().setReversalFlag(isChecked) - - }, - onClick = {} - ) - DrawerItem("Function", Icons.Default.Dashboard) { - scope.launch { drawerState.close() } - onNavigateFunctions() - } - DrawerItem("Version", Icons.Default.Dashboard) { - scope.launch { drawerState.close() } - onNavigateVersion() - } Item( title = "Functions", subTitle = "System Function Settings", onClick = {