Skip to content

Commit

Permalink
Temporarily opt ucrop activity out of Android 15 edge-to-edge
Browse files Browse the repository at this point in the history
This should be reverted as soon as
Yalantis/uCrop#913 is fixed
  • Loading branch information
TheLastProject committed Jan 16, 2025
1 parent 47bf18f commit edfd514
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

<activity
android:name=".UCropWrapper"
android:theme="@style/AppTheme.NoActionBar" />
android:theme="@style/TempUCropAndroid15WorkaroundTheme" />

<provider
android:name=".contentprovider.CardsContentProvider"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/values-v35/themes.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
<style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
</resources>
3 changes: 3 additions & 0 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<resources>
<!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
<style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
</style>

<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
Expand Down

0 comments on commit edfd514

Please sign in to comment.