From 653811520bbee4ac6c54ee34157e9825bcc6cea8 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 19 Dec 2011 11:30:03 -0800
Subject: [PATCH] Fixed the bug where task edit ok buttons would get squished
 off screen

---
 .../plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java | 2 +-
 astrid/res/layout/control_dialog_ok.xml                      | 5 +++--
 astrid/res/layout/control_set_assigned.xml                   | 3 ++-
 astrid/res/layout/control_set_collaborators.xml              | 3 ++-
 astrid/res/layout/control_set_notes.xml                      | 3 ++-
 astrid/res/layout/control_set_opencrx.xml                    | 3 ++-
 astrid/res/layout/control_set_producteev.xml                 | 3 ++-
 astrid/res/layout/control_set_reminders.xml                  | 1 +
 astrid/res/layout/control_set_repeat.xml                     | 4 +++-
 astrid/res/layout/control_set_tags.xml                       | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index 8dbfd19e7..5f73a4cc2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -165,7 +165,7 @@ public class TagViewActivity extends TaskListActivity {
 
     private void showListSettingsPopover() {
         if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) {
-            View tabView = findViewById(R.id.settings);
+            View tabView = findViewById(R.id.members_edit);
             HelpInfoPopover.showPopover(this, tabView, R.string.help_popover_list_settings);
             Preferences.setBoolean(R.string.p_showed_list_settings_help, true);
         }
diff --git a/astrid/res/layout/control_dialog_ok.xml b/astrid/res/layout/control_dialog_ok.xml
index 6eabe4a34..2f996439a 100644
--- a/astrid/res/layout/control_dialog_ok.xml
+++ b/astrid/res/layout/control_dialog_ok.xml
@@ -3,8 +3,9 @@
 	    android:id="@+id/edit_dlg_ok"
 	    android:layout_width="150dip"
 	    android:layout_height="50dip"
-	    android:layout_marginTop="15dip"
-	    android:layout_marginBottom="10dip"
+	    android:layout_marginTop="10dip"
+	    android:layout_marginBottom="5dip"
 	    android:layout_weight="1"
 	    android:layout_gravity="center_horizontal"
+	    android:layout_alignParentBottom="true"
 	    android:text="@string/DLG_ok"/>
\ No newline at end of file
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
index 623c2fd31..26206ccc7 100644
--- a/astrid/res/layout/control_set_assigned.xml
+++ b/astrid/res/layout/control_set_assigned.xml
@@ -30,7 +30,8 @@
 	<ListView
 	    android:id="@+id/assigned_list"
 	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"/>
+	    android:layout_height="fill_parent"
+	    android:layout_weight="100"/>
 	<include layout="@layout/control_dialog_ok"/>
     
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_collaborators.xml b/astrid/res/layout/control_set_collaborators.xml
index 15c68efc6..3cc4d8da4 100644
--- a/astrid/res/layout/control_set_collaborators.xml
+++ b/astrid/res/layout/control_set_collaborators.xml
@@ -6,7 +6,8 @@
   android:orientation="vertical">
 	<ScrollView
 	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent">
+	  android:layout_height="fill_parent"
+	  android:layout_weight="100">
 		<LinearLayout
 		  android:orientation="vertical"
 		  android:layout_width="fill_parent"
diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index 03a9da765..41571a308 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -9,7 +9,8 @@
   <LinearLayout
     android:orientation="horizontal"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_weight="100">
     <!-- Voice Add Note Button -->
     <ImageButton
       android:id="@+id/voiceAddNoteButton"
diff --git a/astrid/res/layout/control_set_opencrx.xml b/astrid/res/layout/control_set_opencrx.xml
index 6f3e16bcc..9cf51107e 100644
--- a/astrid/res/layout/control_set_opencrx.xml
+++ b/astrid/res/layout/control_set_opencrx.xml
@@ -10,7 +10,8 @@
     <LinearLayout
       android:orientation="vertical"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      android:layout_weight="100">
         
       <TextView
         android:layout_width="wrap_content"
diff --git a/astrid/res/layout/control_set_producteev.xml b/astrid/res/layout/control_set_producteev.xml
index 72314c3d0..baa8730dc 100644
--- a/astrid/res/layout/control_set_producteev.xml
+++ b/astrid/res/layout/control_set_producteev.xml
@@ -12,7 +12,8 @@
     <LinearLayout
       android:orientation="vertical"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      android:layout_weight="100">
         
       <TextView
         android:layout_width="wrap_content"
diff --git a/astrid/res/layout/control_set_reminders.xml b/astrid/res/layout/control_set_reminders.xml
index d15c87dba..5c005ad61 100644
--- a/astrid/res/layout/control_set_reminders.xml
+++ b/astrid/res/layout/control_set_reminders.xml
@@ -7,6 +7,7 @@
 	<ScrollView
 	  android:layout_width="fill_parent"
 	  android:layout_height="fill_parent"
+	  android:layout_weight="100"
 	  android:minWidth="320dip"
 	  android:paddingLeft="5dip"
 	  android:paddingRight="5dip">
diff --git a/astrid/res/layout/control_set_repeat.xml b/astrid/res/layout/control_set_repeat.xml
index 3f41aa38d..ebb4303a1 100644
--- a/astrid/res/layout/control_set_repeat.xml
+++ b/astrid/res/layout/control_set_repeat.xml
@@ -9,7 +9,8 @@
   <LinearLayout android:id="@+id/repeatContainer"
       android:orientation="vertical"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      android:layout_weight="100">
       
     <LinearLayout
         android:orientation="horizontal"
@@ -44,6 +45,7 @@
   <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
+      android:layout_weight="1"
       android:layout_marginTop="15dip"
       android:layout_marginBottom="-15dip">
 	  <include layout="@layout/control_dialog_ok"/>
diff --git a/astrid/res/layout/control_set_tags.xml b/astrid/res/layout/control_set_tags.xml
index d205604db..a2932f1fe 100644
--- a/astrid/res/layout/control_set_tags.xml
+++ b/astrid/res/layout/control_set_tags.xml
@@ -23,7 +23,8 @@
   <ListView
       android:id="@+id/existingTags"
       android:layout_width="fill_parent"
-      android:layout_height="fill_parent"/>
+      android:layout_height="fill_parent"
+      android:layout_weight="100"/>
   <include layout="@layout/control_dialog_ok"/>
     
 </LinearLayout>