Enhanced practicality

CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## [1.6.10] - 2026-06-09
+
+### Changes
+- 更新 TunnelManager.kt
+
+---
+
+## [1.6.9] - 2026-06-09
+
+### Changes
+- 更新 TunnelManager.kt
+
+---
+
+## [1.6.8] - 2026-06-09
+
+### Changes
+- 更新 strings.xml
+
+---
+
+## [1.6.7] - 2026-06-09
+
+### Changes
+- 更新 TunnelManager.kt
+
+---
+
+## [1.6.6] - 2026-06-08
+
+### Changes
+- 更新 VpnViewModel.kt
+
+---
+
+## [1.6.5] - 2026-06-08
+
+### Changes
+- Delete azirevpn-ar-bue.conf
+
+---
+
+## [1.6.4] - 2026-06-08
+
+### Changes
+- Add files via upload
+
+---
+
+## [1.6.3] - 2026-06-08
+
+### Changes
+- 更新 VpnViewModelTest.kt
+
+---
+
+## [1.6.2] - 2026-06-06
+
+### Changes
+- Rename Release.yml to release.yml
+
+---
+
+## [1.6.1] - 2026-06-06
+
+### Changes
+- 更新 NetworkGroupDatabase.kt
+
+---
+
 ## [1.6.0] - 2026-05-31
 
 ### Features

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
         applicationId = "com.gatecontrol.client"
         minSdk = 31
         targetSdk = 35
-        versionCode = 10600
-        versionName = "1.6.0"
+        versionCode = 10610
+        versionName = "1.6.10"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/gatecontrol/android/navigation/AppNavigation.kt

@@ -1,5 +1,14 @@
 package com.gatecontrol.android.navigation
 
+import android.net.Uri
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import com.gatecontrol.android.ui.settings.NetworkGroupListScreen
+import com.gatecontrol.android.ui.settings.NetworkGroupEditScreen
+import com.gatecontrol.android.ui.settings.SettingsViewModel
+import androidx.compose.runtime.getValue
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Star
@@ -135,6 +144,9 @@ fun AppNavigation(
                     onNavigateToQrScanner = {
                         navController.navigate(Screen.QrScanner.route)
                     },
+                    onNavigateToNetworkGroups = {
+                        navController.navigate(Screen.NetworkGroups.route)
+                    },
                 )
             }
 
@@ -143,6 +155,37 @@ fun AppNavigation(
                     onNavigateBack = { navController.popBackStack() },
                 )
             }
+
+            composable(Screen.NetworkGroups.route) {
+                val settingsVm: SettingsViewModel = hiltViewModel()
+                val state by settingsVm.uiState.collectAsStateWithLifecycle()
+                NetworkGroupListScreen(
+                    adminLocked = state.splitTunnelAdminLocked,
+                    onNavigateToEdit = { groupId, groupName ->
+                        navController.navigate(Screen.NetworkGroupEdit.createRoute(groupId, groupName))
+                    },
+                    onBack = { navController.popBackStack() },
+                )
+            }
+
+            composable(
+                route = Screen.NetworkGroupEdit.route,
+                arguments = listOf(
+                    navArgument("groupId")   { type = NavType.LongType },
+                    navArgument("groupName") { type = NavType.StringType; defaultValue = "" },
+                ),
+            ) { backStackEntry ->
+                val groupId   = backStackEntry.arguments?.getLong("groupId")   ?: return@composable
+                val groupName = Uri.decode(backStackEntry.arguments?.getString("groupName") ?: "")
+                val settingsVm: SettingsViewModel = hiltViewModel()
+                val state by settingsVm.uiState.collectAsStateWithLifecycle()
+                NetworkGroupEditScreen(
+                    groupId     = groupId,
+                    groupName   = groupName,
+                    adminLocked = state.splitTunnelAdminLocked,
+                    onBack      = { navController.popBackStack() },
+                )
+            }
         }
     }
 }

app/src/main/java/com/gatecontrol/android/navigation/Screen.kt

@@ -1,5 +1,7 @@
 package com.gatecontrol.android.navigation
 
+import android.net.Uri
+
 sealed class Screen(val route: String) {
     data object Setup : Screen("setup")
     data object Vpn : Screen("vpn")
@@ -8,4 +10,9 @@ sealed class Screen(val route: String) {
     data object Settings : Screen("settings")
     data object Logs : Screen("settings/logs")
     data object QrScanner : Screen("setup/qr")
+    data object NetworkGroups : Screen("settings/network_groups")
+    data object NetworkGroupEdit : Screen("settings/network_groups/{groupId}?name={groupName}") {
+        fun createRoute(groupId: Long, groupName: String) =
+            "settings/network_groups/$groupId?name=${Uri.encode(groupName)}"
+    }
 }