From 9743e27403079456dd7d8fb15da90d64a173b8c6 Mon Sep 17 00:00:00 2001
From: Lucas Lima <lucas.lima@nubank.com.br>
Date: Mon, 17 Aug 2020 23:39:29 -0300
Subject: [PATCH] Bump min Sdk to 21

---
 app/build.gradle                              |   2 +-
 .../lucasnlm/antimine/theme/ThemeActivity.kt  |   2 -
 app/src/main/res/layout/activity_tv_game.xml  |   2 +-
 common/build.gradle                           |   2 +-
 .../antimine/core/themes/repository/Themes.kt |   8 +-
 common/src/main/res/values-v21/themes.xml     | 228 ------------------
 common/src/main/res/values/themes.xml         | 122 ++++++++--
 external/build.gradle                         |   2 +-
 foss/build.gradle                             |   2 +-
 proprietary/build.gradle                      |   2 +-
 10 files changed, 110 insertions(+), 262 deletions(-)
 delete mode 100644 common/src/main/res/values-v21/themes.xml

diff --git a/app/build.gradle b/app/build.gradle
index 79d06f6f..db315526 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         // versionCode and versionName must be hardcoded to support F-droid
         versionCode 800051
         versionName '8.0.5'
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
         multiDexEnabled true
         vectorDrawables.useSupportLibrary true
diff --git a/app/src/main/java/dev/lucasnlm/antimine/theme/ThemeActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/theme/ThemeActivity.kt
index c6e4cc70..c4d0a6ac 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/theme/ThemeActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/theme/ThemeActivity.kt
@@ -42,8 +42,6 @@ class ThemeActivity : ThematicActivity(R.layout.activity_theme) {
                 }
             }
         }
-
-        showUnlockDialog()
     }
 
     private fun showUnlockDialog() {
diff --git a/app/src/main/res/layout/activity_tv_game.xml b/app/src/main/res/layout/activity_tv_game.xml
index 0a28d7a6..3c2b2a8c 100644
--- a/app/src/main/res/layout/activity_tv_game.xml
+++ b/app/src/main/res/layout/activity_tv_game.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:elevation="0dp"
         android:minHeight="30dp"
-        android:theme="@style/AppTheme.AppBarOverlay"
+        android:theme="@style/AppTheme"
         tools:targetApi="lollipop" />
 
     <LinearLayout
diff --git a/common/build.gradle b/common/build.gradle
index 2ed78381..2c84b1bc 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -11,7 +11,7 @@ android {
         // versionCode and versionName must be hardcoded to support F-droid
         versionCode 800051
         versionName '8.0.5'
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/common/src/main/java/dev/lucasnlm/antimine/core/themes/repository/Themes.kt b/common/src/main/java/dev/lucasnlm/antimine/core/themes/repository/Themes.kt
index f49cdeb8..c283ab4d 100644
--- a/common/src/main/java/dev/lucasnlm/antimine/core/themes/repository/Themes.kt
+++ b/common/src/main/java/dev/lucasnlm/antimine/core/themes/repository/Themes.kt
@@ -51,11 +51,11 @@ object Themes {
             uncovered = 0x000000,
             uncoveredOdd = 0x050505,
             minesAround1 = 0xCCCCCC,
-            minesAround2 = 0xCCCCCC,
-            minesAround3 = 0xCCCCCC,
+            minesAround2 = 0xFFFFFF,
+            minesAround3 = 0xDDDDDD,
             minesAround4 = 0xCCCCCC,
-            minesAround5 = 0xCCCCCC,
-            minesAround6 = 0xCCCCCC,
+            minesAround5 = 0xDDDDDD,
+            minesAround6 = 0xFFFFFF,
             minesAround7 = 0xCCCCCC,
             minesAround8 = 0xCCCCCC,
             highlight = 0x212121,
diff --git a/common/src/main/res/values-v21/themes.xml b/common/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 2da9e261..00000000
--- a/common/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="AppTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="Theme.Splash" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/splash</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomLightTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#D32F2F</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomLightTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#D32F2F</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomDarkTheme" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#212121</item>
-        <item name="colorPrimaryDark">#212121</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomDarkTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#212121</item>
-        <item name="colorPrimaryDark">#212121</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomAmoledTheme" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#000000</item>
-        <item name="colorPrimaryDark">#000000</item>
-        <item name="android:windowBackground">#000000</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomAmoledTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#000000</item>
-        <item name="colorPrimaryDark">#000000</item>
-        <item name="android:windowBackground">#000000</item>
-        <item name="colorAccent">#FFFFFF</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomGardenTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#53b529</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomGardenTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#53b529</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomMarineTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#03a9f4</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomMarineTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#03a9f4</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomBlueGreyTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#42a5f5</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomBlueGreyTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#FFFFFF</item>
-        <item name="colorAccent">#42a5f5</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomOrangeTheme" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#212121</item>
-        <item name="colorPrimaryDark">#212121</item>
-        <item name="colorAccent">#fb8c00</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomOrangeTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
-        <item name="colorPrimary">#212121</item>
-        <item name="colorPrimaryDark">#212121</item>
-        <item name="colorAccent">#fb8c00</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomPinkTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#f48fb1</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomPinkTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#f48fb1</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomPurpleTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#9c27b0</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-
-    <style name="CustomPurpleTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryDark">#9E9E9E</item>
-        <item name="colorAccent">#9c27b0</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
-</resources>
diff --git a/common/src/main/res/values/themes.xml b/common/src/main/res/values/themes.xml
index 758684f5..2da9e261 100644
--- a/common/src/main/res/values/themes.xml
+++ b/common/src/main/res/values/themes.xml
@@ -4,28 +4,36 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:background">@color/primary</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="Theme.Splash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
-    </style>
-
-    <style name="MyDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="colorAccent">@color/accent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
-
     <style name="CustomLightTheme" parent="ThemeOverlay.AppCompat.Light">
         <item name="colorPrimary">#FFFFFF</item>
         <item name="colorPrimaryDark">#9E9E9E</item>
         <item name="colorAccent">#D32F2F</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomLightTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
@@ -34,12 +42,20 @@
         <item name="colorAccent">#D32F2F</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomDarkTheme" parent="ThemeOverlay.AppCompat.Dark">
         <item name="colorPrimary">#212121</item>
         <item name="colorPrimaryDark">#212121</item>
         <item name="colorAccent">#FFFFFF</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomDarkTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
@@ -48,68 +64,110 @@
         <item name="colorAccent">#FFFFFF</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomAmoledTheme" parent="ThemeOverlay.AppCompat.Dark">
         <item name="colorPrimary">#000000</item>
         <item name="colorPrimaryDark">#000000</item>
+        <item name="android:windowBackground">#000000</item>
         <item name="colorAccent">#FFFFFF</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomAmoledTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
         <item name="colorPrimary">#000000</item>
         <item name="colorPrimaryDark">#000000</item>
+        <item name="android:windowBackground">#000000</item>
         <item name="colorAccent">#FFFFFF</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomGardenTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#19360d</item>
-        <item name="colorPrimaryDark">#001000</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#53b529</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomGardenTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#19360d</item>
-        <item name="colorPrimaryDark">#001000</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#53b529</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomMarineTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#01579b</item>
-        <item name="colorPrimaryDark">#002f6c</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#03a9f4</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomMarineTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#01579b</item>
-        <item name="colorPrimaryDark">#002f6c</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#03a9f4</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomBlueGreyTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#37474f</item>
-        <item name="colorPrimaryDark">#102027</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#42a5f5</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomBlueGreyTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
-        <item name="colorPrimary">#37474f</item>
-        <item name="colorPrimaryDark">#102027</item>
+        <item name="colorPrimary">#FFFFFF</item>
+        <item name="colorPrimaryDark">#FFFFFF</item>
         <item name="colorAccent">#42a5f5</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomOrangeTheme" parent="ThemeOverlay.AppCompat.Dark">
         <item name="colorPrimary">#212121</item>
         <item name="colorPrimaryDark">#212121</item>
         <item name="colorAccent">#fb8c00</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomOrangeTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Dark">
@@ -118,12 +176,20 @@
         <item name="colorAccent">#fb8c00</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomPinkTheme" parent="ThemeOverlay.AppCompat.Light">
         <item name="colorPrimary">#FFFFFF</item>
         <item name="colorPrimaryDark">#9E9E9E</item>
         <item name="colorAccent">#f48fb1</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomPinkTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
@@ -132,12 +198,20 @@
         <item name="colorAccent">#f48fb1</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomPurpleTheme" parent="ThemeOverlay.AppCompat.Light">
         <item name="colorPrimary">#FFFFFF</item>
         <item name="colorPrimaryDark">#9E9E9E</item>
         <item name="colorAccent">#9c27b0</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="CustomPurpleTheme.NoActionBar" parent="ThemeOverlay.AppCompat.Light">
@@ -146,5 +220,9 @@
         <item name="colorAccent">#9c27b0</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 </resources>
diff --git a/external/build.gradle b/external/build.gradle
index 09bdf1d5..4a884360 100644
--- a/external/build.gradle
+++ b/external/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
         versionName '1.0'
diff --git a/foss/build.gradle b/foss/build.gradle
index 6c972a31..0d8fec68 100644
--- a/foss/build.gradle
+++ b/foss/build.gradle
@@ -8,7 +8,7 @@ android {
     defaultConfig {
         versionCode 800051 // MMmmPPv
         versionName '8.0.5'
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
     }
 
diff --git a/proprietary/build.gradle b/proprietary/build.gradle
index a40e2150..bd221dc9 100644
--- a/proprietary/build.gradle
+++ b/proprietary/build.gradle
@@ -12,7 +12,7 @@ android {
     defaultConfig {
         versionCode 800051
         versionName '8.0.5'
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
     }