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

Update remote list picker when batch moving

Browse Source 
* Hide batch move when sync not enabled
* Show selection if source tasks belong to the same list
* No selection if source tasks belong to disparate lists
pull/699/head
Alex Baker 8 years ago
parent c96e518885
commit 6c5319cf9b
12 changed files with 79 additions and 19 deletions
Show Stats Download Patch File Download Diff File

3
app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -525,9 +525,10 @@ public class TaskListFragment extends InjectingFragment
}
} else if (requestCode == REQUEST_MOVE_TASKS) {
if (resultCode == RESULT_OK) {
tracker.reportEvent(Tracking.Events.MULTISELECT_MOVE);
taskMover.move(
taskAdapter.getSelected(),
data.getParcelableExtra(RemoteListSupportPicker.EXTRA_SELECTED));
data.getParcelableExtra(RemoteListSupportPicker.EXTRA_SELECTED_FILTER));
recyclerAdapter.finishActionMode();
}
} else {

5
app/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
Unescape Escape View File

@ -183,8 +183,9 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
this.selected = selected;
}
public int indexOf(FilterListItem item) {
return items.indexOf(item);
public int indexOf(FilterListItem item, int defaultValue) {
int index = items.indexOf(item);
return index == -1 ? defaultValue : index;
}
@NonNull

25
app/src/main/java/com/todoroo/astrid/service/TaskMover.java
Unescape Escape View File

@ -15,6 +15,7 @@ import org.tasks.data.CaldavDao;
import org.tasks.data.CaldavTask;
import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskDao;
import org.tasks.data.GoogleTaskListDao;
import org.tasks.sync.SyncAdapters;
public class TaskMover {
@ -22,13 +23,20 @@ public class TaskMover {
private final CaldavDao caldavDao;
private final GoogleTaskDao googleTaskDao;
private final SyncAdapters syncAdapters;
private final GoogleTaskListDao googleTaskListDao;
@Inject
public TaskMover(TaskDao taskDao, CaldavDao caldavDao, GoogleTaskDao googleTaskDao, SyncAdapters syncAdapters) {
public TaskMover(
TaskDao taskDao,
CaldavDao caldavDao,
GoogleTaskDao googleTaskDao,
SyncAdapters syncAdapters,
GoogleTaskListDao googleTaskListDao) {
this.taskDao = taskDao;
this.caldavDao = caldavDao;
this.googleTaskDao = googleTaskDao;
this.syncAdapters = syncAdapters;
this.googleTaskListDao = googleTaskListDao;
}
public void move(List<Long> tasks, Filter selectedList) {
@ -46,6 +54,21 @@ public class TaskMover {
performMove(task, selectedList);
}
public Filter getSingleFilter(List<Long> tasks) {
List<String> caldavCalendars = caldavDao.getCalendars(tasks);
List<String> googleTaskLists = googleTaskDao.getLists(tasks);
if (caldavCalendars.isEmpty()) {
if (googleTaskLists.size() == 1) {
return new GtasksFilter(googleTaskListDao.getByRemoteId(googleTaskLists.get(0)));
}
} else if (googleTaskLists.isEmpty()) {
if (caldavCalendars.size() == 1) {
return new CaldavFilter(caldavDao.getCalendar(caldavCalendars.get(0)));
}
}
return null;
}
private void performMove(Task task, Filter selectedList) {
long id = task.getId();
GoogleTask googleTask = googleTaskDao.getByTaskId(id);

2
app/src/main/java/org/tasks/activities/FilterSelectionActivity.java
Unescape Escape View File

@ -35,7 +35,7 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity {
.newDialog()
.setSingleChoiceItems(
filterAdapter,
filterAdapter.indexOf(selected),
filterAdapter.indexOf(selected, -1),
(dialog, which) -> {
final Filter selectedFilter = (Filter) filterAdapter.getItem(which);
Intent data = new Intent();

4
app/src/main/java/org/tasks/activities/RemoteListNativePicker.java
Unescape Escape View File

@ -32,8 +32,8 @@ public class RemoteListNativePicker extends InjectingNativeDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Bundle arguments = getArguments();
Filter selected = arguments.getParcelable(EXTRA_SELECTED);
filterAdapter.populateRemoteListPicker();
int selected = filterAdapter.indexOf(getArguments().getParcelable(EXTRA_SELECTED), 0);
return createDialog(filterAdapter, dialogBuilder, selected, list -> handler.selectedList(list));
}

28
app/src/main/java/org/tasks/activities/RemoteListSupportPicker.java
Unescape Escape View File

@ -20,7 +20,8 @@ import org.tasks.injection.InjectingDialogFragment;
public class RemoteListSupportPicker extends InjectingDialogFragment {
public static final String EXTRA_SELECTED = "extra_selected";
public static final String EXTRA_SELECTED_FILTER = "extra_selected_filter";
private static final String EXTRA_NO_SELECTION = "extra_no_selection";
@Inject DialogBuilder dialogBuilder;
@Inject FilterAdapter filterAdapter;
@ -29,9 +30,17 @@ public class RemoteListSupportPicker extends InjectingDialogFragment {
Filter selected, Fragment targetFragment, int requestCode) {
RemoteListSupportPicker dialog = new RemoteListSupportPicker();
Bundle arguments = new Bundle();
if (selected != null) {
arguments.putParcelable(EXTRA_SELECTED, selected);
}
arguments.putParcelable(EXTRA_SELECTED_FILTER, selected);
dialog.setArguments(arguments);
dialog.setTargetFragment(targetFragment, requestCode);
return dialog;
}
public static RemoteListSupportPicker newRemoteListSupportPicker(
Fragment targetFragment, int requestCode) {
RemoteListSupportPicker dialog = new RemoteListSupportPicker();
Bundle arguments = new Bundle();
arguments.putBoolean(EXTRA_NO_SELECTION, true);
dialog.setArguments(arguments);
dialog.setTargetFragment(targetFragment, requestCode);
return dialog;
@ -40,10 +49,8 @@ public class RemoteListSupportPicker extends InjectingDialogFragment {
public static AlertDialog createDialog(
FilterAdapter filterAdapter,
DialogBuilder dialogBuilder,
Filter selected,
int selectedIndex,
RemoteListSelectionHandler handler) {
filterAdapter.populateRemoteListPicker();
int selectedIndex = selected == null ? 0 : filterAdapter.indexOf(selected);
return dialogBuilder
.newDialog()
.setSingleChoiceItems(
@ -66,8 +73,11 @@ public class RemoteListSupportPicker extends InjectingDialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
filterAdapter.populateRemoteListPicker();
Bundle arguments = getArguments();
Filter selected = arguments == null ? null : arguments.getParcelable(EXTRA_SELECTED);
int selected =
arguments.getBoolean(EXTRA_NO_SELECTION, false)
? -1 : filterAdapter.indexOf(arguments.getParcelable(EXTRA_SELECTED_FILTER), 0);
return createDialog(filterAdapter, dialogBuilder, selected, this::selected);
}
@ -76,7 +86,7 @@ public class RemoteListSupportPicker extends InjectingDialogFragment {
.onActivityResult(
getTargetRequestCode(),
Activity.RESULT_OK,
new Intent().putExtra(EXTRA_SELECTED, filter));
new Intent().putExtra(EXTRA_SELECTED_FILTER, filter));
}
@Override

1
app/src/main/java/org/tasks/analytics/Tracking.java
Unescape Escape View File

@ -28,6 +28,7 @@ public class Tracking {
MULTISELECT_DELETE(
R.string.tracking_category_event, R.string.tracking_event_multiselect_delete),
MULTISELECT_CLONE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone),
MULTISELECT_MOVE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone),
CLEAR_COMPLETED(R.string.tracking_category_event, R.string.tracking_action_clear_completed),
UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade),
DB_OPEN_FAILED(R.string.tracking_category_error, R.string.tracking_event_db_open),

3
app/src/main/java/org/tasks/data/CaldavDao.java
Unescape Escape View File

@ -100,4 +100,7 @@ public interface CaldavDao {
@Query("SELECT * FROM caldav_account WHERE name = :name COLLATE NOCASE LIMIT 1")
CaldavAccount getAccountByName(String name);
@Query("SELECT DISTINCT calendar FROM caldav_tasks WHERE deleted = 0 AND task IN (:tasks)")
List<String> getCalendars(List<Long> tasks);
}

3
app/src/main/java/org/tasks/data/GoogleTaskDao.java
Unescape Escape View File

@ -51,4 +51,7 @@ public interface GoogleTaskDao {
@Query("DELETE FROM google_tasks")
void deleteAll();
@Query("SELECT DISTINCT list_id FROM google_tasks WHERE deleted = 0 AND task IN (:tasks)")
List<String> getLists(List<Long> tasks);
}

21
app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.tasks.tasklist;
import static com.todoroo.astrid.activity.TaskListFragment.REQUEST_MOVE_TASKS;
import static org.tasks.activities.RemoteListSupportPicker.newRemoteListSupportPicker;
import android.content.Context;
@ -10,9 +11,11 @@ import android.view.MenuItem;
import com.todoroo.astrid.activity.TaskListActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.service.TaskDuplicator;
import com.todoroo.astrid.service.TaskMover;
import java.util.List;
import javax.inject.Inject;
import org.tasks.R;
@ -20,6 +23,7 @@ import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ForActivity;
import org.tasks.sync.SyncAdapters;
import org.tasks.ui.MenuColorizer;
public class ActionModeProvider {
@ -30,7 +34,9 @@ public class ActionModeProvider {
private final DialogBuilder dialogBuilder;
private final TaskDeleter taskDeleter;
private final TaskDuplicator taskDuplicator;
private final TaskMover taskMover;
private final Tracker tracker;
private final SyncAdapters syncAdapters;
@Inject
public ActionModeProvider(
@ -38,12 +44,17 @@ public class ActionModeProvider {
DialogBuilder dialogBuilder,
TaskDeleter taskDeleter,
TaskDuplicator taskDuplicator,
Tracker tracker) {
TaskMover taskMover,
Tracker tracker,
SyncAdapters syncAdapters
) {
this.context = context;
this.dialogBuilder = dialogBuilder;
this.taskDeleter = taskDeleter;
this.taskDuplicator = taskDuplicator;
this.taskMover = taskMover;
this.tracker = tracker;
this.syncAdapters = syncAdapters;
}
public ActionMode startActionMode(
@ -57,6 +68,9 @@ public class ActionModeProvider {
public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
MenuInflater inflater = actionMode.getMenuInflater();
inflater.inflate(R.menu.menu_multi_select, menu);
if (!syncAdapters.isSyncEnabled()) {
menu.findItem(R.id.move_tasks).setVisible(false);
}
MenuColorizer.colorMenu(context, menu);
return true;
}
@ -70,7 +84,10 @@ public class ActionModeProvider {
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
switch (item.getItemId()) {
case R.id.move_tasks:
newRemoteListSupportPicker(null, taskList, TaskListFragment.REQUEST_MOVE_TASKS)
Filter singleFilter = taskMover.getSingleFilter(adapter.getSelected());
(singleFilter == null
? newRemoteListSupportPicker(taskList, REQUEST_MOVE_TASKS)
: newRemoteListSupportPicker(singleFilter, taskList, REQUEST_MOVE_TASKS))
.show(taskList.getFragmentManager(), FRAG_TAG_REMOTE_LIST_PICKER);
return true;
case R.id.delete:

2
app/src/main/java/org/tasks/ui/RemoteListFragment.java
Unescape Escape View File

@ -141,7 +141,7 @@ public class RemoteListFragment extends TaskEditControlFragment {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_SELECT_LIST) {
if (resultCode == RESULT_OK) {
setList(data.getParcelableExtra(RemoteListSupportPicker.EXTRA_SELECTED));
setList(data.getParcelableExtra(RemoteListSupportPicker.EXTRA_SELECTED_FILTER));
}
} else {
super.onActivityResult(requestCode, resultCode, data);

1
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -256,6 +256,7 @@
<string name="tracking_event_task_creation">Task creation</string>
<string name="tracking_event_multiselect_delete">Multiselect delete</string>
<string name="tracking_event_multiselect_clone">Multiselect clone</string>
<string name="tracking_event_multiselect_move">Multiselect move</string>
<string name="p_badges_enabled">badges_enabled</string>
<string name="p_badge_list">badge_list</string>
<string name="tasker_locale">Tasker/Locale</string>

Write Preview
Loading…
Cancel
Save