archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Subtasks help page now looks cool and fits on one page

Browse Source
pull/14/head
Tim Su 14 years ago
parent e10e4c8a0d
commit ff01ab795f
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

3
api/src/com/todoroo/andlib/utility/DialogUtilities.java
Unescape Escape View File

@ -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)

BIN
astrid/assets/subtasks_horizontal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
astrid/assets/subtasks_vertical.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.8 KiB

11
astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelper.java
Unescape Escape View File

@ -96,21 +96,20 @@ public class OrderedListFragmentHelper<LIST> {
@SuppressWarnings("nls")
private void showSubtasksHelp() {
String imageBase = "file:///android_asset/";
String body = String.format("<h2>%s</h2><br><br><img src='%s'/>" +
"<br>%s<br><br><img src='%s'/><br>%s",
String body = String.format("<h3>%s</h3><img src='%s'>" +
"<br>%s<br><br><br><img src='%s'><br>%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("<html><body style='text-align:center;color:%s'>%s</body></html>",
color, body);
DialogUtilities.htmlDialog(getActivity(), html, R.string.subtasks_help_title);
Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
}
public void beforeSetUpTaskList(Filter filter) {

BIN
astrid/res/drawable/subtasks_horizontal.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
astrid/res/drawable/subtasks_vertical.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

6
astrid/res/values/strings-subtasks.xml
Unescape Escape View File

@ -4,8 +4,8 @@
<!-- Subtasks Help Introduction -->
<string name="subtasks_help_title">Sort and Indent in Astrid</string>
<string name="subtasks_help_1">Tap and hold to move a task.</string>
<string name="subtasks_help_2">Drag vertically to rearrange.</string>
<string name="subtasks_help_3">Drag horizontally to indent.</string>
<string name="subtasks_help_1">Tap and hold to move a task</string>
<string name="subtasks_help_2">Drag vertically to rearrange</string>
<string name="subtasks_help_3">Drag horizontally to indent</string>
</resources>

Write Preview
Loading…
Cancel
Save