From 350e1f31c6f838ec36fbd91b94538566d6917ada Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 13 Mar 2026 10:28:38 -0600 Subject: [PATCH] [build] small tweaks and bump release --- apk/controller/app/build.gradle | 4 ++-- .../app/release/output-metadata.json | 22 ++++++++++++++++--- .../org/iiab/controller/MainActivity.java | 7 ++++++ .../app/src/main/res/layout/main.xml | 13 ++++++++++- 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/apk/controller/app/build.gradle b/apk/controller/app/build.gradle index 5f3f02b..ad5941b 100644 --- a/apk/controller/app/build.gradle +++ b/apk/controller/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.iiab.controller" minSdkVersion 24 targetSdkVersion 34 - versionCode 25 - versionName "v0.1.29alpha" + versionCode 26 + versionName "v0.1.30alpha" setProperty("archivesBaseName", "$applicationId-$versionName") ndk { abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" diff --git a/apk/controller/app/release/output-metadata.json b/apk/controller/app/release/output-metadata.json index 05c8d4b..c2f9e03 100644 --- a/apk/controller/app/release/output-metadata.json +++ b/apk/controller/app/release/output-metadata.json @@ -11,11 +11,27 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 23, - "versionName": "v0.1.27alpha", - "outputFile": "org.iiab.controller-v0.1.27alpha-release.apk" + "versionCode": 26, + "versionName": "v0.1.30alpha", + "outputFile": "org.iiab.controller-v0.1.30alpha-release.apk" } ], "elementType": "File", + "baselineProfiles": [ + { + "minApi": 28, + "maxApi": 30, + "baselineProfiles": [ + "baselineProfiles/1/org.iiab.controller-v0.1.30alpha-release.dm" + ] + }, + { + "minApi": 31, + "maxApi": 2147483647, + "baselineProfiles": [ + "baselineProfiles/0/org.iiab.controller-v0.1.30alpha-release.dm" + ] + } + ], "minSdkVersionForDexing": 24 } \ No newline at end of file diff --git a/apk/controller/app/src/main/java/org/iiab/controller/MainActivity.java b/apk/controller/app/src/main/java/org/iiab/controller/MainActivity.java index 8316a19..fab7b04 100644 --- a/apk/controller/app/src/main/java/org/iiab/controller/MainActivity.java +++ b/apk/controller/app/src/main/java/org/iiab/controller/MainActivity.java @@ -79,6 +79,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private CheckBox checkbox_remote_dns; private CheckBox checkbox_global; private CheckBox checkbox_maintenance; + private TextView textview_maintenance_warning; private CheckBox checkbox_ipv4; private CheckBox checkbox_ipv6; private Button button_apps; @@ -173,6 +174,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe checkbox_remote_dns = findViewById(R.id.remote_dns); checkbox_maintenance = findViewById(R.id.checkbox_maintenance); checkbox_maintenance.setOnClickListener(this); + textview_maintenance_warning = findViewById(R.id.maintenance_warning); button_apps = findViewById(R.id.apps); button_save = findViewById(R.id.save); button_control = findViewById(R.id.control); @@ -741,6 +743,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe edittext_socks_addr.setEnabled(editable); edittext_socks_port.setEnabled(editable); button_save.setEnabled(editable); + + checkbox_maintenance.setEnabled(editable); + if (textview_maintenance_warning != null) { + textview_maintenance_warning.setVisibility(vpnActive ? View.VISIBLE : View.GONE); + } } //DEFAULT VALUES ON ORIGINAL INTERFACE diff --git a/apk/controller/app/src/main/res/layout/main.xml b/apk/controller/app/src/main/res/layout/main.xml index 3f6f209..7ec4774 100644 --- a/apk/controller/app/src/main/res/layout/main.xml +++ b/apk/controller/app/src/main/res/layout/main.xml @@ -154,7 +154,7 @@ android:text="@string/apps" android:layout_marginBottom="12dp" android:background="@drawable/rounded_button" - android:backgroundTint="#444444" + android:backgroundTint="#673AB7" android:textColor="#FFFFFF" android:textAllCaps="false"/> @@ -188,6 +188,17 @@ android:layout_marginBottom="8dp" android:text="Maintenance Mode" /> + +