app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt

@@ -6,15 +6,50 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+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.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.pager.HorizontalPager
 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.BarChart
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.ChevronRight
+import androidx.compose.material.icons.filled.Dashboard
+import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.filled.Sync
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.ModalNavigationDrawer
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.material3.NavigationDrawerItemDefaults
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.VerticalDivider
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip

app/src/main/java/com/mob/utsmyanmar/ui/input_amount/InputAmountScreen.kt

@@ -7,7 +7,6 @@ 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.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -68,7 +67,7 @@ fun InputAmount(
             Box(
                 modifier = Modifier
                     .fillMaxSize()
-                    .weight(2f),
+                    .weight(1f),
             ){
                 Card(
                     modifier = Modifier.align(Alignment.CenterEnd)
@@ -94,7 +93,7 @@ fun InputAmount(
                     Text(
                         text = "Enter Amount",
                         color = Color.Gray,
-                        fontSize = 18.sp,
+                        fontSize = 11.sp,
                         modifier = Modifier.align(Alignment.CenterHorizontally)
                     )
                     Spacer(modifier = Modifier.height(8.dp))
@@ -107,7 +106,7 @@ fun InputAmount(
                             Text(
                                 text = prefixLabel,
                                 color = Color.LegacyRed,
-                                fontSize = 16.sp,
+                                fontSize = 13.sp,
                                 fontWeight = FontWeight.Medium,
                                 modifier = Modifier.padding(end = 10.dp, bottom = 6.dp)
                             )
@@ -121,12 +120,12 @@ fun InputAmount(
                         )
                     }
 
-                    Spacer(modifier = Modifier.height(14.dp))
+                    Spacer(modifier = Modifier.height(12.dp))
 
                     Text(
                         text = supportingText,
                         color = Color.Gray,
-                        fontSize = 14.sp,
+                        fontSize = 11.sp,
                         modifier = Modifier.align(Alignment.CenterHorizontally)
                     )
                 }
@@ -140,7 +139,6 @@ fun InputAmount(
                 verticalArrangement = Arrangement.Bottom
             ){
                 NumericKeypad(
-                    modifier = Modifier.fillMaxSize(),
                     onKeyClick = { value ->
                         amount = appendAmountValue(amount, value)
                     }
@@ -204,7 +202,6 @@ fun InputAmount(
 
 @Composable
 private fun NumericKeypad(
-    modifier: Modifier = Modifier,
     onKeyClick: (String) -> Unit
 ) {
     val keys : List<List<String>> = listOf(
@@ -214,18 +211,18 @@ private fun NumericKeypad(
         listOf(".", "0", "00")
     )
     Column(
-        modifier = modifier,
+        modifier = Modifier.fillMaxWidth(),
         verticalArrangement = Arrangement.spacedBy(6.dp)
     ) {
         keys.forEach { row ->
             Row(
-                modifier = Modifier.fillMaxWidth().weight(1f),
+                modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.spacedBy(6.dp)
             ) {
                 row.forEach { key ->
                     KeypadButton(
                         text = key,
-                        modifier = Modifier.weight(1f).fillMaxHeight(),
+                        modifier = Modifier.weight(1f),
                         onClick = { onKeyClick(key) }
                     )
                 }
@@ -244,6 +241,7 @@ private fun KeypadButton(
 
     Box(
         modifier = modifier
+            .height(66.dp)
             .shadow(
                 elevation = 2.dp,
                 shape = RoundedCornerShape(8.dp),