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

Move enums from dto to enums package and update imports

Browse Source
This commit is contained in:
2dust committed 2026-01-29 14:51:59 +08:00
1 parent 685d23f2d1
commit d6e3fc5c91
30 files changed
+41 -41
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/dto/ProfileItem.kt
+1
View File
@@ -5,6 +5,7 @@ import com.v2ray.ang.AppConfig.PORT_SOCKS
import com.v2ray.ang.AppConfig.TAG_BLOCKED
import com.v2ray.ang.AppConfig.TAG_DIRECT
import com.v2ray.ang.AppConfig.TAG_PROXY
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.util.Utils
data class ProfileItem(
V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+1
View File
@@ -2,6 +2,7 @@ package com.v2ray.ang.dto
import com.google.gson.annotations.SerializedName
import com.v2ray.ang.AppConfig
import com.v2ray.ang.enums.EConfigType
data class V2rayConfig(
var remarks: String? = null,
V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/EConfigType.kt
+2 -3
View File
@@ -1,8 +1,7 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
import com.v2ray.ang.AppConfig
enum class EConfigType(val value: Int, val protocolScheme: String) {
VMESS(1, AppConfig.VMESS),
CUSTOM(2, AppConfig.CUSTOM),
@@ -21,4 +20,4 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
companion object {
fun fromInt(value: Int) = entries.firstOrNull { it.value == value }
}
}
}
V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/Language.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
enum class Language(val code: String) {
AUTO("auto"),
V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/NetworkType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
enum class NetworkType(val type: String) {
TCP("tcp"),
V2rayNG/app/src/main/java/com/v2ray/ang/dto/PermissionType.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
import android.Manifest
import android.os.Build
V2rayNG/app/src/main/java/com/v2ray/ang/dto/RoutingType.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/RoutingType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
enum class RoutingType(val fileName: String) {
WHITE("custom_routing_white"),
V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt → V2rayNG/app/src/main/java/com/v2ray/ang/enums/VpnInterfaceAddressConfig.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.v2ray.ang.dto
package com.v2ray.ang.enums
/**
* VPN interface address configuration enum class
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig
import com.v2ray.ang.util.JsonUtil
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.nullIfBlank
import com.v2ray.ang.handler.MmkvManager
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.isNotNullEmpty
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+2 -2
View File
@@ -2,8 +2,8 @@ package com.v2ray.ang.fmt
import android.util.Log
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.idnHost
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.idnHost
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.idnHost
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package com.v2ray.ang.fmt
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.idnHost
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+2 -3
View File
@@ -3,13 +3,12 @@ package com.v2ray.ang.fmt
import android.text.TextUtils
import android.util.Log
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.dto.VmessQRCode
import com.v2ray.ang.extension.idnHost
import com.v2ray.ang.extension.isNotNullEmpty
import com.v2ray.ang.extension.nullIfBlank
import com.v2ray.ang.handler.MmkvManager
import com.v2ray.ang.handler.V2rayConfigManager
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.v2ray.ang.fmt
import com.v2ray.ang.AppConfig
import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.V2rayConfig.OutboundBean
import com.v2ray.ang.extension.idnHost
V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+1 -1
View File
@@ -7,7 +7,7 @@ import android.util.Log
import com.v2ray.ang.AppConfig
import com.v2ray.ang.AppConfig.HY2
import com.v2ray.ang.R
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.SubscriptionCache
import com.v2ray.ang.dto.SubscriptionItem
V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+4 -4
View File
@@ -11,13 +11,13 @@ import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
import com.v2ray.ang.AppConfig.TAG_DIRECT
import com.v2ray.ang.AppConfig.VPN
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.Language
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.Language
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.RoutingType
import com.v2ray.ang.enums.RoutingType
import com.v2ray.ang.dto.RulesetItem
import com.v2ray.ang.dto.V2rayConfig
import com.v2ray.ang.dto.VpnInterfaceAddressConfig
import com.v2ray.ang.enums.VpnInterfaceAddressConfig
import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
import com.v2ray.ang.handler.MmkvManager.decodeServerList
import com.v2ray.ang.util.JsonUtil
V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import android.util.Log
import androidx.core.content.ContextCompat
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.toast
import com.v2ray.ang.service.ServiceControl
V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+2 -2
View File
@@ -6,8 +6,8 @@ import android.util.Log
import com.google.gson.JsonArray
import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.ConfigResult
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.dto.RulesetItem
import com.v2ray.ang.dto.V2rayConfig
V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import com.v2ray.ang.R
import com.v2ray.ang.dto.PermissionType
import com.v2ray.ang.enums.PermissionType
import com.v2ray.ang.extension.toast
/**
V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.databinding.FragmentGroupServerBinding
import com.v2ray.ang.databinding.ItemQrcodeBinding
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.toast
import com.v2ray.ang.extension.toastError
V2rayNG/app/src/main/java/com/v2ray/ang/ui/HelperBaseActivity.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.v2ray.ang.ui
import android.net.Uri
import android.os.Bundle
import com.v2ray.ang.dto.PermissionType
import com.v2ray.ang.enums.PermissionType
import com.v2ray.ang.helper.FileChooserHelper
import com.v2ray.ang.helper.PermissionHelper
import com.v2ray.ang.helper.QRCodeScannerHelper
V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+2 -2
View File
@@ -24,8 +24,8 @@ import com.google.android.material.tabs.TabLayoutMediator
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.databinding.ActivityMainBinding
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.dto.PermissionType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.PermissionType
import com.v2ray.ang.extension.toast
import com.v2ray.ang.extension.toastError
import com.v2ray.ang.handler.AngConfigManager
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+2 -2
View File
@@ -20,8 +20,8 @@ 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.dto.EConfigType
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.enums.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.isNotNullEmpty
import com.v2ray.ang.extension.toast
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import com.blacksquircle.ui.language.json.JsonLanguage
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.toast
import com.v2ray.ang.extension.toastSuccess
V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
import androidx.appcompat.app.AlertDialog
import com.v2ray.ang.R
import com.v2ray.ang.databinding.ActivityServerGroupBinding
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.toast
import com.v2ray.ang.extension.toastSuccess
V2rayNG/app/src/test/java/com/v2ray/ang/fmt/ShadowsocksFmtTest.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.v2ray.ang.fmt
import android.util.Base64
import android.util.Log
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.enums.EConfigType
import com.v2ray.ang.dto.ProfileItem
import org.junit.After
import org.junit.Assert.assertEquals