From 1b13fadce7aea2e6ddcac346caa55d123042c985 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Tue, 21 Jul 2026 21:19:07 +0800 Subject: [PATCH] Improve Divider --- .../app/src/main/java/com/v2ray/ang/compose/Components.kt | 5 +++++ .../java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt | 4 ++-- .../main/java/com/v2ray/ang/ui/logcat/LogcatActivity.kt | 4 ++-- .../src/main/java/com/v2ray/ang/ui/main/MainActivity.kt | 1 - .../app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt | 2 +- .../main/java/com/v2ray/ang/ui/main/MainServerPager.kt | 8 ++++---- .../com/v2ray/ang/ui/perappproxy/PerAppProxyActivity.kt | 3 ++- .../com/v2ray/ang/ui/routing/RoutingSettingActivity.kt | 4 ++-- .../com/v2ray/ang/ui/subscription/SubSettingActivity.kt | 4 ++-- .../java/com/v2ray/ang/ui/userasset/UserAssetActivity.kt | 4 ++-- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt index 1b71401a..5008fefe 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt @@ -241,6 +241,11 @@ private fun createBitmapFromDrawable(drawable: Drawable): Bitmap { return bitmap } +@Composable +fun ItemDivider() { + AppDivider(modifier = Modifier.padding(horizontal = 12.dp)) +} + @Composable fun AppDivider(modifier: Modifier = Modifier) { val color = if (LocalDarkTheme.current) dividerColorDark else dividerColorLight diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt index 30823d72..cc67ef1a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppListItem import com.v2ray.ang.compose.AppTopBar +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.verticalScrollbar import com.v2ray.ang.dto.AppInfo import com.v2ray.ang.ui.base.BaseComponentActivity @@ -191,7 +191,7 @@ fun AppPickerScreen( checked = checked, onCheckedChange = { onToggleApp(app.packageName) } ) - AppDivider() + ItemDivider() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/logcat/LogcatActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/logcat/LogcatActivity.kt index deca87eb..fef13c0f 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/logcat/LogcatActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/logcat/LogcatActivity.kt @@ -38,8 +38,8 @@ import androidx.core.content.FileProvider import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppTopBar +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.verticalScrollbar import com.v2ray.ang.extension.toast import com.v2ray.ang.ui.base.BaseComponentActivity @@ -210,7 +210,7 @@ fun LogcatScreen( ) { itemsIndexed(items = logs, key = { index, _ -> index }) { _, log -> LogcatItem(log = log, onLongClick = { Utils.setClipboard(context, log) }) - AppDivider() + ItemDivider() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainActivity.kt index 3b95479c..a72200c5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainActivity.kt @@ -1,6 +1,5 @@ package com.v2ray.ang.ui.main -import android.app.Activity import android.content.Intent import android.net.VpnService import android.os.Build diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt index 63c60e1c..a6518b20 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDrawer.kt @@ -85,7 +85,7 @@ fun MainDrawerContent(onNavigate: (String) -> Unit) { ), onNavigate = onNavigate ) - AppDivider(modifier = Modifier.padding(vertical = 4.dp)) + AppDivider() DrawerMenuGroup( items = listOf( DrawerMenuItemData(R.drawable.ic_promotion_24dp, R.string.title_pref_promotion, "promotion"), diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainServerPager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainServerPager.kt index bb2698e6..71d17ab6 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainServerPager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainServerPager.kt @@ -43,7 +43,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.ReorderableGridItem import com.v2ray.ang.compose.ReorderableListItem import com.v2ray.ang.compose.colorConfigType @@ -207,7 +207,7 @@ private fun ServerListPage( onRemoveServer = onRemoveServer ) } - AppDivider(modifier = Modifier.padding(horizontal = 12.dp)) + ItemDivider() } } else { ServerItemRow( @@ -220,7 +220,7 @@ private fun ServerListPage( onMoreServer = onMoreServer, onRemoveServer = onRemoveServer ) - AppDivider(modifier = Modifier.padding(horizontal = 12.dp)) + ItemDivider() } } } @@ -294,7 +294,7 @@ private fun ServerItemColumn( onRemove = { onRemoveServer(serverCache.guid) }, onMore = { onMoreServer(serverCache.guid, profile) } ) - AppDivider(modifier = Modifier.padding(horizontal = 12.dp)) + ItemDivider() } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/perappproxy/PerAppProxyActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/perappproxy/PerAppProxyActivity.kt index a470c0b5..ee4219e8 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/perappproxy/PerAppProxyActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/perappproxy/PerAppProxyActivity.kt @@ -44,6 +44,7 @@ import com.v2ray.ang.R import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppListItem import com.v2ray.ang.compose.AppTopBar +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.colorFabActive import com.v2ray.ang.compose.verticalScrollbar import com.v2ray.ang.dto.AppInfo @@ -275,7 +276,7 @@ fun PerAppProxyScreen( checked = checked, onCheckedChange = { onToggleApp(app.packageName) } ) - AppDivider() + ItemDivider() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingSettingActivity.kt index 6d19ec86..033dde98 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingSettingActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingSettingActivity.kt @@ -45,8 +45,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppTopBar +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.ReorderableListItem import com.v2ray.ang.compose.SelectListDialog import com.v2ray.ang.compose.SettingsListItem @@ -288,7 +288,7 @@ fun RoutingSettingScreen( } ) } - AppDivider(modifier = Modifier.padding(horizontal = 14.dp)) + ItemDivider() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubSettingActivity.kt index e32561f9..22c8d517 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubSettingActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubSettingActivity.kt @@ -40,9 +40,9 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppTopBar import com.v2ray.ang.compose.ConfirmDialog +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.QRCodeDialog import com.v2ray.ang.compose.ReorderableListItem import com.v2ray.ang.compose.SelectListDialog @@ -237,7 +237,7 @@ fun SubSettingScreen( } } } - AppDivider(modifier = Modifier.padding(horizontal = 14.dp)) + ItemDivider() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetActivity.kt index 983af559..3f6c01b1 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetActivity.kt @@ -45,9 +45,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider import com.v2ray.ang.compose.AppTopBar import com.v2ray.ang.compose.ConfirmDialog +import com.v2ray.ang.compose.ItemDivider import com.v2ray.ang.compose.SettingsListItem import com.v2ray.ang.compose.verticalScrollbar import com.v2ray.ang.dto.entities.AssetUrlCache @@ -335,7 +335,7 @@ fun UserAssetScreen( onEdit = { onEditAsset(item.guid) }, onDeleteClick = { deleteTargetGuid = item.guid } ) - AppDivider(modifier = Modifier.padding(horizontal = 14.dp)) + ItemDivider() } } }