Fixed popover workflow stuff

pull/14/head
Sam Bosley 13 years ago
parent bb2f2c890c
commit b38496c837

@ -341,6 +341,8 @@ public final class TaskEditFragment extends Fragment implements
setUpUIComponents(); setUpUIComponents();
adjustInfoPopovers(); adjustInfoPopovers();
Preferences.setBoolean(R.string.p_showed_tap_task_help, true);
overrideFinishAnim = getActivity().getIntent().getBooleanExtra( overrideFinishAnim = getActivity().getIntent().getBooleanExtra(
OVERRIDE_FINISH_ANIM, true); OVERRIDE_FINISH_ANIM, true);

@ -56,7 +56,6 @@ import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ListView; import android.widget.ListView;
import android.widget.PopupWindow.OnDismissListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener; import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast; import android.widget.Toast;
@ -686,15 +685,10 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
HelpInfoPopover.showPopover(getActivity(), quickAddBox, HelpInfoPopover.showPopover(getActivity(), quickAddBox,
R.string.help_popover_add_task, null); R.string.help_popover_add_task, null);
Preferences.setBoolean(R.string.p_showed_add_task_help, true); Preferences.setBoolean(R.string.p_showed_add_task_help, true);
} else if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, } else if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
false)) {
showTaskEditHelpPopover(); showTaskEditHelpPopover();
} else if (Preferences.isSet(getString(R.string.p_showed_lists_help)) } else if (!Preferences.getBoolean(R.string.p_showed_lists_help, false)) {
&& !Preferences.getBoolean(R.string.p_showed_lists_help, false)) { showListsHelp();
// HelpInfoPopover.showPopover(getActivity(),
// getView().findViewById(R.id.back), R.string.help_popover_lists,
// null);
Preferences.setBoolean(R.string.p_showed_lists_help, true);
} }
initiateAutomaticSync(); initiateAutomaticSync();
@ -1003,7 +997,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
currentCursor.moveToPosition(i); currentCursor.moveToPosition(i);
if (currentCursor.get(Task.ID) == withCustomId) { if (currentCursor.get(Task.ID) == withCustomId) {
getListView().setSelection(i); getListView().setSelection(i);
showTaskEditHelpPopover();
return; return;
} }
} }
@ -1032,7 +1025,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
currentCursor.moveToPosition(i); currentCursor.moveToPosition(i);
if (currentCursor.get(Task.ID) == withCustomId) { if (currentCursor.get(Task.ID) == withCustomId) {
getListView().setSelection(i); getListView().setSelection(i);
showTaskEditHelpPopover();
break; break;
} }
} }
@ -1046,13 +1038,21 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
getListView().postDelayed(new Runnable() { getListView().postDelayed(new Runnable() {
public void run() { public void run() {
if (taskAdapter != null && taskAdapter.getCount() > 0) { if (taskAdapter != null && taskAdapter.getCount() > 0) {
Preferences.setBoolean(R.string.p_showed_tap_task_help, true);
final View view = getListView().getChildAt( final View view = getListView().getChildAt(
getListView().getChildCount() - 1); getListView().getChildCount() - 1);
if (view != null) { if (view != null) {
OnDismissListener onDismiss = new OnDismissListener() { HelpInfoPopover.showPopover(getActivity(), view,
@Override R.string.help_popover_tap_task, null);
public void onDismiss() { Preferences.setBoolean(R.string.p_showed_tap_task_help, true);
}
}
}
}, 1000L);
}
}
private void showListsHelp() {
if (!Preferences.getBoolean( if (!Preferences.getBoolean(
R.string.p_showed_lists_help, false)) { R.string.p_showed_lists_help, false)) {
if (AndroidUtilities.isTabletSized(getActivity())) { if (AndroidUtilities.isTabletSized(getActivity())) {
@ -1068,16 +1068,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
true); true);
} }
} }
};
HelpInfoPopover.showPopover(getActivity(), view,
R.string.help_popover_tap_task, onDismiss);
}
}
}
}, 1000L);
}
}
/* /*
* ====================================================================== * ======================================================================
@ -1122,6 +1112,9 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
taskService.save(task); taskService.save(task);
} }
if(title.length() > 0)
showTaskEditHelpPopover();
TextView quickAdd = (TextView) getView().findViewById( TextView quickAdd = (TextView) getView().findViewById(
R.id.quickAddText); R.id.quickAddText);
quickAdd.setText(""); //$NON-NLS-1$ quickAdd.setText(""); //$NON-NLS-1$

Loading…
Cancel
Save