diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 0e1cc727c..53a178eec 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/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); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 1dbcccedc..fc60f11ff 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/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); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 8178c87cc..b74431839 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/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); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java index 7bda3a831..f24be9261 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java +++ b/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: diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_cancel.png b/astrid/src/main/res/drawable-hdpi/ic_action_cancel.png new file mode 100644 index 000000000..f889617e4 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_cancel.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_cancel_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_cancel_light.png new file mode 100644 index 000000000..e206f296c Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_cancel_light.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_discard.png b/astrid/src/main/res/drawable-hdpi/ic_action_discard.png new file mode 100644 index 000000000..9c717dd32 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_discard.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_discard_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_discard_light.png new file mode 100644 index 000000000..703b31f80 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_discard_light.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_mic.png b/astrid/src/main/res/drawable-hdpi/ic_action_mic.png new file mode 100644 index 000000000..eafd19584 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_mic.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_mic_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_mic_light.png new file mode 100644 index 000000000..06f286661 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_mic_light.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png new file mode 100644 index 000000000..28507da2d Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment_light.png new file mode 100644 index 000000000..c01c2b382 Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment_light.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_save.png b/astrid/src/main/res/drawable-hdpi/ic_action_save.png new file mode 100644 index 000000000..c4b7783cc Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_save.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_save_light.png b/astrid/src/main/res/drawable-hdpi/ic_action_save_light.png new file mode 100644 index 000000000..0fe36a1ec Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_save_light.png differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_attach.png b/astrid/src/main/res/drawable-hdpi/ic_menu_attach.png deleted file mode 100644 index 9a974fac6..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_attach.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_attach_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_attach_blue_alt.png deleted file mode 100644 index 334c20e90..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_attach_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_close_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_close_blue_alt.png deleted file mode 100644 index 3c42dea9a..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_close_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_mic.png b/astrid/src/main/res/drawable-hdpi/ic_menu_mic.png deleted file mode 100644 index f5f35f906..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_mic.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_mic_blue_alt.png b/astrid/src/main/res/drawable-hdpi/ic_menu_mic_blue_alt.png deleted file mode 100644 index 05231efbe..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_mic_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/ic_menu_save.png b/astrid/src/main/res/drawable-hdpi/ic_menu_save.png deleted file mode 100644 index f1b115b1d..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/ic_menu_save.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-hdpi/list_settings_white.png b/astrid/src/main/res/drawable-hdpi/list_settings_white.png deleted file mode 100644 index 1ea56f340..000000000 Binary files a/astrid/src/main/res/drawable-hdpi/list_settings_white.png and /dev/null differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_cancel.png b/astrid/src/main/res/drawable-xhdpi/ic_action_cancel.png new file mode 100644 index 000000000..58e2e3b4d Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_cancel.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_cancel_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_cancel_light.png new file mode 100644 index 000000000..d1634205d Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_cancel_light.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_discard.png b/astrid/src/main/res/drawable-xhdpi/ic_action_discard.png new file mode 100644 index 000000000..db69d6c25 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_discard.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_discard_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_discard_light.png new file mode 100644 index 000000000..9eeeed124 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_discard_light.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png b/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png new file mode 100644 index 000000000..c0c3952f7 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_mic_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_mic_light.png new file mode 100644 index 000000000..37b1ca116 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_mic_light.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png new file mode 100644 index 000000000..4948feec2 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment_light.png new file mode 100644 index 000000000..41cbab203 Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment_light.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_save.png b/astrid/src/main/res/drawable-xhdpi/ic_action_save.png new file mode 100644 index 000000000..29c5f4d3b Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_save.png differ diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_save_light.png b/astrid/src/main/res/drawable-xhdpi/ic_action_save_light.png new file mode 100644 index 000000000..dde278b5e Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_save_light.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel.png new file mode 100644 index 000000000..331c545b8 Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel_light.png new file mode 100644 index 000000000..5dc214356 Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_cancel_light.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_discard.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_discard.png new file mode 100644 index 000000000..b522daffe Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_discard.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_discard_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_discard_light.png new file mode 100644 index 000000000..8f27b7153 Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_discard_light.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png new file mode 100644 index 000000000..88769122c Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_mic_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic_light.png new file mode 100644 index 000000000..a9e600e28 Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic_light.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png new file mode 100644 index 000000000..47c47c44f Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment_light.png new file mode 100644 index 000000000..ce7536cbd Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment_light.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_save.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_save.png new file mode 100644 index 000000000..744350049 Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_save.png differ diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_save_light.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_save_light.png new file mode 100644 index 000000000..ccf8c82cd Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_save_light.png differ diff --git a/astrid/src/main/res/drawable/ic_action_cancel.png b/astrid/src/main/res/drawable/ic_action_cancel.png new file mode 100644 index 000000000..d5a9384da Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_cancel.png differ diff --git a/astrid/src/main/res/drawable/ic_action_cancel_light.png b/astrid/src/main/res/drawable/ic_action_cancel_light.png new file mode 100644 index 000000000..21527bbd6 Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_cancel_light.png differ diff --git a/astrid/src/main/res/drawable/ic_action_discard.png b/astrid/src/main/res/drawable/ic_action_discard.png new file mode 100644 index 000000000..9dfb7cc2c Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_discard.png differ diff --git a/astrid/src/main/res/drawable/ic_action_discard_light.png b/astrid/src/main/res/drawable/ic_action_discard_light.png new file mode 100644 index 000000000..5e382cadc Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_discard_light.png differ diff --git a/astrid/src/main/res/drawable/ic_action_mic.png b/astrid/src/main/res/drawable/ic_action_mic.png new file mode 100644 index 000000000..a9c001f8b Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_mic.png differ diff --git a/astrid/src/main/res/drawable/ic_action_mic_light.png b/astrid/src/main/res/drawable/ic_action_mic_light.png new file mode 100644 index 000000000..23d5e323d Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_mic_light.png differ diff --git a/astrid/src/main/res/drawable/ic_action_new_attachment.png b/astrid/src/main/res/drawable/ic_action_new_attachment.png new file mode 100644 index 000000000..354c49d38 Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_new_attachment.png differ diff --git a/astrid/src/main/res/drawable/ic_action_new_attachment_light.png b/astrid/src/main/res/drawable/ic_action_new_attachment_light.png new file mode 100644 index 000000000..1d265aac6 Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_new_attachment_light.png differ diff --git a/astrid/src/main/res/drawable/ic_action_save.png b/astrid/src/main/res/drawable/ic_action_save.png new file mode 100644 index 000000000..61304a68c Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_save.png differ diff --git a/astrid/src/main/res/drawable/ic_action_save_light.png b/astrid/src/main/res/drawable/ic_action_save_light.png new file mode 100644 index 000000000..ea3391621 Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_save_light.png differ diff --git a/astrid/src/main/res/drawable/ic_menu_attach.png b/astrid/src/main/res/drawable/ic_menu_attach.png deleted file mode 100644 index e1bef9e08..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_attach.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/ic_menu_attach_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_attach_blue_alt.png deleted file mode 100644 index 1e02e4d7f..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_attach_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/ic_menu_close_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_close_blue_alt.png deleted file mode 100644 index 3d33f2b5c..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_close_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/ic_menu_mic.png b/astrid/src/main/res/drawable/ic_menu_mic.png deleted file mode 100644 index c33cd2053..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_mic.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/ic_menu_mic_blue_alt.png b/astrid/src/main/res/drawable/ic_menu_mic_blue_alt.png deleted file mode 100644 index d5a8138ee..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_mic_blue_alt.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/ic_menu_save.png b/astrid/src/main/res/drawable/ic_menu_save.png deleted file mode 100644 index d748aaaad..000000000 Binary files a/astrid/src/main/res/drawable/ic_menu_save.png and /dev/null differ diff --git a/astrid/src/main/res/drawable/list_settings_white.png b/astrid/src/main/res/drawable/list_settings_white.png deleted file mode 100644 index 7df4dcbca..000000000 Binary files a/astrid/src/main/res/drawable/list_settings_white.png and /dev/null differ diff --git a/astrid/src/main/res/layout/tag_settings_activity.xml b/astrid/src/main/res/layout/tag_settings_activity.xml index feb5a31a4..c265720b6 100644 --- a/astrid/src/main/res/layout/tag_settings_activity.xml +++ b/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" /> - - diff --git a/astrid/src/main/res/values/strings.xml b/astrid/src/main/res/values/strings.xml index 281fde19a..c94492795 100644 --- a/astrid/src/main/res/values/strings.xml +++ b/astrid/src/main/res/values/strings.xml @@ -2,4 +2,5 @@ Dark theme Dark widget theme + Delete task \ No newline at end of file