Fix #535,Fix part of #530: Material bridge theme and card-view issue …

…fix approach -2 (#537) * material bridge theme * nit
oppia · Jan 21, 2020 · 7e52d4d · 7e52d4d
1 parent 24b5750
commit 7e52d4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -75,7 +75,7 @@ dependencies {
       'androidx.recyclerview:recyclerview:1.0.0',
       'com.chaos.view:pinview:1.4.3',
       'com.github.bumptech.glide:glide:4.9.0',
-      'com.google.android.material:material:1.0.0-alpha1',
+      'com.google.android.material:material:1.2.0-alpha02',
       'com.google.dagger:dagger:2.24',
       'com.google.guava:guava:28.1-android',
       'de.hdodenhof:circleimageview:3.0.1',

diff --git a/app/src/main/res/layout/topic_review_summary_view.xml b/app/src/main/res/layout/topic_review_summary_view.xml
@@ -15,7 +15,7 @@
     android:layout_margin="12dp"
     android:clipToPadding="true"
     app:cardCornerRadius="8dp"
-    app:cardElevation="0dp"
+    app:cardElevation="4dp"
     app:cardMaxElevation="4dp"
     app:strokeColor="@color/oppiaBrown"
     app:strokeWidth="2dp">

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="OppiaTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="OppiaTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorPrimary</item>
   </style>
 
-  <style name="OppiaThemeWithoutActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+  <style name="OppiaThemeWithoutActionBar" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorAccent</item>
@@ -39,7 +39,7 @@
     <item name="android:activityOpenExitAnimation">@anim/fade_out</item>
   </style>
 
-  <style name="FullScreenDialogStyle" parent="Theme.AppCompat.Dialog">
+  <style name="FullScreenDialogStyle" parent="Theme.MaterialComponents.Dialog.Bridge">
     <item name="android:windowNoTitle">true</item>
     <item name="colorPrimaryDark">@color/colorConceptToolbarHeading</item>
     <!-- Set this to true if you want Full Screen without status bar -->
@@ -92,7 +92,7 @@
     <item name="android:clickable">false</item>
   </style>
 
-  <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+  <style name="AlertDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert.Bridge">
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorPrimary</item>