From 797a4046e67ced30e4975cbf6756eca8742524e0 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Thu, 6 Dec 2012 10:51:14 -0800 Subject: [PATCH 001/136] Brought kii strings over from the private branch --- astrid/res/values/strings-premium.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml index 4d649ff40..a930d7e3a 100644 --- a/astrid/res/values/strings-premium.xml +++ b/astrid/res/values/strings-premium.xml @@ -78,6 +78,11 @@ Learn more + Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked. + Special offer aborted + Special offer declined + There was an error processing this offer. Please try again later. + Astrid Premium 1 Month 1 Year From c8fd358efbb3c0c46a0d0e408a3d1e424e0a937c Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 10 Dec 2012 16:32:39 -0800 Subject: [PATCH 002/136] Brought more strings over from ppack branch --- astrid/res/values/strings-premium.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml index a930d7e3a..1d60e3cbb 100644 --- a/astrid/res/values/strings-premium.xml +++ b/astrid/res/values/strings-premium.xml @@ -83,6 +83,11 @@ Special offer declined There was an error processing this offer. Please try again later. + Special Offer + Want one month of Astrid Premium for free? + To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.) + Get it free! + Astrid Premium 1 Month 1 Year From dec4a0d3357115165f907f105169fa35a41aa636 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 30 Nov 2012 14:13:46 -0800 Subject: [PATCH 003/136] All new preference defaults for Astrid Lite version --- .../todoroo/andlib/utility/Preferences.java | 14 ++++ .../todoroo/astrid/actfm/TagViewFragment.java | 19 +++++ .../astrid/core/CustomFilterExposer.java | 43 ++++++----- .../astrid/gtasks/GtasksListFragment.java | 5 +- .../reusable/FeaturedTaskListFragment.java | 7 +- astrid/res/layout/task_list_body_tag.xml | 1 + astrid/res/values/keys.xml | 6 ++ astrid/res/values/strings-core.xml | 8 +++ astrid/res/xml/preferences.xml | 11 +++ .../astrid/activity/BeastModePreferences.java | 25 +++++++ .../astrid/activity/TaskListActivity.java | 2 +- .../astrid/activity/TaskListFragment.java | 12 ++-- .../astrid/service/abtesting/ABTests.java | 16 +++-- .../astrid/utility/AstridPreferences.java | 72 +++++++++++++++++++ .../com/todoroo/astrid/utility/Constants.java | 5 ++ .../astrid/service/ABTestingServiceTest.java | 2 +- 16 files changed, 211 insertions(+), 37 deletions(-) diff --git a/api/src/com/todoroo/andlib/utility/Preferences.java b/api/src/com/todoroo/andlib/utility/Preferences.java index e7e71159a..9e2bcef43 100644 --- a/api/src/com/todoroo/andlib/utility/Preferences.java +++ b/api/src/com/todoroo/andlib/utility/Preferences.java @@ -51,6 +51,20 @@ public class Preferences { editor.putBoolean(key, value); } + /** + * Helper to write to editor if key specified is null + * @param prefs + * @param editor + * @param r + * @param keyResource + * @param value + */ + public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) { + String key = r.getString(keyResource); + if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof Boolean)) + editor.putString(key, value); + } + /* ====================================================================== * ======================================================= helper methods * ====================================================================== */ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 7ac8576f6..0bd593e2d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -17,6 +17,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.support.v4.view.Menu; +import android.support.v4.view.MenuItem; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.MotionEvent; @@ -78,6 +79,7 @@ public class TagViewFragment extends TaskListFragment { public static final String EXTRA_TAG_DATA = "tagData"; //$NON-NLS-1$ protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1; + protected static final int MENU_LIST_SETTINGS_ID = R.string.tag_settings_title; private static final int REQUEST_CODE_SETTINGS = 0; @@ -183,6 +185,16 @@ public class TagViewFragment extends TaskListFragment { } } + @Override + protected void addMenuItems(Menu menu, Activity activity) { + super.addMenuItems(menu, activity); + if (!Preferences.getBoolean(R.string.p_show_list_members, true)) { + MenuItem item = menu.add(Menu.NONE, MENU_LIST_SETTINGS_ID, 0, R.string.tag_settings_title); + item.setIcon(R.drawable.list_settings); + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + } + } + // --- data loading @Override @@ -310,6 +322,10 @@ public class TagViewFragment extends TaskListFragment { } protected void setUpMembersGallery() { + if (!Preferences.getBoolean(R.string.p_show_list_members, true)) { + getView().findViewById(R.id.members_header).setVisibility(View.GONE); + return; + } if (tagData == null) return; LinearLayout membersView = (LinearLayout)getView().findViewById(R.id.shared_with); @@ -546,6 +562,9 @@ public class TagViewFragment extends TaskListFragment { case MENU_REFRESH_ID: refreshData(true); return true; + case MENU_LIST_SETTINGS_ID: + settingsListener.onClick(null); + return true; } return super.handleOptionsMenuItemSelected(id, intent); diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java index a344df867..6514d8958 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -27,6 +27,7 @@ import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.api.AstridApiConstants; @@ -100,11 +101,18 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr private Filter[] buildSavedFilters(Context context, Resources r) { int themeFlags = ThemeService.getFilterThemeFlags(); + boolean useCustomFilters = Preferences.getBoolean(R.string.p_use_filters, true); StoreObjectDao dao = PluginServices.getStoreObjectDao(); - TodorooCursor cursor = dao.query(Query.select(StoreObject.PROPERTIES).where( + TodorooCursor cursor = null; + if (useCustomFilters) + cursor = dao.query(Query.select(StoreObject.PROPERTIES).where( StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME))); try { - Filter[] list = new Filter[cursor.getCount() + 3]; + Filter[] list; + if (useCustomFilters && cursor != null) + list = new Filter[cursor.getCount() + 3]; + else + list = new Filter[3]; // stock filters list[0] = getTodayFilter(r); @@ -120,24 +128,27 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr list[2] = getAssignedByMeFilter(r); - StoreObject savedFilter = new StoreObject(); - for(int i = 3; i < list.length; i++) { - cursor.moveToNext(); - savedFilter.readFromCursor(cursor); - list[i] = SavedFilter.load(savedFilter); - - Intent deleteIntent = new Intent(context, DeleteActivity.class); - deleteIntent.putExtra(TOKEN_FILTER_ID, savedFilter.getId()); - deleteIntent.putExtra(TOKEN_FILTER_NAME, list[i].title); - list[i].contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) }; - list[i].contextMenuIntents = new Intent[] { deleteIntent }; - list[i].listingIcon = ((BitmapDrawable)r.getDrawable( - ThemeService.getDrawable(R.drawable.filter_sliders, themeFlags))).getBitmap(); + if (useCustomFilters && cursor != null) { + StoreObject savedFilter = new StoreObject(); + for(int i = 3; i < list.length; i++) { + cursor.moveToNext(); + savedFilter.readFromCursor(cursor); + list[i] = SavedFilter.load(savedFilter); + + Intent deleteIntent = new Intent(context, DeleteActivity.class); + deleteIntent.putExtra(TOKEN_FILTER_ID, savedFilter.getId()); + deleteIntent.putExtra(TOKEN_FILTER_NAME, list[i].title); + list[i].contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) }; + list[i].contextMenuIntents = new Intent[] { deleteIntent }; + list[i].listingIcon = ((BitmapDrawable)r.getDrawable( + ThemeService.getDrawable(R.drawable.filter_sliders, themeFlags))).getBitmap(); + } } return list; } finally { - cursor.close(); + if (cursor != null) + cursor.close(); } } diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java index 22b752ced..31009a398 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -10,7 +10,6 @@ import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; import android.support.v4.view.Menu; -import android.view.MenuInflater; import android.widget.TextView; import com.timsu.astrid.R; @@ -110,8 +109,8 @@ public class GtasksListFragment extends SubtasksListFragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); + protected void addMenuItems(Menu menu, Activity activity) { + super.addMenuItems(menu, activity); addMenuItem(menu, R.string.gtasks_GTA_clear_completed, android.R.drawable.ic_input_delete, MENU_CLEAR_COMPLETED_ID, false); } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java index 661580002..a073710ef 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java @@ -9,7 +9,6 @@ import android.support.v4.view.MenuItem; import android.text.TextUtils; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; -import android.view.MenuInflater; import android.view.View; import android.widget.TextView; import android.widget.Toast; @@ -64,10 +63,8 @@ public class FeaturedTaskListFragment extends TagViewFragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - if (!isCurrentTaskListFragment()) - return; + protected void addMenuItems(Menu menu, Activity activity) { + super.addMenuItems(menu, activity); MenuItem item = menu.add(Menu.NONE, MENU_CLONE_LIST, 0, R.string.actfm_feat_list_clone); item.setIcon(R.drawable.ic_menu_list_copy); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/res/layout/task_list_body_tag.xml index b53ed1a2d..039a2e86d 100644 --- a/astrid/res/layout/task_list_body_tag.xml +++ b/astrid/res/layout/task_list_body_tag.xml @@ -12,6 +12,7 @@ android:layout_weight="100"> diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 5b7e873c8..fab97b62e 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -316,6 +316,12 @@ p_end_at_deadline + + p_use_filters + + + p_show_list_members + -1 diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 3638592a0..03704b8e9 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -698,6 +698,14 @@ Truncate title to one line with date and lists below Truncate title to two lines with date on right + + Use filters + Lets you create custom filters + + + Show list members in shared lists + + Color theme diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index deef94323..c79bddb65 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -78,6 +78,12 @@ android:title="@string/EPr_ideaAuto_title" android:defaultValue="true" /> + + + + list = constructOrderedControlList(context); + String moreSeparator = context.getResources().getString(R.string.TEA_ctrl_more_pref); + String importancePref = context.getResources().getString(R.string.TEA_ctrl_importance_pref); + String listsPref = context.getResources().getString(R.string.TEA_ctrl_lists_pref); + + list.remove(importancePref); + list.remove(listsPref); + int moreIndex = list.indexOf(moreSeparator); + if (moreIndex >= 0) { + list.add(moreIndex + 1, listsPref); + list.add(moreIndex + 1, importancePref); + } + + StringBuilder newSetting = new StringBuilder(30); + for (String item : list) { + newSetting.append(item); + newSetting.append(BEAST_MODE_PREF_ITEM_SEPARATOR); + } + Preferences.setString(BEAST_MODE_ORDER_PREF, newSetting.toString()); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 1d94211cd..21abe7b4c 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -170,8 +170,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener */ @Override protected void onCreate(Bundle savedInstanceState) { - ThemeService.applyTheme(this); super.onCreate(savedInstanceState); + ThemeService.applyTheme(this); DependencyInjectionService.getInstance().inject(this); int contentView = getContentView(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index ce178cc51..1f40e68ae 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -428,20 +428,23 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, * @return true if menu should be displayed */ @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public final void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { Activity activity = getActivity(); if (activity == null) return; if (!isCurrentTaskListFragment()) return; + addMenuItems(menu, activity); + } + + protected void addMenuItems(Menu menu, Activity activity) { boolean isTablet = AstridPreferences.useTabletLayout(activity); TaskListActivity tla = null; if (activity instanceof TaskListActivity) { tla = (TaskListActivity) activity; tla.getMainMenuPopover().clear(); } - // --- sync if (tla == null || tla.getTaskEditFragment() == null) addSyncRefreshMenuItem(menu, isTablet ? ThemeService.FLAG_INVERT : 0); @@ -453,8 +456,9 @@ public class TaskListFragment extends ListFragment implements OnScrollListener, } // --- new filter - addMenuItem(menu, R.string.FLA_new_filter, - ThemeService.getDrawable(R.drawable.icn_menu_filters, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_NEW_FILTER_ID, false); + if (Preferences.getBoolean(R.string.p_use_filters, true)) + addMenuItem(menu, R.string.FLA_new_filter, + ThemeService.getDrawable(R.drawable.icn_menu_filters, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_NEW_FILTER_ID, false); // --- addons if(Constants.MARKET_STRATEGY.showAddonMenu()) diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java index ed98d0f57..efc2a72be 100644 --- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java +++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java @@ -143,9 +143,11 @@ public class ABTests { * (i.e. the arrays should be the same length if this one exists) * */ - public void addTest(String testKey, int[] newUserProbs, int[] existingUserProbs, String[] descriptions) { - ABTestBundle bundle = new ABTestBundle(newUserProbs, existingUserProbs, descriptions); - bundles.put(testKey, bundle); + public void addTest(String testKey, int[] newUserProbs, int[] existingUserProbs, String[] descriptions, boolean appliesToAstridLite) { + if (appliesToAstridLite) { + ABTestBundle bundle = new ABTestBundle(newUserProbs, existingUserProbs, descriptions); + bundles.put(testKey, bundle); + } } public static final String AB_FEATURED_LISTS = "android_featured_lists"; //$NON-NLS-1$ @@ -163,15 +165,15 @@ public class ABTests { private void initialize() { addTest(AB_FEATURED_LISTS, new int[] { 1, 1 }, - new int[] { 1, 1 }, new String[] { "featured-lists-disabled", "featured-lists-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$ + new int[] { 1, 1 }, new String[] { "featured-lists-disabled", "featured-lists-enabled" }, false); //$NON-NLS-1$ //$NON-NLS-2$ addTest(AB_SOCIAL_REMINDERS, new int[] { 1, 1 }, - new int[] { 1, 1 }, new String[] { "no-faces", "show-faces" }); //$NON-NLS-1$ //$NON-NLS-2$ + new int[] { 1, 1 }, new String[] { "no-faces", "show-faces" }, true); //$NON-NLS-1$ //$NON-NLS-2$ addTest(AB_DRAG_DROP, new int[] { 3, 1 }, - new int[] { 1, 0 }, new String[] { "off-by-default", "on-by-default" }); //$NON-NLS-1$ //$NON-NLS-2$ + new int[] { 1, 0 }, new String[] { "off-by-default", "on-by-default" }, false); //$NON-NLS-1$ //$NON-NLS-2$ addTest(AB_DEFAULT_EDIT_TAB, new int[] { 1, 1 }, - new int[] { 1, 1 }, new String[] { "activity-tab", "details-tab" }); //$NON-NLS-1$ //$NON-NLS-2$ + new int[] { 1, 1 }, new String[] { "activity-tab", "details-tab" }, true); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index f31be0491..4bd62025b 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -17,6 +17,7 @@ import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; +import com.todoroo.astrid.activity.BeastModePreferences; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.SortHelper; @@ -51,6 +52,13 @@ public class AstridPreferences { /** Set preference defaults, if unset. called at startup */ public static void setPreferenceDefaults() { + if (Constants.ASTRID_LITE) + setLitePreferenceDefaults(); + else + setNormalPreferenceDefaults(); + } + + private static void setNormalPreferenceDefaults() { Context context = ContextManager.getContext(); SharedPreferences prefs = Preferences.getPrefs(context); Editor editor = prefs.edit(); @@ -116,6 +124,70 @@ public class AstridPreferences { editor.commit(); } + private static void setLitePreferenceDefaults() { + Context context = ContextManager.getContext(); + SharedPreferences prefs = Preferences.getPrefs(context); + Editor editor = prefs.edit(); + Resources r = context.getResources(); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_urgency_key, 4); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_importance_key, 2); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_hideUntil_key, 0); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_mode_key, 16); + Preferences.setIfUnset(prefs, editor, r, R.string.p_rmd_default_random_hours, 0); + Preferences.setIfUnset(prefs, editor, r, R.string.p_fontSize, 18); + Preferences.setIfUnset(prefs, editor, r, R.string.p_showNotes, false); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_use_contact_picker, false); + Preferences.setIfUnset(prefs, editor, r, R.string.p_field_missed_calls, true); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_third_party_addons, false); + Preferences.setIfUnset(prefs, editor, r, R.string.p_end_at_deadline, true); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_rmd_persistent, true); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_ideas_tab_enabled, false); + Preferences.setIfUnset(prefs, editor, r, R.string.p_autoIdea, false); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_show_featured_lists, false); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_taskRowStyle, true); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_calendar_reminders, true); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_social_reminders, + ABChooser.readChoiceForTest(ABTests.AB_SOCIAL_REMINDERS) != 0); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_use_filters, false); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_show_list_members, false); + + SharedPreferences publicPrefs = getPublicPrefs(context); + if (publicPrefs != null) { + Editor edit = publicPrefs.edit(); + if (edit != null) { + edit.putInt(SortHelper.PREF_SORT_FLAGS, SortHelper.FLAG_DRAG_DROP); + edit.putInt(SortHelper.PREF_SORT_SORT, SortHelper.SORT_AUTO); + edit.commit(); + Preferences.setInt(P_SUBTASKS_HELP, 1); + } + } + + BeastModePreferences.setDefaultLiteModeOrder(context); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_RED); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_force_phone_layout, true); + + setShowFriendsView(); + + setShowFeaturedLists(); + + editor.commit(); + } + /** * Reset preferences based on archived AB tests * @param fromVersion diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java index 13647ee28..de4414a77 100644 --- a/astrid/src/com/todoroo/astrid/utility/Constants.java +++ b/astrid/src/com/todoroo/astrid/utility/Constants.java @@ -43,6 +43,11 @@ public final class Constants { */ public static final boolean DEBUG = false; + /** + * Whether this version is Astrid Lite + */ + public static final boolean ASTRID_LITE = true; + /** * Astrid Help URL */ diff --git a/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java b/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java index 5923e33bf..dcd2651ce 100644 --- a/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java +++ b/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java @@ -91,7 +91,7 @@ public class ABTestingServiceTest extends DatabaseTestCase { @Override protected void setUp() throws Exception { super.setUp(); - abTests.addTest(TEST_NAME, new int[] { 9, 1 } , new int[] { 1, 9 }, TEST_OPTIONS); + abTests.addTest(TEST_NAME, new int[] { 9, 1 } , new int[] { 1, 9 }, TEST_OPTIONS, true); Preferences.clear(TEST_NAME); } From 56ca0030f9a86f7dc4427b13867f59006d8a2e58 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Fri, 30 Nov 2012 14:58:34 -0800 Subject: [PATCH 004/136] Added a release-lite target to the build script --- astrid/build.xml | 23 +++++++++++++++++++++++ build.xml | 7 +++++++ 2 files changed, 30 insertions(+) diff --git a/astrid/build.xml b/astrid/build.xml index 3fd3bd7e1..b7cd07f6a 100644 --- a/astrid/build.xml +++ b/astrid/build.xml @@ -214,6 +214,29 @@ replace="\1${custom.version.name}" /> + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index a4b93ce8a..8e9524bfe 100644 --- a/build.xml +++ b/build.xml @@ -85,6 +85,13 @@ + + + + + + + From a73d34ea3a7d2466096827ff35e3a18ee238fb9f Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 3 Dec 2012 11:34:50 -0800 Subject: [PATCH 005/136] Simpler edit text style preference --- astrid/res/layout/control_set_notes.xml | 1 + astrid/res/values/keys.xml | 3 +++ astrid/res/values/strings-core.xml | 6 ++--- astrid/res/values/styles.xml | 20 ++++++++++++++++ astrid/res/xml/preferences.xml | 6 ++++- .../astrid/activity/EditPreferences.java | 2 ++ .../todoroo/astrid/service/ThemeService.java | 23 ++++++++++++++++++- .../astrid/utility/AstridPreferences.java | 3 +++ 8 files changed, 59 insertions(+), 5 deletions(-) diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml index 2a03dff3e..21f0c28bf 100644 --- a/astrid/res/layout/control_set_notes.xml +++ b/astrid/res/layout/control_set_notes.xml @@ -37,6 +37,7 @@ android:layout_weight="100" android:scrollbars="vertical" android:gravity="top" + android:background="@null" android:hint="@string/TEA_notes_hint" android:autoText="true" android:capitalize="sentences" diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index fab97b62e..8710ae330 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -72,6 +72,9 @@ account + + + simple_input_boxes diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 03704b8e9..d0a1b6dbc 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -704,6 +704,9 @@ Show list members in shared lists + + + Simple input boxes @@ -718,9 +721,6 @@ Task row appearance - - - Use contact picker diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 3eb975e78..1258e6db9 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -52,6 +52,10 @@ @style/CustomTabPageIndicator.Text + + + + + + + + + + + + + + diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 1d7f8b533..2cee290cd 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1191,16 +1191,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio); - item.setIcon(R.drawable.ic_menu_mic); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_mic)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard); - item.setIcon(R.drawable.ic_menu_close); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save); - item.setIcon(R.drawable.ic_menu_save); + item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && remoteId > 0 && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null; diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 758ef411f..cc8b66d52 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -22,6 +22,7 @@ public class ThemeService { public static final String THEME_WHITE = "white"; public static final String THEME_WHITE_RED = "white-red"; + public static final String THEME_WHITE_ALT = "white-alt"; public static final String THEME_BLACK = "black"; public static final String THEME_TRANSPARENT = "transparent"; public static final String THEME_TRANSPARENT_WHITE = "transparent-white"; @@ -79,6 +80,8 @@ public class ThemeService { return R.style.Theme_TransparentWhite; else if (THEME_WHITE_RED.equals(setting)) return R.style.Theme_White; + else if (THEME_WHITE_ALT.equals(setting)) + return R.style.Theme_White_Alt; else return R.style.Theme_White_Blue; } @@ -95,6 +98,8 @@ public class ThemeService { return R.style.Theme_White_Simple; case R.style.Theme_White_Blue: return R.style.Theme_White_Blue_Simple; + case R.style.Theme_White_Alt: + return R.style.Theme_White_Alt_Simple; default: return original; } @@ -204,9 +209,21 @@ public class ThemeService { AstridPreferences.useTabletLayout(ContextManager.getContext())) 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; + } + } + if(!darkTheme) return lightDrawable; + switch(lightDrawable) { case R.drawable.icn_menu_refresh: return R.drawable.icn_menu_refresh_dark; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java index d0aecdc3d..3ddaeae4f 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java @@ -103,7 +103,7 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_show_list_members, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_RED, ifUnset); + setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_ALT, ifUnset); setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset); diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index ebb956f36..f177fec9c 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -348,6 +348,10 @@ public class TasksWidget extends AppWidgetProvider { layout = R.layout.widget_initialized_red; titleColor = r.getColor(R.color.widget_text_color_light); buttonDrawable = R.drawable.plus_button_red; + } else if (theme == R.style.Theme_White_Alt) { + layout = R.layout.widget_initialized; + titleColor = r.getColor(R.color.widget_text_color_light); + buttonDrawable = R.drawable.plus_button_blue; } else { layout = (theme == R.style.Theme_TransparentWhite ? R.layout.widget_initialized_transparent : R.layout.widget_initialized); titleColor = r.getColor(R.color.widget_text_color_light); From 248163f35dcda35e358b9eabda6bab9ad8d5368c Mon Sep 17 00:00:00 2001 From: Jon Paris Date: Sun, 16 Dec 2012 13:05:13 -0800 Subject: [PATCH 051/136] more icons for blue_alt --- astrid/res/drawable/icn_menu_settings.png | Bin 1027 -> 1552 bytes .../res/drawable/icn_menu_settings_dark.png | Bin 1159 -> 1791 bytes astrid/res/drawable/list_settings.png | Bin 1142 -> 914 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/astrid/res/drawable/icn_menu_settings.png b/astrid/res/drawable/icn_menu_settings.png index fb1c9d309ab3627ce5c2168abbb7887878d84bfa..e09332c2f59d9be73a333f49d8460ec0e4596f2c 100644 GIT binary patch delta 1533 zcmVDh9Ej2f+m&K zMc^H-1(pJrxqi<8+kr0NugOf%6~H6FEXA=HaIl&Lg&krEpb2R3I42AIt@!;UFai`c z*Cm0ofpjes)B-#RtN>CT1mzXK+YGau=Dp_tj|1&tMnae&HXB$C+zgxof0}{K^o)|p z?zaIm71yVzPeR0Ru44;s?OGz}8t(3+ju4P=C{T1u+H*C%>wFDC*8@)g zmjFMIj0<`1yLsMBuA?OCgOyxJEQHTKvVdoRCl$wz0NWToi-8M#-g6Y#1AIlVYNrM{ z?J%$g_!Rgz$^^;oJ_}r`e>hg)PK(u3#Qj>9dX&-#vj}=8@I3HMltsE5_|7A%H4=${ z_f3zHwS=HUz@JgqpnVk0dTK~hfNKjxD&RAJ0p0=L2aZLZAW7L7gf#I*tp$yO_CF0n0V_nGT%GO{uv;aRI%-Z9f9*fwvf1 zDjOz_uoV#kZU@eCop(8~2>37zlIkjWpL)Ka&8qn(>WE5nWHGM^$zas?Pcn__~Z|`~!SW;@t#I1(pDF=|Kq+v<~>hBaA1EplR%_ zysXGZwbxNi2hEHk?ESn~+%-39q8>TV-@?$ZdL^CnSp@ctf3uksV*l{@ydl;_g(wgd z#0%_kUSA9=rH4sS(#JUocKTDwZLAqC%|2TZ>DwB{yT(ds(2yfr6j=LARcuBxGhUsm zDD+E^j7Kigv@SU|swI(@s{E+Wa15OwDf~9`WwI2@TQ!SmMr`n$;}ZgA?*US`q{tO^e9!)P_;vtH5dc82;C)J8c=(xq)FB0E?P zSWzZue<#Nhx)9n$1SP4Tql+HRaq*h1z^_pkX<5K)?9c9V{C=FjZ)Hm&sa}ThceutB zPH)SR>@JoK{hS5K$H~R6LiJ_qzpu6@qfStcC4Yt_En;ZA3%tq-TWmkGm3Y!)?9<%$ zk%9e2;A2N<9pW`9)=2Ul>~-J`SKlSobfb0Vf5X8bHz`wXf=VWfTT3q* zhk~Fid#M8o-Py+a>Mj!9sc1^Y17-aBb5!e~lIy?7kQ(-Qhq$JDuhWcD@+9ssi5v-Q z0bvuA=T3WBTG7xt=Q#s(E zQrfP75#qYkp7jTkDcc00000NkvXXu0mjfsMyc^ delta 1004 zcmVjS zL_t(|+U%O&OBF#B$M3yrH%K!}G_=ejrL-<&24+jC1L{+TV!Z`n(J%Tz zLOn)NQIUiZ2qj?!MG>Xh&9qF-B!UXDFz@yqI>Io`?wyVOb!88HKxfXZdv<2doO8yY zrfGr6C_&#a-!R`W-!R`WPC^zxfA1L31oln_!=^~urY4GEWi&H+lD=`pwg@;17TIPQ z+hZmu2gBN5c>v~6dkRFyO=< zGm@{|A*}+Nosl@t+~Kslf0xNi@Xdt&5a^Ag6Z1k4JWdh3s>F0+N6$s~#bCM#{cMmQ zM<>||!&Dw}f^!}fAcyPA0;Ql?@$Z#OK14UT!#R(~ZXD2+lFj}C%v2aV54;z~#=tr+ zoMTy_S7KZ<$TS!?A3W4aX~JGGjB!rKO+N<}U@n*jQb9i01-hLMf2qs{!ArmmP+*|* znS$C7Wy%=_y3c6e_PZGbMHqzr`=36FM#htTMuYbh$fhHknXV1 zJ_s(kosVq+qx6+KXn9U}%k7|FG8xzz1tY~x+G=Ov`e+@I@l*F(Gg>ihcd63492~H*GWOT0@_!>zix%(PWLUk1;NnjgT z23kP75Y9PzDZyTBgV4s#y{L|U5~VVk+(!^U_83T^pN~+oYD+Q4O4x_3p@M2WVKtLN z)n_LM+!eN5+Gtk7)E1@kKsJ>f!dyfXwX^(Y70mk`0&POMf196`YOe1m#i{$;@QP-T z9Sx0wPDm$!_Jmi|lR>H)^D;~LeKwdOIFdfEFU54aQmUtfQ=b;F{9@I0000V diff --git a/astrid/res/drawable/icn_menu_settings_dark.png b/astrid/res/drawable/icn_menu_settings_dark.png index 38c62c6f2ee0ed30b289af7a6fb90fdc5d9529a4..e1055b608baf7c9932d572ee20eb068381d48aec 100644 GIT binary patch delta 1774 zcmV#FlxnLO8WK(2CgO{L#!a0F8xb|s3RbC>S>62-!gYjmblWEhe>(|Xgb};f zR$W~!8XFs>Q7vNx4Gj&6mX?;8+`?)IB|DFB7vXHl7_oNzngMnb*`K~s|LNi4It!8NZU z+()Q#JK1&X;42B62{oMMe-pxlE%1!v&PS*qtdQ)V4}D@HhIC`=2oDn~35N+U65h-v zf-b_{y&EL3olKa9=%%#iLU>oH0YR4$?kAi@_#R}Ofn%pscLnB<67?fqCx|DoiSU4K zJ4dNU372B|Y#^LI%hF#$s3+V+*iHBnUR9<0>>9%3SgIco{`N9Ke;Wzc8;q4=!U6(o z$5oO}qh-q@3FAq)`qds(FW2;Uiuaa1b+a;yeREYpC&I7hsFgg?B##6E{;2B9H^ z7WSP6@-3e8C&F8V7Q$~{Cx~@m8zR?JSQ=*D!g?`I7)7*Vv0X|y6W&rV%QZ$p%+n^h zmgk~a5<2h^p`37dC@7@?|ec7ewuk~m(#+Wi99HkC>EM5i`PNU z06gKCW}FG`MdZ4daD%~dmJv?HP06}MaV@+-Z$A)TAiRO4C9`qh7nCAQz_ln{w017x zNP4RB76+u^#m0YB7}?KK{+7kc|xbjGR_!5OHo^ySptRX0fcfpk&%Uc5XbWC z`bLG&Bkkw6e_71fUCX57X(oXO=U7ZKvA?HzzER{w(_SFRiWem3xPQXUknR>id1-tm z2bKO3o9FOhxrEa!MYwJYIWa#cG-y;4EvAwC6iaSI7!fa5mlUQ;5VuFl3`&TxD{eLF_BCjUevl ztb+#`8GFzj;@=+jAtaLH(6Ch)pRFTVfv!PUHW5?>fv%h-NAiP!LU_z-EVYn@>nee! zagq8CqLEFSk5 z^eNBanmLJFPuP_r$g6Ld?Lu2ZW)p}wy~6qn2ZLx`3>b_vDccD@dtHNg0TVu z7~8j_B;ioc&G?PFHig#P;vl;VX~Q6TLHy`>gDz2hj<7@g|JlDM35p}-p9D$VFXlGu zf7^tYkYTfZfoR2^vZ{y5yQf0@vs$&>bBpM2y<{2c66!fU#^%jZy&7TlLAM-v z@aJU>O2-l@JrN$YY<<(-rwB5)ysTJaDIMZh{xfWG&k@Am`5YM;IpHe@H8nM^L|mBm z8-!UQ(q(03qQ1V~?w3}w)_m&U<19>(Rs<=66hVq0MUXN@kRoWV_KyGq0Dj7>W?9oK QuK)l507*qoM6N<$g3FpWF#rGn delta 1137 zcmV-%1djXv4TlLKiBL{Q4GJ0x0000DNk~Le0000s0000s2nGNE0E|Uy-H{ zL_t(|+U%NXYzEHlpXUiT_EK$N6G~ji2 zum|i11L(AwiBng>DR2g)DJ#_m?3Jwy^6heL7HDh|mI*;dMjxV^tk@)Ce@iH?1kWoV zYVLu}cJ8rrU^plVFz*w{1GmBV0COL358kj_JT8F4KJGmQlR*;bOGHp+gSS4O$u94` zRhB&_R+plo+hs5oJk-XEK`uB!71iavH&_CGI6>~?w6P*E!o(@nt}~2ZYvVnb(`;F> zbj}k-ncSZXo&@opJSO(Vf6AETwvCkh2=Ij|q$CuME%S5lJveLO?@2EE4618+E?&8Q z1-9E=-QNNqEX;qw(Di4(ozS*O9cbk==(msB(Q*Bl2uUpq^J75Ea#rdxzhspn9s@xW zWIOf4>>M`Y2xSQ(Ss-?og!@f641B zcB`T!;$f`7Q(3VaYPpNzq1#qAr|*VWln&#o2wJYCV;5Kbb1oL+RBde>ysWqu`QO&Q*NDsaO`p zK(&2-=F5j)%c^A!zl2C-g%*JYTu~2Ka;6=QT_;vna{>2Mq>l(PoRVX@Eq1M#Rr7MM z$^NR!u>y)y3{|+QqM!xg;8-HlKsV*X-vxsd2W~P{JxnPZm^+s_K|Fk!91P87epAzl zx+?3zBmP^Qf1d!BIz<(InTX6MZLFSl-3ZiCu73o1B4(>&8K4VS&B#w9J*7WR)C93$ zlj5wTgd{)Rg=6;E2O>_*W2nio+&Vg2Oygh4>}=U+#cl;!%Xou5xL||UU(436e%(h zMZ_GD#JHUlY0$_Z1~ZD3+hmUaSAVrzt+V$&*S*eeef6ue*Is*_^WWe4zV)qjqRC`3 z5@w59fmWauXa!nA|bb;nxd*ltp}~Z5LijRGMr+&!A7NR zFE|nw5BAoy^(nR~T18Kd(A@j$v#kQ`0^>~+I1QZOG&}@`vAq|V1?Fp>Sqv&cPhL+1 zN5LkJH6hR#R6KVK4CeI=P!Fzx1r)C{5qBBf26w#KhPhH0?Waf6uXXV;EzeA+9WVH#l0!uIOt$~DKB+0%ez#zh%cty1P@kl%QV)b z-w-gHMRuu2->DpPe~bwptjpE$g60^cT1vP~vS%(mcv@4nya6YDR3~CD*tb(@mre9} z6Q<~O9$Wn8wZz#vunjD6*$lq|tHDzCt#+IYbnrYTQLriMJm}R-nI`_g72p7C(f`@? zBDX(lm1oXzlk8keYbm;cdr4!mXoNpD?ow;|X_MoR=4@iFP*Am~AL}l}my{GpOrs_a zuN2~oeg6TP$)ArVSjGZ<2WG%8!u|nj1%@RCtw1Z#3bX>PKr1kW_D_HT0ESTE!?JS1 QH~;_u07*qoM6N<$f)j0%n*aa+ delta 1120 zcmV-m1fTno2lfadiBL{Q4GJ0x0000DNk~Le0000g0000g2nGNE0L8<}Tah6re*_pw zL_t(|+U%HVNK{c2$L||wOs%PG$HGF2B8#AGA&97`2!s06MnO>&5p7gp*hcGz7Hp9q zLZpZmG9oBL2+1#PR1g(yAnj?II+czy<9q#&{0A<>IO;S{3+BKNpKqD>f9IZa?zz{n zEKB_l=1~8M#f8R&{_Ez9bg{0ke@^A+=PRc(;%)Q5Y+wQ}I1662S4cxcgUZUvQrX$r z?H5{KU$2Uaij>Rc3Z61RXgwPb)_^AP6Wj_Bn!sxj&ExSX!!V)~>To!e+wBet?GAQ> z3UE|=xf|4g0PurU?I#9D}NEXMn9TnxLzMI_L>Df-+EUXV%{V z7wHX?=ekgMB0VX>Q+Q3pC)3mNj_=?U_+U%cYgPqv!7wm}qMY>LW$=LaWH1yaGF~ly z#05}bTX_nxL?%iTk88mWe{hwa3tA!1FQ-_szP8p;UQgrkVrH?Q!j6GUVV((oKpMR( zp)w6j2XFYH6!b4291Zgyn7rJ;X-(aLi!I>HL`TaH-AXagvre@8~M9?DRT00Y3+ z2+xjW=mbmDTkwTLUlnVi@`FoxyZ{_wG7aMVz9+&=wn}?PCI2s{N4>EgdW%I}xXG+d zpjTIdZ6R~JVy!*NW+lK7xeZ=&guHgw(PS-|{ER^nIu$(T>?0y4v+(=0_)KV_^NP99 zAs~;j>F0|b6h4LGe*&CVn<&!7dxeFd8XS(+qixN;u@q!dq>u5N%z3?$*M8G$a?dyZ zwb-1@WvQ}tDIzg;oE{TVdzobWnJ5lT;3Kes*RQc=N_E)T5lx9C(?Paw)tq${V^fl8 zwKgN=@xv5*)6Z;LO0?gb&vJLVt);3x$rPZ7aFrp2v1x@ge<)Hj_wjfXJuWlW3a+!H zKYh;G?;fkdUkh!?#9LPwqvHAZVeaY8?p|iJ7xbpA6n0VE1bV-~PN6qIvF6=Cn0q8# z9&#y@!K4!=@dH1Crya4b_iOE6xW*=fVIZPDF&x%`Qa|G^%f6lOybjnVN8S)+@#8HNJkJXtTy~|bXCa{IgO)cmCwQQ;-Mi)g|p*lOr zqh3zKCYRVbEN2d$OX0feRcCLK$y7TOyyliqHHAK+$K6c0=nB4Rn#~(!+TK&N_JeI< za2a!*yDYgZ_~Set&jZ;gYsrjAd-z_jSCy5OHE&+UHh8Nui&dbM@u~uWfJ#qKSDBfa m?H3x~$c+n)3vIjo5nupq0yeX}6So)u0000 Date: Sun, 16 Dec 2012 13:05:30 -0800 Subject: [PATCH 052/136] more icons for blue_alt --- .../drawable-hdpi/ic_menu_attach_blue_alt.png | Bin 0 -> 1146 bytes .../drawable-hdpi/ic_menu_camera_blue_alt.png | Bin 0 -> 695 bytes .../res/drawable-hdpi/ic_menu_close_blue_alt.png | Bin 0 -> 511 bytes astrid/res/drawable/ic_menu_attach_blue_alt.png | Bin 0 -> 742 bytes .../res/drawable/ic_menu_list_copy_blue_alt.png | Bin 0 -> 615 bytes astrid/res/drawable/icn_arrow_left_white.png | Bin 0 -> 254 bytes astrid/res/drawable/icn_arrow_right_white.png | Bin 0 -> 258 bytes astrid/res/drawable/icn_edit_repeats_white.png | Bin 0 -> 993 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 astrid/res/drawable-hdpi/ic_menu_attach_blue_alt.png create mode 100644 astrid/res/drawable-hdpi/ic_menu_camera_blue_alt.png create mode 100644 astrid/res/drawable-hdpi/ic_menu_close_blue_alt.png create mode 100644 astrid/res/drawable/ic_menu_attach_blue_alt.png create mode 100644 astrid/res/drawable/ic_menu_list_copy_blue_alt.png create mode 100644 astrid/res/drawable/icn_arrow_left_white.png create mode 100644 astrid/res/drawable/icn_arrow_right_white.png create mode 100644 astrid/res/drawable/icn_edit_repeats_white.png diff --git a/astrid/res/drawable-hdpi/ic_menu_attach_blue_alt.png b/astrid/res/drawable-hdpi/ic_menu_attach_blue_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..334c20e903798205d54120daa26441972a3d705e GIT binary patch literal 1146 zcmV-=1cm#FP)YFCJP1UW%1}2$q4w zKKjo9XN0%DgEHXs=YDpJ$pgcscGiNDa53h2W_W^9W?q z77Mn3C*T|C1a06VNN1lEE`Vx3!Mbn?$~6&_MVmV0$H6b3dAk6T*>|_-cOzVaa=7wF zYZ9Ir397|b>H()2&5U!_1y- zu3wAswO|}=2e?Ih!6mx|sVbw;Bx%l~Jzk4uN=zk)6ytR*6+x6yr-Z zG4)_3?W$ThDN3IX<~4^Mf+FadH)1jkU>@y>TAoqctO~>kF-72=82>KdbUOLj8WT-;rL!Ley8wk&;{jb2e?6OGY2EnRk6*g zG%?CEZ?!WsON^}%w(k@ZW%Wq-+i?=liJZ)AlYS~fU1tR##gu5A2u?zr4>!fF*15GFXc65nsU2fq9CEA&**Tm?a*&3*4 ztO|1TuwG-4>Cc#AE$NztX8CSm+y8jRsvr+Tag7Df{7cL!P0SVx3l%g$DmR?-qi>;B zLAXQ!N#vsRif9-#F;)b95YIR17Pgs7*Dq3R9xHVZ_M3Z-ks3L9az zoeyO4jptoab&uzn=@MdgYDqUNf{a>iIU|-?Q%{zMK$;k{KzL4x*>0zpKwbr_&o3z; zo3Cw?_(gCj9(-UkJ8$=WGxOfeY}B^x$aAu&5o81zK}L`fRJ9MW6%;kpN4eWV^Q#eG*b}ND3Oa{oA-y9Db%;BdAq_%ikqVudm>P&x!IA zjBpyp%IN@#;QXO-s1AH)e#G@zOM$JR#;2fba7Y1Bt^JaDHV+DtIn)T!c5s$v3}QJn zV+U_Dk~y>mdLL;iIb`0bC7?}f-v)hmIa@AY61zu$D!3C~Cs|aSY!Unb@4&3r7~GCf z-p#*LVY^@jWLUi-tcF8i40Jk-(0|YX+AC&Bzf@7kdz|lC(BbgB4)*b4dC8*SMbLN9 ztod4?i&$EFGy8^G&?y+u{Q5W&|45c?<@*El39X=vHVWCo?G6`#-vvMS1NH9PjP76u}yS9|6<*uSNZYTMA> zFS`Q~E(%8=rTKjXo8W+KvaNhSMW0ZwL*GDL^KAidNQ>4UXW!5-tjZQZ(&2eY_7UGH zxZTU`fNqbo`4>oYqgk$G>R>nsCct}-&-)8{q&BC&!CRkcx(AMU{Q|tc#~PQCDhgAe z5a8jiz!=1GNNrK3K`{U^MZVjT{_3L^z)|pp2eqpQKDk;v7|ww;x9>Bbf{h>}$Otlm do|N4PFaQvYui2mB9KQen002ovPDHLkV1g*5I)?xN literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/ic_menu_close_blue_alt.png b/astrid/res/drawable-hdpi/ic_menu_close_blue_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..3c42dea9a52f302ee63bce43d60dc10a2eb442bd GIT binary patch literal 511 zcmV2hKp3#Yo>+Em#Lv>NjE#maNzL?^J&e zwk+pkCA5)}Nn#Fy73%}aPsbhDb|rMFvSR`I1+{(3%ZiyRp=XsJdgTW>b%TtZ`MV%a zgo1*JePo=ekiIu9MCeK=nP5~P)uY^AflOp8!y%OHlxd=G;G8~9;sL{4ScDR(rK%Q7 zE*TA1r!WNvU|zCrPIc2dwmuVZ45AhDBg&s}wmxmXnaKZUR{53A-FElHSd5S@Hx*>n{j7uK&NC~m+BPPm9E7kGc?HPtJ#I&>er!q zo}ZtzJ`HY8Yx($KbA}!bH_byZ&KV!mc$_o-2&7yxny!!1XulCb~)002ovPDHLkV1gH8 B-lYHl literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/ic_menu_attach_blue_alt.png b/astrid/res/drawable/ic_menu_attach_blue_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..1e02e4d7f300a8b9949390633ecf242054418a6b GIT binary patch literal 742 zcmV2qQ&32?2_pZ17UCjlRWucCqc-I_4Emt3n(V_$+9c7UC^v?g6@_S& zmfn6ZJp+fqX6|_Jgne* zEQNYVLX`xKKp%8MZ(dQBGa*n7SKz1jr@ek{%*Ldu~NzN>#24r%-)^_>n| zj5*S+$?xiU72H!_FC3Q>?_fPNXsI5DDW-ZFN6IA1lgM=th08Dj^{^R!z_YN#Sm65# zdIzeY64L5R%OM-PA3nlcNWd=m1rNgzQvfsHDvZi9-_%!Z@@B zsWTS%k%D&VdAXA}ZjS6zj!Zd@BvtUNwM*QL#H?_3O^+OkXy;s0v8z?zj%gg(tz*IR z<_yfww+gvlwmV;6ll5+yu;0yDITF*(`6`$4I^su+Ezc-y%Q2=wyJk{FE-oRNon+Ov z)bEbX_3{8TUEdT%j literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/ic_menu_list_copy_blue_alt.png b/astrid/res/drawable/ic_menu_list_copy_blue_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..047fc80c1584d21e5c37b5e1f9bb00f620ecbef7 GIT binary patch literal 615 zcmV-t0+{`YP)pR?Wc&Pz9t6@8<(8V3$ka1ZY+ri>w~CV8}k$<8-hO)G>}&)T}`Hj~B#; z+3Dd{5?7!r(18L?tzxf*8;PWS4?Z>hmFPUU5cdk6L7|-vK7m0>;*~1I@sLin5dvc% zVz+}wU>od!V%7OWFbqaPt&T{^Zh?>V^4g|3e+m4c?7tUD+<{1vS}W1~bkj^$3zVEH zP@=r~qRFT10{uE2%XB@}wHOhPBCa$es>T-WOTyqQMRmCWQ?&mO$-9fHi`tMyP(#1N z90EmY3aIj2E@)3O0%Ako3RY=2BeW^s1f?K{+D#iTsEVS;iSip)zy}5tbJ0)zoYC=e zn)@Xn8(eK-I7Yw{m@)Y5qTLFZ1ofG`$ry3)T;s?%$OoY`&V{JmnCAS3SqG&wA22&W zwQ7QkUD+Dd+5^y(D}1W90!Tb#hlP`>6UDbL$d8{Mz`7UM^N0RX*8&~JFuCU^h<002ovPDHLkV1k7; B83+IX literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_arrow_left_white.png b/astrid/res/drawable/icn_arrow_left_white.png new file mode 100644 index 0000000000000000000000000000000000000000..8eeb9d22093e67a3646504e33857bc3e11e32c86 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz5!3HE(wfP(cQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiWYdfIEGZ*+H$Rzvq3?CEg+Z4J%h!)WU*Uei(5vE_sK(N z{_K7KfP+)+L~OaIlF*!u9M2?Jr+N#|d;cN)ozK%tmqg9x%>QmI@$^FEo4&Q;I*IMx zcbUzSbrU#m2d`n9w!yzN`+>kWcD`iGg1HBS0@_#cCL5k;`k6A{Y=gFQ7gMIRN3ye> z?TLbh9{m#yt!o%gOln$lQNncRwTXBBn=NNxX7HJB)G_Ppr@uhAGI+ZBxvX8U}fi7AzZCsS>Jik5h~IEGZ*Ix_7dZ-WAlOCzVmK|z^`y)vzWGL3>-E_NN7 zPN!Ygf%yJt4qp+BA;{V?Nw7(&)Kl?d|!$7wHqFHnkS0gVq^a(oI_kdY!AJYSGu6=IN85a(8y%pcDXx(Ihb2h@`UPae~od$(> z*u;0tt>_}~h-0qEknjpHq7dHcR&={?QJcX~IS6JY(QiRCo#@@*lW-Az-(yI0HgAWb zQLLYI5>2ahNbwgv040Wm(-t}>jeiqliGE@}eFD@fo&d^F%V zrk&w}hur&Wh9Z7sD-Adteu8$;=fanKPRpXHdY+SxQ39V6u<$P+4iXMNAK7O{7X2QK zO2?`|fq^~xA-L?&Vz|UUAys@`mtts+pHwEEh$}&#B98k(fm6cNqR4N1IX5sNycSFe zW7GF->9V{iXIG-lau#MP<2xmc-Riao=v4egl<$@s5}gkQ!F`bDR&avk^Yb{R!;uwD$6-2Ym%>aL9u{a4(OT5zZBYE!@Ml>*bM%!=PJtf4YXd zn?acN@Q@d0TzX*Y*dg$g-*|- Date: Sun, 16 Dec 2012 13:19:42 -0800 Subject: [PATCH 053/136] repeat --- .../icn_edit_repeats_white.png | Bin .../res/drawable-hdpi/icn_menu_settings.png | Bin 2103 -> 1552 bytes .../drawable-hdpi/icn_menu_settings_dark.png | Bin 2228 -> 1791 bytes astrid/res/drawable-hdpi/list_settings.png | Bin 1166 -> 914 bytes 4 files changed, 0 insertions(+), 0 deletions(-) rename astrid/res/{drawable => drawable-hdpi}/icn_edit_repeats_white.png (100%) diff --git a/astrid/res/drawable/icn_edit_repeats_white.png b/astrid/res/drawable-hdpi/icn_edit_repeats_white.png similarity index 100% rename from astrid/res/drawable/icn_edit_repeats_white.png rename to astrid/res/drawable-hdpi/icn_edit_repeats_white.png diff --git a/astrid/res/drawable-hdpi/icn_menu_settings.png b/astrid/res/drawable-hdpi/icn_menu_settings.png index be39aa04a5053b0130e27e1fb507f7e7197ef07e..e09332c2f59d9be73a333f49d8460ec0e4596f2c 100644 GIT binary patch delta 1498 zcmV<01tt2o5ReRzNPh*gNkl9@kRiwrWC$_@8G=o;?sqmB@e za41l8OWJcaz3Y4pLDvIM0G9wikc4Os=CO>VuVBNGycUKC*ykfF~8ljsV*j zK8t}1eBN^u*aLh;uWF|TIqfj82KW^CH_8Ob?mi1#s((0E;7*IxQ^fsRmU@)Z2(t)! zC-6M*O_W8t8~Dy6t2GjdfcH(0k+p=NL%^R=*PwkA&3bA`Q-Es=L@MAje*xYB-Up6F zoghisTbQ}T-4~4EEut60z!0;Qgy1ybVtPyC81H$C#JoT+s);OSQwMfXi)LuflOpgl z657X#S%0+V9A0-Na1a0W^4P9Q3iCv^8Z90nCSma=$?2gdj5>}B!Mm8bRsqX3_n8iy z%T1}dLU94T!EHYR>w&izS}GeRj<6LG0&WM+a-DZMun71t43g?9c%OQ{pv|iJChCYv zb7V2E1i1em>X{Uj^Ih+qW<@O(c`v;%MzPQF-+!tTBt+asfffyE1(qpx+hQU2Q5nzZ zp%_nBbpEZZy>>8E)AYIn!0#Rn?}QO_6?>y1ckDdwwyMth68O4|XZ!YN8%F&)>q(uX-h&^H~J; zjeoP56k`AI`Me?4MTIC36vPYcab8~xE2W1?P}0Xa33mEZ%5AI}F3mn$5$W3+#=FK! zY0!`(TNGIPOjT?~Gc#VDt0?qKkc>wz(zGr)HmW6&ma6=y&u|Q#ASwJd^JTIW%Ud;z zY2)$kfX@(bxPkXnWjM)>yQw?%)T%G6|9?*~t4h#I4vmo%KL9*MS9jVHrum=*wXiRn ztvDv*mFL)=5p03DbTkl(!H0BFw`0XY@RIOTVNCL9Dt53C9f?!#y`=CfYW z?RJLx6x2pJOVXunDIz;q4p>npXn!Zi61ouDMFb_OpQDQ&&2jOXt-!BQ7in3*YwXYN zbNqgszi(wrBB@@6@prh!6i#o;k?by(4gH)2$;ZjXu0r)?>%XtIC!u2UG5gtm#haT1cW&di!))UDEoKYKD06lpX6)7}td z2r>j2f(${1AVZKL$e1C>5M&541Q~*A%}xt20Be3v^IPkZOaK4?07*qoM6N<$f?4Fs AUjP6A delta 2053 zcmV+g2>SPs47U)FNPh>}NklDOX zD4rmmiTaO06EX2f^bbr-jGCxuP(-3ejTcb_qR<2dQA80%5Y$4gK)ETN!Tyt(pdo_01?Sov3klZym7un8u^d5>pfJff^@0O7pC1*} z3Yr|Q%N3j=$j@eidJFCp+$hLPLQsRv=W*OD>hNp>1rG>HGHC5>>S6-~vjyV?)q);^ z1z1L6=j|pbk9NQsSj{8g$^l^F5M!_1v zFIZIx8e|@u1WyaT798_4K{~rn2+pxN7GtJ$6d>YmM}Iwfl;9`WSn#gsZV5-A?dI`ERDOr~&j=~zO z<1fKn!MnJY-KYUOC`FWj>ja%F=M5H&6?~d$k|G|@E#Lv;WX)HiBX*jjFY}6r`>#RI zG@%@6dA58qYR$;EVTB>YKFZH_CrF9727y)$8Gk0Y!DhA%61gu@c%CxExR*`kKaAXK zC9ax})vXikOj7V>jG*(WjhdLTZp^k_F7>nE_Y|Jzh~Qg@w-VG{FiCI`7L)@)uL+hV zapQ~;)RWpO*=V9r-Db+By+%eA_6qJ5w)BmP&?EEtOK|;m&!nR+lfd#ci%BJRugmYN zB7ZN6`GFuWRuE6~`lj{>>FE-b>*AaoD*Z007SFg#50|Bg)@_Bx30!>eqCr)rXb~g# z>25=K4m7o_*8h@i9zEbcArfwdS2=iVE>P=lXz~-2?SLRTj zL`{ieT?&@!K@sEebTCd(7PlYk1=9sNF7Gu=Fkf)k=3Y&Ld4k+DpVu?et;MzoekAj? z7OdJfosD3xAiuGjX)QvvZ+)*|hC{RLZ;IN6Y%5mlDGv@iRP@EvSK8oTjG$KWqJM?7 zNHqDpOK^FT@2TKgBijhle$Hqt$Z4nr%@j=GCCjPcRl^2yytR&GF9TdY}cVr zUPmLnB&V>gN#r=v0mIJ(t)eaAm%{B@8t7T5Sd@CF&S zj-QBDYDxD~r&;f#4f}b5FHNqsfot-}k#rsGZNWR1x=XX^&PL0^!67E8u7AA=N(_Cu zXR)F~yo9y0SBblgvmvOST56q*?kp$2ng-E}ZHiKz9BswwCWk?kHw)U*1>0iTM@|0) zT&gC?_kn&iVN*9CjM!?$U+v-^7Yd#+ zn%B+#LHu=c#v3i$|CGe(H0=~OF$tQjzf2aNu}s>_=*CPBL2Kf?Of~va?xGOAMew2F zeaDE7?~LYk{bhb7C=4OFMoX_bgl;7k{#tvGA(S>V9Ng6@X*~!z^M6uF4>Glpya_F- zHd>aOt4(#8n^{s_Swv^iIyMsZw%BCmd(!DTw#&{@FBXozXffQANM(+Ax^S4-IZ{a{ z@>V(wMHoO4slY)=`#!w2?uBKj6ZIZ5Ll=o9%zRIxQD%fEx$iRiR6V3L~`_X7MiYOQ6|JvC9 z6(UDtWqVU?qJD+4=x=wZuIR4*nGo<9WX+;J>je={(h5;6nnK5M5y@h-BU{ihl0YS4 zKL`=NBPLDSYC683(qyNR;<9xp%m4aIJ~_{1N)Rn27N*ko>8J!{B$W?FKu|zXKu|zX jKu|zXK+wrJ{uf{X&!@gU;7af$00000NkvXXu0mjfYGTk= diff --git a/astrid/res/drawable-hdpi/icn_menu_settings_dark.png b/astrid/res/drawable-hdpi/icn_menu_settings_dark.png index 54545f2fbce04b4dc6ed156fbb6d062a19022f01..e1055b608baf7c9932d572ee20eb068381d48aec 100644 GIT binary patch delta 1739 zcmV;+1~mD!5&sR4NPh;QNkls6zikaR2vaB)CyXxVhVOa zb}74_gWuM1dS}=fW|mpFC;0-*-Fe(^&i&3~X7MGHNukWx{C|o9MUWy$5u^xG1Sx_P zL5tLK7s^DMo10C?W3iYhDJc;R4Gp58pkVP4)ZX51Iv$NiMR|F-sI9GCoCI}ucOU<~ zuCDHc@nA40ii(Pa-)~J-7NiEXwzevf&J;;1iYbB=LEg@T`uqDuM@NSU1Ome6^I6^f z62f(ab9CD$34c2YU4#+4*H&F!EgBmerBN+o1Pu)hiI$d@ncTu^2qim@a2Mfh$r!W! z)m#W-V}j<@gV=Mz;jjpWLVAL72qzH|gbAYrm++^AprhC)VX$8wr#6H*j**obw487| z;YLEf2|-hm?MW=NxWP5ABHTx)ay!{|>)j)1MDhY=PFB0C&CW0=)-Mt$mu$@ephUliW=R$Z_sR2Qk5$-3PMfe_MoPlGf zRCfjDkP`JHUMGkru!-=1ZaYV*M+ui=`D`GZKFiWyLZ~O)MA%LE5?)oM`|KLR<5;R6 z5dQWuL4O+w*BgwLV!{FfYvmf(f}DH^wBFd0ZXpa1_Ip{R`v~6|jB!*e0CKDbODxlX z!8k{}eS|-}zQjIhRWQ&<{i-okn@P8dbB zVzFIHI1}DdFv~SYLCn)8xt8amSQ0w$5uu!Lnt#FPI0^g^gdRl3%z4o%*zbHo1Adx$ zY?sr*oQXUrl_(aPEQ{Ac&Hy~&m}Z;_?nUIfmvDo@ah4HI#ZAe&L~$*=L2o}0ULd@I zr6sd*;1`r4Ou)4$U9@&C;YvcQTO{Q=bc`S_Fo~?W8ag7=9G*kVCBy#WDIL83Qc$uWIH&muJCTuveGtd;>-t88&?D{Vw|`m8*j>w{<7p;=2j^H!GO@p>dA?EPMblm& z$ch&v=eU2u&5-UEL3wF>CI^-N5}W7nVY!6UEJe6(3pp`ACp2hO6D_8Z`xHxVL>Lh- zSCQIzgQHZ4v+VhgmGIHkeEW#``RugT3Jj9Dh?5 z;W#>e0^JEht3E|wn0d+?iA3g=pl3B2!y$f{@DN;GYY~Kbs{}1aUA9s(#_g3SQJ%y# ziQ=RUPj!VLP7ud5e;-8wd7FfwVl=k6gm^d2D8q^1BZSK(ddD~9Yt(I1*;I@56Fx)c zt1no&Gq@Roy%YJ3>`rqL%6;p5K!3KZS@xrw7tvBwS^3ov!Tu<1QBFL+6nC(JaLS_?)IK9I93kQQ}T?`nE zGb!5%KYLw+cml8BPT#88ei+-gqa@)_&&~Lax;BN@+u|U*3u(h3dO`f?d4n!deU7k0 z{Qud%Ckcup<(~ve+%M)f>wnvXmyltzeSv7jp0o*dn*KQ4uz#7*p~;i>VV`{DNcxYio1r{KHs|eoZ&P53%h-0w}dikYn3}_^nZgE^t5esTW$4#IlM)Uq-|{ zo9!j$5J_VYanBLN z-}xLF89CuA2Q@V{u0&jz_8Wv*A<|`KWum^m-tL!Hveta+-{UMykyZpLf)qiDAVrWe hMUWzBuJ(@r0|0)?tY%r$E3W_m002ovPDHLkV1o1WF^vEK delta 2179 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 From 109c2611479d4e78684a87fc0087d3b1abe66590 Mon Sep 17 00:00:00 2001 From: Jon Paris Date: Sun, 16 Dec 2012 13:27:12 -0800 Subject: [PATCH 054/136] small and medium updates --- .../drawable-hdpi/icn_edit_repeats_white.png | Bin 993 -> 0 bytes .../res/drawable/icn_edit_repeats_white.png | Bin 0 -> 999 bytes astrid/res/drawable/icn_menu_settings.png | Bin 1552 -> 1027 bytes .../res/drawable/icn_menu_settings_dark.png | Bin 1791 -> 1159 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 astrid/res/drawable-hdpi/icn_edit_repeats_white.png create mode 100644 astrid/res/drawable/icn_edit_repeats_white.png diff --git a/astrid/res/drawable-hdpi/icn_edit_repeats_white.png b/astrid/res/drawable-hdpi/icn_edit_repeats_white.png deleted file mode 100644 index 8e304976b27b991596eca1ba144edcf5ae6163f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 993 zcmV<710MW|P)Xx(Ihb2h@`UPae~od$(> z*u;0tt>_}~h-0qEknjpHq7dHcR&={?QJcX~IS6JY(QiRCo#@@*lW-Az-(yI0HgAWb zQLLYI5>2ahNbwgv040Wm(-t}>jeiqliGE@}eFD@fo&d^F%V zrk&w}hur&Wh9Z7sD-Adteu8$;=fanKPRpXHdY+SxQ39V6u<$P+4iXMNAK7O{7X2QK zO2?`|fq^~xA-L?&Vz|UUAys@`mtts+pHwEEh$}&#B98k(fm6cNqR4N1IX5sNycSFe zW7GF->9V{iXIG-lau#MP<2xmc-Riao=v4egl<$@s5}gkQ!F`bDR&avk^Yb{R!;uwD$6-2Ym%>aL9u{a4(OT5zZBYE!@Ml>*bM%!=PJtf4YXd zn?acN@Q@d0TzX*Y*dg$g-*|-W=5rkxj zn5gLH_6$72FwDJsXPtY?=)ezluQPL>9nZ|1b0(BbCNmbBWo9fwTa==+EsnL686V_2 z@FZGnZC&iNDj?xe2On?qD*B+*=^DrkNVr&>2}SgK-Ttk1jDb&5r%|vgAkih<4rQAH zyVbUG%#aJtgP8PeIpc$}03yy&a7B40BF61%Y$Ja;3>r0qZ3ZWJ!uf6Yd9un@1qyX1 z;(GAKB{mobO#!%wI5~TicMpRK)jdQkaRyYn%s>%13(9?-=_&9`c@_aVs(YLS`#lV} z37n>%`DICFIjZHTnTvREnctUz14;++%lr9xl2O~VMWMNzv;wASO`0~Rz*BynP<<+* z@#mvH`*Ak7U=VvB&(!#?Y9&7J93t^;2QNIdy$&v^zq*2}Rkj|NIN2sUz?jPni(|fA zJzO%F;`b}hYUpo%+aqahsW!v^#y4HDW`Ze`Y$8S48&DmlU9;s0yA5u*rCV{H`Lgvf zHV7gHsRtuU(6lC1low$`*%FMxf)Fi|?Q?wZFR;&R642(b5TXGI7iryFCI?wwMTeOL zsMZaN0uml`%0t~cH8WRJ?G{s{KbBjjN;*3o_RI%h-2z{}mRWs+Np;CfHZJN9&s{eA zR!en{dnV&}X;ke}SedUdiK0yz-6o{j4N_H@W>~?pTFa{gS6P2{i-mj1n3A$prKshJ zzH#uxcBwbw;^Pao4wG`P>EaOs9|8lG#13#gqkwFoHvw_p1ejzqbG*vvO7|upUD5Ma zOh2y&+xP=kYuXL7{@hQ$6+zkepzmCqZnug!>uS<4&9K+X?Uqf^|1UrPInlob7y!c* VhC3y#87%++002ovPDHLkV1nHX!Cn9W literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_menu_settings.png b/astrid/res/drawable/icn_menu_settings.png index e09332c2f59d9be73a333f49d8460ec0e4596f2c..fb1c9d309ab3627ce5c2168abbb7887878d84bfa 100644 GIT binary patch delta 1004 zcmVjS zL_t(|+U%O&OBF#B$M3yrH%K!}G_=ejrL-<&24+jC1L{+TV!Z`n(J%Tz zLOn)NQIUiZ2qj?!MG>Xh&9qF-B!UXDFz@yqI>Io`?wyVOb!88HKxfXZdv<2doO8yY zrfGr6C_&#a-!R`W-!R`WPC^zxfA1L31oln_!=^~urY4GEWi&H+lD=`pwg@;17TIPQ z+hZmu2gBN5c>v~6dkRFyO=< zGm@{|A*}+Nosl@t+~Kslf0xNi@Xdt&5a^Ag6Z1k4JWdh3s>F0+N6$s~#bCM#{cMmQ zM<>||!&Dw}f^!}fAcyPA0;Ql?@$Z#OK14UT!#R(~ZXD2+lFj}C%v2aV54;z~#=tr+ zoMTy_S7KZ<$TS!?A3W4aX~JGGjB!rKO+N<}U@n*jQb9i01-hLMf2qs{!ArmmP+*|* znS$C7Wy%=_y3c6e_PZGbMHqzr`=36FM#htTMuYbh$fhHknXV1 zJ_s(kosVq+qx6+KXn9U}%k7|FG8xzz1tY~x+G=Ov`e+@I@l*F(Gg>ihcd63492~H*GWOT0@_!>zix%(PWLUk1;NnjgT z23kP75Y9PzDZyTBgV4s#y{L|U5~VVk+(!^U_83T^pN~+oYD+Q4O4x_3p@M2WVKtLN z)n_LM+!eN5+Gtk7)E1@kKsJ>f!dyfXwX^(Y70mk`0&POMf196`YOe1m#i{$;@QP-T z9Sx0wPDm$!_Jmi|lR>H)^D;~LeKwdOIFdfEFU54aQmUtfQ=b;F{9@I0000V delta 1533 zcmVDh9Ej2f+m&K zMc^H-1(pJrxqi<8+kr0NugOf%6~H6FEXA=HaIl&Lg&krEpb2R3I42AIt@!;UFai`c z*Cm0ofpjes)B-#RtN>CT1mzXK+YGau=Dp_tj|1&tMnae&HXB$C+zgxof0}{K^o)|p z?zaIm71yVzPeR0Ru44;s?OGz}8t(3+ju4P=C{T1u+H*C%>wFDC*8@)g zmjFMIj0<`1yLsMBuA?OCgOyxJEQHTKvVdoRCl$wz0NWToi-8M#-g6Y#1AIlVYNrM{ z?J%$g_!Rgz$^^;oJ_}r`e>hg)PK(u3#Qj>9dX&-#vj}=8@I3HMltsE5_|7A%H4=${ z_f3zHwS=HUz@JgqpnVk0dTK~hfNKjxD&RAJ0p0=L2aZLZAW7L7gf#I*tp$yO_CF0n0V_nGT%GO{uv;aRI%-Z9f9*fwvf1 zDjOz_uoV#kZU@eCop(8~2>37zlIkjWpL)Ka&8qn(>WE5nWHGM^$zas?Pcn__~Z|`~!SW;@t#I1(pDF=|Kq+v<~>hBaA1EplR%_ zysXGZwbxNi2hEHk?ESn~+%-39q8>TV-@?$ZdL^CnSp@ctf3uksV*l{@ydl;_g(wgd z#0%_kUSA9=rH4sS(#JUocKTDwZLAqC%|2TZ>DwB{yT(ds(2yfr6j=LARcuBxGhUsm zDD+E^j7Kigv@SU|swI(@s{E+Wa15OwDf~9`WwI2@TQ!SmMr`n$;}ZgA?*US`q{tO^e9!)P_;vtH5dc82;C)J8c=(xq)FB0E?P zSWzZue<#Nhx)9n$1SP4Tql+HRaq*h1z^_pkX<5K)?9c9V{C=FjZ)Hm&sa}ThceutB zPH)SR>@JoK{hS5K$H~R6LiJ_qzpu6@qfStcC4Yt_En;ZA3%tq-TWmkGm3Y!)?9<%$ zk%9e2;A2N<9pW`9)=2Ul>~-J`SKlSobfb0Vf5X8bHz`wXf=VWfTT3q* zhk~Fid#M8o-Py+a>Mj!9sc1^Y17-aBb5!e~lIy?7kQ(-Qhq$JDuhWcD@+9ssi5v-Q z0bvuA=T3WBTG7xt=Q#s(E zQrfP75#qYkp7jTkDcc00000NkvXXu0mjfsMyc^ diff --git a/astrid/res/drawable/icn_menu_settings_dark.png b/astrid/res/drawable/icn_menu_settings_dark.png index e1055b608baf7c9932d572ee20eb068381d48aec..38c62c6f2ee0ed30b289af7a6fb90fdc5d9529a4 100644 GIT binary patch delta 1137 zcmV-%1djXv4TlLKiBL{Q4GJ0x0000DNk~Le0000s0000s2nGNE0E|Uy-H{ zL_t(|+U%NXYzEHlpXUiT_EK$N6G~ji2 zum|i11L(AwiBng>DR2g)DJ#_m?3Jwy^6heL7HDh|mI*;dMjxV^tk@)Ce@iH?1kWoV zYVLu}cJ8rrU^plVFz*w{1GmBV0COL358kj_JT8F4KJGmQlR*;bOGHp+gSS4O$u94` zRhB&_R+plo+hs5oJk-XEK`uB!71iavH&_CGI6>~?w6P*E!o(@nt}~2ZYvVnb(`;F> zbj}k-ncSZXo&@opJSO(Vf6AETwvCkh2=Ij|q$CuME%S5lJveLO?@2EE4618+E?&8Q z1-9E=-QNNqEX;qw(Di4(ozS*O9cbk==(msB(Q*Bl2uUpq^J75Ea#rdxzhspn9s@xW zWIOf4>>M`Y2xSQ(Ss-?og!@f641B zcB`T!;$f`7Q(3VaYPpNzq1#qAr|*VWln&#o2wJYCV;5Kbb1oL+RBde>ysWqu`QO&Q*NDsaO`p zK(&2-=F5j)%c^A!zl2C-g%*JYTu~2Ka;6=QT_;vna{>2Mq>l(PoRVX@Eq1M#Rr7MM z$^NR!u>y)y3{|+QqM!xg;8-HlKsV*X-vxsd2W~P{JxnPZm^+s_K|Fk!91P87epAzl zx+?3zBmP^Qf1d!BIz<(InTX6MZLFSl-3ZiCu73o1B4(>&8K4VS&B#w9J*7WR)C93$ zlj5wTgd{)Rg=6;E2O>_*W2nio+&Vg2O#FlxnLO8WK(2CgO{L#!a0F8xb|s3RbC>S>62-!gYjmblWEhe>(|Xgb};f zR$W~!8XFs>Q7vNx4Gj&6mX?;8+`?)IB|DFB7vXHl7_oNzngMnb*`K~s|LNi4It!8NZU z+()Q#JK1&X;42B62{oMMe-pxlE%1!v&PS*qtdQ)V4}D@HhIC`=2oDn~35N+U65h-v zf-b_{y&EL3olKa9=%%#iLU>oH0YR4$?kAi@_#R}Ofn%pscLnB<67?fqCx|DoiSU4K zJ4dNU372B|Y#^LI%hF#$s3+V+*iHBnUR9<0>>9%3SgIco{`N9Ke;Wzc8;q4=!U6(o z$5oO}qh-q@3FAq)`qds(FW2;Uiuaa1b+a;yeREYpC&I7hsFgg?B##6E{;2B9H^ z7WSP6@-3e8C&F8V7Q$~{Cx~@m8zR?JSQ=*D!g?`I7)7*Vv0X|y6W&rV%QZ$p%+n^h zmgk~a5<2h^p`37dC@7@?|ec7ewuk~m(#+Wi99HkC>EM5i`PNU z06gKCW}FG`MdZ4daD%~dmJv?HP06}MaV@+-Z$A)TAiRO4C9`qh7nCAQz_ln{w017x zNP4RB76+u^#m0YB7}?KK{+7kc|xbjGR_!5OHo^ySptRX0fcfpk&%Uc5XbWC z`bLG&Bkkw6e_71fUCX57X(oXO=U7ZKvA?HzzER{w(_SFRiWem3xPQXUknR>id1-tm z2bKO3o9FOhxrEa!MYwJYIWa#cG-y;4EvAwC6iaSI7!fa5mlUQ;5VuFl3`&TxD{eLF_BCjUevl ztb+#`8GFzj;@=+jAtaLH(6Ch)pRFTVfv!PUHW5?>fv%h-NAiP!LU_z-EVYn@>nee! zagq8CqLEFSk5 z^eNBanmLJFPuP_r$g6Ld?Lu2ZW)p}wy~6qn2ZLx`3>b_vDccD@dtHNg0TVu z7~8j_B;ioc&G?PFHig#P;vl;VX~Q6TLHy`>gDz2hj<7@g|JlDM35p}-p9D$VFXlGu zf7^tYkYTfZfoR2^vZ{y5yQf0@vs$&>bBpM2y<{2c66!fU#^%jZy&7TlLAM-v z@aJU>O2-l@JrN$YY<<(-rwB5)ysTJaDIMZh{xfWG&k@Am`5YM;IpHe@H8nM^L|mBm z8-!UQ(q(03qQ1V~?w3}w)_m&U<19>(Rs<=66hVq0MUXN@kRoWV_KyGq0Dj7>W?9oK QuK)l507*qoM6N<$g3FpWF#rGn From 834c01f60340ca09c993b871ab38e281a405e78e Mon Sep 17 00:00:00 2001 From: Jon Paris Date: Sun, 16 Dec 2012 13:31:24 -0800 Subject: [PATCH 055/136] settings menu in low res --- astrid/res/drawable/icn_menu_settings.png | Bin 1027 -> 798 bytes astrid/res/drawable/icn_menu_settings_dark.png | Bin 1159 -> 924 bytes astrid/res/drawable/list_settings.png | Bin 914 -> 1001 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/astrid/res/drawable/icn_menu_settings.png b/astrid/res/drawable/icn_menu_settings.png index fb1c9d309ab3627ce5c2168abbb7887878d84bfa..4f68db6b70fa6bab7bdc66884e065a936fb50b76 100644 GIT binary patch delta 738 zcmV<80v-K>2%ZLzNPhyrNklgZ{~jQc@JZ*>lPJa6c-g}urLF1wVCd*OW;QYdw&e{ zm|P$h!aI-s;C~LN2*_Cg<78GleVj5CU%)XiYTFfuz$2fz@1PYlgM&m9=mfuf*4#7| z6_zWOf)9#4BFtlZz`8w>6Us42j%w8v1&0*HO@K;`wRO@_k&3@yuW4P&-D7RQAxq1f#2z$S7Oe(|;fDHlbwt-=vN1D~9b%n9V;^2v5 zyaha?pMUCRum-H9{dAh<8WijL!5`D2!f1kPKp)r- U2#0nuAOHXW07*qoM6N<$f>C2yAOHXW delta 969 zcmV;)12+7g27?HYNPh#RNkl}%_M>fu`uuU9Xi4=&F-Cz z{dHvzd_ZT;tb2B5&YW|`pr&bo$tXeJFyAoWFyAoWFit`iKY#BS&;<5Q2E(RE+NLIo zVP!Nkd6K?y#kL4I3KrRB8QWtfCV;@&uHEB+@Mguc_}1SZwkg zlrW>b5)2A2{Rq^7cFkDE!Cg=fI)y&=dy$)l-O}unvsN2sW{({QpKRC-UEsXi=h$j+ z8RQ!1jDUCKn12d&JmrME1zSO<+s=d0q_dp*Ks8taa>%ii(Z2ekGvGI8V`P9= zk{4voW1+#g63!Fya*sT!>xONVyj%~+Qy3fJj*1ES4VK$sn93fj1Vn@$K_r+kk3H@x4A4ezI3d2+$a)NUn6(EP}%L1jKS@G|cOFl$5xWhS*$8H?Z zm6FZ=0?bqxI}f}U#>T)pFPvjppjTpCGsrX;Hy=FINom4fFpP0d$4x&66<{uy22w#j z*afP#hW%Jny1}N zG%tYfLR$}LQivv)bdc__&^`z*xt)(~0i*PlJ7{@Mc+2geUosnAU=w#Ftl?@WLsTI0 zgjd`Qu7ahKzB3ZT_Dl3wMeB-=QLJcm5;TBxCw~ny;*`X&28D5avU!lkjR{UA=wx)S z8u%JXCAs?=P(pPTCP`o$SO!`^yAaMfdMUwPY=h9o&b_FPeiEfJncPPZKlT_%p`VXX zvT92)$4c0Tt)YTyJYhAHLe*y{2iz65T-s<>!qgU}@<29~9l~5h6ScGaW);l)9Rh7a zxqq9Vm1?fBmA zgj1smRuxDCx!^W8OCQ0iIEC5&PFw7dB1&JvT-yNMgz_`k3f3or^9ayoV2fe~@B{4e zQsfcO-Dhw&FZZdS!_QnR9o(rPEm3AHKteY&he3gGoAZl~gaFM{m777Z71WXw`9MV= rM`|Aaf9Cjx`G)z1`GzH={1IRPhbwz_D>0+z00000NkvXXu0mjfjpoQ} diff --git a/astrid/res/drawable/icn_menu_settings_dark.png b/astrid/res/drawable/icn_menu_settings_dark.png index 38c62c6f2ee0ed30b289af7a6fb90fdc5d9529a4..d5e127d70232ef662f8da4dba76abbd5383235a1 100644 GIT binary patch delta 865 zcmV-n1D^bc37iLzNPh!9Nkl!HYa#5-&<#$n90}FcD)o#2`W#G{%ET;}X$~m~k15D8yur|Ej-Qt=8UW?|t^1 zwa-{z{T}wW_FC<4ukW_@Iq_5~73+_Z7we~D4YP(>!>nO}WPe~3A1aYZxQ-{2N$ZN% z6|*6-tEF?xoZT@m@szW!7{s_huISS}_Jhreu7>)YP9B3ax`JHEiWS^}F`BVI9(7Z| zJ}@yVhD`?zbhqPR6!rOF7MQP@vlNtr0lY2)^P4+Tn9J7T7PM$CV(>{l)+O|hHV2S8n>+Q=q+=JDq_br5F@U50KDsi*nb8Nn~bqW zumW_Zx$iq@1&_h+H21z>3_diSJnn#t4r6b?Mlc)9BO;+}2cI409L*%Q!t50bnKV>s z0_(s_Mc)CM!Bu8aHNDRPdq7VV(tVktYX?;tqhx8J8-IUP^fOu0jO|% z9@c4PVc#w3L~T37lphB_SwcFqVc1@mu`l43kF`WC`vC?kb*@~x?gA%F_ll3eS0DGk zr|Y^&Zxotf(FgkZZrLXR{CN z|MIw-g)ZwY=5BYGG)z3?Nig0+<}3EN<}{wB*MEREQ|W$Z7{_>rOu5Nq9XkTPDY`cH zdhH(OKjFPyivF$N7AkC4yhN7~u2aA`s$z3n#B-Qvaz`rjp0kl|Vo9i@OP4Snmw|gh zzXFGq6-6Ol&JKJfjrx}@>zO=MImW|jw^R$o3poXr=+b@YJ0^eib$Npqh}Q--W rL?mwi)@Kc~hFQa`VgG|+e+3u-z*e?1C%I+n00000NkvXXu0mjfhKQQM delta 1102 zcmV-U1hM;^2ZsreNPh$=Nkl1Kq6vtmn5o(L2sPzLO6+xP4t!X3@5^Iav z>YF7Zg2whiEFbJkP=rdFioL{65c^Ue2t`q}LTg__Vqc#BN&l1F+{|01+Bfr5iv~`MOUBN+y+cwaY<58d&=x6dwGKdG2cpV3J zf$87?XlKhFQ!G)!8#Lf`cd!TS2LtG|nTb#tc;qOT<`wXgUc`jbLeg(GMUESXTA1us&!O-<*zn##wNF8Y9H0ZaF+R<_Sm~fi z$CfMNVOXq5Sc-V0g^Ocer4f~1Ue5AB$1o|XPch#`GepB8kI4s4W<`-n=cKh6??);9 z3CgJa)96%2xHx90qgp1(ahx23zwwlw9E)XJeQAXI-}+p~T*q9;T*v+g$NmT~0J9V0 UTP3R9UH||907*qoM6N<$f|(Q#`v3p{ diff --git a/astrid/res/drawable/list_settings.png b/astrid/res/drawable/list_settings.png index c9aef9b51aad426f558d056a1cede51c20646396..f80abd5e59bab09a9e79880889148c72f78e15cb 100644 GIT binary patch delta 977 zcmV;?11|iM2k8ePiBL{Q4GJ0x0000DNk~Le0000g0000g2nGNE0L8<}Tah6se~U>( zK~#9!?3r0;6Hyd~@1#j>tBFR`ND-BSD1r!5u?S*SqDTwA859M7q7ml4kr*_#@Mhrl!m!DdfUOGs~U%@408W zbF1mPt|mjXsY%ibLJLCkz1eg1f8xf*#!<(iP)Jo)R;rqsn*0*#_xnd34-5<_P1D8{ znzO0z?Cexdr}G~!mrIqDl;o$6wzs#N@1yr!5#TmFVgWcR?g?75k)CFPb6_X<4Mh1{AmO@^B4a#%1S|$`Kpof& zYB>|PQp|{{LcL(Scmt33fiRd3hH2fz6jy*ll6}Bbadj{Q8~`ssz{<+>9NeWfVmvp6 z!i#B15nje?BEFQCmiPSxf7ihmtEavj90QBMa*DFkg7?8o-cvzWSVe!;Ify&pX0}Rb zF#~0Uzx%*(@Q{{Ev=*Me*3T}szUq^OVJ z8>hb8Y@zbN9sIo&Tx2lKV|_oBrjpee-q*$B04+LX_SEZ4>cV42Z4s@y8yrrm?TWef z8W$^3y2vx|jx#i5e{~)$H3Uwe};$qpy7u_%#XI?ttBe-EpUqHjtt?J-oOCJsz- zZTgjqmbOg4ne!rtq1f`vHa((?UYnk zSF4VWj{kk$Bk`pSAYQkZvYFiW5(oy00000NkvXXu0mjfHt5lb delta 889 zcmV-<1BU$R2a*RNiBL{Q4GJ0x0000DNk~Le0000u0000u2nGNE0H}sL9+4p^e>6!% zK~#9!?3r7LO;H%f&tZ^TlQEKeL=0&j#w8&SIw4-%9_13lOz}1mx#Ue=co4=EDKZg7 z#2k^txSbSf(8wSLGm4bkWRCw=f3;h!v-dvNz0PiZ^{cbjUVEMM-{1Pa^{sWH$z(DT zW{X;ZR-hGV1zLetV37)p#bU1af8+7E=NLUAA-AHMqN+!&2d%&mSV_JzoMOAdMx|{p zI1&~Q_SUrZDYhwEMNf^;-23aZtpe-<<4qGd4V>UKJOqZZy%(4T=4+l=3@SlSUQYx^ z!6uG1Atvo%#_mO3+?qk?3n0)i4K z31>hW{ma3~e1uarF<8&%B_S+S%C&OFPg5FMc%afI+4lyMjKpWcf6p0AE(Pv!e7*+` zEBCj82jHv6IO4fl&6KTU5pKj3l^^m>v$s14%3Pis%@?Ci&nMuaNiirX{HE??12l5m zB;{E@&>xHf%fXoxyN+w%k4dH4BrrF{y(!>0=wN**FLg4@yHvJ_FQ(lD4_0u?G}fcv z5HOoXcBx0-sT^~Re+eF}%hmCM<`|?}O1Mn2XD&T>T2r;W0VjP_Ct@$yw^M1CP4sya zrs#DZTm0s=#MwHq4J>il48H=a!BY0EcAN}!@H{3_uqo<1=+#V_CjP(`-~emU|Jn5- zw?Au@XU=hx>|9H0DY}7sNn^5Tgg-X!QfvBYljD!(Y+|lZPqnBY>n_BXloUuzqb3fo z6yl40{{foGpN}S3#sYl@X237P{sC$Qh9w5AKr7G+v;wU_D=>uiPk;dchEU Date: Sun, 16 Dec 2012 13:36:39 -0800 Subject: [PATCH 056/136] some high-res" --- .../drawable-hdpi/ic_menu_list_copy_blue_alt.png | Bin 0 -> 545 bytes astrid/res/drawable-hdpi/icn_arrow_left_white.png | Bin 0 -> 254 bytes .../res/drawable-hdpi/icn_arrow_right_white.png | Bin 0 -> 258 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png create mode 100644 astrid/res/drawable-hdpi/icn_arrow_left_white.png create mode 100644 astrid/res/drawable-hdpi/icn_arrow_right_white.png diff --git a/astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png b/astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1f34bebf39eeac6b6faea9c9e557e9ef2a7568 GIT binary patch literal 545 zcmV++0^a?JP)hXS&|gex@KG=M|U3UVI$7QF6&T@&FNFu<#cHJi@( z4cvi7%^9mc>p+C}885=ht@S|CWpRh=O4$<_1)DCHYYA_G5sp@gTbiO(U>_t+ldB!H z7{;_sCxqc5aW%Dfdg*@y`4wRil(1!*)%olUtbsHKTnT2tY@XS^luP)7d+s2Jfh;%$ zdwGP*c1YN+Q}lr@K1=Cr6n>L-)H3mwDVp>mYcb0S$v{3aa(m1101 jocj?i7ULhcPXPu1gfO-$=H8)u00000NkvXXu0mjf_z&jU literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/icn_arrow_left_white.png b/astrid/res/drawable-hdpi/icn_arrow_left_white.png new file mode 100644 index 0000000000000000000000000000000000000000..8eeb9d22093e67a3646504e33857bc3e11e32c86 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz5!3HE(wfP(cQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiWYdfIEGZ*+H$Rzvq3?CEg+Z4J%h!)WU*Uei(5vE_sK(N z{_K7KfP+)+L~OaIlF*!u9M2?Jr+N#|d;cN)ozK%tmqg9x%>QmI@$^FEo4&Q;I*IMx zcbUzSbrU#m2d`n9w!yzN`+>kWcD`iGg1HBS0@_#cCL5k;`k6A{Y=gFQ7gMIRN3ye> z?TLbh9{m#yt!o%gOln$lQNncRwTXBBn=NNxX7HJB)G_Ppr@uhAGI+ZBxvX8U}fi7AzZCsS>Jik5h~IEGZ*Ix_7dZ-WAlOCzVmK|z^`y)vzWGL3>-E_NN7 zPN!Ygf%yJt4qp+BA;{V?Nw7(&)Kl?d|!$7wHqFHnkS0gVq^a(oI_kdY!AJYSGu6=IN85a(8y%pcD Date: Sun, 16 Dec 2012 13:39:44 -0800 Subject: [PATCH 057/136] bigger in the big size --- .../ic_menu_list_copy_blue_alt.png | Bin 545 -> 615 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png b/astrid/res/drawable-hdpi/ic_menu_list_copy_blue_alt.png index 2a1f34bebf39eeac6b6faea9c9e557e9ef2a7568..047fc80c1584d21e5c37b5e1f9bb00f620ecbef7 100644 GIT binary patch delta 589 zcmV-T0Rh%&A|sy1*8n`=L0QZmrLLTXjUDI ztRA&s$UfNPbg&Q9F^*W&tU&pX7sQ9z>ETuqSD-7T-W zOTyqQMRmCWQ?&mO$-9fHi`tMyP(#1N90EmY3aIj2E@)3O0%Ako3RY=2BeW^s1f?K{ z+D#iTsEVS;iSip)zy}5te{<1K{hZP9a+>=kARAn5VmL;?5|}ag?4sQYm<08iyvZ1G z@Lc1_ILHT~G|q*n-I(V5hFJ%tG#@ZKK(%Uui(T0o)!GBll;l6BpcCAIUaHyOlv*yp zF{guiG=OW3L${#OLZ1m(?H~YRBrXbiIK^=Y6a-0NkXxL<%TT`NBPc1)+fp0dulyF{ bM}PqUy-Cn-c+@6%00000NkvXXu0mjf8V?Z~ delta 518 zcmV+h0{Q*t1fc{WiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCpde*wcu zL_t(|+U%D*O9Md^g)@ooLQ&B)f>^7KC>9nX+L*#NK0rZ5?5z9)mg2J!tZfV^Vy{>P z5wWuJ4@6KgAPQnulkp6mg>}heb~d^eUijGT?(CeId+*HL2q|SK2n&Y-vcQBZG}<(P zL(mFx9{Lu%?tonr;TkZ&tBEz6f6n*~+<`{T8LK|)K!o=hFT%>L^+3{Pafj3;+H6=4ySuw|On`Roj= zfiwqP31+}-p4q;XOZbC(?jVSPEI0*wd4$V$NZ77Z^noruOX+MBeq$`yf7WuX*IZCp zE&f_oXC1$#AK@@(AzdAc0&QOziV%-T&&hSq%)JIzV99k7U4jJ=1>>L-)H3mwDVp>m zYcb0S$v{3aa(m-PrqgJZt4ZIKmZ2V
  • 60$0tb{!< z39|Cb);)gv4Po#XW|iA!T<0(-$LVBS0-XC1Ef(V+w@(2E0E95MD(2pydjJ3c07*qo IM6N<$g052Dr2qf` From be9e6015740af727113271d714c18c1f2b7af87b Mon Sep 17 00:00:00 2001 From: Jon Paris Date: Sun, 16 Dec 2012 13:45:12 -0800 Subject: [PATCH 058/136] left/right arrows --- .../res/drawable-hdpi/icn_arrow_left_white.png | Bin 254 -> 0 bytes .../res/drawable-hdpi/icn_arrow_right_white.png | Bin 258 -> 0 bytes astrid/res/drawable/icn_arrow_right_white.png | Bin 258 -> 323 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 astrid/res/drawable-hdpi/icn_arrow_left_white.png delete mode 100644 astrid/res/drawable-hdpi/icn_arrow_right_white.png diff --git a/astrid/res/drawable-hdpi/icn_arrow_left_white.png b/astrid/res/drawable-hdpi/icn_arrow_left_white.png deleted file mode 100644 index 8eeb9d22093e67a3646504e33857bc3e11e32c86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz5!3HE(wfP(cQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiWYdfIEGZ*+H$Rzvq3?CEg+Z4J%h!)WU*Uei(5vE_sK(N z{_K7KfP+)+L~OaIlF*!u9M2?Jr+N#|d;cN)ozK%tmqg9x%>QmI@$^FEo4&Q;I*IMx zcbUzSbrU#m2d`n9w!yzN`+>kWcD`iGg1HBS0@_#cCL5k;`k6A{Y=gFQ7gMIRN3ye> z?TLbh9{m#yt!o%gOln$lQNncRwTXBBn=NNxX7HJB)G_Ppr@uhAGI+ZBxvX8U}fi7AzZCsS>Jik5h~IEGZ*Ix_7dZ-WAlOCzVmK|z^`y)vzWGL3>-E_NN7 zPN!Ygf%yJt4qp+BA;{V?Nw7(&)Kl?d|!$7wHqFHnkS0gVq^a(oI_kdY!AJYSGu6=IN85a(8y%pcDc83Nq^-@L_t(|+QgO74Z<)C1%t%^9f1+T2uub{!YGW;j?fL-4T2+F z$)rhYJCU&TRORP#aq1RA2(D+q?Q6h1=&7${hXFH&Z;iAz8%Coy#?#u6{nsp%E4#SKf+qBWyRS&=XbznqVbhgp3wgu7|ZbJ%pu( z&9D@BZ-u3^oSRqmpARbYsxvFx@&j$X1DI@1ax=q3e@ps5y81e}ICgVrC93_2|ev~8e`4gK_>!vQ+J v-~$%E0^myuzD8SU(7=lA7r!D)x&#;ic#<-RV(i>A00000NkvXXu0mjfS$R?b From a3198b9084172f139db81bcbc95c4695ecdfc5a4 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 10:30:08 -0800 Subject: [PATCH 059/136] Rename 'Notes' to 'Description' and 'Importance' to 'Priority' --- astrid/res/values/strings-core.xml | 18 +++++++++--------- astrid/res/values/strings-defaults.xml | 4 ++-- astrid/res/values/strings-filters.xml | 4 ++-- astrid/res/values/strings-premium.xml | 2 +- astrid/res/values/strings-voice.xml | 2 +- astrid/res/values/strings-welcome.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 9e6733a67..2c3b07c4a 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -250,7 +250,7 @@ By due date - By importance + By priority By last modified @@ -319,7 +319,7 @@ Task Summary - Importance + Priority @@ -339,10 +339,10 @@ Loading... - Notes + Description - Enter task notes... + Enter task description... How long will it take? @@ -416,11 +416,11 @@ ----Details---- - Importance + Priority Lists - Notes + Description Files @@ -662,7 +662,7 @@ - Show notes in task + Show description in task Task edit screen @@ -671,9 +671,9 @@ Reset to defaults - Notes will be accessible from the task edit screen + Description will be accessible from the task edit screen - Notes will always be displayed + Description will always be displayed Compact task row diff --git a/astrid/res/values/strings-defaults.xml b/astrid/res/values/strings-defaults.xml index 69b250494..981809979 100644 --- a/astrid/res/values/strings-defaults.xml +++ b/astrid/res/values/strings-defaults.xml @@ -8,7 +8,7 @@ New task defaults - Importance, due date, add to calendar + Priority, due date, add to calendar Default deadline @@ -16,7 +16,7 @@ Currently: %s - Default importance + Default priority Currently: %s diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml index c849c4f4d..7e888e8b8 100644 --- a/astrid/res/values/strings-filters.xml +++ b/astrid/res/values/strings-filters.xml @@ -88,9 +88,9 @@ - Importance at least ? + Priority at least ? - Importance... + Priority... List: ? diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml index 391202780..f4b8b8a05 100644 --- a/astrid/res/values/strings-premium.xml +++ b/astrid/res/values/strings-premium.xml @@ -95,7 +95,7 @@ Attach files to to-dos \n(pdfs, doc, ppt…) Syncs files with astrid.com Add attachments via email - Save voice notes as audio files + Save voice recordings as audio files Preview upcoming features Support the Astrid Team! Premium will power up your productivity! diff --git a/astrid/res/values/strings-voice.xml b/astrid/res/values/strings-voice.xml index 3b8c9df8a..bb1204334 100644 --- a/astrid/res/values/strings-voice.xml +++ b/astrid/res/values/strings-voice.xml @@ -9,7 +9,7 @@ Speak to create a task Speak to set task title - Speak to set task notes + Speak to set task description Voice-input is not installed.\nDo you want to go to the market and install it? diff --git a/astrid/res/values/strings-welcome.xml b/astrid/res/values/strings-welcome.xml index c99adfdfb..4fe99620e 100644 --- a/astrid/res/values/strings-welcome.xml +++ b/astrid/res/values/strings-welcome.xml @@ -47,7 +47,7 @@ Never wonder who\'s\nbringing dessert! - Tap to add notes,\nset reminders,\nand much more! + Tap to add description,\nset reminders,\nand much more! Login Tap Astrid to return. From 1ad51e122bbc3fb54b1e255364c89e438fb8f917 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 10:44:06 -0800 Subject: [PATCH 060/136] Polish notes layout --- .../res/layout/control_set_notes_display.xml | 14 ++++---- .../astrid/ui/EditNotesControlSet.java | 33 +++---------------- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml index 0bd106ffa..4804c3dad 100644 --- a/astrid/res/layout/control_set_notes_display.xml +++ b/astrid/res/layout/control_set_notes_display.xml @@ -14,10 +14,10 @@ @@ -26,17 +26,17 @@ style="@style/TextAppearance.GEN_EditLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="15dip" + android:paddingTop="4dip" + android:paddingBottom="4dip" android:text="@string/TEA_note_label" /> - + android:gravity="left" /> 2) { - notesBody.setGravity(Gravity.TOP); - notesBody.setPadding( notesBody.getPaddingLeft(), (int) (metrics.density * 8), notesBody.getPaddingRight(), (int) (metrics.density * 8)); - notesPreview.setGravity(Gravity.LEFT); - } else { - notesBody.setGravity(Gravity.CENTER_VERTICAL); - notesBody.setPadding( notesBody.getPaddingLeft(), 0, notesBody.getPaddingRight(), 0); - notesPreview.setGravity(Gravity.RIGHT); - } - } - } From 325417da97edb4f755ef543ab4c5bb97c365274f Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 11:15:34 -0800 Subject: [PATCH 061/136] Remove task rabbit from the who picker --- .../com/todoroo/astrid/actfm/EditPeopleControlSet.java | 2 +- .../astrid/subtasks/AstridOrderedListFragmentHelper.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index eafe4c02a..9134860fd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -410,8 +410,8 @@ public class EditPeopleControlSet extends PopupControlSet { int taskRabbitIndex = addUnassigned ? 3 : 2; if (!addContactPicker) taskRabbitIndex--; - coreUsers.add(taskRabbitIndex, taskRabbitUser); if(l.didPostToTaskRabbit()){ + coreUsers.add(taskRabbitIndex, taskRabbitUser); assignedIndex = taskRabbitIndex; } } diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index c071c7193..8e864eab2 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -321,6 +321,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen updater.onCreateTask(list, getFilter(), task.getId()); fragment.reconstructCursor(); fragment.loadTaskListContent(true); + fragment.selectCustomId(task.getId()); } public void onDeleteTask(Task task) { From 1712b89e1c13969b3a9cad49edeb8377178c9523 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 11:26:10 -0800 Subject: [PATCH 062/136] New default task list text size for astrid lite, make quickadd box have the same text size as the list --- astrid/src/com/todoroo/astrid/ui/QuickAddBar.java | 3 +++ .../com/todoroo/astrid/utility/AstridLitePreferenceSpec.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java index 98f2fde6e..22471f06d 100644 --- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java @@ -146,6 +146,9 @@ public class QuickAddBar extends LinearLayout { } }); + int fontSize = Preferences.getIntegerFromString(R.string.p_fontSize, 18); + quickAddBox.setTextSize(Math.min(fontSize, 22)); + quickAddButton = ((ImageButton) findViewById( R.id.quickAddButton)); diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java index 3ddaeae4f..84c1fc1b5 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java @@ -78,7 +78,7 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE, ifUnset); setPreference(prefs, editor, r, R.string.p_default_reminders_mode_key, 16, ifUnset); setPreference(prefs, editor, r, R.string.p_rmd_default_random_hours, 0, ifUnset); - setPreference(prefs, editor, r, R.string.p_fontSize, 18, ifUnset); + setPreference(prefs, editor, r, R.string.p_fontSize, 22, ifUnset); setPreference(prefs, editor, r, R.string.p_showNotes, false, ifUnset); setPreference(prefs, editor, r, R.string.p_use_contact_picker, false, ifUnset); From 189c10aa31caef9867692c925f3366a37f7d59c1 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 11:38:55 -0800 Subject: [PATCH 063/136] Fixed bugs with showing/not showing comments in edit page, new images for baby blue theme --- .../res/drawable/custom_tab_indicator_alt.xml | 27 ++++++++++++++++++ .../custom_tab_indicator_selected_alt.9.png | Bin 0 -> 4048 bytes ...m_tab_indicator_selected_focused_alt.9.png | Bin 0 -> 4033 bytes .../custom_tab_indicator_unselected_alt.9.png | Bin 0 -> 4048 bytes ...tab_indicator_unselected_focused_alt.9.png | Bin 0 -> 4032 bytes astrid/res/values/styles.xml | 1 + .../astrid/activity/TaskEditFragment.java | 2 +- 7 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 astrid/res/drawable/custom_tab_indicator_alt.xml create mode 100644 astrid/res/drawable/custom_tab_indicator_selected_alt.9.png create mode 100644 astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png create mode 100644 astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png create mode 100644 astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png diff --git a/astrid/res/drawable/custom_tab_indicator_alt.xml b/astrid/res/drawable/custom_tab_indicator_alt.xml new file mode 100644 index 000000000..f8f0fa5f6 --- /dev/null +++ b/astrid/res/drawable/custom_tab_indicator_alt.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + diff --git a/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png b/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0a1dc8e8659c517034fed817c4e0a609f70e940b GIT binary patch literal 4048 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 CA=yg+ literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png b/astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..657df6674f88a08e91f290213e9bffd4d054b8e8 GIT binary patch literal 4033 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 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png b/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e98bd9329d3ff9e2d25dff15ef3e32c1dd44d51e GIT binary patch literal 4048 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 CG1sU7 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png b/astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png new file mode 100644 index 0000000000000000000000000000000000000000..bb2088c74b12e08d9a107b41a2175a609a107e5d GIT binary patch literal 4032 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 literal 0 HcmV?d00001 diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 23b3f825d..4adfd5870 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -144,6 +144,7 @@ @drawable/comment_blue_filled_alt @drawable/menu_button_blue_alt @drawable/lists_disclosure_blue_alt + @drawable/custom_tab_indicator_alt @color/blue_theme_color @drawable/home_button_blue_alt @drawable/header_blue_alt diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 2cee290cd..abdbaa3bf 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1208,7 +1208,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE, R.string.ENA_refresh_comments); item.setIcon(R.drawable.icn_menu_refresh_dark); - } else { + } else if (wouldShowComments && !showEditComments) { item = menu.add(Menu.NONE, MENU_SHOW_COMMENTS_ID, Menu.NONE, R.string.TEA_menu_comments); item.setIcon(commentIcon); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); From 14e48c4f806e91eda3a4646af55ba8084004fb94 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 11:50:30 -0800 Subject: [PATCH 064/136] Polish to the calendar view --- astrid/src/com/todoroo/astrid/ui/CalendarView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java index 1ab440bc8..a25d1e0d9 100644 --- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java +++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java @@ -369,9 +369,10 @@ public class CalendarView extends View { dayLeftArr[dayOfMonth-1] = dayLeft; dayTopArr[dayOfMonth-1] = dayTop; rectF.set(dayLeft, dayTop, dayLeft + boxWidth, dayTop + boxHeight); - canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, borderPaint); + if (j != 1) + canvas.drawLine(rectF.left, rectF.top, rectF.left, rectF.bottom, borderPaint); - rectF.set(dayLeft+1, dayTop+1, dayLeft + boxWidth - 1, dayTop + boxHeight - 1); + rectF.set(dayLeft+1, dayTop, dayLeft + boxWidth - 1, dayTop + boxHeight); canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint); textX = dayLeft + boxWidth - TEXT_PADDING * 3; From 668cecff38a176547f45d19d3868bb66604e315e Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 11:56:03 -0800 Subject: [PATCH 065/136] Better text color for comments button --- astrid/res/layout/header_nav_views.xml | 2 +- astrid/src/com/todoroo/astrid/activity/TaskListActivity.java | 3 +++ astrid/src/com/todoroo/astrid/service/ThemeService.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml index c66bd04a3..5df4c456d 100644 --- a/astrid/res/layout/header_nav_views.xml +++ b/astrid/res/layout/header_nav_views.xml @@ -70,7 +70,7 @@ android:layout_width="51dip" android:layout_height="fill_parent" android:background="?attr/asCommentButtonImg" - android:textColor="@android:color/white" + android:textColor="?attr/asTextColorInverse" android:paddingBottom="6dip"/> \ No newline at end of file diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 21abe7b4c..a41e4d59a 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -17,6 +17,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; +import android.graphics.Color; import android.os.Bundle; import android.support.v4.app.ActionBar; import android.support.v4.app.Fragment; @@ -190,6 +191,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu); personStatus = (TextView) actionBar.getCustomView().findViewById(R.id.person_image); commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments); + if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt) + commentsButton.setTextColor(Color.BLACK); initializeFragments(actionBar); createMainMenuPopover(); diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index cc8b66d52..ca9c8652d 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -48,7 +48,7 @@ public class ThemeService { activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER); } - private static int getTheme() { + public static int getTheme() { int style = getUnsimplifiedTheme(); boolean simple = Preferences.getBoolean(R.string.p_simple_input_boxes, false); if (simple) @@ -56,7 +56,7 @@ public class ThemeService { return style; } - private static int getUnsimplifiedTheme() { + public static int getUnsimplifiedTheme() { String preference = Preferences.getStringValue(R.string.p_theme); return getStyleForSetting(preference); } From 1157d19383df474d74efc5eb844e3b5c4f39253f Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 12:01:43 -0800 Subject: [PATCH 066/136] Fixed a bug in the preference screen --- astrid/src/com/todoroo/astrid/activity/EditPreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 5c16c9f03..a418b75c0 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -190,7 +190,7 @@ public class EditPreferences extends TodorooPreferenceActivity { }); PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE); - Preference beastMode = appearance.getPreference(1); + Preference beastMode = appearance.getPreference(3); beastMode.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference p) { From ae6b12010fcde935d99bdcf5847ff0637ec066c9 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 13:05:03 -0800 Subject: [PATCH 067/136] Fixed a bug with showing comments button in edit page --- .../astrid/activity/TaskEditFragment.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index abdbaa3bf..3a4746a6f 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -235,6 +235,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { private EditNoteActivity editNotes; private NestableViewPager mPager; private TabPageIndicator mIndicator; + private HashMap controlSetMap = new HashMap(); private final List controls = Collections.synchronizedList(new ArrayList()); @@ -472,7 +473,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { constructWhenDialog(whenDialogView); - HashMap controlSetMap = new HashMap(); + controlSetMap = new HashMap(); // populate control set EditTitleControlSet editTitle = new EditTitleControlSet(getActivity(), @@ -610,6 +611,20 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$ } + loadEditPageOrder(false); + + // Load task data in background + new TaskEditBackgroundLoader().start(); + } + + private void loadEditPageOrder(boolean removeViews) { + LinearLayout basicControls = (LinearLayout) getView().findViewById( + R.id.basic_controls); + if (removeViews) { + basicControls.removeAllViews(); + moreControls.removeAllViews(); + } + ArrayList controlOrder = BeastModePreferences.constructOrderedControlList(getActivity()); String[] itemOrder = controlOrder.toArray(new String[controlOrder.size()]); @@ -659,9 +674,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } getActivity().getIntent().removeExtra(TOKEN_OPEN_CONTROL); - - // Load task data in background - new TaskEditBackgroundLoader().start(); } private void removeTeaSeparator(View view) { @@ -760,6 +772,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { if (model != null && model.containsNonNullValue(Task.REMOTE_ID)) { remoteId = model.getValue(Task.REMOTE_ID); model.clearValue(Task.REMOTE_ID); // Having this can screw up autosync + } else { + remoteId = -1; } } @@ -1203,7 +1217,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save)); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && remoteId > 0 && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null; + boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null; if(wouldShowComments && showEditComments) { item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE, R.string.ENA_refresh_comments); From 62ac52e74016d5f010e2aa09ff12aaf5c882bac2 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 13:27:39 -0800 Subject: [PATCH 068/136] Added place in the preferences to set configuration defaults --- astrid/res/values/keys.xml | 6 ++++ astrid/res/values/strings-core.xml | 20 +++++++++--- astrid/res/xml/preferences.xml | 6 ++++ .../astrid/activity/EditPreferences.java | 32 +++++++++++++++++++ .../astrid/utility/AstridPreferenceSpec.java | 2 +- 5 files changed, 61 insertions(+), 5 deletions(-) diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 8dbe7f287..127638102 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -271,6 +271,12 @@ taskRowPrefs fullTaskTitle + + + p_configurations + p_config_default + p_config_lite + diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 2c3b07c4a..788b30e49 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -752,17 +752,29 @@ Get ideas to help you complete tasks - Calendar event time - End calendar events at due time - Start calendar events at due time + Calendar event time + End calendar events at due time + Start calendar events at due time Use phone layout Show featured lists + + Set configuration + Default + Astrid Lite - + + Set configuration? + + Reset preferences to the %s configuration? + + + default + + Swipe between lists diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml index 49aeb7996..686de6a15 100644 --- a/astrid/res/xml/preferences.xml +++ b/astrid/res/xml/preferences.xml @@ -180,6 +180,12 @@ + + + + + diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index a418b75c0..e9630092b 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -66,6 +66,9 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.sync.SyncProviderPreferences; import com.todoroo.astrid.ui.ContactListAdapter; import com.todoroo.astrid.ui.TaskListFragmentPager; +import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec; +import com.todoroo.astrid.utility.AstridLitePreferenceSpec; +import com.todoroo.astrid.utility.AstridPreferenceSpec; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.voice.VoiceInputAssistant; @@ -121,6 +124,29 @@ public class EditPreferences extends TodorooPreferenceActivity { } } + private class SetDefaultsClickListener implements OnPreferenceClickListener { + private final AstridPreferenceSpec spec; + private final int nameId; + public SetDefaultsClickListener(AstridPreferenceSpec spec, int nameId) { + this.spec = spec; + this.nameId = nameId; + } + + @Override + public boolean onPreferenceClick(Preference preference) { + DialogUtilities.okCancelDialog(EditPreferences.this, getString(R.string.EPr_config_dialog_title), + getString(R.string.EPr_config_dialog_text, getString(nameId)), new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + spec.resetDefaults(); + setResult(RESULT_CODE_PERFORMANCE_PREF_CHANGED); + finish(); + } + }, null); + return true; + } + } + @Override public int getPreferenceResource() { return R.xml.preferences; @@ -644,6 +670,12 @@ public class EditPreferences extends TodorooPreferenceActivity { findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); + findPreference(getString(R.string.p_config_default)).setOnPreferenceClickListener( + new SetDefaultsClickListener(new AstridDefaultPreferenceSpec(), R.string.EPr_config_dialog_default_id)); + + findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener( + new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite)); + int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_friends, R.string.p_show_featured_lists, R.string.p_show_menu_sync, R.string.p_show_menu_sort, R.string.p_show_menu_addons }; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java index 209241b76..253535fb0 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java @@ -14,7 +14,7 @@ public abstract class AstridPreferenceSpec { if (ifUnset) Preferences.setIfUnset(prefs, editor, r, key, value); else - Preferences.setInt(r.getString(key), value); + Preferences.setString(r.getString(key), Integer.toString(value)); } protected static void setPreference(SharedPreferences prefs, Editor editor, Resources r, int key, boolean value, boolean ifUnset) { From f594ed998113439049e800143a2801df0ba48df1 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 17 Dec 2012 14:24:51 -0800 Subject: [PATCH 069/136] New style ok button for edit dialogs --- .../astrid/actfm/EditPeopleControlSet.java | 23 +++++---- astrid/res/layout/control_dialog_ok.xml | 5 +- .../res/layout/control_set_collaborators.xml | 8 +-- astrid/res/layout/control_set_notes.xml | 4 +- astrid/res/layout/control_set_reminders.xml | 8 +-- astrid/res/layout/control_set_tags.xml | 7 +-- astrid/res/layout/date_time_picker.xml | 5 -- .../astrid/helper/TaskEditControlSet.java | 17 +++++++ .../todoroo/astrid/service/ThemeService.java | 6 +++ .../todoroo/astrid/ui/DeadlineControlSet.java | 15 +++++- .../astrid/ui/EditDialogOkBackground.java | 49 +++++++++++++++++++ 11 files changed, 116 insertions(+), 31 deletions(-) create mode 100644 astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 9134860fd..8a180f33b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -173,15 +173,6 @@ public class EditPeopleControlSet extends PopupControlSet { DisplayMetrics metrics = new DisplayMetrics(); activity.getWindowManager().getDefaultDisplay().getMetrics(metrics); sharedWithDialog.setContentView(v, new LayoutParams(metrics.widthPixels - (int)(30 * metrics.density), LayoutParams.WRAP_CONTENT)); - Button dismiss = (Button) v.findViewById(R.id.edit_dlg_ok); - if (dismiss != null) { - dismiss.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { - DialogUtilities.dismissDialog(EditPeopleControlSet.this.activity, sharedWithDialog); - } - }); - } sharedWithDialog.setOwnerActivity(this.activity); assignedCustom = (EditText) getView().findViewById(R.id.assigned_custom); @@ -199,6 +190,20 @@ public class EditPeopleControlSet extends PopupControlSet { setUpListeners(); } + @Override + protected void setupOkButton(View v) { + super.setupOkButton(getSharedWithView()); + Button dismiss = (Button) getSharedWithView().findViewById(R.id.edit_dlg_ok); + if (dismiss != null) { + dismiss.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + DialogUtilities.dismissDialog(EditPeopleControlSet.this.activity, sharedWithDialog); + } + }); + } + } + @Override public void readFromTask(Task sourceTask) { setTask(sourceTask); diff --git a/astrid/res/layout/control_dialog_ok.xml b/astrid/res/layout/control_dialog_ok.xml index 47c8da6e2..9ce0a0e44 100644 --- a/astrid/res/layout/control_dialog_ok.xml +++ b/astrid/res/layout/control_dialog_ok.xml @@ -6,13 +6,12 @@ -->