Merge remote-tracking branch 'origin/master'

xpistarlink · Oct 5, 2024 · 93a88f8 · 93a88f8
1 parent b508664
commit 93a88f8
Show file tree

Hide file tree

Showing 10 changed files with 1,332 additions and 53 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,10 +11,10 @@ android {
 
     defaultConfig {
         applicationId = "com.magix.pistarlink"
-        minSdk = 34
+        minSdk = 33
         targetSdk = 34
-        versionCode = 8
-        versionName = "Pi-Starlink-0.0.8-Nebula"
+        versionCode = 10
+        versionName = "Pi-Starlink-0.1.0-Nebula"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
 
@@ -36,18 +36,16 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         viewBinding = true
     }
 
-
-
 }
 
 dependencies {
@@ -74,4 +72,5 @@ dependencies {
     implementation(libs.slidetoact)
     implementation(libs.switch.button)
     implementation(libs.minidns.hla)
+    implementation(libs.tunnel)
 }
diff --git a/app/src/main/java/com/magix/pistarlink/ui/home/HomeFragment.kt b/app/src/main/java/com/magix/pistarlink/ui/home/HomeFragment.kt
diff --git a/app/src/main/res/drawable/openvpn_icon.png b/app/src/main/res/drawable/openvpn_icon.png
diff --git a/app/src/main/res/drawable/wg_icon.png b/app/src/main/res/drawable/wg_icon.png
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -29,6 +29,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <include
+        layout="@layout/fragment_vpn_wg"
+        android:id="@+id/fragment_vpn_included_wg"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <include
         layout="@layout/fragment_ddns"
         android:id="@+id/fragment_ddns_included"

diff --git a/app/src/main/res/layout/fragment_vpn.xml b/app/src/main/res/layout/fragment_vpn.xml
@@ -33,14 +33,40 @@
                 android:src="@drawable/cross"
                 app:tint="@color/teal_200" />
 
-            <TextView
-                android:id="@+id/title_sbc_info"
-                android:layout_width="300dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:text="@string/vpn_title"
-                android:textColor="@color/white"
-                android:textSize="20sp" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/title_sbc_info_wg"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/vpn_title_wireguard"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textSize="20sp"
+                    android:alpha="0.5"
+                    android:layout_gravity="center" />
+
+                <View
+                    android:id="@+id/divider"
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/white" />
+
+                <TextView
+                    android:id="@+id/title_sbc_info"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/vpn_title"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textSize="20sp"
+                    android:layout_gravity="center" />
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -58,12 +84,37 @@
                 android:layout_height="wrap_content">
 
                 <LinearLayout
+                    android:layout_marginTop="10dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical" >
 
+                    <ImageView
+                        android:id="@+id/openvpn_icon"
+                        android:layout_width="100sp"
+                        android:layout_height="100sp"
+                        android:layout_gravity="center"
+                        android:layout_marginBottom="10sp"
+                        app:srcCompat="@drawable/openvpn_icon" />
+
+                    <TextView
+                        android:id="@+id/textView4"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="10sp"
+                        android:text="@string/about_openvpn"
+                        android:gravity="center"
+                        android:textColor="@color/teal_700" />
+
+                    <View
+                        android:id="@+id/divider2"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="@color/teal_700" />
+
                     <TextView
                         android:id="@+id/setup_title"
+                        android:layout_marginTop="10sp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="10sp"