From 7f63206531e5399358283391544ad217eabf0d2a Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 13 Feb 2012 12:19:01 -0800
Subject: [PATCH] Added preference to compress task rows to fit title

---
 astrid/res/values/keys.xml                             | 1 +
 astrid/res/values/strings-core.xml                     | 4 ++++
 astrid/res/xml/preferences.xml                         | 6 ++++++
 astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java | 9 +++++++++
 4 files changed, 20 insertions(+)

diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index f4ff4787a..214debcf3 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -200,6 +200,7 @@
   
   <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
 
+  <string name="p_allowCompressedTaskRows">allowCompressedTaskRows</string>
   <!-- ========================================================= DEFAULTS == -->
   
   <!-- default urgency setting (corresponds to entry in TEA_urgency) -->  
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 01b80d2bc..408c43b02 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -477,6 +477,10 @@
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
   
+  <!-- Preferences: Allow task rows to compress to size of task -->
+  <string name="EPr_compressTaskRows_title">Compact Task Row</string>
+  <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
+  
   <!-- Preference: Theme -->
   <string name="EPr_theme_title">Color Theme</string>
   <!-- Preference: Theme Description (%s => value) -->
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 47ca073f5..35acab67e 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -22,6 +22,12 @@
             android:title="@string/EPr_showNotes_title"
             android:defaultValue="false" />
         
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+            android:key="@string/p_allowCompressedTaskRows"
+            android:title="@string/EPr_compressTaskRows_title"
+            android:summary="@string/EPr_compressTaskRows_desc"
+            android:defaultValue="false" />
+        
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_showSmartConfirmation_key"
             android:title="@string/EPr_showSmartConfirmation_title"
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index a1a0cd9e0..0dc8890c9 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -169,6 +169,8 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     private final AtomicReference<String> query;
 
+    private final int minRowHeight;
+
     // quick action bar
     private QuickActionWidget mBar;
     private final QuickActionListener mBarListener = new QuickActionListener();
@@ -214,6 +216,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         displayMetrics = new DisplayMetrics();
         fragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
 
+        this.minRowHeight = (int) (57 * displayMetrics.density);
 
         if (Preferences.getBoolean(R.string.p_showNotes, false)) {
             detailLoader = new DetailLoaderThread();
@@ -342,6 +345,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         ViewHolder viewHolder = (ViewHolder)view.getTag();
         Task task = viewHolder.task;
 
+        if (Preferences.getBoolean(R.string.p_allowCompressedTaskRows, false)) {
+            viewHolder.rowBody.setMinimumHeight(0);
+        } else {
+            viewHolder.rowBody.setMinimumHeight(minRowHeight);
+        }
+
         // name
         final TextView nameView = viewHolder.nameView; {
             String nameValue = task.getValue(Task.TITLE);