Parcourir la source

worked on help screen UI

Khubaib il y a 10 mois
Parent
commit
311a0e7e27

+ 2 - 2
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/AccountScreen.kt

@@ -113,7 +113,7 @@ fun Account(navHostController: NavHostController,
                     .padding(start = 16.dp, end = 24.dp)
                     .fillMaxSize()
             ) {
-                Spacer(modifier = Modifier.height(60.dp))
+                Spacer(modifier = Modifier.height(50.dp))
                 AddTextAccount(
                     text = "Account",
                     size = 28.sp,
@@ -434,7 +434,7 @@ fun ColumnScope.AddRowAccountIcon(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 44.dp)
+            .padding(top = 40.dp)
             .background(Color.Transparent)
             .height(24.dp)
             .pointerInput(Unit) {

+ 12 - 8
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HelpScreen.kt

@@ -38,6 +38,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -78,14 +79,15 @@ fun Help(navHostController: NavHostController) {
                     .padding(start = 16.dp, end = 24.dp)
                     .fillMaxSize()
             ) {
-                Spacer(modifier = Modifier.height(60.dp))
+                Spacer(modifier = Modifier.height(50.dp))
                 AddTextHelp(
                     text = "Help",
                     size = 28.sp,
                     color = MaterialTheme.colorScheme.primary
                 )
                 AddRow(icon = R.drawable.faq3x,
-                    text = "FAQ", navHostController = navHostController)
+                    text = "FAQ", navHostController = navHostController,
+                    topPadding = 33.dp)
                 {
                     navHostController.navigate(
                         Screen.FAQ.route
@@ -132,14 +134,15 @@ fun ColumnScope.AddRow(
     icon: Int,
     text: String,
     navHostController: NavHostController,
+    topPadding: Dp = 40.dp,
     onClick: () -> Unit
 ) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 33.dp)
+            .padding(top = topPadding)
             .background(Color.Transparent)
-            .height(30.dp)
+            .height(24.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     Log.d("test_row", "Clicked Row ${onClick().toString()}")
@@ -198,7 +201,7 @@ fun ColumnScope.AddRow(
                     id = R.drawable.frontarrow3x),
                 contentDescription = "Front_Arrow",
                 modifier = Modifier
-                    .padding(start = 0.dp, end = 5.dp)
+                    .padding(start = 0.dp, end = 3.dp)
                     .size(10.dp, 18.dp)
                     .weight(1f)
                     .alpha(1F),
@@ -216,14 +219,15 @@ fun ColumnScope.AddRowIcon(
     icon: ImageVector,
     text: String,
     navHostController: NavHostController,
+    topPadding: Dp = 40.dp,
     onClick: () -> Unit
 ) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = 33.dp)
+            .padding(top = topPadding)
             .background(Color.Transparent)
-            .height(30.dp)
+            .height(24.dp)
             .pointerInput(Unit) {
                 detectTapGestures {
                     Log.d("test_row", "Clicked Row ${onClick().toString()}")
@@ -282,7 +286,7 @@ fun ColumnScope.AddRowIcon(
                     id = R.drawable.frontarrow3x),
                 contentDescription = "Front_Arrow",
                 modifier = Modifier
-                    .padding(start = 0.dp, end = 5.dp)
+                    .padding(start = 0.dp, end = 3.dp)
                     .size(10.dp, 18.dp)
                     .weight(1f)
                     .alpha(1F),