clean basic code

app/build.gradle.kts

@@ -46,6 +46,7 @@ android {
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            resources.merges.add("META-INF/DEPENDENCIES")
         }
     }
 }
@@ -61,6 +62,8 @@ dependencies {
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.datastore.preferences.core.jvm)
+    implementation(libs.androidx.espresso.core)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -70,40 +73,41 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
     implementation ("androidx.compose.material:material-icons-extended:1.5.0")
 
-    implementation ("androidx.work:work-runtime-ktx:2.7.1")
+//    implementation ("androidx.work:work-runtime-ktx:2.7.1")
 
 
     // DataStore
     implementation ("androidx.datastore:datastore-preferences:1.0.0")
     implementation ("androidx.datastore:datastore-core:1.0.0")
 
-    implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
-
-    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") // Version before 1.6.0
-
-    implementation ("androidx.work:work-runtime-ktx:2.7.1")
-
+//    implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
+//
+//    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") // Version before 1.6.0
+//
+//    implementation ("androidx.work:work-runtime-ktx:2.7.1")
 
+    implementation ("androidx.core:core-ktx:1.10.1")
+    implementation ("androidx.navigation:navigation-compose:2.8.3")
 
+//    implementation ("com.jcraft:jsch:0.1.55")
+//
+//    implementation ("org.apache.sshd:sshd-core:2.9.0")
 //    implementation(libs.charts)
 
 
-
+//    implementation ("com.github.peerlab:socks5:1.0.0")
     implementation (libs.kotlinx.serialization.json)
 //    implementation ("com.github.bumptech.glide:glide:4.15.1")
 
     implementation(libs.timber)
-//    implementation (libs.mpandroidchart)
 
+    implementation (libs.okhttp)
+    implementation (libs.nanohttpd)
+//    implementation (libs.littleproxy)
+//    implementation ("org.littleshoot:littleproxy:2.0.0-beta6")
+//    implementation (libs.netty.all)
 
 
 
 
-//    implementation ("androidx.core:core-ktx:1.12.0")
-//    implementation ("androidx.activity:activity-compose:1.7.2")
-//    implementation ("androidx.compose.ui:ui:1.5.0")
-//    implementation ("androidx.compose.material:material:1.5.0")
-//    implementation ("androidx.compose.ui:ui-tooling-preview:1.5.0")
-//    implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-//    implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
 }

app/src/main/AndroidManifest.xml

@@ -16,17 +16,31 @@
     <!-- Wi-Fi P2P Permissions -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY"
+        tools:ignore="ProtectedPermissions" />
+
     <!-- Android 13+ Permission -->
     <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
     <!-- Wi-Fi P2P permissions -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+
+    <!-- VPN Permission -->
 
     <!-- Required Permissions -->
     <uses-permission android:name="android.permission.BIND_VPN_SERVICE"
         tools:ignore="ProtectedPermissions" />
 
+
     <!-- Minimum SDK version -->
     <uses-sdk android:minSdkVersion="29" />
 
@@ -47,14 +61,5 @@
             </intent-filter>
         </activity>
 
-<!--        <service-->
-<!--            android:name=".Proxy.ProxyService"-->
-<!--            android:permission="android.permission.BIND_VPN_SERVICE"-->
-<!--            android:exported="false">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.net.VpnService" />-->
-<!--            </intent-filter>-->
-<!--        </service>-->
-
     </application>
 </manifest>

app/src/main/java/com/example/wifip2photspot/BandSelection.kt

@@ -1,62 +1,55 @@
 package com.example.wifip2photspot
 
-import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.compose.foundation.layout.padding
-
-//@Composable
-//fun BandSelection(
-//    selectedBand: String,
-//    onBandSelected: (String) -> Unit,
-//    bands: List<String>,
-//    isHotspotEnabled: Boolean
-//) {
-//    Card(
-//        elevation = CardDefaults.cardElevation(4.dp),
-//        shape = MaterialTheme.shapes.medium,
-//        modifier = Modifier
-//            .fillMaxWidth()
-//            .padding(vertical = 8.dp)
-//    ) {
-//        Column(modifier = Modifier.padding(16.dp)) {
-//            Text(
-//                text = "Select Band",
-//                style = MaterialTheme.typography.titleMedium,
-//                modifier = Modifier.padding(bottom = 8.dp)
-//            )
-//            Row(
-//                horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()
-//            ) {
-//                bands.forEach { band ->
-//                    OutlinedButton(
-//                        onClick = { onBandSelected(band) },
-//                        colors = ButtonDefaults.outlinedButtonColors(
-//                            containerColor = if (selectedBand == band) MaterialTheme.colorScheme.primary.copy(
-//                                alpha = 0.1f
-//                            ) else Color.Transparent
-//                        ),
-//                        enabled = !isHotspotEnabled,
-//                        modifier = Modifier
-//                            .weight(1f)
-//                            .padding(horizontal = 4.dp)
-//                    ) {
-//                        Text(
-//                            text = band,
-//                            color = if (selectedBand == band) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface
-//                        )
-//                    }
-//                }
-//            }
-//        }
-//    }
-//}
-
 
+@Composable
+fun BandSelection(
+    selectedBand: String,
+    onBandSelected: (String) -> Unit,
+    bands: List<String>,
+    isHotspotEnabled: Boolean
+) {
+    Column(modifier = Modifier.padding(8.dp)) {
+        Text("Wi-Fi Band Selection", style = MaterialTheme.typography.titleMedium)
+        Spacer(modifier = Modifier.height(8.dp))
+        bands.forEach { band ->
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable(enabled = isHotspotEnabled.not()) { onBandSelected(band) }
+                    .padding(vertical = 4.dp)
+            ) {
+                RadioButton(
+                    selected = selectedBand == band,
+                    onClick = { onBandSelected(band) },
+                    enabled = isHotspotEnabled.not()
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(band, style = MaterialTheme.typography.bodyLarge)
+            }
+        }
+        if (isHotspotEnabled) {
+            Text(
+                text = "Cannot change band while hotspot is active.",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
+                modifier = Modifier.padding(top = 4.dp)
+            )
+        }
+    }
+}

app/src/main/java/com/example/wifip2photspot/BlockedDevicesSection.kt

@@ -1,67 +1,24 @@
 package com.example.wifip2photspot
 
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.Smartphone
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
-@Composable
-fun BlockedDevicesSection(
-    devices: List<DeviceInfo>,
-    onUnblock: (String) -> Unit
-) {
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(8.dp)
-    ) {
-        Text(
-            text = "Blocked Devices (${devices.size}):",
-            style = MaterialTheme.typography.titleMedium,
-            modifier = Modifier.padding(vertical = 8.dp)
-        )
-
-        if (devices.isEmpty()) {
-            Text(
-                text = "No blocked devices.",
-                style = MaterialTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(vertical = 8.dp)
-            )
-        } else {
-            LazyColumn(
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                items(devices) { deviceInfo ->
-                    BlockedDeviceCard(
-                        deviceInfo = deviceInfo,
-                        onUnblock = onUnblock
-                    )
-                    Divider()
-                }
-            }
-        }
-    }
-}
 // BlockedDevicesSection.kt
 fun LazyListScope.blockedDevicesSection(
     devices: List<DeviceInfo>,
@@ -90,7 +47,7 @@ fun LazyListScope.blockedDevicesSection(
                 deviceInfo = deviceInfo,
                 onUnblock = onUnblock
             )
-            Divider()
+            HorizontalDivider()
         }
     }
 }