Merge branch 'rc_review' into 'master'

Bugfixes after Release Candidate Review

Closes #9121, #8934, and #9052

See merge request leap/bitmask_android!226

1 files changed, 18 insertions, 8 deletions

diff --git a/app/build.gradle b/app/build.gradle
index af65493f..6c1bf394 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
     // however we don't calculate the versionCode here, because F-Droid doesn't like that
     versionCode 165000
     versionName "1.1.6RC1"
-    minSdkVersion 16
+    minSdkVersion 21
     targetSdkVersion 31
     vectorDrawables.useSupportLibrary = true
     buildConfigField 'boolean', 'openvpn3', 'false'
@@ -48,9 +48,9 @@ android {
     // decide if we use obfsvpn or shapeshifter as obfs4 lib
     buildConfigField 'boolean', 'use_obfsvpn', 'true'
     // obfsvpn Debugging config fields to pin and configure a particular proxy
-    buildConfigField "String", "obfsvpn_port", '"443"'
-    buildConfigField "String", "obfsvpn_ip", '"159.223.173.205"'
-    buildConfigField "String", "obfsvpn_cert", '"8nuAbPJwFrKc/29KcCfL5LBuEWxQrjBASYXdUbwcm9d9pKseGK4r2Tg47e23+t6WghxGGw"'
+    buildConfigField "String", "obfsvpn_port", '""'
+    buildConfigField "String", "obfsvpn_ip", '""'
+    buildConfigField "String", "obfsvpn_cert", '""'
     buildConfigField 'boolean', 'obfsvpn_use_kcp', 'false'
 
     // static update url pointing to the latest stable release apk
@@ -60,6 +60,10 @@ android {
     // the version file contains the versionCode of the latest release
     buildConfigField "String", "version_file_url", '"https://dl.bitmask.net/client/android/versioncode.txt"'
 
+    // if center_actionbar_title is set to true, the actionbar title and subtitle will be centered, otherwise default
+    buildConfigField 'boolean', 'actionbar_center_title', 'true'
+    buildConfigField 'boolean', 'actionbar_capitalize_title', 'true'
+
     //ignore the following configs, only used in custom flavor
     buildConfigField 'String', 'donation_url', 'null'
     buildConfigField "String", "customProviderUrl", '""'
@@ -147,10 +151,10 @@ android {
       // decide if we use obfsvpn or shapeshifter as obfs4 lib
       buildConfigField 'boolean', 'use_obfsvpn', 'true'
       // obfsvpn Debugging config fields to pin and configure a particular proxy
-      buildConfigField "String", "obfsvpn_port", '""'
-      buildConfigField "String", "obfsvpn_ip", '""'
-      buildConfigField "String", "obfsvpn_cert", '""'
-      buildConfigField 'boolean', 'obfsvpn_use_kcp', 'false'
+      buildConfigField "String", "obfsvpn_port", '"443"'
+      buildConfigField "String", "obfsvpn_ip", '"159.223.173.205"'
+      buildConfigField "String", "obfsvpn_cert", '"8nuAbPJwFrKc/29KcCfL5LBuEWxQrjBASYXdUbwcm9d9pKseGK4r2Tg47e23+t6WghxGGw"'
+      buildConfigField 'boolean', 'obfsvpn_use_kcp', 'true'
 
       //Build Config Fields for automatic apk update checks
 
@@ -174,6 +178,12 @@ android {
       //The duration in days to trigger the donation reminder
       buildConfigField 'int', 'donation_reminder_duration', '7'
 
+      // ActionBar design
+
+      // if center_actionbar_title is set to true, the actionbar title and subtitle will be centered, otherwise default
+      buildConfigField 'boolean', 'actionbar_center_title', 'true'
+      buildConfigField 'boolean', 'actionbar_capitalize_title', 'false'
+
       // Build apks for each architecture, in addition to one 'fat' apk containing libraries for all all architectures
       // enable this if you're publishing in gplay
       ext {