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

Move delete/reload actions to task list fragment

Browse Source
pull/795/head
Alex Baker 6 years ago
parent 7aa50bf5f9
commit dd9f6a88f2
5 changed files with 22 additions and 62 deletions
Show Stats Download Patch File Download Diff File

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

@ -99,6 +99,8 @@ public final class TaskListFragment extends InjectingFragment
public static final String GTASK_METADATA_JOIN = "for_gtask"; // $NON-NLS-1$
public static final String CALDAV_METADATA_JOIN = "for_caldav"; // $NON-NLS-1$
public static final String FILE_METADATA_JOIN = "for_actions"; // $NON-NLS-1$
public static final String ACTION_RELOAD = "action_reload";
public static final String ACTION_DELETED = "action_deleted";
private static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
private static final String EXTRA_FILTER = "extra_filter";
private static final String FRAG_TAG_SORT_DIALOG = "frag_tag_sort_dialog";
@ -592,22 +594,6 @@ public final class TaskListFragment extends InjectingFragment
}
}
break;
case REQUEST_FILTER_SETTINGS:
if (resultCode == RESULT_OK) {
String action = data.getAction();
MainActivity activity = (MainActivity) getActivity();
if (FilterSettingsActivity.ACTION_FILTER_DELETED.equals(action)) {
activity.onFilterItemClicked(null);
} else if (FilterSettingsActivity.ACTION_FILTER_RENAMED.equals(action)) {
activity
.getIntent()
.putExtra(
MainActivity.OPEN_FILTER,
(Filter) data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER));
activity.recreate();
}
}
break;
case REQUEST_MOVE_TASKS:
if (resultCode == RESULT_OK) {
tracker.reportEvent(Tracking.Events.MULTISELECT_MOVE);
@ -617,40 +603,16 @@ public final class TaskListFragment extends InjectingFragment
recyclerAdapter.finishActionMode();
}
break;
case REQUEST_FILTER_SETTINGS:
case REQUEST_CALDAV_SETTINGS:
if (resultCode == RESULT_OK) {
MainActivity activity = (MainActivity) getActivity();
String action = data.getAction();
if (CaldavCalendarSettingsActivity.ACTION_DELETED.equals(action)) {
activity.onFilterItemClicked(null);
} else if (CaldavCalendarSettingsActivity.ACTION_RELOAD.equals(action)) {
activity
.getIntent()
.putExtra(
MainActivity.OPEN_FILTER,
(Filter) data.getParcelableExtra(MainActivity.OPEN_FILTER));
activity.recreate();
}
}
break;
case REQUEST_GTASK_SETTINGS:
if (resultCode == RESULT_OK) {
MainActivity activity = (MainActivity) getActivity();
String action = data.getAction();
if (GoogleTaskListSettingsActivity.ACTION_DELETED.equals(action)) {
activity.onFilterItemClicked(null);
} else if (GoogleTaskListSettingsActivity.ACTION_RELOAD.equals(action)) {
activity.onFilterItemClicked(data.getParcelableExtra(MainActivity.OPEN_FILTER));
}
}
break;
case REQUEST_TAG_SETTINGS:
if (resultCode == Activity.RESULT_OK) {
String action = data.getAction();
MainActivity activity = (MainActivity) getActivity();
if (TagSettingsActivity.ACTION_DELETED.equals(action)) {
if (ACTION_DELETED.equals(action)) {
activity.onFilterItemClicked(null);
} else if (TagSettingsActivity.ACTION_RELOAD.equals(action)) {
} else if (ACTION_RELOAD.equals(action)) {
activity
.getIntent()
.putExtra(

9
app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
Unescape Escape View File

@ -20,6 +20,7 @@ import butterknife.ButterKnife;
import butterknife.OnTextChanged;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.CustomFilter;
import javax.inject.Inject;
import org.tasks.R;
@ -35,8 +36,6 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity
public static final String TOKEN_FILTER = "token_filter";
public static final String ACTION_FILTER_DELETED = "filterDeleted";
public static final String ACTION_FILTER_RENAMED = "filterRenamed";
@Inject FilterDao filterDao;
@Inject DialogBuilder dialogBuilder;
@Inject Preferences preferences;
@ -107,7 +106,8 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity
if (nameChanged) {
filter.listingTitle = newName;
filterDao.update(filter.toStoreObject());
setResult(RESULT_OK, new Intent(ACTION_FILTER_RENAMED).putExtra(TOKEN_FILTER, filter));
setResult(
RESULT_OK, new Intent(TaskListFragment.ACTION_RELOAD).putExtra(TOKEN_FILTER, filter));
}
finish();
@ -137,7 +137,8 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity
(dialog, which) -> {
filterDao.delete(filter.getId());
setResult(
RESULT_OK, new Intent(ACTION_FILTER_DELETED).putExtra(TOKEN_FILTER, filter));
RESULT_OK,
new Intent(TaskListFragment.ACTION_DELETED).putExtra(TOKEN_FILTER, filter));
finish();
})
.setNegativeButton(android.R.string.cancel, null)

13
app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.google.android.material.textfield.TextInputEditText;
import com.google.api.services.tasks.model.TaskList;
import com.rey.material.widget.ProgressView;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.gtasks.GtasksListService;
import com.todoroo.astrid.service.TaskDeleter;
@ -46,8 +47,6 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
public static final String EXTRA_ACCOUNT = "extra_account";
public static final String EXTRA_STORE_DATA = "extra_store_data";
public static final String ACTION_DELETED = "action_deleted";
public static final String ACTION_RELOAD = "action_reload";
private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
private static final int REQUEST_COLOR_PICKER = 10109;
@Inject @ForApplication Context context;
@ -218,7 +217,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
googleTaskListDao.insertOrReplace(gtasksList);
setResult(
RESULT_OK,
new Intent(ACTION_RELOAD)
new Intent(TaskListFragment.ACTION_RELOAD)
.putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
}
finish();
@ -298,15 +297,14 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
gtasksList.setColor(selectedTheme);
gtasksList.setId(googleTaskListDao.insertOrReplace(gtasksList));
setResult(
RESULT_OK,
new Intent().putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
RESULT_OK, new Intent().putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
finish();
}
private void onListDeleted() {
tracker.reportEvent(Tracking.Events.GTASK_DELETE_LIST);
taskDeleter.delete(gtasksList);
setResult(RESULT_OK, new Intent(ACTION_DELETED));
setResult(RESULT_OK, new Intent(TaskListFragment.ACTION_DELETED));
finish();
}
@ -317,7 +315,8 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
googleTaskListDao.insertOrReplace(gtasksList);
setResult(
RESULT_OK,
new Intent(ACTION_RELOAD).putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
new Intent(TaskListFragment.ACTION_RELOAD)
.putExtra(MainActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
finish();
}

7
app/src/main/java/org/tasks/activities/TagSettingsActivity.java
Unescape Escape View File

@ -24,6 +24,7 @@ import butterknife.OnTextChanged;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.helper.UUIDHelper;
import com.todoroo.astrid.tags.TagService;
@ -46,8 +47,6 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
public static final String TOKEN_AUTOPOPULATE_NAME = "autopopulateName"; // $NON-NLS-1$
public static final String EXTRA_TAG_DATA = "tagData"; // $NON-NLS-1$
public static final String ACTION_RELOAD = "tagRenamed";
public static final String ACTION_DELETED = "tagDeleted";
private static final String EXTRA_TAG_UUID = "uuid"; // $NON-NLS-1$
private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
private static final int REQUEST_COLOR_PICKER = 10109;
@ -202,7 +201,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
tagDao.rename(tagData.getRemoteId(), newName);
setResult(
RESULT_OK,
new Intent(ACTION_RELOAD).putExtra(MainActivity.OPEN_FILTER, new TagFilter(tagData)));
new Intent(TaskListFragment.ACTION_RELOAD).putExtra(MainActivity.OPEN_FILTER, new TagFilter(tagData)));
}
finish();
@ -255,7 +254,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
String uuid = tagData.getRemoteId();
tagDao.deleteTag(uuid);
tagDataDao.delete(tagData.getId());
setResult(RESULT_OK, new Intent(ACTION_DELETED).putExtra(EXTRA_TAG_UUID, uuid));
setResult(RESULT_OK, new Intent(TaskListFragment.ACTION_DELETED).putExtra(EXTRA_TAG_UUID, uuid));
}
finish();
})

7
app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
Unescape Escape View File

@ -24,6 +24,7 @@ import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.helper.UUIDHelper;
import com.todoroo.astrid.service.TaskDeleter;
@ -53,8 +54,6 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
public static final String EXTRA_CALDAV_CALENDAR = "extra_caldav_calendar";
public static final String EXTRA_CALDAV_ACCOUNT = "extra_caldav_account";
public static final String ACTION_RELOAD = "accountRenamed";
public static final String ACTION_DELETED = "accountDeleted";
private static final String EXTRA_SELECTED_THEME = "extra_selected_theme";
private static final int REQUEST_COLOR_PICKER = 10109;
@Inject DialogBuilder dialogBuilder;
@ -270,7 +269,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
caldavDao.update(caldavCalendar);
setResult(
RESULT_OK,
new Intent(ACTION_RELOAD)
new Intent(TaskListFragment.ACTION_RELOAD)
.putExtra(MainActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar)));
finish();
}
@ -375,7 +374,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
private void onDeleted() {
taskDeleter.delete(caldavCalendar);
tracker.reportEvent(Events.CALDAV_LIST_DELETED);
setResult(RESULT_OK, new Intent(ACTION_DELETED));
setResult(RESULT_OK, new Intent(TaskListFragment.ACTION_DELETED));
finish();
}
}

Write Preview
Loading…
Cancel
Save