From d4ebab69c7f940744330c2bd3f7499f6c5c2c1f8 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Fri, 31 Jul 2026 20:20:25 +0800 Subject: [PATCH] Move Compose package into ui namespace --- .../main/java/com/v2ray/ang/AngApplication.kt | 2 +- .../java/com/v2ray/ang/extension/ToastExt.kt | 4 ++-- .../java/com/v2ray/ang/ui/AboutActivity.kt | 6 +++--- .../java/com/v2ray/ang/ui/ScannerActivity.kt | 2 +- .../ang/ui/apppicker/AppPickerActivity.kt | 8 ++++---- .../com/v2ray/ang/ui/backup/BackupActivity.kt | 10 +++++----- .../v2ray/ang/ui/base/BaseComponentActivity.kt | 2 +- .../ang/ui/checkupdate/CheckUpdateActivity.kt | 8 ++++---- .../v2ray/ang/{ => ui}/compose/Components.kt | 2 +- .../com/v2ray/ang/{ => ui}/compose/Dialog.kt | 2 +- .../v2ray/ang/{ => ui}/compose/FormFields.kt | 2 +- .../v2ray/ang/{ => ui}/compose/Scrollbar.kt | 2 +- .../v2ray/ang/{ => ui}/compose/SettingsItem.kt | 2 +- .../com/v2ray/ang/{ => ui}/compose/SnackBar.kt | 2 +- .../com/v2ray/ang/{ => ui}/compose/Theme.kt | 2 +- .../com/v2ray/ang/ui/logcat/LogcatActivity.kt | 6 +++--- .../com/v2ray/ang/ui/main/MainBottomBar.kt | 8 ++++---- .../java/com/v2ray/ang/ui/main/MainDialogs.kt | 2 +- .../java/com/v2ray/ang/ui/main/MainDrawer.kt | 4 ++-- .../java/com/v2ray/ang/ui/main/MainGroupTab.kt | 2 +- .../com/v2ray/ang/ui/main/MainImportMenu.kt | 2 +- .../java/com/v2ray/ang/ui/main/MainScreen.kt | 4 ++-- .../com/v2ray/ang/ui/main/MainServerPager.kt | 14 +++++++------- .../java/com/v2ray/ang/ui/main/MainTopBar.kt | 4 ++-- .../ang/ui/perappproxy/PerAppProxyActivity.kt | 12 ++++++------ .../ang/ui/routing/RoutingEditActivity.kt | 12 ++++++------ .../ang/ui/routing/RoutingSettingActivity.kt | 16 ++++++++-------- .../v2ray/ang/ui/server/BaseServerActivity.kt | 12 ++++++------ .../com/v2ray/ang/ui/server/ServerActivity.kt | 12 ++++++------ .../ui/server/ServerCustomConfigActivity.kt | 10 +++++----- .../v2ray/ang/ui/server/ServerGroupActivity.kt | 10 +++++----- .../v2ray/ang/ui/server/ServerHttpActivity.kt | 2 +- .../ang/ui/server/ServerHysteria2Activity.kt | 4 ++-- .../ang/ui/server/ServerProxyChainActivity.kt | 12 ++++++------ .../ang/ui/server/ServerShadowsocksActivity.kt | 4 ++-- .../v2ray/ang/ui/server/ServerSocksActivity.kt | 2 +- .../ang/ui/server/ServerTrojanActivity.kt | 2 +- .../v2ray/ang/ui/server/ServerVlessActivity.kt | 4 ++-- .../v2ray/ang/ui/server/ServerVmessActivity.kt | 4 ++-- .../ang/ui/server/ServerWireguardActivity.kt | 2 +- .../v2ray/ang/ui/settings/SettingsActivity.kt | 16 ++++++++-------- .../v2ray/ang/ui/shortcut/TaskerActivity.kt | 6 +++--- .../ang/ui/subscription/SubEditActivity.kt | 12 ++++++------ .../ang/ui/subscription/SubSettingActivity.kt | 18 +++++++++--------- .../ang/ui/userasset/UserAssetActivity.kt | 10 +++++----- .../ang/ui/userasset/UserAssetUrlActivity.kt | 6 +++--- 46 files changed, 145 insertions(+), 145 deletions(-) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/Components.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/Dialog.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/FormFields.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/Scrollbar.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/SettingsItem.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/SnackBar.kt (99%) rename V2rayNG/app/src/main/java/com/v2ray/ang/{ => ui}/compose/Theme.kt (99%) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt index 58db77ef..6a3a1758 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt @@ -6,7 +6,7 @@ import androidx.work.Configuration import androidx.work.WorkManager import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig.ANG_PACKAGE -import com.v2ray.ang.compose.ThemeManager +import com.v2ray.ang.ui.compose.ThemeManager import com.v2ray.ang.handler.SettingsManager class AngApplication : Application() { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/ToastExt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/ToastExt.kt index 40296f89..68a34cb7 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/ToastExt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/ToastExt.kt @@ -4,8 +4,8 @@ import android.content.Context import android.os.Handler import android.os.Looper import android.widget.Toast -import com.v2ray.ang.compose.AppSnackbarManager -import com.v2ray.ang.compose.ToastType +import com.v2ray.ang.ui.compose.AppSnackbarManager +import com.v2ray.ang.ui.compose.ToastType /** * Shows a toast message with the given resource ID. diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt index 8e5309c0..90821cd8 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt @@ -29,9 +29,9 @@ import androidx.compose.ui.viewinterop.AndroidView import com.v2ray.ang.AppConfig import com.v2ray.ang.BuildConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.SettingsMenuItem -import com.v2ray.ang.compose.VersionInfoBlock +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.SettingsMenuItem +import com.v2ray.ang.ui.compose.VersionInfoBlock import com.v2ray.ang.core.CoreNativeManager import com.v2ray.ang.ui.base.BaseComponentActivity import com.v2ray.ang.util.Utils diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt index 2b99105c..f31dd002 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt @@ -63,7 +63,7 @@ import com.google.zxing.PlanarYUVLuminanceSource import com.google.zxing.common.HybridBinarizer import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar +import com.v2ray.ang.ui.compose.AppTopBar import com.v2ray.ang.enums.PermissionType import com.v2ray.ang.extension.toast import com.v2ray.ang.ui.base.HelperBaseComponentActivity 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 cc67ef1a..1fb2669d 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,10 +31,10 @@ 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.AppListItem -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.ItemDivider -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppListItem +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.AppInfo import com.v2ray.ang.ui.base.BaseComponentActivity diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/backup/BackupActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/backup/BackupActivity.kt index deee006c..7be52143 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/backup/BackupActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/backup/BackupActivity.kt @@ -31,11 +31,11 @@ import androidx.lifecycle.repeatOnLifecycle import com.v2ray.ang.AppConfig import com.v2ray.ang.BuildConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.InputDialog -import com.v2ray.ang.compose.InputField -import com.v2ray.ang.compose.SelectListDialog -import com.v2ray.ang.compose.SettingsMenuItem +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.InputDialog +import com.v2ray.ang.ui.compose.InputField +import com.v2ray.ang.ui.compose.SelectListDialog +import com.v2ray.ang.ui.compose.SettingsMenuItem import com.v2ray.ang.dto.entities.WebDavConfig import com.v2ray.ang.extension.toastError import com.v2ray.ang.extension.toastSuccess diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/base/BaseComponentActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/base/BaseComponentActivity.kt index d836553a..c25b24a6 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/base/BaseComponentActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/base/BaseComponentActivity.kt @@ -6,7 +6,7 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.compose.runtime.Composable -import com.v2ray.ang.compose.AppTheme +import com.v2ray.ang.ui.compose.AppTheme import com.v2ray.ang.handler.SettingsManager import com.v2ray.ang.util.MyContextWrapper diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/checkupdate/CheckUpdateActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/checkupdate/CheckUpdateActivity.kt index e663a98f..f962c71c 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/checkupdate/CheckUpdateActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/checkupdate/CheckUpdateActivity.kt @@ -23,10 +23,10 @@ import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.v2ray.ang.BuildConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.SettingsMenuItem -import com.v2ray.ang.compose.SettingsSwitchItem -import com.v2ray.ang.compose.VersionInfoBlock +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.SettingsMenuItem +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.VersionInfoBlock import com.v2ray.ang.core.CoreNativeManager import com.v2ray.ang.ui.base.BaseComponentActivity import com.v2ray.ang.util.Utils diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Components.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Components.kt index e353a886..ff695448 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Components.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Components.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import android.graphics.Bitmap import android.graphics.Canvas diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Dialog.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Dialog.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/Dialog.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Dialog.kt index 8b72f07e..8c95e958 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Dialog.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Dialog.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import android.graphics.Bitmap import androidx.compose.foundation.Image diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/FormFields.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/FormFields.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/FormFields.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/FormFields.kt index ace22652..7ab3f1e9 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/FormFields.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/FormFields.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Scrollbar.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Scrollbar.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/Scrollbar.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Scrollbar.kt index c7e0d8e5..601f4c46 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Scrollbar.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Scrollbar.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/SettingsItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SettingsItem.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/SettingsItem.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SettingsItem.kt index 30168149..7ed4e69c 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/SettingsItem.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SettingsItem.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/SnackBar.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SnackBar.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/SnackBar.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SnackBar.kt index 69d97841..f2575d51 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/SnackBar.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/SnackBar.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Theme.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Theme.kt similarity index 99% rename from V2rayNG/app/src/main/java/com/v2ray/ang/compose/Theme.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Theme.kt index 2097f32b..3a07ac22 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/compose/Theme.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Theme.kt @@ -1,4 +1,4 @@ -package com.v2ray.ang.compose +package com.v2ray.ang.ui.compose import android.app.Activity import androidx.compose.foundation.isSystemInDarkTheme 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 fef13c0f..c3db7e9b 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,9 +38,9 @@ import androidx.core.content.FileProvider import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.ItemDivider -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.extension.toast import com.v2ray.ang.ui.base.BaseComponentActivity import com.v2ray.ang.util.Utils diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt index e43ad58a..950cf69d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainBottomBar.kt @@ -26,10 +26,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider -import com.v2ray.ang.compose.colorFabActive -import com.v2ray.ang.compose.colorFabInactiveDark -import com.v2ray.ang.compose.colorFabInactiveLight +import com.v2ray.ang.ui.compose.AppDivider +import com.v2ray.ang.ui.compose.colorFabActive +import com.v2ray.ang.ui.compose.colorFabInactiveDark +import com.v2ray.ang.ui.compose.colorFabInactiveLight @Composable fun MainBottomBar( diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDialogs.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDialogs.kt index 75254142..3eede6fb 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDialogs.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDialogs.kt @@ -3,7 +3,7 @@ package com.v2ray.ang.ui.main import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.DeleteConfirmDialog @Composable fun MainDialogs( 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 a6518b20..fbb8b044 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 @@ -34,8 +34,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.v2ray.ang.R -import com.v2ray.ang.compose.AppDivider -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppDivider +import com.v2ray.ang.ui.compose.verticalScrollbar @Composable fun MainDrawerContent(onNavigate: (String) -> Unit) { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainGroupTab.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainGroupTab.kt index e85dd4a9..b511cca8 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainGroupTab.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainGroupTab.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.v2ray.ang.compose.colorFabActive +import com.v2ray.ang.ui.compose.colorFabActive import com.v2ray.ang.dto.GroupMapItem import com.v2ray.ang.dto.entities.ServersCache import kotlinx.coroutines.flow.StateFlow diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainImportMenu.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainImportMenu.kt index 3523bf24..2dcb3cb7 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainImportMenu.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainImportMenu.kt @@ -6,7 +6,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.SelectListDialog +import com.v2ray.ang.ui.compose.SelectListDialog import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.isComplexType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainScreen.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainScreen.kt index 2d1e947f..4cf625db 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainScreen.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainScreen.kt @@ -28,8 +28,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.v2ray.ang.compose.LocalDarkTheme -import com.v2ray.ang.compose.QRCodeDialog +import com.v2ray.ang.ui.compose.LocalDarkTheme +import com.v2ray.ang.ui.compose.QRCodeDialog import com.v2ray.ang.dto.entities.ProfileItem import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged 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 05688e41..832f2f4d 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,13 +43,13 @@ 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.ItemDivider -import com.v2ray.ang.compose.ReorderableGridItem -import com.v2ray.ang.compose.ReorderableListItem -import com.v2ray.ang.compose.colorConfigType -import com.v2ray.ang.compose.colorPing -import com.v2ray.ang.compose.colorPingRed -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.ReorderableGridItem +import com.v2ray.ang.ui.compose.ReorderableListItem +import com.v2ray.ang.ui.compose.colorConfigType +import com.v2ray.ang.ui.compose.colorPing +import com.v2ray.ang.ui.compose.colorPingRed +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.dto.entities.ServersCache import com.v2ray.ang.extension.isComplexType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainTopBar.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainTopBar.kt index 0671b567..56afcd76 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainTopBar.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainTopBar.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.verticalScrollbar @OptIn(ExperimentalMaterial3Api::class) @Composable 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 ee4219e8..47c1f653 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 @@ -41,12 +41,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp 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.colorFabActive -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppDivider +import com.v2ray.ang.ui.compose.AppListItem +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.colorFabActive +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.AppInfo import com.v2ray.ang.extension.toastInfo import com.v2ray.ang.extension.toastSuccess diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingEditActivity.kt index 4ed2e20d..f93eefd7 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/routing/RoutingEditActivity.kt @@ -34,12 +34,12 @@ import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig.BUILTIN_OUTBOUND_TAGS import com.v2ray.ang.AppConfig.TAG_PROXY import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -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.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.RulesetItem import com.v2ray.ang.extension.nullIfBlank import com.v2ray.ang.extension.toast 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 e246b678..56848eb7 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,14 +45,14 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig import com.v2ray.ang.R -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 -import com.v2ray.ang.compose.colorConfigType -import com.v2ray.ang.compose.colorFabActive -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.ReorderableListItem +import com.v2ray.ang.ui.compose.SelectListDialog +import com.v2ray.ang.ui.compose.SettingsListItem +import com.v2ray.ang.ui.compose.colorConfigType +import com.v2ray.ang.ui.compose.colorFabActive +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.RulesetItem import com.v2ray.ang.extension.toastError import com.v2ray.ang.extension.toastSuccess diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt index 0a5570c5..2040baf2 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/BaseServerActivity.kt @@ -32,12 +32,12 @@ import androidx.compose.ui.unit.dp import com.v2ray.ang.AppConfig.REALITY import com.v2ray.ang.AppConfig.TLS import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -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.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.enums.NetworkType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt index f57cd399..89af54ca 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerActivity.kt @@ -34,12 +34,12 @@ import com.v2ray.ang.AppConfig.TLS import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -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.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.enums.NetworkType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt index 086e30e8..19a628e4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerCustomConfigActivity.kt @@ -55,11 +55,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.FormTextField -import com.v2ray.ang.compose.horizontalScrollbar -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.horizontalScrollbar +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toast diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt index 1c31d89d..4da40585 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerGroupActivity.kt @@ -26,11 +26,11 @@ import androidx.compose.ui.unit.dp import com.v2ray.ang.AppConfig.BUILTIN_OUTBOUND_TAGS import com.v2ray.ang.AppConfig.TAG_PROXY import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.FormDropdownField -import com.v2ray.ang.compose.FormTextField -import com.v2ray.ang.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.BalancerStrategyType import com.v2ray.ang.enums.EConfigType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt index ecd38450..b7026606 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHttpActivity.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.enums.EConfigType class ServerHttpActivity : BaseServerActivity() { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt index 2f152518..456ceabd 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerHysteria2Activity.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringResource import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.FormTextField -import com.v2ray.ang.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toast diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt index 62745337..f1bfd4d0 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerProxyChainActivity.kt @@ -35,12 +35,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.FormDropdownField -import com.v2ray.ang.compose.FormTextField -import com.v2ray.ang.compose.reorderableDragHandle -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.reorderableDragHandle +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.isComplexType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt index b74da806..e8522795 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerShadowsocksActivity.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormDropdownField -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt index 5b45323d..66c5c4f1 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerSocksActivity.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.enums.EConfigType class ServerSocksActivity : BaseServerActivity() { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt index 965a7670..6bf8deaf 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerTrojanActivity.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toast diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt index edf34132..41949f20 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVlessActivity.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormDropdownField -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toast diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt index 1fa41d3d..dd1fdd53 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerVmessActivity.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource import com.v2ray.ang.R -import com.v2ray.ang.compose.FormDropdownField -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.dto.entities.ProfileItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toast diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt index 2cbbbc7e..a01cf564 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/server/ServerWireguardActivity.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import com.v2ray.ang.R -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.enums.EConfigType class ServerWireguardActivity : BaseServerActivity() { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt index 121ed51b..c53a5724 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt @@ -25,14 +25,14 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.v2ray.ang.AppConfig import com.v2ray.ang.AppConfig.VPN import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.CollapsiblePreferenceGroupHeader -import com.v2ray.ang.compose.SettingsEditItem -import com.v2ray.ang.compose.SettingsListItem -import com.v2ray.ang.compose.SettingsMenuItem -import com.v2ray.ang.compose.SettingsSwitchItem -import com.v2ray.ang.compose.ThemeManager -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.CollapsiblePreferenceGroupHeader +import com.v2ray.ang.ui.compose.SettingsEditItem +import com.v2ray.ang.ui.compose.SettingsListItem +import com.v2ray.ang.ui.compose.SettingsMenuItem +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.ThemeManager +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.handler.MmkvManager.rememberMmkvBool import com.v2ray.ang.handler.MmkvManager.rememberMmkvString import com.v2ray.ang.handler.SettingsChangeManager diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/shortcut/TaskerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/shortcut/TaskerActivity.kt index 44f53be6..290af8e4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/shortcut/TaskerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/shortcut/TaskerActivity.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.SettingsSwitchItem -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.ui.base.BaseComponentActivity import com.v2ray.ang.util.LogUtil diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubEditActivity.kt index f2ea7424..79d71a1e 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubEditActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/subscription/SubEditActivity.kt @@ -26,12 +26,12 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -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.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormDropdownField +import com.v2ray.ang.ui.compose.FormTextField +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.SubscriptionItem import com.v2ray.ang.enums.EConfigType import com.v2ray.ang.extension.toLongEx 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 37cbdbba..66618cd0 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,15 +40,15 @@ 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.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.ItemDivider -import com.v2ray.ang.compose.QRCodeDialog -import com.v2ray.ang.compose.ReorderableListItem -import com.v2ray.ang.compose.SelectListDialog -import com.v2ray.ang.compose.SettingsSwitchItem -import com.v2ray.ang.compose.colorFabActive -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.QRCodeDialog +import com.v2ray.ang.ui.compose.ReorderableListItem +import com.v2ray.ang.ui.compose.SelectListDialog +import com.v2ray.ang.ui.compose.SettingsSwitchItem +import com.v2ray.ang.ui.compose.colorFabActive +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.extension.toast import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.handler.MmkvManager.rememberMmkvBool 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 372f697f..ceff32f7 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,11 +45,11 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.lifecycleScope import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.ItemDivider -import com.v2ray.ang.compose.SettingsListItem -import com.v2ray.ang.compose.verticalScrollbar +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.ItemDivider +import com.v2ray.ang.ui.compose.SettingsListItem +import com.v2ray.ang.ui.compose.verticalScrollbar import com.v2ray.ang.dto.entities.AssetUrlCache import com.v2ray.ang.dto.entities.AssetUrlItem import com.v2ray.ang.extension.toTrafficString diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetUrlActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetUrlActivity.kt index 1fab8e67..c95b643c 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetUrlActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/userasset/UserAssetUrlActivity.kt @@ -20,9 +20,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.v2ray.ang.AppConfig import com.v2ray.ang.R -import com.v2ray.ang.compose.AppTopBar -import com.v2ray.ang.compose.DeleteConfirmDialog -import com.v2ray.ang.compose.FormTextField +import com.v2ray.ang.ui.compose.AppTopBar +import com.v2ray.ang.ui.compose.DeleteConfirmDialog +import com.v2ray.ang.ui.compose.FormTextField import com.v2ray.ang.dto.entities.AssetUrlItem import com.v2ray.ang.extension.toast import com.v2ray.ang.extension.toastSuccess