From 09caeec32620cb8db8a127932c8ec091e646ba8d Mon Sep 17 00:00:00 2001 From: fuilloi <219219107+fuilloi@users.noreply.github.com> Date: Sat, 18 Jul 2026 09:58:24 +0800 Subject: [PATCH] Fiximepadding (#5924) * Revert "Add imePadding for edit" This reverts commit c74a6cade3c5fb9d1c9ea92a438fe686ea2552ee. * fix imepadding --- .../main/java/com/v2ray/ang/ui/RoutingEditActivity.kt | 6 +++++- .../app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt | 9 ++++++--- .../java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt | 8 +++++--- .../main/java/com/v2ray/ang/ui/ServerGroupActivity.kt | 4 +++- .../java/com/v2ray/ang/ui/ServerProxyChainActivity.kt | 7 +++++-- .../src/main/java/com/v2ray/ang/ui/SubEditActivity.kt | 5 ++++- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt index f2a2bf86d..d099c94e1 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt @@ -6,6 +6,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.imePadding @@ -39,6 +40,7 @@ import com.v2ray.ang.compose.ConfirmDialog import com.v2ray.ang.compose.FormDropdownField import com.v2ray.ang.compose.FormTextField import com.v2ray.ang.compose.SettingsSwitchItem +import com.v2ray.ang.compose.verticalScrollbar import com.v2ray.ang.dto.entities.RulesetItem import com.v2ray.ang.extension.nullIfBlank import com.v2ray.ang.extension.toast @@ -198,8 +200,10 @@ fun RoutingEditScreen( modifier = Modifier .fillMaxSize() .padding(innerPadding) - .imePadding() + .consumeWindowInsets(innerPadding) + .imepadding() .verticalScroll(scrollState) + .verticalScrollbar(scrollState) .padding(vertical = 8.dp) ) { FormTextField( diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt index ca54f9e13..a67db2254 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn @@ -356,13 +357,15 @@ fun ServerScreen( } ) } - ) { padding -> + ) { innerPadding -> LazyColumn( state = listState, modifier = Modifier .fillMaxSize() - .padding(padding) - .imePadding(), + .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imepadding() + .verticalScrollbar(listState), contentPadding = PaddingValues(bottom = 36.dp), verticalArrangement = Arrangement.spacedBy(8.dp) ) { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index 5ca8c8a87..a63929c7f 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -325,12 +326,13 @@ fun ServerCustomConfigScreen( } ) }, - ) { padding -> + ) { innerPadding -> Column( modifier = Modifier .fillMaxSize() - .padding(padding) - .imePadding() + .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imepadding() ) { FormTextField( label = stringResource(R.string.server_lab_remarks), diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt index 299a95577..c9e562b95 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt @@ -2,6 +2,7 @@ package com.v2ray.ang.ui import android.os.Bundle import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding @@ -227,8 +228,9 @@ fun ServerGroupScreen( modifier = Modifier .fillMaxSize() .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imepadding() .padding(vertical = 8.dp) - .imePadding() ) { FormTextField(stringResource(R.string.server_lab_remarks), remarks, { remarks = it }) FormDropdownField( diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt index fc0fb89fb..8c8ae6e03 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.imePadding @@ -239,8 +240,10 @@ fun ProxyChainScreen( state = lazyListState, modifier = Modifier .fillMaxSize() - .imePadding() - .padding(innerPadding), + .padding(innerPadding) + .consumeWindowInsets(innerPadding) + .imepadding() + .verticalScrollbar(lazyListState), contentPadding = PaddingValues( top = 8.dp, start = 16.dp, diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt index 335a4c7f8..b7693205d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt @@ -3,6 +3,7 @@ package com.v2ray.ang.ui import android.os.Bundle import android.text.TextUtils import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding @@ -186,8 +187,10 @@ fun SubEditScreen( modifier = Modifier .fillMaxSize() .padding(innerPadding) - .imePadding() + .consumeWindowInsets(innerPadding) + .imepadding() .verticalScroll(scrollState) + .verticalScrollbar(scrollState) .padding(vertical = 8.dp) .padding(bottom = 36.dp) ) {