MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove strokes from most cards

Browse Source
This commit is contained in:
topjohnwu 2020-09-17 02:27:43 -07:00
parent 9a16ab1bd7
commit 2dbaf9595c
10 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/fragment_hide_md2.xml
View File

@ -48,7 +48,7 @@
<com.google.android.material.circularreveal.cardview.CircularRevealCardView <com.google.android.material.circularreveal.cardview.CircularRevealCardView
android:id="@+id/hide_filter" android:id="@+id/hide_filter"
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"

20
app/src/main/res/layout/fragment_install_md2.xml
View File

@ -37,12 +37,11 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
gone="@{viewModel.skipOptions}" gone="@{viewModel.skipOptions}"
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1" >
app:strokeWidth="@{viewModel.step != 0 ? 0f : @dimen/l_125}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -124,13 +123,12 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1" >
app:strokeWidth="@{viewModel.step != 1 ? 0f : @dimen/l_125}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -217,13 +215,12 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1" >
app:strokeWidth="@{viewModel.step != 0 ? 0f : @dimen/l_125}">
<TextView <TextView
android:id="@+id/release_notes" android:id="@+id/release_notes"
@ -232,7 +229,10 @@
android:layout_margin="15dp" android:layout_margin="15dp"
android:textAppearance="@style/AppearanceFoundation.Caption" android:textAppearance="@style/AppearanceFoundation.Caption"
android:visibility="gone" 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> </com.google.android.material.card.MaterialCardView>

3
app/src/main/res/layout/fragment_log_md2.xml
View File

@ -37,7 +37,8 @@
<com.google.android.material.circularreveal.cardview.CircularRevealCardView <com.google.android.material.circularreveal.cardview.CircularRevealCardView
android:id="@+id/log_filter" android:id="@+id/log_filter"
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
app:cardBackgroundColor="?colorSurface"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"

2
app/src/main/res/layout/fragment_module_md2.xml
View File

@ -62,7 +62,7 @@
<com.google.android.material.circularreveal.cardview.CircularRevealCardView <com.google.android.material.circularreveal.cardview.CircularRevealCardView
android:id="@+id/module_filter" android:id="@+id/module_filter"
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
app:cardBackgroundColor="?colorSurface" app:cardBackgroundColor="?colorSurface"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
app/src/main/res/layout/item_hide_md2.xml
View File

@ -18,7 +18,7 @@
</data> </data>
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout_gravity="center" tools:layout_gravity="center"

2
app/src/main/res/layout/item_module_md2.xml
View File

@ -24,7 +24,7 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
isEnabled="@{!item.removed}" isEnabled="@{!item.removed}"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
app/src/main/res/layout/item_policy_md2.xml
View File

@ -17,7 +17,7 @@
android:layout_gravity="center"> android:layout_gravity="center">
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="@{item.enabled ? 1f : .5f}" android:alpha="@{item.enabled ? 1f : .5f}"

2
app/src/main/res/layout/item_repo_md2.xml
View File

@ -18,7 +18,7 @@
</data> </data>
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:layout_gravity="center" tools:layout_gravity="center"

5
app/src/main/res/layout/item_theme.xml
View File

@ -16,12 +16,13 @@
</data> </data>
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="@{() -> viewModel.saveTheme(theme)}" android:onClick="@{() -> viewModel.saveTheme(theme)}"
app:cardBackgroundColor="@android:color/transparent" app:cardBackgroundColor="@android:color/transparent"
app:strokeColor="?colorPrimaryVariant" app:strokeColor="?colorPrimaryVariant"
app:strokeWidth="1.5dp"
tools:layout_gravity="center"> tools:layout_gravity="center">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -67,7 +68,7 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/theme_card_bottom" android:id="@+id/theme_card_bottom"
style="@style/WidgetFoundation.Card.Variant" style="@style/WidgetFoundation.Card"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"

9
app/src/main/res/values/styles_md2_impl.xml
View File

@ -29,15 +29,6 @@
<item name="cardBackgroundColor">?colorSecondary</item> <item name="cardBackgroundColor">?colorSecondary</item>
</style> </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"> <style name="WidgetFoundation.Card.Elevated">
<item name="cardBackgroundColor">?colorSurfaceSurfaceVariant</item> <item name="cardBackgroundColor">?colorSurfaceSurfaceVariant</item>
<item name="cardCornerRadius">@dimen/l_50</item> <item name="cardCornerRadius">@dimen/l_50</item>