Rename TagViewFragment to TagListFragment

pull/467/head
Alex Baker 8 years ago
parent 02249c93cd
commit 3236950861

@ -19,7 +19,9 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.actfm.TagViewFragment;
import org.tasks.tasklist.TagListFragment;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.FilterListItem;
@ -292,7 +294,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
if (tagData != null) { if (tagData != null) {
return preferences.getBoolean(R.string.p_manual_sort, false) return preferences.getBoolean(R.string.p_manual_sort, false)
? SubtasksTagListFragment.newSubtasksTagListFragment(tagFilter, tagData) ? SubtasksTagListFragment.newSubtasksTagListFragment(tagFilter, tagData)
: TagViewFragment.newTagViewFragment(tagFilter, tagData); : TagListFragment.newTagViewFragment(tagFilter, tagData);
} }
} else if (filter instanceof GtasksFilter) { } else if (filter instanceof GtasksFilter) {
GtasksFilter gtasksFilter = (GtasksFilter) filter; GtasksFilter gtasksFilter = (GtasksFilter) filter;

@ -11,7 +11,7 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.actfm.TagViewFragment; import org.tasks.tasklist.TagListFragment;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.api.TagFilter; import com.todoroo.astrid.api.TagFilter;
@ -35,7 +35,7 @@ import org.tasks.ui.CheckBoxes;
import javax.inject.Inject; import javax.inject.Inject;
public class SubtasksTagListFragment extends TagViewFragment { public class SubtasksTagListFragment extends TagListFragment {
public static TaskListFragment newSubtasksTagListFragment(TagFilter filter, TagData tagData) { public static TaskListFragment newSubtasksTagListFragment(TagFilter filter, TagData tagData) {
SubtasksTagListFragment fragment = new SubtasksTagListFragment(); SubtasksTagListFragment fragment = new SubtasksTagListFragment();

@ -1,6 +1,5 @@
package org.tasks.injection; package org.tasks.injection;
import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.activity.TaskEditFragment; import com.todoroo.astrid.activity.TaskEditFragment;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.files.FilesControlSet; import com.todoroo.astrid.files.FilesControlSet;
@ -15,6 +14,7 @@ import com.todoroo.astrid.ui.HideUntilControlSet;
import com.todoroo.astrid.ui.ReminderControlSet; import com.todoroo.astrid.ui.ReminderControlSet;
import org.tasks.fragments.CommentBarFragment; import org.tasks.fragments.CommentBarFragment;
import org.tasks.tasklist.TagListFragment;
import org.tasks.ui.CalendarControlSet; import org.tasks.ui.CalendarControlSet;
import org.tasks.ui.DeadlineControlSet; import org.tasks.ui.DeadlineControlSet;
import org.tasks.ui.DescriptionControlSet; import org.tasks.ui.DescriptionControlSet;
@ -60,7 +60,7 @@ public interface FragmentComponent {
void inject(TaskListFragment taskListFragment); void inject(TaskListFragment taskListFragment);
void inject(TagViewFragment tagViewFragment); void inject(TagListFragment tagListFragment);
void inject(GtasksListFragment gtasksListFragment); void inject(GtasksListFragment gtasksListFragment);

@ -1,9 +1,4 @@
/** package org.tasks.tasklist;
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.actfm;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -27,12 +22,12 @@ import org.tasks.injection.FragmentComponent;
import javax.inject.Inject; import javax.inject.Inject;
public class TagViewFragment extends TaskListFragment { public class TagListFragment extends TaskListFragment {
private static final int REQUEST_EDIT_TAG = 11543; private static final int REQUEST_EDIT_TAG = 11543;
public static TaskListFragment newTagViewFragment(TagFilter filter, TagData tagData) { public static TaskListFragment newTagViewFragment(TagFilter filter, TagData tagData) {
TagViewFragment fragment = new TagViewFragment(); TagListFragment fragment = new TagListFragment();
fragment.filter = filter; fragment.filter = filter;
fragment.tagData = tagData; fragment.tagData = tagData;
return fragment; return fragment;
Loading…
Cancel
Save