From 6303dbc958cc12b3f44ce7a3883f740695e9c798 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 2 Jun 2020 12:01:15 -0500 Subject: [PATCH] Rename to ListSelectionHandler --- app/src/main/java/org/tasks/activities/ListPicker.kt | 10 +++++----- .../main/java/org/tasks/gtasks/ListSelectionHandler.kt | 9 +++++++++ .../org/tasks/gtasks/RemoteListSelectionHandler.java | 10 ---------- 3 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/org/tasks/gtasks/ListSelectionHandler.kt delete mode 100644 app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java diff --git a/app/src/main/java/org/tasks/activities/ListPicker.kt b/app/src/main/java/org/tasks/activities/ListPicker.kt index eb8513eac..f13175cc4 100644 --- a/app/src/main/java/org/tasks/activities/ListPicker.kt +++ b/app/src/main/java/org/tasks/activities/ListPicker.kt @@ -22,14 +22,14 @@ import org.tasks.LocalBroadcastManager import org.tasks.R import org.tasks.dialogs.DialogBuilder import org.tasks.filters.FilterProvider -import org.tasks.gtasks.RemoteListSelectionHandler +import org.tasks.gtasks.ListSelectionHandler import org.tasks.injection.DialogFragmentComponent import org.tasks.injection.InjectingDialogFragment import org.tasks.sync.AddAccountDialog import org.tasks.sync.SyncAdapters import javax.inject.Inject -class ListPicker : InjectingDialogFragment(), RemoteListSelectionHandler { +class ListPicker : InjectingDialogFragment(), ListSelectionHandler { @Inject lateinit var dialogBuilder: DialogBuilder @Inject lateinit var filterAdapter: FilterAdapter @Inject lateinit var filterProvider: FilterProvider @@ -72,11 +72,11 @@ class ListPicker : InjectingDialogFragment(), RemoteListSelectionHandler { override fun addAccount() = AddAccountDialog.showAddAccountDialog(activity, dialogBuilder) - override fun selectedList(filter: Filter) { + override fun selectedList(list: Filter?) { targetFragment!!.onActivityResult( targetRequestCode, Activity.RESULT_OK, - Intent().putExtra(EXTRA_SELECTED_FILTER, filter)) + Intent().putExtra(EXTRA_SELECTED_FILTER, list)) } private fun refresh() { @@ -114,7 +114,7 @@ class ListPicker : InjectingDialogFragment(), RemoteListSelectionHandler { filterAdapter: FilterAdapter, dialogBuilder: DialogBuilder, syncAdapters: SyncAdapters, - handler: RemoteListSelectionHandler): AlertDialog { + handler: ListSelectionHandler): AlertDialog { val builder = dialogBuilder .newDialog() .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/org/tasks/gtasks/ListSelectionHandler.kt b/app/src/main/java/org/tasks/gtasks/ListSelectionHandler.kt new file mode 100644 index 000000000..d601399ed --- /dev/null +++ b/app/src/main/java/org/tasks/gtasks/ListSelectionHandler.kt @@ -0,0 +1,9 @@ +package org.tasks.gtasks + +import com.todoroo.astrid.api.Filter + +interface ListSelectionHandler { + fun addAccount() + + fun selectedList(list: Filter?) +} \ No newline at end of file diff --git a/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java b/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java deleted file mode 100644 index 98c9f4db7..000000000 --- a/app/src/main/java/org/tasks/gtasks/RemoteListSelectionHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.tasks.gtasks; - -import com.todoroo.astrid.api.Filter; - -public interface RemoteListSelectionHandler { - - void addAccount(); - - void selectedList(Filter list); -}