[Android] Temporary fix for BottomSheet style due to material lib issue
Nicolas Pomepuy
git at videolan.org
Wed Mar 18 09:06:31 CET 2020
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Wed Mar 18 08:19:24 2020 +0100| [95eb01d9ec11e653a2b182a7198ef9ae8c1ba89f] | committer: Nicolas Pomepuy
Temporary fix for BottomSheet style due to material lib issue
This is a temporary fix that has to be reverted when this bug is fixed:
https://github.com/material-components/material-components-android/issues/1086
> https://code.videolan.org/videolan/vlc-android/commit/95eb01d9ec11e653a2b182a7198ef9ae8c1ba89f
---
application/vlc-android/res/values-v21/styles.xml | 3 ++-
application/vlc-android/res/values/styles.xml | 3 ++-
build.gradle | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/application/vlc-android/res/values-v21/styles.xml b/application/vlc-android/res/values-v21/styles.xml
index cc169f40b..b1d525edd 100644
--- a/application/vlc-android/res/values-v21/styles.xml
+++ b/application/vlc-android/res/values-v21/styles.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="AppModalStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
+ <!-- fixme : We'll have to revert to Widget.MaterialComponents.BottomSheet.Modal when this issue is fixed: https://github.com/material-components/material-components-android/issues/1086-->
+ <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@drawable/bottom_sheet_background</item>
</style>
diff --git a/application/vlc-android/res/values/styles.xml b/application/vlc-android/res/values/styles.xml
index 46715dc4c..391a4dfcc 100644
--- a/application/vlc-android/res/values/styles.xml
+++ b/application/vlc-android/res/values/styles.xml
@@ -578,7 +578,8 @@
</style>
- <style name="AppModalStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
+ <!-- fixme : We'll have to revert to Widget.MaterialComponents.BottomSheet.Modal when this issue is fixed: https://github.com/material-components/material-components-android/issues/1086-->
+ <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
</style>
<style name="Theme.VLC.BottomSheetTitle">
diff --git a/build.gradle b/build.gradle
index 7b0f87966..eac0c2be9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,8 @@ ext {
androidxRecyclerviewVersion = '1.1.0'
androidxMediaVersion = '1.1.0'
androidxLeanbackVersion = '1.0.0'
+ //fixme : When we update this dep, please verify of this issue is fixed: https://github.com/material-components/material-components-android/issues/1086
+ // if so, revert application/vlc-android/res/values[-v21]/styles.xml -> AppModalStyle
androidxMaterialVersion = '1.1.0-rc02'
constraintLayoutVersion = '1.1.3'
archVersion = '2.1.0'
More information about the Android
mailing list