diff --git a/app/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/amazon/java/org/tasks/ui/RemoteListFragment.java similarity index 78% rename from app/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/amazon/java/org/tasks/ui/RemoteListFragment.java index 3e523465a..5471aa92e 100644 --- a/app/src/amazon/java/org/tasks/ui/GoogleTaskListFragment.java +++ b/app/src/amazon/java/org/tasks/ui/RemoteListFragment.java @@ -1,12 +1,12 @@ package org.tasks.ui; +import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.data.Task; import org.tasks.R; -import org.tasks.data.GoogleTaskList; import org.tasks.injection.FragmentComponent; -public class GoogleTaskListFragment extends TaskEditControlFragment { +public class RemoteListFragment extends TaskEditControlFragment { public static final int TAG = R.string.TEA_ctrl_google_task_list; @Override @@ -34,7 +34,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { } - public void setList(GoogleTaskList list) { + public void setList(Filter filter) { } } diff --git a/app/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/generic/java/org/tasks/ui/RemoteListFragment.java similarity index 78% rename from app/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/generic/java/org/tasks/ui/RemoteListFragment.java index 3e523465a..5471aa92e 100644 --- a/app/src/generic/java/org/tasks/ui/GoogleTaskListFragment.java +++ b/app/src/generic/java/org/tasks/ui/RemoteListFragment.java @@ -1,12 +1,12 @@ package org.tasks.ui; +import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.data.Task; import org.tasks.R; -import org.tasks.data.GoogleTaskList; import org.tasks.injection.FragmentComponent; -public class GoogleTaskListFragment extends TaskEditControlFragment { +public class RemoteListFragment extends TaskEditControlFragment { public static final int TAG = R.string.TEA_ctrl_google_task_list; @Override @@ -34,7 +34,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { } - public void setList(GoogleTaskList list) { + public void setList(Filter filter) { } } diff --git a/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java index a7ccc7775..1ace86950 100644 --- a/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/app/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -12,6 +12,8 @@ import android.preference.Preference; import android.support.annotation.NonNull; import com.todoroo.andlib.utility.DateUtilities; +import com.todoroo.astrid.api.Filter; +import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity; import org.tasks.R; @@ -20,8 +22,8 @@ import org.tasks.analytics.Tracking; import org.tasks.data.GoogleTaskDao; import org.tasks.data.GoogleTaskList; import org.tasks.dialogs.DialogBuilder; -import org.tasks.gtasks.GoogleTaskListSelectionHandler; import org.tasks.gtasks.PlayServicesAvailability; +import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.injection.ActivityComponent; import org.tasks.injection.InjectingPreferenceActivity; @@ -31,9 +33,9 @@ import org.tasks.preferences.PermissionRequestor; import javax.inject.Inject; import static org.tasks.PermissionUtil.verifyPermissions; -import static org.tasks.activities.NativeGoogleTaskListPicker.newNativeGoogleTaskListPicker; +import static org.tasks.activities.RemoteListNativePicker.newRemoteListNativePicker; -public class GtasksPreferences extends InjectingPreferenceActivity implements GoogleTaskListSelectionHandler { +public class GtasksPreferences extends InjectingPreferenceActivity implements RemoteListSelectionHandler { private static final String FRAG_TAG_GOOGLE_TASK_LIST_SELECTION = "frag_tag_google_task_list_selection"; @@ -96,7 +98,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go }); Preference defaultListPreference = findPreference(R.string.p_gtasks_default_list); defaultListPreference.setOnPreferenceClickListener(preference -> { - newNativeGoogleTaskListPicker(getDefaultList()) + newRemoteListNativePicker(new GtasksFilter(getDefaultList())) .show(getFragmentManager(), FRAG_TAG_GOOGLE_TASK_LIST_SELECTION); return false; }); @@ -158,10 +160,14 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go } @Override - public void selectedList(GoogleTaskList list) { - tracker.reportEvent(Tracking.Events.GTASK_DEFAULT_LIST); - String listId = list.getRemoteId(); - gtasksPreferenceService.setDefaultList(listId); - findPreference(R.string.p_gtasks_default_list).setSummary(list.getTitle()); + public void selectedList(Filter list) { + if (list instanceof GtasksFilter) { + tracker.reportEvent(Tracking.Events.GTASK_DEFAULT_LIST); + String listId = ((GtasksFilter) list).getRemoteId(); + gtasksPreferenceService.setDefaultList(listId); + } else { + throw new RuntimeException("Unhandled filter type"); + } + findPreference(R.string.p_gtasks_default_list).setSummary(list.listingTitle); } } diff --git a/app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java b/app/src/googleplay/java/org/tasks/activities/RemoteListNativePicker.java similarity index 59% rename from app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java rename to app/src/googleplay/java/org/tasks/activities/RemoteListNativePicker.java index b5e276227..6500d7852 100644 --- a/app/src/googleplay/java/org/tasks/activities/NativeGoogleTaskListPicker.java +++ b/app/src/googleplay/java/org/tasks/activities/RemoteListNativePicker.java @@ -5,24 +5,24 @@ import android.app.Dialog; import android.os.Bundle; import com.todoroo.astrid.adapter.FilterAdapter; +import com.todoroo.astrid.api.Filter; -import org.tasks.data.GoogleTaskList; import org.tasks.dialogs.DialogBuilder; -import org.tasks.gtasks.GoogleTaskListSelectionHandler; +import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.injection.InjectingNativeDialogFragment; import org.tasks.injection.NativeDialogFragmentComponent; import javax.inject.Inject; -import static org.tasks.activities.SupportGoogleTaskListPicker.createDialog; +import static org.tasks.activities.RemoteListSupportPicker.createDialog; -public class NativeGoogleTaskListPicker extends InjectingNativeDialogFragment { +public class RemoteListNativePicker extends InjectingNativeDialogFragment { - public static NativeGoogleTaskListPicker newNativeGoogleTaskListPicker(GoogleTaskList defaultList) { - NativeGoogleTaskListPicker dialog = new NativeGoogleTaskListPicker(); + public static RemoteListNativePicker newRemoteListNativePicker(Filter selected) { + RemoteListNativePicker dialog = new RemoteListNativePicker(); Bundle arguments = new Bundle(); - if (defaultList != null) { - arguments.putParcelable(EXTRA_SELECTED, defaultList); + if (selected != null) { + arguments.putParcelable(EXTRA_SELECTED, selected); } dialog.setArguments(arguments); return dialog; @@ -33,12 +33,12 @@ public class NativeGoogleTaskListPicker extends InjectingNativeDialogFragment { @Inject DialogBuilder dialogBuilder; @Inject FilterAdapter filterAdapter; - private GoogleTaskListSelectionHandler handler; + private RemoteListSelectionHandler handler; @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Bundle arguments = getArguments(); - GoogleTaskList selected = arguments.getParcelable(EXTRA_SELECTED); + Filter selected = arguments.getParcelable(EXTRA_SELECTED); return createDialog(filterAdapter, dialogBuilder, selected, list -> handler.selectedList(list)); } @@ -46,7 +46,7 @@ public class NativeGoogleTaskListPicker extends InjectingNativeDialogFragment { public void onAttach(Activity activity) { super.onAttach(activity); - handler = (GoogleTaskListSelectionHandler) activity; + handler = (RemoteListSelectionHandler) activity; } @Override diff --git a/app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java b/app/src/googleplay/java/org/tasks/activities/RemoteListSupportPicker.java similarity index 69% rename from app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java rename to app/src/googleplay/java/org/tasks/activities/RemoteListSupportPicker.java index 8a4ff5e72..a23130f41 100644 --- a/app/src/googleplay/java/org/tasks/activities/SupportGoogleTaskListPicker.java +++ b/app/src/googleplay/java/org/tasks/activities/RemoteListSupportPicker.java @@ -7,21 +7,21 @@ import android.support.annotation.NonNull; import android.support.v7.app.AlertDialog; import com.todoroo.astrid.adapter.FilterAdapter; +import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.GtasksFilter; -import org.tasks.data.GoogleTaskList; import org.tasks.dialogs.DialogBuilder; -import org.tasks.gtasks.GoogleTaskListSelectionHandler; +import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.injection.DialogFragmentComponent; import org.tasks.injection.InjectingDialogFragment; import javax.inject.Inject; -public class SupportGoogleTaskListPicker extends InjectingDialogFragment { +public class RemoteListSupportPicker extends InjectingDialogFragment { - public static SupportGoogleTaskListPicker newSupportGoogleTaskListPicker(GoogleTaskList selected) { - SupportGoogleTaskListPicker dialog = new SupportGoogleTaskListPicker(); + public static RemoteListSupportPicker newRemoteListSupportPicker(Filter selected) { + RemoteListSupportPicker dialog = new RemoteListSupportPicker(); Bundle arguments = new Bundle(); if (selected != null) { arguments.putParcelable(EXTRA_SELECTED, selected); @@ -35,13 +35,13 @@ public class SupportGoogleTaskListPicker extends InjectingDialogFragment { @Inject DialogBuilder dialogBuilder; @Inject FilterAdapter filterAdapter; - private GoogleTaskListSelectionHandler handler; + private RemoteListSelectionHandler handler; @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { Bundle arguments = getArguments(); - GoogleTaskList selected = arguments == null ? null : arguments.getParcelable(EXTRA_SELECTED); + Filter selected = arguments == null ? null : arguments.getParcelable(EXTRA_SELECTED); return createDialog(filterAdapter, dialogBuilder, selected, list -> handler.selectedList(list)); } @@ -49,18 +49,18 @@ public class SupportGoogleTaskListPicker extends InjectingDialogFragment { public void onAttach(Activity activity) { super.onAttach(activity); - handler = (GoogleTaskListSelectionHandler) activity; + handler = (RemoteListSelectionHandler) activity; } public static AlertDialog createDialog(FilterAdapter filterAdapter, DialogBuilder dialogBuilder, - GoogleTaskList selected, GoogleTaskListSelectionHandler handler) { + Filter selected, RemoteListSelectionHandler handler) { filterAdapter.populateRemoteListPicker(); - int selectedIndex = filterAdapter.indexOf(new GtasksFilter(selected)); + int selectedIndex = filterAdapter.indexOf(selected); return dialogBuilder.newDialog() .setSingleChoiceItems(filterAdapter, selectedIndex, (dialog, which) -> { FilterListItem item = filterAdapter.getItem(which); if (item instanceof GtasksFilter) { - handler.selectedList(((GtasksFilter) item).getList()); + handler.selectedList((GtasksFilter) item); } dialog.dismiss(); }) diff --git a/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java b/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java index acfae77f2..a6b2da604 100644 --- a/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java +++ b/app/src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java @@ -1,7 +1,7 @@ package org.tasks.injection; import org.tasks.activities.CalendarSelectionDialog; -import org.tasks.activities.SupportGoogleTaskListPicker; +import org.tasks.activities.RemoteListSupportPicker; import org.tasks.dialogs.AddAttachmentDialog; import org.tasks.dialogs.ColorPickerDialog; import org.tasks.dialogs.RecordAudioDialog; @@ -19,7 +19,7 @@ import dagger.Subcomponent; @Subcomponent(modules = DialogFragmentModule.class) public interface DialogFragmentComponent { - void inject(SupportGoogleTaskListPicker supportGoogleTaskListPicker); + void inject(RemoteListSupportPicker remoteListSupportPicker); void inject(NotificationDialog notificationDialog); diff --git a/app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java b/app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java index 16d7d19bc..70ec052a0 100644 --- a/app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java +++ b/app/src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java @@ -1,6 +1,6 @@ package org.tasks.injection; -import org.tasks.activities.NativeGoogleTaskListPicker; +import org.tasks.activities.RemoteListNativePicker; import org.tasks.dialogs.DonationDialog; import org.tasks.dialogs.ExportTasksDialog; import org.tasks.dialogs.ImportTasksDialog; @@ -13,7 +13,7 @@ import dagger.Subcomponent; @Subcomponent(modules = NativeDialogFragmentModule.class) public interface NativeDialogFragmentComponent { - void inject(NativeGoogleTaskListPicker nativeGoogleTaskListPicker); + void inject(RemoteListNativePicker remoteListNativePicker); void inject(LocalePickerDialog localePickerDialog); diff --git a/app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java b/app/src/googleplay/java/org/tasks/ui/RemoteListFragment.java similarity index 74% rename from app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java rename to app/src/googleplay/java/org/tasks/ui/RemoteListFragment.java index 9072c7e23..5e480ed13 100644 --- a/app/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java +++ b/app/src/googleplay/java/org/tasks/ui/RemoteListFragment.java @@ -7,6 +7,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.todoroo.astrid.api.Filter; +import com.todoroo.astrid.api.GtasksFilter; import com.todoroo.astrid.data.SyncFlags; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gtasks.GtasksListService; @@ -17,7 +19,6 @@ import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracking; import org.tasks.data.GoogleTask; import org.tasks.data.GoogleTaskDao; -import org.tasks.data.GoogleTaskList; import org.tasks.injection.FragmentComponent; import javax.inject.Inject; @@ -26,9 +27,9 @@ import butterknife.BindView; import butterknife.OnClick; import static com.todoroo.andlib.utility.DateUtilities.now; -import static org.tasks.activities.SupportGoogleTaskListPicker.newSupportGoogleTaskListPicker; +import static org.tasks.activities.RemoteListSupportPicker.newRemoteListSupportPicker; -public class GoogleTaskListFragment extends TaskEditControlFragment { +public class RemoteListFragment extends TaskEditControlFragment { private static final String FRAG_TAG_GOOGLE_TASK_LIST_SELECTION = "frag_tag_google_task_list_selection"; private static final String EXTRA_ORIGINAL_LIST = "extra_original_list"; @@ -43,8 +44,8 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { @Inject GoogleTaskDao googleTaskDao; @Inject Tracker tracker; - @Nullable private GoogleTaskList originalList; - @Nullable private GoogleTaskList selectedList; + @Nullable private Filter originalList; + @Nullable private Filter selectedList; @Nullable @Override @@ -55,15 +56,15 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { selectedList = savedInstanceState.getParcelable(EXTRA_SELECTED_LIST); } else { if (task.isNew()) { - originalList = gtasksListService.getList(task.getTransitory(GoogleTask.KEY)); + originalList = new GtasksFilter(gtasksListService.getList(task.getTransitory(GoogleTask.KEY))); } else { GoogleTask googleTask = googleTaskDao.getByTaskId(task.getId()); if (googleTask != null) { - originalList = gtasksListService.getList(googleTask.getListId()); + originalList = new GtasksFilter(gtasksListService.getList(googleTask.getListId())); } } if (originalList == null) { - originalList = gtasksListService.getList(gtasksPreferenceService.getDefaultList()); + originalList = new GtasksFilter(gtasksListService.getList(gtasksPreferenceService.getDefaultList())); } selectedList = originalList; } @@ -101,7 +102,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { @OnClick(R.id.google_task_list) void clickGoogleTaskList(View view) { - newSupportGoogleTaskListPicker(selectedList) + newRemoteListSupportPicker(selectedList) .show(getChildFragmentManager(), FRAG_TAG_GOOGLE_TASK_LIST_SELECTION); } @@ -113,13 +114,13 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { GoogleTask googleTask = googleTaskDao.getByTaskId(task.getId()); if (googleTask == null) { - googleTaskDao.insert(new GoogleTask(task.getId(), selectedList.getRemoteId())); - } else if (!googleTask.getListId().equals(selectedList.getRemoteId())) { + googleTaskDao.insert(new GoogleTask(task.getId(), ((GtasksFilter) selectedList).getRemoteId())); + } else if (!googleTask.getListId().equals(((GtasksFilter) selectedList).getRemoteId())) { tracker.reportEvent(Tracking.Events.GTASK_MOVE); task.putTransitory(SyncFlags.FORCE_SYNC, true); googleTask.setDeleted(now()); googleTaskDao.update(googleTask); - googleTaskDao.insert(new GoogleTask(task.getId(), selectedList.getRemoteId())); + googleTaskDao.insert(new GoogleTask(task.getId(), ((GtasksFilter) selectedList).getRemoteId())); } } @@ -133,14 +134,18 @@ public class GoogleTaskListFragment extends TaskEditControlFragment { component.inject(this); } - public void setList(GoogleTaskList list) { - this.selectedList = list; + public void setList(Filter list) { + if (list instanceof GtasksFilter) { + this.selectedList = list; + } else { + throw new RuntimeException("Unhandled filter type"); + } refreshView(); } private void refreshView() { if (selectedList != null) { - textView.setText(selectedList.getTitle()); + textView.setText(selectedList.listingTitle); } } } diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 2c37c27aa..fbd69d9aa 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -21,6 +21,7 @@ import android.widget.LinearLayout; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; +import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.files.FilesControlSet; @@ -34,7 +35,6 @@ import com.todoroo.astrid.utility.Flags; import org.tasks.LocalBroadcastManager; import org.tasks.R; import org.tasks.analytics.Tracker; -import org.tasks.data.GoogleTaskList; import org.tasks.data.UserActivity; import org.tasks.data.UserActivityDao; import org.tasks.dialogs.DialogBuilder; @@ -44,7 +44,7 @@ import org.tasks.injection.FragmentComponent; import org.tasks.injection.InjectingFragment; import org.tasks.notifications.NotificationManager; import org.tasks.preferences.Preferences; -import org.tasks.ui.GoogleTaskListFragment; +import org.tasks.ui.RemoteListFragment; import org.tasks.ui.MenuColorizer; import org.tasks.ui.TaskEditControlFragment; @@ -227,8 +227,8 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar return getFragment(EditTitleControlSet.TAG); } - private GoogleTaskListFragment getGoogleTaskListFragment() { - return getFragment(GoogleTaskListFragment.TAG); + private RemoteListFragment getRemoteListFragment() { + return getFragment(RemoteListFragment.TAG); } private RepeatControlSet getRepeatControlSet() { @@ -307,8 +307,8 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar getEditTitleControlSet().repeatChanged(repeat); } - public void onGoogleTaskListChanged(GoogleTaskList list) { - getGoogleTaskListFragment().setList(list); + public void onRemoteListChanged(Filter list) { + getRemoteListFragment().setList(list); } public void onDueDateChanged(long dueDate) { diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index eef70473f..1b5e99a30 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -43,7 +43,7 @@ import org.tasks.data.TagData; import org.tasks.data.TagDataDao; import org.tasks.dialogs.SortDialog; import org.tasks.fragments.CommentBarFragment; -import org.tasks.gtasks.GoogleTaskListSelectionHandler; +import org.tasks.gtasks.RemoteListSelectionHandler; import org.tasks.gtasks.SyncAdapterHelper; import org.tasks.injection.ActivityComponent; import org.tasks.injection.InjectingAppCompatActivity; @@ -83,7 +83,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements TaskEditFragment.TaskEditFragmentCallbackHandler, CommentBarFragment.CommentBarFragmentCallback, SortDialog.SortDialogCallback, - GoogleTaskListSelectionHandler { + RemoteListSelectionHandler { @Inject Preferences preferences; @Inject SubtasksHelper subtasksHelper; @@ -480,8 +480,8 @@ public class TaskListActivity extends InjectingAppCompatActivity implements } @Override - public void selectedList(GoogleTaskList list) { - getTaskEditFragment().onGoogleTaskListChanged(list); + public void selectedList(Filter list) { + getTaskEditFragment().onRemoteListChanged(list); } @Override diff --git a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java index 9f9fde0ef..62d8aa1a7 100644 --- a/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java +++ b/app/src/main/java/com/todoroo/astrid/api/GtasksFilter.java @@ -107,4 +107,8 @@ public class GtasksFilter extends Filter { public GoogleTaskList getList() { return list; } + + public String getRemoteId() { + return list.getRemoteId(); + } } diff --git a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java index de28fac8a..3e0414339 100644 --- a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java +++ b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java @@ -21,7 +21,7 @@ import org.tasks.preferences.Preferences; import org.tasks.ui.CalendarControlSet; import org.tasks.ui.DeadlineControlSet; import org.tasks.ui.DescriptionControlSet; -import org.tasks.ui.GoogleTaskListFragment; +import org.tasks.ui.RemoteListFragment; import org.tasks.ui.PriorityControlSet; import org.tasks.ui.TaskEditControlFragment; @@ -61,7 +61,7 @@ public class TaskEditControlSetFragmentManager { TagsControlSet.TAG, RepeatControlSet.TAG, CommentBarFragment.TAG, - GoogleTaskListFragment.TAG + RemoteListFragment.TAG }; static { @@ -150,9 +150,9 @@ public class TaskEditControlSetFragmentManager { return new RepeatControlSet(); case CommentBarFragment.TAG: return new CommentBarFragment(); - case GoogleTaskListFragment.TAG: + case RemoteListFragment.TAG: return syncAdapterHelper.isEnabled() - ? new GoogleTaskListFragment() + ? new RemoteListFragment() : null; default: throw new RuntimeException("Unsupported fragment"); diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java deleted file mode 100644 index 0f45dc17b..000000000 --- a/app/src/main/java/org/tasks/gtasks/GoogleTaskListSelectionHandler.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.tasks.gtasks; - -import org.tasks.data.GoogleTaskList; - -public interface GoogleTaskListSelectionHandler { - void selectedList(GoogleTaskList list); -} diff --git a/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java b/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java new file mode 100644 index 000000000..838ae5bda --- /dev/null +++ b/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java @@ -0,0 +1,7 @@ +package org.tasks.gtasks; + +import com.todoroo.astrid.api.Filter; + +public interface RemoteListSelectionHandler { + void selectedList(Filter list); +} diff --git a/app/src/main/java/org/tasks/injection/FragmentComponent.java b/app/src/main/java/org/tasks/injection/FragmentComponent.java index 5e4f85639..f45243af4 100644 --- a/app/src/main/java/org/tasks/injection/FragmentComponent.java +++ b/app/src/main/java/org/tasks/injection/FragmentComponent.java @@ -19,7 +19,7 @@ import org.tasks.tasklist.TagListFragment; import org.tasks.ui.CalendarControlSet; import org.tasks.ui.DeadlineControlSet; import org.tasks.ui.DescriptionControlSet; -import org.tasks.ui.GoogleTaskListFragment; +import org.tasks.ui.RemoteListFragment; import org.tasks.ui.NavigationDrawerFragment; import org.tasks.ui.PriorityControlSet; @@ -66,7 +66,7 @@ public interface FragmentComponent { void inject(SubtasksTagListFragment subtasksTagListFragment); - void inject(GoogleTaskListFragment googleTaskListFragment); + void inject(RemoteListFragment remoteListFragment); void inject(GtasksListFragment gtasksListFragment); }