diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/com/todoroo/andlib/utility/DialogUtilities.java index aecdac250..d834cf6d6 100644 --- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DialogUtilities.java @@ -48,9 +48,10 @@ public class DialogUtilities { * @param html * @param title */ + @SuppressWarnings("nls") public static void htmlDialog(Context context, String html, int title) { WebView webView = new WebView(context); - webView.loadData(html, "text/html", "utf-8"); //$NON-NLS-1$ //$NON-NLS-2$ + webView.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null); webView.setBackgroundColor(0); new AlertDialog.Builder(context) diff --git a/astrid/assets/subtasks_horizontal.png b/astrid/assets/subtasks_horizontal.png deleted file mode 100644 index b33b1105e..000000000 Binary files a/astrid/assets/subtasks_horizontal.png and /dev/null differ diff --git a/astrid/assets/subtasks_vertical.png b/astrid/assets/subtasks_vertical.png deleted file mode 100644 index c9173f737..000000000 Binary files a/astrid/assets/subtasks_vertical.png and /dev/null differ diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java index e503bbdbe..45910e2dd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java @@ -96,21 +96,20 @@ public class OrderedListFragmentHelper { @SuppressWarnings("nls") private void showSubtasksHelp() { - String imageBase = "file:///android_asset/"; - String body = String.format("

%s



" + - "
%s


%s", + String body = String.format("

%s

" + + "
%s



%s", getActivity().getString(R.string.subtasks_help_1), - imageBase + "subtasks_vertical.png", + "subtasks_vertical.png", getActivity().getString(R.string.subtasks_help_2), - imageBase + "subtasks_horizontal.png", + "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); + Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1); } public void beforeSetUpTaskList(Filter filter) { diff --git a/astrid/res/drawable/subtasks_horizontal.png b/astrid/res/drawable/subtasks_horizontal.png new file mode 100644 index 000000000..cdb7666b5 Binary files /dev/null and b/astrid/res/drawable/subtasks_horizontal.png differ diff --git a/astrid/res/drawable/subtasks_vertical.png b/astrid/res/drawable/subtasks_vertical.png new file mode 100644 index 000000000..a2df9f709 Binary files /dev/null and b/astrid/res/drawable/subtasks_vertical.png differ diff --git a/astrid/res/values/strings-subtasks.xml b/astrid/res/values/strings-subtasks.xml index 899e7ee7c..0e8cb3779 100644 --- a/astrid/res/values/strings-subtasks.xml +++ b/astrid/res/values/strings-subtasks.xml @@ -4,8 +4,8 @@ Sort and Indent in Astrid - Tap and hold to move a task. - Drag vertically to rearrange. - Drag horizontally to indent. + Tap and hold to move a task + Drag vertically to rearrange + Drag horizontally to indent