From 2dbaf9595c8d73ce846afbef379ee451652eaa7b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 17 Sep 2020 02:27:43 -0700
Subject: [PATCH] Remove strokes from most cards

---
 app/src/main/res/layout/fragment_hide_md2.xml |  2 +-
 .../main/res/layout/fragment_install_md2.xml  | 20 +++++++++----------
 app/src/main/res/layout/fragment_log_md2.xml  |  3 ++-
 .../main/res/layout/fragment_module_md2.xml   |  2 +-
 app/src/main/res/layout/item_hide_md2.xml     |  2 +-
 app/src/main/res/layout/item_module_md2.xml   |  2 +-
 app/src/main/res/layout/item_policy_md2.xml   |  2 +-
 app/src/main/res/layout/item_repo_md2.xml     |  2 +-
 app/src/main/res/layout/item_theme.xml        |  5 +++--
 app/src/main/res/values/styles_md2_impl.xml   |  9 ---------
 10 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/layout/fragment_hide_md2.xml b/app/src/main/res/layout/fragment_hide_md2.xml
index 29efa3961..3442d4dfa 100644
--- a/app/src/main/res/layout/fragment_hide_md2.xml
+++ b/app/src/main/res/layout/fragment_hide_md2.xml
@@ -48,7 +48,7 @@
 
         <com.google.android.material.circularreveal.cardview.CircularRevealCardView
             android:id="@+id/hide_filter"
-            style="@style/WidgetFoundation.Card.Variant"
+            style="@style/WidgetFoundation.Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/fragment_install_md2.xml b/app/src/main/res/layout/fragment_install_md2.xml
index 5556bd990..034aee613 100644
--- a/app/src/main/res/layout/fragment_install_md2.xml
+++ b/app/src/main/res/layout/fragment_install_md2.xml
@@ -37,12 +37,11 @@
 
                 <com.google.android.material.card.MaterialCardView
                     gone="@{viewModel.skipOptions}"
-                    style="@style/WidgetFoundation.Card.Variant"
+                    style="@style/WidgetFoundation.Card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    app:strokeWidth="@{viewModel.step != 0 ? 0f : @dimen/l_125}">
+                    android:layout_marginEnd="@dimen/l1" >
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -124,13 +123,12 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    style="@style/WidgetFoundation.Card.Variant"
+                    style="@style/WidgetFoundation.Card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/l1"
                     android:layout_marginTop="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    app:strokeWidth="@{viewModel.step != 1 ? 0f : @dimen/l_125}">
+                    android:layout_marginEnd="@dimen/l1" >
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -217,13 +215,12 @@
                 </com.google.android.material.card.MaterialCardView>
 
                 <com.google.android.material.card.MaterialCardView
-                    style="@style/WidgetFoundation.Card.Variant"
+                    style="@style/WidgetFoundation.Card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/l1"
                     android:layout_marginStart="@dimen/l1"
-                    android:layout_marginEnd="@dimen/l1"
-                    app:strokeWidth="@{viewModel.step != 0 ? 0f : @dimen/l_125}">
+                    android:layout_marginEnd="@dimen/l1" >
 
                     <TextView
                         android:id="@+id/release_notes"
@@ -232,7 +229,10 @@
                         android:layout_margin="15dp"
                         android:textAppearance="@style/AppearanceFoundation.Caption"
                         android:visibility="gone"
-                        markdownText="@{viewModel.notes}"/>
+                        markdownText="@{viewModel.notes}"
+                        tools:visibility="visible"
+                        tools:text="@tools:sample/lorem/random"
+                        tools:maxLines="5" />
 
                 </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/layout/fragment_log_md2.xml b/app/src/main/res/layout/fragment_log_md2.xml
index 2b46b86fd..2ce599fd2 100644
--- a/app/src/main/res/layout/fragment_log_md2.xml
+++ b/app/src/main/res/layout/fragment_log_md2.xml
@@ -37,7 +37,8 @@
 
         <com.google.android.material.circularreveal.cardview.CircularRevealCardView
             android:id="@+id/log_filter"
-            style="@style/WidgetFoundation.Card.Variant"
+            style="@style/WidgetFoundation.Card"
+            app:cardBackgroundColor="?colorSurface"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/fragment_module_md2.xml b/app/src/main/res/layout/fragment_module_md2.xml
index d0a80cc84..022423ba0 100644
--- a/app/src/main/res/layout/fragment_module_md2.xml
+++ b/app/src/main/res/layout/fragment_module_md2.xml
@@ -62,7 +62,7 @@
 
         <com.google.android.material.circularreveal.cardview.CircularRevealCardView
             android:id="@+id/module_filter"
-            style="@style/WidgetFoundation.Card.Variant"
+            style="@style/WidgetFoundation.Card"
             app:cardBackgroundColor="?colorSurface"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_hide_md2.xml b/app/src/main/res/layout/item_hide_md2.xml
index 44aef96fb..808149ffc 100644
--- a/app/src/main/res/layout/item_hide_md2.xml
+++ b/app/src/main/res/layout/item_hide_md2.xml
@@ -18,7 +18,7 @@
     </data>
 
     <com.google.android.material.card.MaterialCardView
-        style="@style/WidgetFoundation.Card.Variant"
+        style="@style/WidgetFoundation.Card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_module_md2.xml b/app/src/main/res/layout/item_module_md2.xml
index 1be87f742..33a9983c5 100644
--- a/app/src/main/res/layout/item_module_md2.xml
+++ b/app/src/main/res/layout/item_module_md2.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.card.MaterialCardView
-            style="@style/WidgetFoundation.Card.Variant"
+            style="@style/WidgetFoundation.Card"
             isEnabled="@{!item.removed}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_policy_md2.xml b/app/src/main/res/layout/item_policy_md2.xml
index bc66e94f3..f93816da1 100644
--- a/app/src/main/res/layout/item_policy_md2.xml
+++ b/app/src/main/res/layout/item_policy_md2.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="center">
 
         <com.google.android.material.card.MaterialCardView
-            style="@style/WidgetFoundation.Card.Variant"
+            style="@style/WidgetFoundation.Card"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:alpha="@{item.enabled ? 1f : .5f}"
diff --git a/app/src/main/res/layout/item_repo_md2.xml b/app/src/main/res/layout/item_repo_md2.xml
index 670ae42b1..092f30b9d 100644
--- a/app/src/main/res/layout/item_repo_md2.xml
+++ b/app/src/main/res/layout/item_repo_md2.xml
@@ -18,7 +18,7 @@
     </data>
 
     <com.google.android.material.card.MaterialCardView
-        style="@style/WidgetFoundation.Card.Variant"
+        style="@style/WidgetFoundation.Card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout_gravity="center"
diff --git a/app/src/main/res/layout/item_theme.xml b/app/src/main/res/layout/item_theme.xml
index 90ec25d40..23ef7a1ba 100644
--- a/app/src/main/res/layout/item_theme.xml
+++ b/app/src/main/res/layout/item_theme.xml
@@ -16,12 +16,13 @@
     </data>
 
     <com.google.android.material.card.MaterialCardView
-        style="@style/WidgetFoundation.Card.Variant"
+        style="@style/WidgetFoundation.Card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:onClick="@{() -> viewModel.saveTheme(theme)}"
         app:cardBackgroundColor="@android:color/transparent"
         app:strokeColor="?colorPrimaryVariant"
+        app:strokeWidth="1.5dp"
         tools:layout_gravity="center">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -67,7 +68,7 @@
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/theme_card_bottom"
-                style="@style/WidgetFoundation.Card.Variant"
+                style="@style/WidgetFoundation.Card"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/l1"
diff --git a/app/src/main/res/values/styles_md2_impl.xml b/app/src/main/res/values/styles_md2_impl.xml
index 0fb5c3661..8fb33fe8e 100644
--- a/app/src/main/res/values/styles_md2_impl.xml
+++ b/app/src/main/res/values/styles_md2_impl.xml
@@ -29,15 +29,6 @@
         <item name="cardBackgroundColor">?colorSecondary</item>
     </style>
 
-    <style name="WidgetFoundation.Card.Variant">
-        <item name="strokeColor">?colorSurfaceSurfaceVariant</item>
-        <item name="strokeWidth">1.5dp</item>
-    </style>
-
-    <style name="WidgetFoundation.Card.Variant.Primary">
-        <item name="strokeColor">?colorPrimary</item>
-    </style>
-
     <style name="WidgetFoundation.Card.Elevated">
         <item name="cardBackgroundColor">?colorSurfaceSurfaceVariant</item>
         <item name="cardCornerRadius">@dimen/l_50</item>