Use done/done-all material icons
TODO(rosswang): Have a different icon for the reset action. Possibly
also use the material delete icon.
Change-Id: I800d900c18c851648458b30deb700706bd2dedbc
diff --git a/app/src/main/res/drawable-hdpi/ic_done_all_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_all_black_24dp.png
new file mode 100644
index 0000000..0aabe09
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_done_all_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_done_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_done_black_24dp.png
new file mode 100644
index 0000000..d4c0607
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_done_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_done_all_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_all_black_24dp.png
new file mode 100644
index 0000000..eb0dc4e
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_done_all_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_done_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_black_24dp.png
new file mode 100644
index 0000000..5e5e7cf
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_done_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_done_all_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_all_black_24dp.png
new file mode 100644
index 0000000..0d871d3
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_done_all_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_done_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_black_24dp.png
new file mode 100644
index 0000000..64a4944
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_done_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_all_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_all_black_24dp.png
new file mode 100644
index 0000000..2d49549
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_done_all_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png
new file mode 100644
index 0000000..c9c0174
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_all_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_all_black_24dp.png
new file mode 100644
index 0000000..6b5fd32
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_done_all_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png
new file mode 100644
index 0000000..2f6d638
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/layout/task_row.xml b/app/src/main/res/layout/task_row.xml
index 8d95a3a..e268ea8 100644
--- a/app/src/main/res/layout/task_row.xml
+++ b/app/src/main/res/layout/task_row.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
<LinearLayout
android:id="@+id/swipe_right"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#00FF00"
android:visibility="gone">
+
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@android:drawable/checkbox_on_background"
android:layout_gravity="center_vertical"
- android:layout_margin="@dimen/fab_margin"/>
+ android:layout_margin="@dimen/fab_margin"
+ android:src="@drawable/ic_done_black_24dp"/>
</LinearLayout>
+
<LinearLayout
android:id="@+id/swipe_left"
android:layout_width="match_parent"
@@ -22,59 +25,64 @@
android:background="#FF0000"
android:gravity="right"
android:visibility="gone">
+
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@android:drawable/ic_input_delete"
android:layout_gravity="center_vertical"
- android:layout_margin="@dimen/fab_margin"/>
+ android:layout_margin="@dimen/fab_margin"
+ android:src="@android:drawable/ic_input_delete"/>
</LinearLayout>
+
<android.support.v7.widget.CardView android:id="@+id/card"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
- android:layout_marginBottom="1dp"
- card_view:cardElevation="1dp"
- card_view:cardBackgroundColor="#DDDDFF">
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="1dp"
+ card_view:cardBackgroundColor="#DDDDFF"
+ card_view:cardElevation="1dp">
<LinearLayout
- android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
- <ImageView android:id="@+id/task_done"
+ <ImageView
+ android:id="@+id/task_done"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight = "0"
- android:src="@android:drawable/checkbox_on_background"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/fab_margin"
+ android:layout_weight="0"
+ android:src="@drawable/ic_done_black_24dp"
android:visibility="gone"/>
<LinearLayout
- android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_weight = "1"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
- <TextView android:id="@+id/task_text"
+ <TextView
+ android:id="@+id/task_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_weight = "1"
+ android:layout_margin="5dp"
+ android:layout_weight="1"
android:gravity="center_vertical"
- android:textStyle="bold"
- android:textSize="22sp"
android:textColor="#000000"
- android:layout_margin="5dp" />
+ android:textSize="22sp"
+ android:textStyle="bold"/>
- <TextView android:id="@+id/task_time"
+ <TextView
+ android:id="@+id/task_time"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_weight = "1"
+ android:layout_margin="5dp"
+ android:layout_weight="1"
android:gravity="center_vertical"
- android:textSize="12sp"
android:textColor="#333333"
- android:layout_margin="5dp" />
+ android:textSize="12sp"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/todo_list_row.xml b/app/src/main/res/layout/todo_list_row.xml
index ef299e5..819b107 100644
--- a/app/src/main/res/layout/todo_list_row.xml
+++ b/app/src/main/res/layout/todo_list_row.xml
@@ -11,7 +11,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@android:drawable/checkbox_on_background"
+ android:src="@drawable/ic_done_all_black_24dp"
android:layout_gravity="center_vertical"
android:layout_margin="@dimen/fab_margin"/>
</LinearLayout>
