From 03f2327dfe89a9a3de21a5b5a69ccef5cf6e0312 Mon Sep 17 00:00:00 2001
From: Andrew Shaw <andrew.t.shaw@gmail.com>
Date: Wed, 25 Jan 2012 20:31:03 -0800
Subject: [PATCH] Added camera button

---
 .../astrid/actfm/TagUpdatesActivity.java      |   4 ++--
 .../astrid/timers/TimerActionControlSet.java  |   4 ++--
 astrid/res/drawable/camera_button.xml         |  11 +++++++++++
 astrid/res/drawable/icn_camera.png            | Bin 693 -> 0 bytes
 astrid/res/layout/tag_updates_activity.xml    |   3 +--
 astrid/res/layout/task_adapter_row.xml        |  18 ++++++++++++++++--
 astrid/res/layout/task_edit_activity.xml      |  18 +++++-------------
 .../todoroo/astrid/adapter/TaskAdapter.java   |   4 ++++
 8 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 astrid/res/drawable/camera_button.xml
 delete mode 100644 astrid/res/drawable/icn_camera.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
index 2de190d18..f334284e0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
@@ -125,7 +125,7 @@ public class TagUpdatesActivity extends ListActivity {
             @Override
             public void clearImage() {
                 picture = null;
-                pictureButton.setImageResource(R.drawable.icn_camera);
+                pictureButton.setImageResource(R.drawable.camera_button);
             }
         };
         pictureButton = (ImageButton) findViewById(R.id.picture);
@@ -246,7 +246,7 @@ public class TagUpdatesActivity extends ListActivity {
         }.start();
         addCommentField.setText(""); //$NON-NLS-1$
         picture = null;
-        pictureButton.setImageResource(R.drawable.icn_camera);
+        pictureButton.setImageResource(R.drawable.camera_button);
         refreshUpdatesList();
 
         StatisticsService.reportEvent(StatisticsConstants.ACTFM_TAG_COMMENT);
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
index 0ba910e1b..d4fed56e9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
@@ -33,7 +33,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
         timerContainer = (View) parent.findViewById(R.id.timer_container);
         timerContainer.setOnClickListener(timerListener);
 
-        chronometer = (Chronometer) parent.findViewById(R.id.timer);
+        chronometer = new Chronometer(activity);
     }
 
     @Override
@@ -95,7 +95,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
             chronometer.setBase(SystemClock.elapsedRealtime() - elapsed);
             chronometer.start();
         } else {
-            chronometer.setVisibility(View.INVISIBLE);
+            chronometer.setVisibility(View.GONE);
             chronometer.stop();
         }
     }
diff --git a/astrid/res/drawable/camera_button.xml b/astrid/res/drawable/camera_button.xml
new file mode 100644
index 000000000..c24c1152a
--- /dev/null
+++ b/astrid/res/drawable/camera_button.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="false" android:state_enabled="true"
+          android:state_focused="false" android:drawable="@drawable/camera_button_red" />
+    <item android:state_pressed="true" android:state_enabled="true"
+          android:drawable="@drawable/camera_button_gray" />
+    <item android:state_pressed="false" android:state_enabled="true"
+          android:state_focused="true" android:drawable="@drawable/camera_button_gray" />
+
+</selector>
diff --git a/astrid/res/drawable/icn_camera.png b/astrid/res/drawable/icn_camera.png
deleted file mode 100644
index 15134ddfed953f436aef416f6e435798187e43ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq001ih001Ni1^@s65DUW<00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0zyed
zK~#9!?3kf$!!Qs)y(}Q0pfE6?QUVGB1_}pDDg_P<>=X7WgM)>Il}ZW=1_}lO3ZiNt
zFfd>sU|@ICxpKY4brL5H=t-8_`kFkS&v$1tc9Wa1I~}FP;wgY`4sBdAoI=}fHmj^_
z*n16754vY)PK63iVCwtR&*Sm%(<Q8>p)=Fa!HERDx&c^mR`OC;VO3FbY9<Arw*wc;
z&tL&Gf-W53zAB)-Bd|rF?m$7gi#_58n|_!`OXz4WeP1#bVZWipWxHI^xw_aFocqww
zJyL3Xl|0(0D#5Uq5tCaNmII^JN1Bj3XnWWUMM=CKQ(_4!K=;%$f)4A#GT{N2cI;A>
z#VGu&02(18X*iSKQ)(pJP-r;=B`bR5_vj88w>I=Kj57(?)>(DS0PI!*#if2F7z{Zt
z_?;}ut&E#FkrIzscX(yds4Z+xFBTKatRhxMA}~%;(!sF@`oGt-Hc&|{6+D+B#~kz=
z!G}|6e58u+ZDCW%GIa}{)O6KVE6W(v>lC(gu?$)>(fm)+)XHsP18K7rmwa4G96_(J
zlmHk7{iOmJAy-252<ujMCNfw=kO-Us#9K+MjHP(&P@TZ~hV?KR0L)sj@J?|6bttPj
z*MR+tvE&YGeqK_Xl%uBM%hnjzeXvJ00MGk5xdkt1!m2cC3U<=O$~>D<b!Ggd;FQeT
zWy3m$onVW$OVnouOEd!dH6=dXb>SVA?@zzTM~AfZXuuEHsQZ7{N5X~2Ab<ffWjE<T
begzl+Y*(_U?-=WV00000NkvXXu0mjf54<Ca

diff --git a/astrid/res/layout/tag_updates_activity.xml b/astrid/res/layout/tag_updates_activity.xml
index b99a87182..6da9e5200 100644
--- a/astrid/res/layout/tag_updates_activity.xml
+++ b/astrid/res/layout/tag_updates_activity.xml
@@ -60,8 +60,7 @@
             android:paddingRight="7dip"
             android:paddingBottom="2dip"
             android:layout_weight="1"
-            android:background="@drawable/footer_button"
-            android:src="@drawable/icn_camera"
+            android:src="@drawable/camera_button"
             android:scaleType="fitCenter"/> 
     
         <!-- Quick Add Task -->
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 7d69e8b9c..cf9411172 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -19,14 +19,28 @@
         android:button="@drawable/btn_check" />
     <!-- assignee photo -->
 
+<LinearLayout
+    android:id="@+id/pictureContainer"
+        android:layout_width="58dip"
+        android:layout_height="54dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginTop="10dip"
+        android:padding="7dip"
+        android:paddingTop="9dip"
+        android:background="#111111"
+        >
     <greendroid.widget.AsyncImageView
         android:id="@+id/picture"
         android:layout_width="35dip"
         android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
         astrid:defaultSrc="@drawable/icn_default_person_image"
         android:scaleType="fitCenter"
-        android:visibility="gone" />
+        android:visibility="gone" >
+        
+        
+    </greendroid.widget.AsyncImageView>
+</LinearLayout>
+
 
     <LinearLayout
         android:id="@+id/task_row"
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 188341b4a..3b3af1739 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -112,12 +112,12 @@
             android:layout_gravity="top"
             android:layout_marginRight="3dip"
             android:layout_weight="1"
-            android:background="@drawable/footer_button"
             android:paddingBottom="2dip"
             android:paddingLeft="7dip"
             android:paddingRight="7dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/icn_camera" />
+            android:scaleType="centerInside"
+            android:background="#00000000"
+            android:src="@drawable/camera_button" />
 
         <!-- Quick Add Task -->
 
@@ -146,19 +146,11 @@
                 android:id="@+id/timer_button"
                 android:layout_width="25dip"
                 android:layout_height="25dip"
-                android:maxHeight="25dip"
+                android:layout_marginTop="7dip"
+                android:scaleType="fitCenter"
                 android:gravity="center_horizontal"
                 android:layout_gravity="center_horizontal"
                 android:layout_weight="1"/>
-            <Chronometer 
-                android:id="@+id/timer"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:gravity="center_horizontal"
-                android:visibility="visible"
-                android:textColor="@color/task_edit_details"
-                android:textSize="10sp" />
         </LinearLayout>
         
         <ImageButton
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index b60000996..0f5be5e51 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -249,6 +249,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.rowBody = (ViewGroup)view.findViewById(R.id.rowBody);
         viewHolder.nameView = (TextView)view.findViewById(R.id.title);
         viewHolder.picture = (AsyncImageView)view.findViewById(R.id.picture);
+        viewHolder.pictureContainer = (View) view.findViewById(R.id.pictureContainer);
         viewHolder.completeBox = (CheckBox)view.findViewById(R.id.completeBox);
         viewHolder.dueDate = (TextView)view.findViewById(R.id.dueDate);
         viewHolder.details1 = (TextView)view.findViewById(R.id.details1);
@@ -302,6 +303,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         public TextView nameView;
         public CheckBox completeBox;
         public AsyncImageView picture;
+        public View pictureContainer;
         public TextView dueDate;
         public TextView details1, details2;
         public LinearLayout taskRow;
@@ -366,8 +368,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         final AsyncImageView pictureView = viewHolder.picture; {
             if(task.getValue(Task.USER_ID) == 0) {
                 pictureView.setVisibility(View.GONE);
+                viewHolder.pictureContainer.setVisibility(View.GONE);
             } else {
                 pictureView.setVisibility(View.VISIBLE);
+                viewHolder.pictureContainer.setVisibility(View.VISIBLE);
                 pictureView.setUrl(null);
                 try {
                     JSONObject user = new JSONObject(task.getValue(Task.USER));