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

Move actions into setting activities

Browse Source
pull/467/head
Alex Baker 8 years ago
parent b81643ce66
commit e069b5a978
5 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File

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

@ -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);
}

14
src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
Unescape Escape View File

@ -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";
}

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

@ -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)

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

@ -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();
})

5
src/main/java/org/tasks/tasklist/TagListFragment.java
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save