AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

#334 fix unlock in Android 8.0 by setting windowIsTranslucent to false

Browse Source
This commit is contained in:
Julian Raufelder 2021-07-16 12:17:31 +02:00
parent 1a96a4dd46
commit 24dbcf20e1
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
presentation/src/main/AndroidManifest.xml
View File

@ -80,7 +80,9 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".ui.activity.AutoUploadChooseVaultActivity" /> <activity
android:name=".ui.activity.UnlockVaultActivity"
android:theme="@style/TransparentPopUp" />
<!-- Cloud Services --> <!-- Cloud Services -->
<activity <activity
@ -97,13 +99,9 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".ui.activity.UnlockVaultActivity"
android:label=""
android:theme="@style/TransparentAlertDialogCustom" />
<activity android:name=".ui.activity.EmptyDirIdFileInfoActivity" />
<!-- Settings --> <!-- Settings -->
<activity android:name=".ui.activity.AutoUploadChooseVaultActivity" />
<activity android:name=".ui.activity.EmptyDirIdFileInfoActivity" />
<activity android:name=".ui.activity.BiometricAuthSettingsActivity" /> <activity android:name=".ui.activity.BiometricAuthSettingsActivity" />
<activity android:name=".ui.activity.CloudConnectionListActivity" /> <activity android:name=".ui.activity.CloudConnectionListActivity" />
<activity android:name=".ui.activity.CloudSettingsActivity" /> <activity android:name=".ui.activity.CloudSettingsActivity" />

9
presentation/src/main/res/values-v21/styles.xml → presentation/src/main/res/values-v26/styles.xml
View File

@ -1,8 +1,15 @@
<resources> <resources>
<style name="FullscreenTheme" parent="AppTheme"> <style name="FullscreenTheme" parent="AppTheme">
<item name="android:navigationBarColor">@color/colorBlackTransparent</item>
<!-- windowIsTranslucent=false due to https://issuetracker.google.com/issues/68454482 see #467 --> <!-- windowIsTranslucent=false due to https://issuetracker.google.com/issues/68454482 see #467 -->
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
<item name="android:navigationBarColor">@color/colorBlackTransparent</item>
</style> </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> </resources>

14
presentation/src/main/res/values-v27/styles.xml Normal file
View File

@ -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>

11
presentation/src/main/res/values/styles.xml
View File

@ -29,10 +29,6 @@
<item name="colorAccent">@color/colorPrimary</item> <item name="colorAccent">@color/colorPrimary</item>
</style> </style>
<style name="TransparentAlertDialogCustom" parent="AlertDialogCustom">
<item name="android:windowBackground">@android:color/transparent</item>
</style>
<style name="Toolbar.Theme" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="Toolbar.Theme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="colorAccent">@color/textColorWhite</item> <item name="colorAccent">@color/textColorWhite</item>
</style> </style>
@ -116,8 +112,15 @@
<item name="android:windowAnimationStyle">@null</item> <item name="android:windowAnimationStyle">@null</item>
</style> </style>
<!-- keep in sync with v27 style -->
<style name="FullscreenTheme" parent="AppTheme"> <style name="FullscreenTheme" parent="AppTheme">
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
</style> </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> </resources>