[build] small tweaks and bump release
This commit is contained in:
parent
0f1bd3b16f
commit
350e1f31c6
|
|
@ -9,8 +9,8 @@ android {
|
||||||
applicationId "org.iiab.controller"
|
applicationId "org.iiab.controller"
|
||||||
minSdkVersion 24
|
minSdkVersion 24
|
||||||
targetSdkVersion 34
|
targetSdkVersion 34
|
||||||
versionCode 25
|
versionCode 26
|
||||||
versionName "v0.1.29alpha"
|
versionName "v0.1.30alpha"
|
||||||
setProperty("archivesBaseName", "$applicationId-$versionName")
|
setProperty("archivesBaseName", "$applicationId-$versionName")
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
|
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,27 @@
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 23,
|
"versionCode": 26,
|
||||||
"versionName": "v0.1.27alpha",
|
"versionName": "v0.1.30alpha",
|
||||||
"outputFile": "org.iiab.controller-v0.1.27alpha-release.apk"
|
"outputFile": "org.iiab.controller-v0.1.30alpha-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"elementType": "File",
|
"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
|
"minSdkVersionForDexing": 24
|
||||||
}
|
}
|
||||||
|
|
@ -79,6 +79,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
||||||
private CheckBox checkbox_remote_dns;
|
private CheckBox checkbox_remote_dns;
|
||||||
private CheckBox checkbox_global;
|
private CheckBox checkbox_global;
|
||||||
private CheckBox checkbox_maintenance;
|
private CheckBox checkbox_maintenance;
|
||||||
|
private TextView textview_maintenance_warning;
|
||||||
private CheckBox checkbox_ipv4;
|
private CheckBox checkbox_ipv4;
|
||||||
private CheckBox checkbox_ipv6;
|
private CheckBox checkbox_ipv6;
|
||||||
private Button button_apps;
|
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_remote_dns = findViewById(R.id.remote_dns);
|
||||||
checkbox_maintenance = findViewById(R.id.checkbox_maintenance);
|
checkbox_maintenance = findViewById(R.id.checkbox_maintenance);
|
||||||
checkbox_maintenance.setOnClickListener(this);
|
checkbox_maintenance.setOnClickListener(this);
|
||||||
|
textview_maintenance_warning = findViewById(R.id.maintenance_warning);
|
||||||
button_apps = findViewById(R.id.apps);
|
button_apps = findViewById(R.id.apps);
|
||||||
button_save = findViewById(R.id.save);
|
button_save = findViewById(R.id.save);
|
||||||
button_control = findViewById(R.id.control);
|
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_addr.setEnabled(editable);
|
||||||
edittext_socks_port.setEnabled(editable);
|
edittext_socks_port.setEnabled(editable);
|
||||||
button_save.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
|
//DEFAULT VALUES ON ORIGINAL INTERFACE
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,7 @@
|
||||||
android:text="@string/apps"
|
android:text="@string/apps"
|
||||||
android:layout_marginBottom="12dp"
|
android:layout_marginBottom="12dp"
|
||||||
android:background="@drawable/rounded_button"
|
android:background="@drawable/rounded_button"
|
||||||
android:backgroundTint="#444444"
|
android:backgroundTint="#673AB7"
|
||||||
android:textColor="#FFFFFF"
|
android:textColor="#FFFFFF"
|
||||||
android:textAllCaps="false"/>
|
android:textAllCaps="false"/>
|
||||||
|
|
||||||
|
|
@ -188,6 +188,17 @@
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:text="Maintenance Mode" />
|
android:text="Maintenance Mode" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/maintenance_warning"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="Disable Safe Pocket Web in order to modify"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textStyle="italic"
|
||||||
|
android:textColor="#FF9800"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<Button android:id="@+id/save"
|
<Button android:id="@+id/save"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue