|
@@ -122,9 +122,10 @@ fun Settings(navHostController: NavHostController) {
|
|
|
verticalArrangement = Arrangement.Top,
|
|
|
horizontalAlignment = Alignment.Start,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 16.dp, end = 24.dp)
|
|
|
+ .padding(start = 16.dp, end = 0.dp)
|
|
|
.fillMaxSize()
|
|
|
.verticalScroll(rememberScrollState())
|
|
|
+ .background(Color.Transparent)
|
|
|
) {
|
|
|
// if (BottomBarScreen.Settings.isTrue) {
|
|
|
// AddRowSettingsSmart(
|
|
@@ -136,7 +137,7 @@ fun Settings(navHostController: NavHostController) {
|
|
|
// )
|
|
|
// }
|
|
|
|
|
|
- Spacer(modifier = Modifier.height(60.dp))
|
|
|
+ Spacer(modifier = Modifier.height(50.dp))
|
|
|
AddTextSettings(
|
|
|
text = "Settings",
|
|
|
size = 28.sp,
|
|
@@ -175,6 +176,7 @@ fun Settings(navHostController: NavHostController) {
|
|
|
AddRowSettings(
|
|
|
icon = R.drawable.kill_switch3x,
|
|
|
text = "Kill Switch",
|
|
|
+ topPadding = 34.dp,
|
|
|
onClick = {
|
|
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
|
|
gotoVPNSettings(context)
|
|
@@ -217,7 +219,7 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
|
|
|
Row(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(top = 33.dp)
|
|
|
+ .padding(top = 34.dp, end = 13.dp)
|
|
|
.background(Color.Transparent)
|
|
|
.height(30.dp),
|
|
|
horizontalArrangement = Arrangement.Start,
|
|
@@ -248,7 +250,7 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
)
|
|
|
}
|
|
@@ -288,9 +290,7 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
|
|
|
uncheckedTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,
|
|
|
uncheckedBorderColor = MaterialTheme.colorScheme.surfaceContainerHighest
|
|
|
),
|
|
|
- thumbContent = {
|
|
|
-
|
|
|
- }
|
|
|
+ thumbContent = {}
|
|
|
)
|
|
|
}
|
|
|
}
|
|
@@ -300,14 +300,15 @@ fun ColumnScope.AddRowSwitch(icon: Int, text: String) {
|
|
|
fun ColumnScope.AddRowSettings(
|
|
|
icon: Int,
|
|
|
text: String,
|
|
|
+ topPadding: Dp = 40.dp,
|
|
|
onClick: () -> Unit
|
|
|
) {
|
|
|
Row(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(top = 33.dp)
|
|
|
+ .padding(top = topPadding, end = 27.dp)
|
|
|
.background(Color.Transparent)
|
|
|
- .height(30.dp)
|
|
|
+ .height(24.dp)
|
|
|
.pointerInput(Unit) {
|
|
|
detectTapGestures {
|
|
|
onClick()
|
|
@@ -341,7 +342,7 @@ fun ColumnScope.AddRowSettings(
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
)
|
|
|
}
|
|
@@ -358,7 +359,7 @@ fun ColumnScope.AddRowSettings(
|
|
|
painter = painterResource(id = R.drawable.frontarrow3x),
|
|
|
contentDescription = "Front_Arrow",
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 0.dp, end = 20.dp)
|
|
|
+ .padding(start = 0.dp, end = 0.dp)
|
|
|
.size(10.dp, 18.dp)
|
|
|
.weight(1f),
|
|
|
colorFilter = ColorFilter.tint(
|
|
@@ -395,7 +396,7 @@ fun ColumnScope.AddRowSettingsColumn(
|
|
|
Row(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(top = 33.dp)
|
|
|
+ .padding(top = 40.dp, end = 27.dp)
|
|
|
.background(Color.Transparent)
|
|
|
.height(40.dp)
|
|
|
// .clickable { isSheetOpen = true }
|
|
@@ -435,7 +436,7 @@ fun ColumnScope.AddRowSettingsColumn(
|
|
|
style = MaterialTheme.typography.titleSmall,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
)
|
|
|
Spacer(modifier = Modifier.height(2.dp))
|
|
@@ -446,7 +447,7 @@ fun ColumnScope.AddRowSettingsColumn(
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
.alpha(0.6F),
|
|
|
)
|
|
@@ -465,7 +466,7 @@ fun ColumnScope.AddRowSettingsColumn(
|
|
|
painter = painterResource(id = R.drawable.frontarrow3x),
|
|
|
contentDescription = "Front_Arrow",
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 0.dp, end = 20.dp)
|
|
|
+ .padding(start = 0.dp, end = 0.dp)
|
|
|
.size(10.dp, 18.dp)
|
|
|
.weight(1f),
|
|
|
colorFilter = ColorFilter.tint(
|
|
@@ -613,14 +614,14 @@ fun AddRowDarkLightTheme(
|
|
|
Row(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(top = 33.dp)
|
|
|
+ .padding(top = 40.dp, end = 27.dp)
|
|
|
.background(Color.Transparent)
|
|
|
.pointerInput(Unit) {
|
|
|
detectTapGestures {
|
|
|
isThemeSheetOpen = true
|
|
|
}
|
|
|
}
|
|
|
- .height(30.dp),
|
|
|
+ .height(24.dp),
|
|
|
horizontalArrangement = Arrangement.Start,
|
|
|
verticalAlignment = Alignment.CenterVertically
|
|
|
) {
|
|
@@ -649,7 +650,7 @@ fun AddRowDarkLightTheme(
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
)
|
|
|
}
|
|
@@ -666,7 +667,7 @@ fun AddRowDarkLightTheme(
|
|
|
painter = painterResource(id = R.drawable.frontarrow3x),
|
|
|
contentDescription = "Front_Arrow",
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 0.dp, end = 20.dp)
|
|
|
+ .padding(start = 0.dp, end = 0.dp)
|
|
|
.size(10.dp, 18.dp)
|
|
|
.weight(1f),
|
|
|
colorFilter = ColorFilter.tint(
|
|
@@ -791,7 +792,7 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
Row(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(top = 33.dp)
|
|
|
+ .padding(top = 40.dp, end = 27.dp)
|
|
|
.background(Color.Transparent)
|
|
|
.pointerInput(Unit) {
|
|
|
detectTapGestures {
|
|
@@ -827,7 +828,7 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
color = MaterialTheme.colorScheme.primary,
|
|
|
maxLines = 1,
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 20.dp, end = 0.dp)
|
|
|
+ .padding(start = 18.dp, end = 0.dp)
|
|
|
.weight(1f)
|
|
|
)
|
|
|
}
|
|
@@ -842,7 +843,7 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
painter = painterResource(id = R.drawable.frontarrow3x),
|
|
|
contentDescription = "Front_Arrow",
|
|
|
modifier = Modifier
|
|
|
- .padding(start = 0.dp, end = 20.dp)
|
|
|
+ .padding(start = 0.dp, end = 3.dp)
|
|
|
.size(10.dp, 18.dp)
|
|
|
.weight(1f),
|
|
|
colorFilter = ColorFilter.tint(
|