From 9b1c69b17dbabf30e9ee975ab608712a3d6b90aa Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 26 Jan 2012 13:52:37 -0800
Subject: [PATCH] Cleaned up some code and fixed a couple crashes

---
 .../astrid/repeats/RepeatControlSet.java      |  6 ++---
 .../astrid/ui/EditTitleControlSet.java        | 26 +++++++------------
 .../astrid/ui/ImportanceControlSet.java       |  2 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index 3a392ea42..f68ae4ce6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -76,7 +76,7 @@ public class RepeatControlSet extends PopupControlSet {
     private final List<RepeatChangedListener> listeners = new LinkedList<RepeatChangedListener>();
 
     public interface RepeatChangedListener {
-        public void RepeatChanged(boolean repeat);
+        public void repeatChanged(boolean repeat);
     }
 
     @Autowired
@@ -342,7 +342,7 @@ public class RepeatControlSet extends PopupControlSet {
                 okListener.onClick(d, which);
 
                 for (RepeatChangedListener l : listeners) {
-                    l.RepeatChanged(doRepeat);
+                    l.repeatChanged(doRepeat);
                 }
             }
         };
@@ -356,7 +356,7 @@ public class RepeatControlSet extends PopupControlSet {
                 DialogUtilities.dismissDialog(activity, d);
 
                 for (RepeatChangedListener l : listeners) {
-                    l.RepeatChanged(doRepeat);
+                    l.repeatChanged(doRepeat);
                 }
             }
         };
diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
index 408038e4b..cc65ca62d 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -3,7 +3,6 @@ package com.todoroo.astrid.ui;
 import android.app.Activity;
 import android.text.TextUtils;
 
-import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;
@@ -28,7 +27,7 @@ public class EditTitleControlSet extends EditTextControlSet implements Importanc
 
 
     @Override
-    public void RepeatChanged(boolean repeat) {
+    public void repeatChanged(boolean repeat) {
         isRepeating = repeat;
         updateCompleteBox();
 
@@ -42,21 +41,16 @@ public class EditTitleControlSet extends EditTextControlSet implements Importanc
     }
 
 
-    public void updateCompleteBox() {
-        if(importanceValue < TaskAdapter.IMPORTANCE_RESOURCES.length)
-        {
-            if (isRepeating)
-            {
-                completeBox.setButtonDrawable(TaskAdapter.IMPORTANCE_REPEAT_RESOURCES[importanceValue]);
+    private void updateCompleteBox() {
+        int valueToUse = importanceValue;
+        if (valueToUse >= TaskAdapter.IMPORTANCE_RESOURCES.length)
+            valueToUse = TaskAdapter.IMPORTANCE_RESOURCES.length - 1;
+        if(valueToUse < TaskAdapter.IMPORTANCE_RESOURCES.length) {
+            if (isRepeating) {
+                completeBox.setButtonDrawable(TaskAdapter.IMPORTANCE_REPEAT_RESOURCES[valueToUse]);
+            } else {
+                completeBox.setButtonDrawable(TaskAdapter.IMPORTANCE_RESOURCES[valueToUse]);
             }
-            else
-            {
-                completeBox.setButtonDrawable(TaskAdapter.IMPORTANCE_RESOURCES[importanceValue]);
-            }
-        }
-        else
-        {
-            completeBox.setBackgroundResource(R.drawable.btn_check);
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
index 8d5b4869a..2ebc0e600 100644
--- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
@@ -92,7 +92,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
         }
 
         if (usedWidth > width * 2 /3 ) {
-            getView().findViewById(R.id.display_row_edit).setVisibility(View.GONE);
+            getView().findViewById(R.id.display_row_title).setVisibility(View.GONE);
         }
     }