From d66e927f49d23e163d4e0521ac36a1b5baa96e2a Mon Sep 17 00:00:00 2001
From: rocka <i@rocka.me>
Date: Mon, 14 Aug 2017 18:04:53 +0800
Subject: [PATCH] ui: use CardView for available packages

---
 app/src/main/res/layout/content_main.xml     |   7 +-
 app/src/main/res/layout/item_rom_package.xml | 110 ++++++++++---------
 2 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 907b9a5..e430a56 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -70,7 +70,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="0dp"
             android:layout_marginStart="0dp"
-            android:layout_marginTop="0dp"
             android:clickable="true"
             android:focusable="true"
             android:foreground="?attr/selectableItemBackground"
@@ -117,13 +116,15 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="0dp"
-            android:layout_marginTop="8dp"
+            android:clipToPadding="false"
+            android:paddingTop="8dp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_available_packages" />
+            app:layout_constraintTop_toBottomOf="@+id/text_available_packages"
+            tools:listitem="@layout/item_rom_package" />
 
         <ProgressBar
             android:id="@+id/main_progress_bar"
diff --git a/app/src/main/res/layout/item_rom_package.xml b/app/src/main/res/layout/item_rom_package.xml
index 94ed9f1..2efacc2 100644
--- a/app/src/main/res/layout/item_rom_package.xml
+++ b/app/src/main/res/layout/item_rom_package.xml
@@ -10,60 +10,68 @@
             type="me.rocka.mokeedelta.model.IRomPackage" />
     </data>
 
-    <android.support.constraint.ConstraintLayout
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="?attr/selectableItemBackground">
 
-        <TextView
-            android:id="@+id/text_package_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:text="@{pkg.name}"
-            android:textColor="@color/colorTextBold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginTop="0dp"
-            android:text="@{pkg.size}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/text_package_name"
-            app:layout_constraintTop_toBottomOf="@+id/text_package_name" />
+            <TextView
+                android:id="@+id/text_package_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{pkg.name}"
+                android:textColor="@color/colorTextBold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <ProgressBar
-            android:id="@+id/progress_circle_download"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="@dimen/download_idc_width"
-            android:layout_height="@dimen/download_idc_width"
-            android:layout_marginBottom="@dimen/download_btn_margin"
-            android:layout_marginEnd="13dp"
-            android:layout_marginTop="@dimen/download_btn_margin"
-            android:alpha="0.0"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:layout_marginTop="0dp"
+                android:text="@{pkg.size}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/text_package_name"
+                app:layout_constraintTop_toBottomOf="@+id/text_package_name" />
 
-        <ImageButton
-            android:id="@+id/button_download"
-            android:layout_width="@dimen/download_btn_width"
-            android:layout_height="@dimen/download_btn_width"
-            android:layout_marginBottom="@dimen/download_btn_margin"
-            android:layout_marginEnd="@dimen/download_btn_margin"
-            android:layout_marginTop="@dimen/download_btn_margin"
-            android:background="@android:color/transparent"
-            android:clickable="true"
-            android:contentDescription="@string/desc_download_btn"
-            android:focusable="true"
-            android:foreground="?attr/selectableItemBackground"
-            android:tint="@color/colorPrimary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_file_download" />
-    </android.support.constraint.ConstraintLayout>
+            <ProgressBar
+                android:id="@+id/progress_circle_download"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="@dimen/download_idc_width"
+                android:layout_height="@dimen/download_idc_width"
+                android:layout_marginBottom="@dimen/download_btn_margin"
+                android:layout_marginEnd="13dp"
+                android:layout_marginTop="@dimen/download_btn_margin"
+                android:alpha="0.0"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageButton
+                android:id="@+id/button_download"
+                android:layout_width="@dimen/download_btn_width"
+                android:layout_height="@dimen/download_btn_width"
+                android:layout_marginBottom="@dimen/download_btn_margin"
+                android:layout_marginEnd="@dimen/download_btn_margin"
+                android:layout_marginTop="@dimen/download_btn_margin"
+                android:background="@android:color/transparent"
+                android:clickable="true"
+                android:contentDescription="@string/desc_download_btn"
+                android:focusable="true"
+                android:foreground="?attr/selectableItemBackground"
+                android:tint="@color/colorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_file_download" />
+        </android.support.constraint.ConstraintLayout>
+    </android.support.v7.widget.CardView>
 </layout>