Move trash can to action bar

Closes #13

astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -5,20 +5,14 @@
  */
 package com.todoroo.astrid.actfm;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
@@ -34,7 +28,6 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import org.tasks.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -59,17 +52,19 @@ import com.todoroo.astrid.data.TagMetadata;
 import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.helper.UUIDHelper;
-import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagFilterExposer;
 import com.todoroo.astrid.tags.TagMemberMetadata;
 import com.todoroo.astrid.tags.TagService;
-import com.todoroo.astrid.ui.PeopleContainer;
-import com.todoroo.astrid.ui.PeopleContainer.ParseSharedException;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.tasks.R;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 public class TagSettingsActivity extends SherlockFragmentActivity {
@@ -187,7 +182,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
                 if (ThemeService.getTheme() == R.style.Theme_White_Alt) {
                     actionBar.setLogo(R.drawable.ic_menu_save_blue_alt);
                 } else {
-                    actionBar.setLogo(R.drawable.ic_menu_save);
+                    actionBar.setLogo(R.drawable.ic_action_save);
                 }
             } else {
                 actionBar.setLogo(null);
@@ -507,7 +502,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
 
         if (isDialog) {
             item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-            item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
+            item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_save));
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
         return super.onCreateOptionsMenu(menu);

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -11,12 +11,13 @@ import android.view.KeyEvent;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
-import org.tasks.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.service.ThemeService;
 
+import org.tasks.R;
+
 public class TaskEditActivity extends AstridActivity {
     /**
 	 * @see android.app.Activity#onCreate(Bundle)
@@ -29,7 +30,7 @@ public class TaskEditActivity extends AstridActivity {
             if (ThemeService.getTheme() == R.style.Theme_White_Alt) {
                 actionBar.setLogo(R.drawable.ic_menu_save_blue_alt);
             } else {
-                actionBar.setLogo(R.drawable.ic_menu_save);
+                actionBar.setLogo(R.drawable.ic_action_save);
             }
         } else {
             actionBar.setLogo(null);

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -23,7 +23,6 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.MeasureSpec;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.ViewParent;
@@ -165,6 +164,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     private static final int MENU_SHOW_COMMENTS_ID = R.string.TEA_menu_comments;
     private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
     private static final int MENU_RECORD_ID = R.string.premium_record_audio;
+    private static final int MENU_DELETE_TASK_ID = R.string.delete_task;
 
     // --- result codes
 
@@ -510,13 +510,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
-        getView().findViewById(R.id.delete_task).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                deleteButtonClick();
-            }
-        });
-
         loadEditPageOrder(false);
 
         // Load task data in background
@@ -1059,6 +1052,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         case MENU_RECORD_ID:
             startRecordingAudio();
             return true;
+        case MENU_DELETE_TASK_ID:
+            deleteButtonClick();
+            return true;
         case MENU_COMMENTS_REFRESH_ID: {
             if (editNotes != null) {
                 editNotes.refreshData();
@@ -1089,28 +1085,31 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem item;
 
-        if (ActFmPreferenceService.isPremiumUser()) {
-            item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file);
-            item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_attach));
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file);
+        item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_new_attachment));
 
-            item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio);
-            item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_mic));
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        }
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio);
+        item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_mic));
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        item = menu.add(Menu.NONE, MENU_DELETE_TASK_ID, 0, R.string.delete_task);
+        item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_discard));
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         boolean useSaveAndCancel = Preferences.getBoolean(R.string.p_save_and_cancel, false);
 
         if (useSaveAndCancel || AstridPreferences.useTabletLayout(getActivity())) {
             if (useSaveAndCancel) {
                 item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-                item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
+                item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_cancel));
                 item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             }
 
             if (!(getActivity() instanceof TaskEditActivity)) {
                 item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-                item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
+                item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_save));
                 item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             }
         }

astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java

@@ -63,11 +63,7 @@ public class ThemeService {
         int theme = getTheme();
         switch(theme) {
         case R.style.Theme:
-        case R.style.Theme_Transparent:
             return R.color.blue_theme_color;
-        case R.style.Theme_White:
-        case R.style.Theme_TransparentWhite:
-            return R.color.red_theme_color;
         case R.style.Theme_White_Blue:
         default:
             return R.color.dark_blue_theme_color;
@@ -149,7 +145,7 @@ public class ThemeService {
 
     public static int getDrawable(int lightDrawable, int alter) {
         int theme = getTheme();
-        boolean darkTheme = theme == R.style.Theme || theme == R.style.Theme_Transparent;
+        boolean darkTheme = theme == R.style.Theme;
         switch(alter) {
         case FLAG_FORCE_DARK:
             darkTheme = true;
@@ -169,37 +165,25 @@ public class ThemeService {
             return R.drawable.icn_menu_refresh_tablet;
         }
 
-        if (theme == R.style.Theme_White_Alt) {
-            switch(lightDrawable) {
-            case R.drawable.ic_menu_save:
-                return R.drawable.ic_menu_save_blue_alt;
-            case R.drawable.ic_menu_close:
-                return R.drawable.ic_menu_close_blue_alt;
-            case R.drawable.ic_menu_mic:
-                return R.drawable.ic_menu_mic_blue_alt;
-            case R.drawable.ic_menu_attach:
-                return R.drawable.ic_menu_attach_blue_alt;
-            case R.drawable.list_settings:
-                return R.drawable.list_settings_white;
-            }
-        }
-
         if(!darkTheme) {
             return lightDrawable;
         }
 
 
         switch(lightDrawable) {
-        case R.drawable.ic_menu_save:
-            return R.drawable.ic_menu_save;
-        case R.drawable.ic_menu_close:
-            return R.drawable.ic_menu_close;
-        case R.drawable.ic_menu_mic:
-            return R.drawable.ic_menu_mic;
-        case R.drawable.ic_menu_attach:
-            return R.drawable.ic_menu_attach;
+        case R.drawable.ic_action_mic:
+            return R.drawable.ic_action_mic_light;
+        case R.drawable.ic_action_save:
+            return R.drawable.ic_action_save_light;
+        case R.drawable.ic_action_discard:
+            return R.drawable.ic_action_discard_light;
+            case R.drawable.ic_action_cancel:
+            return R.drawable.ic_action_cancel_light;
+        case R.drawable.ic_action_new_attachment:
+                return R.drawable.ic_action_new_attachment_light;
         case R.drawable.list_settings:
-            return R.drawable.list_settings;
+                return lightDrawable;
+
         case R.drawable.icn_menu_refresh:
             return R.drawable.icn_menu_refresh_dark;
         case R.drawable.icn_menu_filters:

astrid/src/main/res/layout/tag_settings_activity.xml

@@ -46,7 +46,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
                     android:background="@android:color/transparent"
-                    android:src="@drawable/ic_menu_save" />
+                    android:src="@drawable/ic_action_save" />
             </LinearLayout>
 
             <RelativeLayout

astrid/src/main/res/layout/task_edit_activity.xml

@@ -55,15 +55,6 @@
                 android:layout_marginBottom="0dip"
                 android:orientation="vertical"/>
 
-            <ImageView
-                android:id="@+id/delete_task"
-                android:layout_width="20dip"
-                android:layout_height="20dip"
-                android:layout_marginTop="10dip"
-                android:layout_marginBottom="10dip"
-                android:src="@drawable/trashcan"
-                android:scaleType="fitCenter"/>
-            
         </LinearLayout>
     </ScrollView>
 

astrid/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
 <resources>
     <string name="EPr_use_dark_theme">Dark theme</string>
     <string name="EPr_use_dark_theme_widget">Dark widget theme</string>
+    <string name="delete_task">Delete task</string>
 </resources>