Use MaterialCardView

pull/848/head
Alex Baker 5 years ago
parent 7ea23a0c94
commit daa167c0ae

@ -164,7 +164,6 @@ dependencies {
implementation("com.nononsenseapps:filepicker:4.2.1") implementation("com.nononsenseapps:filepicker:4.2.1")
implementation("com.google.android.material:material:1.1.0-alpha10") implementation("com.google.android.material:material:1.1.0-alpha10")
implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.cardview:cardview:1.0.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta2") implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta2")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.jakewharton.timber:timber:4.7.1")

@ -3,7 +3,7 @@
** **
** See the file "LICENSE" for the full license governing this code. ** See the file "LICENSE" for the full license governing this code.
--> -->
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/row" android:id="@+id/row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -21,4 +21,4 @@
android:visibility="?attr/horizontal_divider" android:visibility="?attr/horizontal_divider"
android:layout_gravity="bottom" /> android:layout_gravity="bottom" />
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?listPreferredItemHeight" android:layout_height="?listPreferredItemHeight"
@ -28,4 +28,4 @@
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_outline_drag_handle_24px" android:src="@drawable/ic_outline_drag_handle_24px"
android:tint="@color/icon_tint"/> android:tint="@color/icon_tint"/>
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardViewStyle" style="@style/CardViewStyle"
@ -45,4 +45,4 @@
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>

@ -110,7 +110,7 @@
<item name="android:background">@android:color/transparent</item> <item name="android:background">@android:color/transparent</item>
</style> </style>
<style name="CardViewStyle" parent="CardView"> <style name="CardViewStyle" parent="Widget.MaterialComponents.CardView">
<item name="android:layout_marginTop">0dp</item> <item name="android:layout_marginTop">0dp</item>
<item name="android:layout_marginBottom">0dp</item> <item name="android:layout_marginBottom">0dp</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>

Loading…
Cancel
Save