rkp/v2rayNG
1
0 Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fiximepadding (#5924)

Browse Source 
* Revert "Add imePadding for edit"

This reverts commit c74a6cade3.

* fix imepadding
This commit is contained in:
fuilloi authored and GitHub committed 2026-07-18 09:58:24 +08:00
1 parent 346c6cd60c
commit 09caeec326
6 files changed
+28 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt
+5 -1
View File
@@ -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(
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+6 -3
View File
@@ -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)
) {
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+5 -3
View File
@@ -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),
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
+3 -1
View File
@@ -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(
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerProxyChainActivity.kt
+5 -2
View File
@@ -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,
V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt
+4 -1
View File
@@ -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)
) {