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

Rename RemoteListPicker to ListPicker

Browse Source
pull/1001/head
Alex Baker 4 years ago
parent d57d8cb5d4
commit 0eeb393154
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -525,7 +525,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
REQUEST_MOVE_TASKS -> if (resultCode == Activity.RESULT_OK) { REQUEST_MOVE_TASKS -> if (resultCode == Activity.RESULT_OK) {
taskMover.move( taskMover.move(
taskAdapter.getSelected(), taskAdapter.getSelected(),
data!!.getParcelableExtra(RemoteListPicker.EXTRA_SELECTED_FILTER)) data!!.getParcelableExtra(ListPicker.EXTRA_SELECTED_FILTER))
finishActionMode() finishActionMode()
} }
REQUEST_LIST_SETTINGS -> if (resultCode == Activity.RESULT_OK) { REQUEST_LIST_SETTINGS -> if (resultCode == Activity.RESULT_OK) {
@ -623,7 +623,7 @@ class TaskListFragment : InjectingFragment(), OnRefreshListener, Toolbar.OnMenuI
} }
R.id.move_tasks -> { R.id.move_tasks -> {
val singleFilter = taskMover.getSingleFilter(selected) val singleFilter = taskMover.getSingleFilter(selected)
(if (singleFilter == null) RemoteListPicker.newRemoteListSupportPicker(this, REQUEST_MOVE_TASKS) else RemoteListPicker.newRemoteListSupportPicker(singleFilter, this, REQUEST_MOVE_TASKS)) (if (singleFilter == null) ListPicker.newListPicker(this, REQUEST_MOVE_TASKS) else ListPicker.newListPicker(singleFilter, this, REQUEST_MOVE_TASKS))
.show(parentFragmentManager, FRAG_TAG_REMOTE_LIST_PICKER) .show(parentFragmentManager, FRAG_TAG_REMOTE_LIST_PICKER)
true true
} }

11
app/src/main/java/org/tasks/activities/RemoteListPicker.java → app/src/main/java/org/tasks/activities/ListPicker.java
Unescape Escape View File

@ -30,7 +30,7 @@ import org.tasks.injection.InjectingDialogFragment;
import org.tasks.sync.AddAccountDialog; import org.tasks.sync.AddAccountDialog;
import org.tasks.sync.SyncAdapters; import org.tasks.sync.SyncAdapters;
public class RemoteListPicker extends InjectingDialogFragment public class ListPicker extends InjectingDialogFragment
implements RemoteListSelectionHandler { implements RemoteListSelectionHandler {
public static final String EXTRA_SELECTED_FILTER = "extra_selected_filter"; public static final String EXTRA_SELECTED_FILTER = "extra_selected_filter";
@ -50,9 +50,9 @@ public class RemoteListPicker extends InjectingDialogFragment
} }
}; };
public static RemoteListPicker newRemoteListSupportPicker( public static ListPicker newListPicker(
Filter selected, Fragment targetFragment, int requestCode) { Filter selected, Fragment targetFragment, int requestCode) {
RemoteListPicker dialog = new RemoteListPicker(); ListPicker dialog = new ListPicker();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
arguments.putParcelable(EXTRA_SELECTED_FILTER, selected); arguments.putParcelable(EXTRA_SELECTED_FILTER, selected);
dialog.setArguments(arguments); dialog.setArguments(arguments);
@ -60,9 +60,8 @@ public class RemoteListPicker extends InjectingDialogFragment
return dialog; return dialog;
} }
public static RemoteListPicker newRemoteListSupportPicker( public static ListPicker newListPicker(Fragment targetFragment, int requestCode) {
Fragment targetFragment, int requestCode) { ListPicker dialog = new ListPicker();
RemoteListPicker dialog = new RemoteListPicker();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
arguments.putBoolean(EXTRA_NO_SELECTION, true); arguments.putBoolean(EXTRA_NO_SELECTION, true);
dialog.setArguments(arguments); dialog.setArguments(arguments);

4
app/src/main/java/org/tasks/injection/DialogFragmentComponent.kt
Unescape Escape View File

@ -1,7 +1,7 @@
package org.tasks.injection package org.tasks.injection
import dagger.Subcomponent import dagger.Subcomponent
import org.tasks.activities.RemoteListPicker import org.tasks.activities.ListPicker
import org.tasks.calendars.CalendarPicker import org.tasks.calendars.CalendarPicker
import org.tasks.dialogs.* import org.tasks.dialogs.*
import org.tasks.locale.LocalePickerDialog import org.tasks.locale.LocalePickerDialog
@ -12,7 +12,7 @@ import org.tasks.repeats.CustomRecurrenceDialog
@Subcomponent(modules = [DialogFragmentModule::class]) @Subcomponent(modules = [DialogFragmentModule::class])
interface DialogFragmentComponent { interface DialogFragmentComponent {
fun inject(dialogFragment: RemoteListPicker) fun inject(dialogFragment: ListPicker)
fun inject(dialogFragment: NotificationDialog) fun inject(dialogFragment: NotificationDialog)
fun inject(dialogFragment: CalendarPicker) fun inject(dialogFragment: CalendarPicker)
fun inject(dialogFragment: AddAttachmentDialog) fun inject(dialogFragment: AddAttachmentDialog)

6
app/src/main/java/org/tasks/preferences/fragments/TaskDefaults.kt
Unescape Escape View File

@ -8,7 +8,7 @@ import com.todoroo.astrid.api.CaldavFilter
import com.todoroo.astrid.api.Filter import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.api.GtasksFilter import com.todoroo.astrid.api.GtasksFilter
import org.tasks.R import org.tasks.R
import org.tasks.activities.RemoteListPicker import org.tasks.activities.ListPicker
import org.tasks.calendars.CalendarPicker import org.tasks.calendars.CalendarPicker
import org.tasks.calendars.CalendarPicker.newCalendarPicker import org.tasks.calendars.CalendarPicker.newCalendarPicker
import org.tasks.calendars.CalendarProvider import org.tasks.calendars.CalendarProvider
@ -46,7 +46,7 @@ class TaskDefaults : InjectingPreferenceFragment() {
findPreference(R.string.p_default_remote_list) findPreference(R.string.p_default_remote_list)
.setOnPreferenceClickListener { .setOnPreferenceClickListener {
RemoteListPicker.newRemoteListSupportPicker( ListPicker.newListPicker(
defaultFilterProvider.defaultRemoteList, defaultFilterProvider.defaultRemoteList,
this, this,
REQUEST_REMOTE_LIST REQUEST_REMOTE_LIST
@ -61,7 +61,7 @@ class TaskDefaults : InjectingPreferenceFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_REMOTE_LIST) { if (requestCode == REQUEST_REMOTE_LIST) {
val list: Filter? = data!!.getParcelableExtra(RemoteListPicker.EXTRA_SELECTED_FILTER) val list: Filter? = data!!.getParcelableExtra(ListPicker.EXTRA_SELECTED_FILTER)
if (list == null) { if (list == null) {
preferences.setString(R.string.p_default_remote_list, null) preferences.setString(R.string.p_default_remote_list, null)
} else if (list is GtasksFilter || list is CaldavFilter) { } else if (list is GtasksFilter || list is CaldavFilter) {

6
app/src/main/java/org/tasks/ui/ListFragment.kt
Unescape Escape View File

@ -16,7 +16,7 @@ import com.todoroo.astrid.data.Task
import com.todoroo.astrid.gtasks.GtasksListService import com.todoroo.astrid.gtasks.GtasksListService
import com.todoroo.astrid.service.TaskMover import com.todoroo.astrid.service.TaskMover
import org.tasks.R import org.tasks.R
import org.tasks.activities.RemoteListPicker import org.tasks.activities.ListPicker
import org.tasks.data.CaldavDao import org.tasks.data.CaldavDao
import org.tasks.data.CaldavTask import org.tasks.data.CaldavTask
import org.tasks.data.GoogleTask import org.tasks.data.GoogleTask
@ -126,7 +126,7 @@ class ListFragment : TaskEditControlFragment() {
get() = true get() = true
private fun openPicker() { private fun openPicker() {
RemoteListPicker.newRemoteListSupportPicker(selectedList, this, REQUEST_CODE_SELECT_LIST) ListPicker.newListPicker(selectedList, this, REQUEST_CODE_SELECT_LIST)
.show(parentFragmentManager, FRAG_TAG_GOOGLE_TASK_LIST_SELECTION) .show(parentFragmentManager, FRAG_TAG_GOOGLE_TASK_LIST_SELECTION)
} }
@ -153,7 +153,7 @@ class ListFragment : TaskEditControlFragment() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == REQUEST_CODE_SELECT_LIST) { if (requestCode == REQUEST_CODE_SELECT_LIST) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
setList(data?.getParcelableExtra(RemoteListPicker.EXTRA_SELECTED_FILTER)) setList(data?.getParcelableExtra(ListPicker.EXTRA_SELECTED_FILTER))
} }
} else { } else {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)

Write Preview
Loading…
Cancel
Save