From e069b5a9786df21b92b525da0ed497dcd98b6802 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 26 Oct 2016 13:42:12 -0500 Subject: [PATCH] Move actions into setting activities --- .../todoroo/astrid/activity/TaskListFragment.java | 4 ++-- .../com/todoroo/astrid/api/AstridApiConstants.java | 14 -------------- .../tasks/activities/FilterSettingsActivity.java | 8 +++++--- .../org/tasks/activities/TagSettingsActivity.java | 8 +++++--- .../java/org/tasks/tasklist/TagListFragment.java | 5 ++--- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index c71048547..277e1fd35 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -622,10 +622,10 @@ public class TaskListFragment extends InjectingListFragment implements } else if (requestCode == REQUEST_EDIT_FILTER) { if (resultCode == Activity.RESULT_OK) { String action = data.getAction(); - if (AstridApiConstants.BROADCAST_EVENT_FILTER_RENAMED.equals(action)) { + if (FilterSettingsActivity.ACTION_FILTER_RENAMED.equals(action)) { CustomFilter customFilter = data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER); ((TaskListActivity) getActivity()).onFilterItemClicked(customFilter); - } else if(AstridApiConstants.BROADCAST_EVENT_FILTER_DELETED.equals(action)) { + } else if(FilterSettingsActivity.ACTION_FILTER_DELETED.equals(action)) { ((TaskListActivity) getActivity()).onFilterItemClicked(null); } diff --git a/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java index 04e8b8ec4..d99c72f82 100644 --- a/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java +++ b/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java @@ -79,18 +79,4 @@ public class AstridApiConstants { public static final String BROADCAST_EVENT_TASK_REPEATED = BuildConfig.APPLICATION_ID + ".TASK_REPEATED"; public static final String BROADCAST_EVENT_TASK_SAVED = BuildConfig.APPLICATION_ID + ".TASK_SAVED"; - - /** - * Action name for broadcast intent notifying that tag was deleted - */ - public static final String BROADCAST_EVENT_TAG_DELETED = BuildConfig.APPLICATION_ID + ".TAG_DELETED"; - - /** - * Action name for broadcast intent notifying that tag was renamed - */ - public static final String BROADCAST_EVENT_TAG_RENAMED = BuildConfig.APPLICATION_ID + ".TAG_RENAMED"; - - public static final String BROADCAST_EVENT_FILTER_DELETED = BuildConfig.APPLICATION_ID + ".FILTER_DELETED"; - - public static final String BROADCAST_EVENT_FILTER_RENAMED = BuildConfig.APPLICATION_ID + ".FILTER_RENAMED"; } diff --git a/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/src/main/java/org/tasks/activities/FilterSettingsActivity.java index 764db4d23..4ab17899a 100644 --- a/src/main/java/org/tasks/activities/FilterSettingsActivity.java +++ b/src/main/java/org/tasks/activities/FilterSettingsActivity.java @@ -15,7 +15,6 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.Toast; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.CustomFilter; import com.todoroo.astrid.dao.StoreObjectDao; @@ -37,6 +36,9 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp public static final String TOKEN_FILTER = "token_filter"; + public static final String ACTION_FILTER_DELETED = "filterDeleted"; + public static final String ACTION_FILTER_RENAMED = "filterRenamed"; + private CustomFilter filter; @Inject StoreObjectDao storeObjectDao; @@ -91,7 +93,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp if (nameChanged) { filter.listingTitle = newName; storeObjectDao.update(filter.toStoreObject()); - setResult(RESULT_OK, new Intent(AstridApiConstants.BROADCAST_EVENT_FILTER_RENAMED).putExtra(TOKEN_FILTER, filter)); + setResult(RESULT_OK, new Intent(ACTION_FILTER_RENAMED).putExtra(TOKEN_FILTER, filter)); } finish(); @@ -117,7 +119,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity imp dialogBuilder.newMessageDialog(R.string.delete_tag_confirmation, filter.listingTitle) .setPositiveButton(R.string.delete, (dialog, which) -> { storeObjectDao.delete(filter.getId()); - setResult(RESULT_OK, new Intent(AstridApiConstants.BROADCAST_EVENT_FILTER_DELETED).putExtra(TOKEN_FILTER, filter)); + setResult(RESULT_OK, new Intent(ACTION_FILTER_DELETED).putExtra(TOKEN_FILTER, filter)); finish(); }) .setNegativeButton(android.R.string.cancel, null) diff --git a/src/main/java/org/tasks/activities/TagSettingsActivity.java b/src/main/java/org/tasks/activities/TagSettingsActivity.java index 59223c6a0..8a809b844 100644 --- a/src/main/java/org/tasks/activities/TagSettingsActivity.java +++ b/src/main/java/org/tasks/activities/TagSettingsActivity.java @@ -18,7 +18,6 @@ import android.widget.TextView; import android.widget.Toast; import com.todoroo.andlib.sql.Criterion; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.data.Metadata; @@ -58,6 +57,9 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem public static final String EXTRA_TAG_DATA = "tagData"; //$NON-NLS-1$ public static final String EXTRA_TAG_UUID = "uuid"; //$NON-NLS-1$ + public static final String ACTION_TAG_RENAMED = "tagRenamed"; + public static final String ACTION_TAG_DELETED = "tagDeleted"; + private boolean isNewTag; private TagData tagData; private int selectedTheme; @@ -188,7 +190,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem metadataDao.update(Criterion.and( MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(tagData.getUUID())), m); - setResult(RESULT_OK, new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_RENAMED).putExtra(EXTRA_TAG_UUID, tagData.getUuid())); + setResult(RESULT_OK, new Intent(ACTION_TAG_RENAMED).putExtra(EXTRA_TAG_UUID, tagData.getUuid())); } finish(); @@ -238,7 +240,7 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity implem String uuid = tagData.getUuid(); metadataDao.deleteWhere(Criterion.and(MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(uuid))); tagDataDao.delete(tagData.getId()); - setResult(RESULT_OK, new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED).putExtra(EXTRA_TAG_UUID, uuid)); + setResult(RESULT_OK, new Intent(ACTION_TAG_DELETED).putExtra(EXTRA_TAG_UUID, uuid)); } finish(); }) diff --git a/src/main/java/org/tasks/tasklist/TagListFragment.java b/src/main/java/org/tasks/tasklist/TagListFragment.java index 6d799167b..fc9e5cab8 100644 --- a/src/main/java/org/tasks/tasklist/TagListFragment.java +++ b/src/main/java/org/tasks/tasklist/TagListFragment.java @@ -8,7 +8,6 @@ import android.view.MenuItem; import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.TagFilter; import com.todoroo.astrid.dao.TagDataDao; @@ -75,7 +74,7 @@ public class TagListFragment extends TaskListFragment { String action = data.getAction(); String uuid = data.getStringExtra(TagSettingsActivity.EXTRA_TAG_UUID); TaskListActivity activity = (TaskListActivity) getActivity(); - if (AstridApiConstants.BROADCAST_EVENT_TAG_RENAMED.equals(action)) { + if (TagSettingsActivity.ACTION_TAG_RENAMED.equals(action)) { if (tagData.getUuid().equals(uuid)) { TagData newTagData = tagDataDao.fetch(uuid, TagData.PROPERTIES); if (newTagData != null) { @@ -83,7 +82,7 @@ public class TagListFragment extends TaskListFragment { activity.onFilterItemClicked(filter); } } - } else if (AstridApiConstants.BROADCAST_EVENT_TAG_DELETED.equals(action)) { + } else if (TagSettingsActivity.ACTION_TAG_DELETED.equals(action)) { String activeUuid = tagData.getUuid(); if (activeUuid.equals(uuid)) { activity.onFilterItemClicked(null);