From e10e4c8a0d0f0257763397c06d42ba71fd389c6d Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 23 Feb 2012 01:17:55 -0800 Subject: [PATCH] First pass at making a help file for subtasks --- astrid/assets/subtasks_horizontal.png | Bin 0 -> 6414 bytes astrid/assets/subtasks_vertical.png | Bin 0 -> 7952 bytes .../subtasks/OrderedListFragmentHelper.java | 26 ++++++++++++++++++ astrid/res/values/strings-subtasks.xml | 11 ++++++++ .../todoroo/astrid/service/ThemeService.java | 1 + .../astrid/service/UpgradeService.java | 2 +- .../astrid/utility/AstridPreferences.java | 2 ++ 7 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 astrid/assets/subtasks_horizontal.png create mode 100644 astrid/assets/subtasks_vertical.png create mode 100644 astrid/res/values/strings-subtasks.xml diff --git a/astrid/assets/subtasks_horizontal.png b/astrid/assets/subtasks_horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..b33b1105e87d448794d9464e6caebfe96e218b0a GIT binary patch literal 6414 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

_0QI5g5g0CIo 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 { @@ -85,6 +89,28 @@ public class OrderedListFragmentHelper { getTouchListView().setClickListener(rowClickListener); getTouchListView().setSwipeListener(swipeListener); getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics); + + if(Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0) + showSubtasksHelp(); + } + + @SuppressWarnings("nls") + private void showSubtasksHelp() { + String imageBase = "file:///android_asset/"; + String body = String.format("

%s



" + + "
%s


%s", + getActivity().getString(R.string.subtasks_help_1), + imageBase + "subtasks_vertical.png", + getActivity().getString(R.string.subtasks_help_2), + imageBase + "subtasks_horizontal.png", + getActivity().getString(R.string.subtasks_help_3)); + System.err.println(body);; + + String color = (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); + String html = String.format("%s", + color, body); + + DialogUtilities.htmlDialog(getActivity(), html, R.string.subtasks_help_title); } public void beforeSetUpTaskList(Filter filter) { diff --git a/astrid/res/values/strings-subtasks.xml b/astrid/res/values/strings-subtasks.xml new file mode 100644 index 000000000..899e7ee7c --- /dev/null +++ b/astrid/res/values/strings-subtasks.xml @@ -0,0 +1,11 @@ + + + + + + Sort and Indent in Astrid + Tap and hold to move a task. + Drag vertically to rearrange. + Drag horizontally to indent. + + diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 5d4f30507..747520819 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -58,4 +58,5 @@ public class ThemeService { } return theme; } + } diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index bbf7cff83..d1fab5551 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -433,7 +433,7 @@ public final class UpgradeService { return; changeLog.append("Have a spectacular day!"); - String color = (AndroidUtilities.getSdkVersion() >= 14 ? "black" : "white"); + String color = (AndroidUtilities.getSdkVersion() >= 11 ? "black" : "white"); String changeLogHtml = "" + changeLog; DialogUtilities.htmlDialog(context, changeLogHtml, diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index a8b42650e..bfa7d4ed7 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -27,6 +27,8 @@ public class AstridPreferences { private static final long MIN_POPOVER_TIME = 3 * 1000L; + public static final String P_SUBTASKS_HELP = "sthelp"; //$NON-NLS-1$ + /** Set preference defaults, if unset. called at startup */ public static void setPreferenceDefaults() { Context context = ContextManager.getContext();