Improve Divider

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

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()
             }
         }
     }

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()
                 }
             }
         }

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

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"),

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()
     }
 }
 

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()
                 }
             }
         }

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()
                 }
             }
         }

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()
                 }
             }
         }

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()
             }
         }
     }