[Android] Revert "Temporary fix for BottomSheet style due to material lib issue"

Nicolas Pomepuy git at videolan.org
Thu Mar 3 12:56:19 UTC 2022


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Wed Feb 16 13:35:17 2022 +0100| [96c4a8be17c3d1611cddb38c45038586822dc95c] | committer: Nicolas Pomepuy

Revert "Temporary fix for BottomSheet style due to material lib issue"

This reverts commit 95eb01d9

> https://code.videolan.org/videolan/vlc-android/commit/96c4a8be17c3d1611cddb38c45038586822dc95c
---

 application/vlc-android/res/values/styles.xml | 3 +--
 build.gradle                                  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/vlc-android/res/values/styles.xml b/application/vlc-android/res/values/styles.xml
index fd98122e9..041bd52dc 100644
--- a/application/vlc-android/res/values/styles.xml
+++ b/application/vlc-android/res/values/styles.xml
@@ -672,8 +672,7 @@
 
     </style>
 
-    <!--    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 name="AppModalStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
     </style>
 
     <style name="Theme.VLC.BottomSheetTitle">
diff --git a/build.gradle b/build.gradle
index 1b26357ee..48200558d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,8 +51,6 @@ ext {
     androidxRecyclerviewVersion = '1.2.1'
     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.5.0'
     constraintLayoutVersion = '2.1.3'
     viewPager2Version = "1.0.0"



More information about the Android mailing list