From 18168ecf82481b80fe8366d3a5249e482a212a63 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 16 Jul 2015 12:53:27 -0500
Subject: [PATCH] Use list footer for FAB padding

---
 .../com/todoroo/astrid/activity/TaskListFragment.java    | 9 +++++++++
 src/main/res/layout/task_adapter_row_simple.xml          | 7 ++++++-
 src/main/res/layout/task_list_activity.xml               | 3 ++-
 src/main/res/layout/task_list_footer.xml                 | 5 +++++
 src/main/res/layout/widget_config_activity.xml           | 1 -
 src/main/res/values-v11/styles.xml                       | 7 +++----
 src/main/res/values-v21/dimens.xml                       | 5 +++++
 src/main/res/values/dimens.xml                           | 3 +++
 src/main/res/values/styles.xml                           | 7 ++++---
 9 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 src/main/res/layout/task_list_footer.xml
 create mode 100644 src/main/res/values-v21/dimens.xml

diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 85ff3401f..45f5e47f9 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -289,6 +289,15 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr
         return parent;
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        ListView listView = getListView();
+        View footer = getActivity().getLayoutInflater().inflate(R.layout.task_list_footer, listView, false);
+        listView.addFooterView(footer, null, false);
+    }
+
     private void setupRefresh(SwipeRefreshLayout layout) {
         layout.setOnRefreshListener(this);
         layout.setColorScheme(
diff --git a/src/main/res/layout/task_adapter_row_simple.xml b/src/main/res/layout/task_adapter_row_simple.xml
index fbec918d7..169eee476 100644
--- a/src/main/res/layout/task_adapter_row_simple.xml
+++ b/src/main/res/layout/task_adapter_row_simple.xml
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="?attr/asTaskRowSelector"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
 	<RelativeLayout 
 	    android:id="@+id/rowBody"
@@ -123,4 +123,9 @@
 	
 	</RelativeLayout>
 
+	<View
+		android:layout_width="fill_parent"
+		android:layout_height="1px"
+		android:background="?attr/asListDividerColor" />
+
 </LinearLayout>
diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml
index 10ec66cb6..0dfbb4829 100644
--- a/src/main/res/layout/task_list_activity.xml
+++ b/src/main/res/layout/task_list_activity.xml
@@ -28,7 +28,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:layout_margin="16dp"
+        android:layout_margin="@dimen/task_list_fab_margin"
+        android:padding="0dp"
         app:borderWidth="0dp"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/task_list_footer.xml b/src/main/res/layout/task_list_footer.xml
new file mode 100644
index 000000000..b159a0d93
--- /dev/null
+++ b/src/main/res/layout/task_list_footer.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/task_list_footer_height"
+    android:orientation="vertical" />
diff --git a/src/main/res/layout/widget_config_activity.xml b/src/main/res/layout/widget_config_activity.xml
index d58552691..d651668ba 100644
--- a/src/main/res/layout/widget_config_activity.xml
+++ b/src/main/res/layout/widget_config_activity.xml
@@ -75,7 +75,6 @@
         android:layout_weight="100"
         android:listSelector="?attr/selectableItemBackground"
         android:drawSelectorOnTop="true"
-        android:divider="@android:color/transparent"
         android:cacheColorHint="@android:color/transparent"
         android:scrollingCache="false"
         android:scrollbars="vertical"/>
diff --git a/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml
index 53e1189bb..9af270890 100644
--- a/src/main/res/values-v11/styles.xml
+++ b/src/main/res/values-v11/styles.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="TaskListView" parent="ListView">
-        <item name="android:paddingBottom">90dp</item>
-        <item name="android:clipToPadding">false</item>
-    </style>
+
+    <style name="TaskListView" parent="ListView" />
+
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
new file mode 100644
index 000000000..9d4d9d43e
--- /dev/null
+++ b/src/main/res/values-v21/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="task_list_fab_margin">16dp</dimen>
+    <dimen name="task_list_footer_height">88dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 8c0d68dd7..26a80e9fc 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,6 +5,9 @@
     <dimen name="widget_margin">8dp</dimen>
     <dimen name="dialog_width">300dp</dimen>
 
+    <dimen name="task_list_footer_height">96dp</dimen>
+    <dimen name="task_list_fab_margin">0dp</dimen>
+
     <dimen name="task_edit_title_padding_top_bottom">18dp</dimen>
     <dimen name="task_edit_padding_top_bottom">9dp</dimen>
     <dimen name="task_edit_double_padding_top_bottom">18dp</dimen>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 6ad054460..cd973b86d 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -49,16 +49,17 @@
     </style>
 
     <!--=============================================== TaskListActivity == -->
-    
+
     <style name="ListView">
-        <item name="android:divider">?attr/asListDividerColor</item>
-        <item name="android:dividerHeight">1px</item>
+        <item name="android:divider">@android:color/transparent</item>
+        <item name="android:dividerHeight">0px</item>
         <item name="android:scrollbars">vertical</item>
         <item name="android:cacheColorHint">#00000000</item>
         <item name="android:smoothScrollbar">true</item>
     </style>
 
     <style name="TaskListView" parent="ListView">
+        <item name="android:scrollingCache">false</item>
     </style>
 
     <!-- ==================================================== TaskAdapter == -->