diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 7277f193d..5d9f012d9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -62,7 +62,6 @@ import com.todoroo.astrid.tags.TagMemberMetadata;
import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.ResourceDrawableCache;
-import com.todoroo.astrid.welcome.HelpInfoPopover;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index 52d3980b9..2b98e1dc1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -80,7 +80,6 @@ import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.utility.ResourceDrawableCache;
-import com.todoroo.astrid.welcome.HelpInfoPopover;
import org.json.JSONArray;
import org.json.JSONException;
@@ -212,20 +211,6 @@ public class TagViewFragment extends TaskListFragment {
return R.layout.task_list_body_tag;
}
- private void showListSettingsPopover() {
- if (!AstridPreferences.canShowPopover()) {
- return;
- }
- if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) {
- Preferences.setBoolean(R.string.p_showed_list_settings_help, true);
- View tabView = getView().findViewById(R.id.members_edit);
- if (tabView != null) {
- HelpInfoPopover.showPopover(getActivity(), tabView,
- R.string.help_popover_list_settings, null);
- }
- }
- }
-
@Override
protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) {
if (actFmPreferenceService.isLoggedIn()) {
@@ -764,7 +749,6 @@ public class TagViewFragment extends TaskListFragment {
IntentFilter intentFilter = new IntentFilter(BROADCAST_TAG_ACTIVITY);
getActivity().registerReceiver(notifyReceiver, intentFilter);
- showListSettingsPopover();
updateCommentCount();
}
diff --git a/astrid/res/layout-xlarge/help_popover.xml b/astrid/res/layout-xlarge/help_popover.xml
deleted file mode 100644
index 2d28c31e5..000000000
--- a/astrid/res/layout-xlarge/help_popover.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/layout/help_popover.xml b/astrid/res/layout/help_popover.xml
deleted file mode 100644
index d12cc27d2..000000000
--- a/astrid/res/layout/help_popover.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
index 3781345d6..1d2864250 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@@ -55,7 +55,6 @@ import com.todoroo.astrid.api.FilterWithUpdate;
import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.tags.TagsPlugin;
import com.todoroo.astrid.utility.AstridPreferences;
-import com.todoroo.astrid.welcome.HelpInfoPopover;
/**
* Activity that displays a user's task lists and allows users
@@ -448,11 +447,6 @@ public class FilterListFragment extends SherlockListFragment {
adapter.getLists();
}
- public void showAddListPopover() {
- View anchor = getView().findViewById(R.id.new_list_button);
- HelpInfoPopover.showPopover(getActivity(), anchor, R.string.help_popover_add_lists, null);
- }
-
/**
* Receiver which receives refresh intents
*
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index 23f793367..e19df4b3b 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -102,7 +102,6 @@ import com.todoroo.astrid.ui.FeedbackPromptDialogs;
import com.todoroo.astrid.ui.QuickAddBar;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Flags;
-import com.todoroo.astrid.welcome.HelpInfoPopover;
import com.todoroo.astrid.widget.TasksWidget;
import java.util.List;
@@ -695,13 +694,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
setUpBackgroundJobs();
- if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
- showTaskCreateHelpPopover();
- } else if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
- showTaskEditHelpPopover();
- } else if (!Preferences.getBoolean(R.string.p_showed_lists_help, false)) {
- showListsHelp();
- }
refreshFilterCount();
initiateAutomaticSync();
@@ -906,11 +898,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
@Override
public void run() {
Activity activity = getActivity();
- if (activity != null) {
- HelpInfoPopover.showPopover(getActivity(), quickAddBar.getQuickAddBox(),
- R.string.help_popover_add_task, null);
- Preferences.setBoolean(R.string.p_showed_add_task_help, true);
- }
}
}, 1000);
}
@@ -1105,74 +1092,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
}
}
- private void showTaskCreateHelpPopover() {
- if (!AstridPreferences.canShowPopover()) {
- return;
- }
- if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
- Preferences.setBoolean(R.string.p_showed_add_task_help, true);
- HelpInfoPopover.showPopover(getActivity(), quickAddBar.getQuickAddBox(),
- R.string.help_popover_add_task, null);
- }
- }
-
- public void showTaskEditHelpPopover() {
- if (!AstridPreferences.canShowPopover()) {
- return;
- }
- if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
- quickAddBar.hideKeyboard();
- getListView().postDelayed(new Runnable() {
- @Override
- public void run() {
- try {
- if (taskAdapter != null && taskAdapter.getCount() > 0) {
- final View view = getListView().getChildAt(
- getListView().getChildCount() - 1);
- if (view != null) {
- Activity activity = getActivity();
- if (activity != null) {
- HelpInfoPopover.showPopover(getActivity(), view,
- R.string.help_popover_tap_task, null);
- Preferences.setBoolean(R.string.p_showed_tap_task_help, true);
- }
- }
- }
- } catch (IllegalStateException e) {
- // Whoops, view is gone. Try again later
- }
- }
- }, 1000L);
-
- }
- }
-
- private void showListsHelp() {
- if (!AstridPreferences.canShowPopover()) {
- return;
- }
- if (!Preferences.getBoolean(
- R.string.p_showed_lists_help, false)) {
- AstridActivity activity = (AstridActivity) getActivity();
- if (activity != null) {
- if (AstridPreferences.useTabletLayout(activity)) {
- FilterListFragment flf = activity.getFilterListFragment();
- if (flf != null) {
- flf.showAddListPopover();
- }
- } else {
- ActionBar ab = activity.getSupportActionBar();
- View anchor = ab.getCustomView().findViewById(R.id.lists_nav);
- HelpInfoPopover.showPopover(activity,
- anchor, R.string.help_popover_switch_lists, null);
- }
- Preferences.setBoolean(
- R.string.p_showed_lists_help,
- true);
- }
- }
- }
-
/*
* ======================================================================
* ============================================================== actions
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index bade786de..2a92b83f0 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -295,10 +295,6 @@ public class QuickAddBar extends LinearLayout {
addToCalendar(task, title);
- if (!TextUtils.isEmpty(title)) {
- fragment.showTaskEditHelpPopover();
- }
-
TextView quickAdd = (TextView) findViewById(R.id.quickAddText);
quickAdd.setText(""); //$NON-NLS-1$
diff --git a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java
deleted file mode 100644
index 522b17982..000000000
--- a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.welcome;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Rect;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.timsu.astrid.R;
-import com.todoroo.astrid.utility.AstridPreferences;
-
-import java.util.List;
-
-import greendroid.widget.QuickAction;
-import greendroid.widget.QuickActionWidget;
-
-/**
- * Displays a popover with some help text for first time users.
- *
- * @author Sam Bosley
- */
-public class HelpInfoPopover extends QuickActionWidget {
-
- public static HelpInfoPopover showPopover(final Activity activity, final View parent,
- final int textId, OnDismissListener dismissListener) {
- final HelpInfoPopover toShow = new HelpInfoPopover(activity, textId);
- if (dismissListener != null) {
- toShow.setOnDismissListener(dismissListener);
- }
- parent.postDelayed(new Runnable() {
- @Override
- public void run() {
- try {
- toShow.show(parent);
- } catch (Exception e) {
- //Activity wasn't running or something like that
- }
- }
- }, 250);
- return toShow;
- }
-
- private final boolean tablet;
- private int measuredWidth;
-
- private HelpInfoPopover(Context context, int textId) {
- super(context);
- setContentView(R.layout.help_popover);
- TextView message = (TextView) getContentView().findViewById(R.id.gdi_message);
- message.setText(textId);
- setFocusable(false);
- setTouchable(true);
- measuredWidth = -1; // uninitialized
- tablet = AstridPreferences.useTabletLayout(context);
- }
-
- @Override
- protected void populateQuickActions(List quickActions) {
- // Do nothing
- }
-
- @Override
- protected int getArrowLeftMargin(View arrow) {
- if (measuredWidth > 0) {
- return (measuredWidth - arrow.getMeasuredWidth()) / 2;
- }
-
- if (tablet) {
- return mRect.width() / 4;
- }
- return mRect.width() / 2;
- }
-
- @Override
- protected int getShowAtX() {
- if (measuredWidth > 0) {
- return mRect.left + (mRect.width() - measuredWidth) / 2;
- }
- return mRect.left;
- }
-
- @Override
- protected void onMeasureAndLayout(Rect anchorRect, View contentView) {
- contentView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
- contentView.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-
- int rootHeight = contentView.getMeasuredHeight();
- measuredWidth = contentView.getMeasuredWidth();
-
- int offsetY = getArrowOffsetY();
- int dyTop = anchorRect.top;
- int dyBottom = getScreenHeight() - anchorRect.bottom;
-
- boolean onTop = dyTop > dyBottom;
- int popupY = onTop ? anchorRect.top - rootHeight + offsetY : anchorRect.bottom - offsetY;
-
- setWidgetSpecs(popupY, onTop);
- }
-
-}