From 6124039d9dc998a2e2da59ae0bfbaf2db2a694ae Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 3 Jun 2014 12:21:17 -0500 Subject: [PATCH] Remove subtasks help, change log --- .../andlib/utility/DialogUtilities.java | 18 ------- .../astrid/activity/TaskListFragment.java | 5 -- .../todoroo/astrid/service/ThemeService.java | 21 -------- .../astrid/service/UpgradeService.java | 51 +------------------ .../AstridOrderedListFragmentHelper.java | 24 --------- .../OrderedMetadataListFragmentHelper.java | 24 --------- .../utility/AstridDefaultPreferenceSpec.java | 1 - .../astrid/utility/AstridPreferences.java | 4 -- 8 files changed, 1 insertion(+), 147 deletions(-) diff --git a/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java index d807a8c4a..5f432b76f 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java @@ -10,10 +10,8 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; -import android.content.Context; import android.content.DialogInterface; import android.view.View; -import android.webkit.WebView; import org.tasks.api.R; @@ -44,22 +42,6 @@ public class DialogUtilities { }); } - /** - * Display an OK dialog with HTML content - */ - public static void htmlDialog(Context context, String html, int title) { - WebView webView = new WebView(context); - webView.loadDataWithBaseURL("file:///android_asset/", html, "text/html", "utf-8", null); - webView.setBackgroundColor(0); - - new AlertDialog.Builder(context) - .setTitle(title) - .setView(webView) - .setIcon(android.R.drawable.ic_dialog_info) - .setPositiveButton(android.R.string.ok, null) - .show(); - } - /** * Displays a dialog box with an OK button */ diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 9a1a8e241..60dfb8995 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -299,11 +299,6 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel getListView().setItemsCanFocus(false); } - if (preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1) > -1) { - upgradeService.showChangeLog(getActivity(), - preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1)); - } - getListView().setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java index fc05b7f04..f4ff57a62 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java @@ -96,27 +96,6 @@ public class ThemeService { return theme; } - public static int getDialogTextColor() { - if (AndroidUtilities.getSdkVersion() >= 11) { - int theme = getTheme(); - if (theme == R.style.Tasks) { - return android.R.color.white; - } else { - return android.R.color.black; - } - } else { - return android.R.color.white; - } - } - - public static String getDialogTextColorString() { - int color = getDialogTextColor(); - if (color == android.R.color.white) { - return "white"; - } - return "black"; - } - public static int getDrawable(int lightDrawable) { return getDrawable(lightDrawable, 0); } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java index 2a324e1d5..286035198 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java @@ -7,17 +7,14 @@ package com.todoroo.astrid.service; import android.app.Activity; import android.app.ProgressDialog; -import android.content.Context; import android.content.Intent; import android.os.Bundle; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.utility.AstridPreferences; import org.tasks.R; -import org.tasks.preferences.Preferences; import javax.inject.Inject; import javax.inject.Singleton; @@ -27,11 +24,9 @@ public final class UpgradeService { public static final int V4_6_5 = 306; public static final int V3_0_0 = 136; - private final Preferences preferences; @Inject - public UpgradeService(Preferences preferences) { - this.preferences = preferences; + public UpgradeService() { } /** @@ -40,8 +35,6 @@ public final class UpgradeService { * show users a change log. */ public void performUpgrade(final Activity context, final int from) { - preferences.setInt(AstridPreferences.P_UPGRADE_FROM, from); - int maxWithUpgrade = V4_6_5; if(from < maxWithUpgrade) { @@ -94,46 +87,4 @@ public final class UpgradeService { } } } - - /** - * Return a change log string. Releases occur often enough that we don't - * expect change sets to be localized. - */ - public void showChangeLog(Context context, int from) { - if(!(context instanceof Activity) || from == 0) { - return; - } - - preferences.clear(AstridPreferences.P_UPGRADE_FROM); - StringBuilder changeLog = new StringBuilder(); - - if (from >= 0 && from < V4_6_5) { - newVersionString(changeLog, "4.6.5 (4/23/13)", new String[] { - "Improvements to monthly repeating tasks scheduled for the end of the month", - "Minor bugfixes" - }); - } - - if(changeLog.length() == 0) { - return; - } - - changeLog.append("Enjoy!"); - String color = ThemeService.getDialogTextColorString(); - String changeLogHtml = "" + changeLog; - - DialogUtilities.htmlDialog(context, changeLogHtml, - R.string.UpS_changelog_title); - } - - /** - * Helper for adding a single version to the changelog - */ - private void newVersionString(StringBuilder changeLog, String version, String[] changes) { - changeLog.append("Version ").append(version).append(":
"); - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 1e28ade5b..461890f43 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -18,7 +18,6 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Functions; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; @@ -28,9 +27,7 @@ import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.DraggableListView; -import com.todoroo.astrid.utility.AstridPreferences; import org.tasks.R; @@ -87,27 +84,6 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen getTouchListView().setClickListener(rowClickListener); getTouchListView().setSwipeListener(swipeListener); getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics); - - if(Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0) { - showSubtasksHelp(); - } - } - - private void showSubtasksHelp() { - String body = String.format("

%s

" + - "
%s



%s", - getActivity().getString(R.string.subtasks_help_1), - "subtasks_vertical.png", - getActivity().getString(R.string.subtasks_help_2), - "subtasks_horizontal.png", - getActivity().getString(R.string.subtasks_help_3)); - - String color = ThemeService.getDialogTextColorString(); - String html = String.format("%s", - color, body); - - DialogUtilities.htmlDialog(getActivity(), html, R.string.subtasks_help_title); - Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index d720a4df3..d72d5d2f0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -20,7 +20,6 @@ import com.commonsware.cwac.tlv.TouchListView.SwipeListener; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; @@ -31,11 +30,9 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.Node; import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVisitor; import com.todoroo.astrid.ui.DraggableListView; -import com.todoroo.astrid.utility.AstridPreferences; import org.tasks.R; @@ -91,27 +88,6 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm getTouchListView().setClickListener(rowClickListener); getTouchListView().setSwipeListener(swipeListener); getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics); - - if(Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0) { - showSubtasksHelp(); - } - } - - private void showSubtasksHelp() { - String body = String.format("

%s

" + - "
%s



%s", - getActivity().getString(R.string.subtasks_help_1), - "subtasks_vertical.png", - getActivity().getString(R.string.subtasks_help_2), - "subtasks_horizontal.png", - getActivity().getString(R.string.subtasks_help_3)); - - String color = ThemeService.getDialogTextColorString(); - String html = String.format("%s", - color, body); - - DialogUtilities.htmlDialog(getActivity(), html, R.string.subtasks_help_title); - Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 4244edeba..97fddd945 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -78,7 +78,6 @@ public class AstridDefaultPreferenceSpec { if (edit != null) { edit.putInt(SortHelper.PREF_SORT_SORT, SortHelper.SORT_AUTO); edit.commit(); - Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1); } } setBoolean(dragDropTestInitialized, true); diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java index 3a7748610..d50729a25 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridPreferences.java @@ -23,10 +23,6 @@ public class AstridPreferences { public static final String P_FIRST_LIST = "fl"; //$NON-NLS-1$ - public static final String P_UPGRADE_FROM = "uf"; //$NON-NLS-1$ - - public static final String P_SUBTASKS_HELP = "sthelp"; //$NON-NLS-1$ - /* ====================================================================== * ========================================================= public prefs * ====================================================================== */