From 24dbcf20e19e45ecd4d4877a5429297c878ae18b Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 16 Jul 2021 12:17:31 +0200
Subject: [PATCH] #334 fix unlock in Android 8.0 by setting windowIsTranslucent
  to false

---
 presentation/src/main/AndroidManifest.xml          | 12 +++++-------
 .../main/res/{values-v21 => values-v26}/styles.xml |  9 ++++++++-
 presentation/src/main/res/values-v27/styles.xml    | 14 ++++++++++++++
 presentation/src/main/res/values/styles.xml        | 11 +++++++----
 4 files changed, 34 insertions(+), 12 deletions(-)
 rename presentation/src/main/res/{values-v21 => values-v26}/styles.xml (52%)
 create mode 100644 presentation/src/main/res/values-v27/styles.xml

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 3740906d..61dea3f0 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -80,7 +80,9 @@
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".ui.activity.AutoUploadChooseVaultActivity" />
+		<activity
+			android:name=".ui.activity.UnlockVaultActivity"
+			android:theme="@style/TransparentPopUp" />
 
 		<!-- Cloud Services -->
 		<activity
@@ -97,13 +99,9 @@
 			</intent-filter>
 		</activity>
 
-		<activity
-			android:name=".ui.activity.UnlockVaultActivity"
-			android:label=""
-			android:theme="@style/TransparentAlertDialogCustom" />
-		<activity android:name=".ui.activity.EmptyDirIdFileInfoActivity" />
-
 		<!-- Settings -->
+		<activity android:name=".ui.activity.AutoUploadChooseVaultActivity" />
+		<activity android:name=".ui.activity.EmptyDirIdFileInfoActivity" />
 		<activity android:name=".ui.activity.BiometricAuthSettingsActivity" />
 		<activity android:name=".ui.activity.CloudConnectionListActivity" />
 		<activity android:name=".ui.activity.CloudSettingsActivity" />
diff --git a/presentation/src/main/res/values-v21/styles.xml b/presentation/src/main/res/values-v26/styles.xml
similarity index 52%
rename from presentation/src/main/res/values-v21/styles.xml
rename to presentation/src/main/res/values-v26/styles.xml
index 570843e3..52c81d47 100644
--- a/presentation/src/main/res/values-v21/styles.xml
+++ b/presentation/src/main/res/values-v26/styles.xml
@@ -1,8 +1,15 @@
 <resources>
 
 	<style name="FullscreenTheme" parent="AppTheme">
+		<item name="android:navigationBarColor">@color/colorBlackTransparent</item>
 		<!-- windowIsTranslucent=false due to https://issuetracker.google.com/issues/68454482 see #467 -->
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:navigationBarColor">@color/colorBlackTransparent</item>
 	</style>
+
+	<style name="TransparentPopUp" parent="AppTheme">
+		<item name="android:windowBackground">@color/colorPrimaryTransparent</item>
+		<!-- windowIsTranslucent=false due to https://issuetracker.google.com/issues/68454482 see #467 -->
+		<item name="android:windowIsTranslucent">false</item>
+	</style>
+
 </resources>
diff --git a/presentation/src/main/res/values-v27/styles.xml b/presentation/src/main/res/values-v27/styles.xml
new file mode 100644
index 00000000..0cb30415
--- /dev/null
+++ b/presentation/src/main/res/values-v27/styles.xml
@@ -0,0 +1,14 @@
+<resources>
+
+	<!-- keep in sync with default style -->
+	<style name="FullscreenTheme" parent="AppTheme">
+		<item name="android:windowBackground">@null</item>
+	</style>
+
+	<!-- keep in sync with default style -->
+	<style name="TransparentPopUp" parent="AppTheme">
+		<item name="android:windowBackground">@android:color/transparent</item>
+		<item name="android:windowIsTranslucent">true</item>
+	</style>
+
+</resources>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
index be5e68ea..c981be31 100644
--- a/presentation/src/main/res/values/styles.xml
+++ b/presentation/src/main/res/values/styles.xml
@@ -29,10 +29,6 @@
 		<item name="colorAccent">@color/colorPrimary</item>
 	</style>
 
-	<style name="TransparentAlertDialogCustom" parent="AlertDialogCustom">
-		<item name="android:windowBackground">@android:color/transparent</item>
-	</style>
-
 	<style name="Toolbar.Theme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
 		<item name="colorAccent">@color/textColorWhite</item>
 	</style>
@@ -116,8 +112,15 @@
 		<item name="android:windowAnimationStyle">@null</item>
 	</style>
 
+	<!-- keep in sync with v27 style -->
 	<style name="FullscreenTheme" parent="AppTheme">
 		<item name="android:windowBackground">@null</item>
 	</style>
 
+	<!-- keep in sync with v27 style -->
+	<style name="TransparentPopUp" parent="AppTheme">
+		<item name="android:windowBackground">@android:color/transparent</item>
+		<item name="android:windowIsTranslucent">true</item>
+	</style>
+
 </resources>