fix app

Author: code3-dev

app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.hilt)
     id("kotlin-kapt")
+    alias(libs.plugins.kotlin.serialization) version "2.0.21"
 }
 
 android {
@@ -17,8 +18,8 @@ android {
         applicationId = "com.pira.gnetp"
         minSdk = 23
         targetSdk = 36
-        versionCode = 4
-        versionName = "1.0.3"
+        versionCode = 5
+        versionName = "1.0.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -99,6 +100,16 @@ dependencies {
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.coil.compose)
+    
+    // Ktor
+    implementation(libs.ktor.client.core)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.client.content.negotiation)
+    implementation(libs.ktor.serialization.kotlinx.json)
+    
+    // Kotlinx Serialization
+    implementation(libs.kotlinx.serialization.json)
+    
     kapt(libs.hilt.android.compiler)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".GNetApplication"

app/src/main/java/com/pira/gnetp/MainActivity.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.List
+import androidx.compose.material.icons.filled.FormatColorFill
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.filled.Settings
@@ -43,6 +44,8 @@ import com.pira.gnetp.ui.home.HomeViewModel
 import com.pira.gnetp.ui.hotspot.HotspotScreen
 import com.pira.gnetp.ui.logs.LogsScreen
 import com.pira.gnetp.ui.settings.SettingsScreen
+import com.pira.gnetp.ui.settings.ThemeSettingsScreen
+import com.pira.gnetp.ui.settings.ProxySettingsScreen
 import com.pira.gnetp.ui.theme.GNetTheme
 import com.pira.gnetp.ui.theme.ThemeManager
 import com.pira.gnetp.ui.theme.ThemeSettings
@@ -104,11 +107,14 @@ fun MainNavHost(
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentDestination = navBackStackEntry?.destination
     val isAboutScreen = currentDestination?.route == Screen.About.route
+        val isProxySettingsScreen = currentDestination?.route == Screen.ProxySettings.route
+        val isThemeSettingsScreen = currentDestination?.route == Screen.ThemeSettings.route
+        val shouldHideBottomBar = isAboutScreen || isProxySettingsScreen || isThemeSettingsScreen
 
     Scaffold(
         topBar = {},
         bottomBar = {
-            if (!isAboutScreen) {
+            if (!shouldHideBottomBar) {
                 BottomNavigationBar(navController)
             }
         }
@@ -121,8 +127,8 @@ fun MainNavHost(
             composable(Screen.Home.route) {
                 HomeScreen(
                     uiState = homeUiState,
-                    onStartProxy = { homeViewModel.startProxy() },
-                    onStopProxy = { homeViewModel.stopProxy() },
+                    onStartBothProxies = { homeViewModel.startBothProxies() },
+                    onStopBothProxies = { homeViewModel.stopBothProxies() },
                     onNavigateToSettings = { navController.navigate(Screen.Settings.route) },
                     onNavigateToHotspot = { navController.navigate(Screen.Hotspot.route) },
                     onNavigateToLogs = { navController.navigate(Screen.Logs.route) },
@@ -135,6 +141,8 @@ fun MainNavHost(
                 SettingsScreen(
                     onNavigateBack = { navController.popBackStack() },
                     onNavigateToAbout = { navController.navigate(Screen.About.route) },
+                    onNavigateToProxySettings = { navController.navigate(Screen.ProxySettings.route) },
+                    onNavigateToThemeSettings = { navController.navigate(Screen.ThemeSettings.route) },
                     onThemeSettingsChanged = onThemeSettingsChanged
                 )
             }
@@ -158,6 +166,19 @@ fun MainNavHost(
                     onNavigateBack = { navController.popBackStack() }
                 )
             }
+            
+            composable(Screen.ProxySettings.route) {
+                ProxySettingsScreen(
+                    onNavigateBack = { navController.popBackStack() }
+                )
+            }
+            
+            composable(Screen.ThemeSettings.route) {
+                ThemeSettingsScreen(
+                    onNavigateBack = { navController.popBackStack() },
+                    onThemeSettingsChanged = onThemeSettingsChanged
+                )
+            }
         }
     }
 }
@@ -185,6 +206,8 @@ fun BottomNavigationBar(navController: NavHostController) {
                             Screen.Hotspot -> Icons.Default.Info
                             Screen.Logs -> Icons.AutoMirrored.Filled.List
                             Screen.About -> Icons.Default.Info
+                            Screen.ProxySettings -> Icons.Default.Settings
+                            Screen.ThemeSettings -> Icons.Default.FormatColorFill
                         },
                         contentDescription = null
                     )

app/src/main/java/com/pira/gnetp/data/ProxyConfig.kt

@@ -1,9 +1,12 @@
 package com.pira.gnetp.data
 
 data class ProxyConfig(
-    val proxyType: ProxyType = ProxyType.HTTP,
-    val port: Int = 8080,
-    val isActive: Boolean = false
+    val httpPort: Int = 8080,
+    val socks5Port: Int = 1080,
+    val isHttpEnabled: Boolean = true,
+    val isSocks5Enabled: Boolean = true,
+    val isHttpActive: Boolean = false,
+    val isSocks5Active: Boolean = false
 )
 
 enum class ProxyType {

app/src/main/java/com/pira/gnetp/navigation/Screen.kt

@@ -8,5 +8,7 @@ sealed class Screen(val route: String, @StringRes val resourceId: Int) {
     object Hotspot : Screen("hotspot", R.string.hotspot)
     object Logs : Screen("logs", R.string.logs)
     object Settings : Screen("settings", R.string.settings)
+    object ThemeSettings : Screen("theme_settings", R.string.theme_settings)
+    object ProxySettings : Screen("proxy_settings", R.string.proxy_settings)
     object About : Screen("about", R.string.about)
 }