public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partially fix #295 - add confirmation when marking folder or all stories read with options to mark all read or cancel

Browse source
This commit is contained in:
Mark Anderson 2013-06-25 22:48:18 +01:00
parent 5c184be4ae
commit 4f48d0c89d
4 changed files with 120 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
media/android/NewsBlur/res/values/strings.xml
View file

@ -165,4 +165,9 @@
<item>UNREAD</item>
</string-array>
<string name="default_read_filter_value">ALL</string>
<string-array name="mark_all_read_options">
<item>Mark entire folder read</item>
<item>Cancel</item>
</string-array>
</resources>

64
media/android/NewsBlur/src/com/newsblur/activity/AllStoriesItemsList.java
View file

@ -1,11 +1,8 @@
package com.newsblur.activity;
import java.util.ArrayList;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Intent;
import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
@ -18,7 +15,9 @@ import com.newsblur.database.DatabaseConstants;
import com.newsblur.database.FeedProvider;
import com.newsblur.fragment.AllStoriesItemListFragment;
import com.newsblur.fragment.FeedItemListFragment;
import com.newsblur.fragment.MarkAllReadDialogFragment;
import com.newsblur.fragment.SyncUpdateFragment;
import com.newsblur.fragment.MarkAllReadDialogFragment.MarkAllReadDialogListener;
import com.newsblur.network.APIManager;
import com.newsblur.service.SyncService;
import com.newsblur.util.PrefConstants;
@ -26,7 +25,7 @@ import com.newsblur.util.PrefsUtils;
import com.newsblur.util.ReadFilter;
import com.newsblur.util.StoryOrder;
public class AllStoriesItemsList extends ItemsList {
public class AllStoriesItemsList extends ItemsList implements MarkAllReadDialogListener {
private APIManager apiManager;
private ContentResolver resolver;
@ -83,29 +82,8 @@ public class AllStoriesItemsList extends ItemsList {
@Override
public void markItemListAsRead() {
new AsyncTask<Void, Void, Boolean>() {
@Override
protected Boolean doInBackground(Void... arg) {
return apiManager.markAllAsRead();
}
@Override
protected void onPostExecute(Boolean result) {
if (result) {
// mark all feed IDs as read
ContentValues values = new ContentValues();
values.put(DatabaseConstants.FEED_NEGATIVE_COUNT, 0);
values.put(DatabaseConstants.FEED_NEUTRAL_COUNT, 0);
values.put(DatabaseConstants.FEED_POSITIVE_COUNT, 0);
resolver.update(FeedProvider.FEEDS_URI, values, null, null);
setResult(RESULT_OK);
Toast.makeText(AllStoriesItemsList.this, R.string.toast_marked_all_stories_as_read, Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(AllStoriesItemsList.this, R.string.toast_error_marking_feed_as_read, Toast.LENGTH_SHORT).show();
}
};
}.execute();
MarkAllReadDialogFragment dialog = MarkAllReadDialogFragment.newInstance(getResources().getString(R.string.all_stories));
dialog.show(fragmentManager, "dialog");
}
@Override
@ -139,4 +117,36 @@ public class AllStoriesItemsList extends ItemsList {
protected ReadFilter getReadFilter() {
return PrefsUtils.getReadFilterForFolder(this, PrefConstants.ALL_STORIES_FOLDER_NAME);
}
@Override
public void onMarkAllRead() {
new AsyncTask<Void, Void, Boolean>() {
@Override
protected Boolean doInBackground(Void... arg) {
return apiManager.markAllAsRead();
}
@Override
protected void onPostExecute(Boolean result) {
if (result) {
// mark all feed IDs as read
ContentValues values = new ContentValues();
values.put(DatabaseConstants.FEED_NEGATIVE_COUNT, 0);
values.put(DatabaseConstants.FEED_NEUTRAL_COUNT, 0);
values.put(DatabaseConstants.FEED_POSITIVE_COUNT, 0);
resolver.update(FeedProvider.FEEDS_URI, values, null, null);
setResult(RESULT_OK);
Toast.makeText(AllStoriesItemsList.this, R.string.toast_marked_all_stories_as_read, Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(AllStoriesItemsList.this, R.string.toast_error_marking_feed_as_read, Toast.LENGTH_SHORT).show();
}
};
}.execute();
}
@Override
public void onCancel() {
// do nothing
}
}

39
media/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java
View file

@ -16,6 +16,8 @@ import com.newsblur.database.DatabaseConstants;
import com.newsblur.database.FeedProvider;
import com.newsblur.fragment.FeedItemListFragment;
import com.newsblur.fragment.FolderItemListFragment;
import com.newsblur.fragment.MarkAllReadDialogFragment;
import com.newsblur.fragment.MarkAllReadDialogFragment.MarkAllReadDialogListener;
import com.newsblur.fragment.SyncUpdateFragment;
import com.newsblur.network.APIManager;
import com.newsblur.network.MarkFolderAsReadTask;
@ -24,7 +26,7 @@ import com.newsblur.util.PrefsUtils;
import com.newsblur.util.ReadFilter;
import com.newsblur.util.StoryOrder;
public class FolderItemsList extends ItemsList {
public class FolderItemsList extends ItemsList implements MarkAllReadDialogListener {
public static final String EXTRA_FOLDER_NAME = "folderName";
private String folderName;
@ -99,18 +101,8 @@ public class FolderItemsList extends ItemsList {
@Override
public void markItemListAsRead() {
new MarkFolderAsReadTask(apiManager, getContentResolver()) {
@Override
protected void onPostExecute(Boolean result) {
if (result) {
setResult(RESULT_OK);
Toast.makeText(FolderItemsList.this, R.string.toast_marked_folder_as_read, Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(FolderItemsList.this, R.string.toast_error_marking_feed_as_read, Toast.LENGTH_SHORT).show();
}
}
}.execute(folderName);
MarkAllReadDialogFragment dialog = MarkAllReadDialogFragment.newInstance(folderName);
dialog.show(fragmentManager, "dialog");
}
@Override
@ -136,4 +128,25 @@ public class FolderItemsList extends ItemsList {
protected ReadFilter getReadFilter() {
return PrefsUtils.getReadFilterForFolder(this, folderName);
}
@Override
public void onMarkAllRead() {
new MarkFolderAsReadTask(apiManager, getContentResolver()) {
@Override
protected void onPostExecute(Boolean result) {
if (result) {
setResult(RESULT_OK);
Toast.makeText(FolderItemsList.this, R.string.toast_marked_folder_as_read, Toast.LENGTH_SHORT).show();
finish();
} else {
Toast.makeText(FolderItemsList.this, R.string.toast_error_marking_feed_as_read, Toast.LENGTH_SHORT).show();
}
}
}.execute(folderName);
}
@Override
public void onCancel() {
// do nothing
}
}

52
media/android/NewsBlur/src/com/newsblur/fragment/MarkAllReadDialogFragment.java Normal file
View file

@ -0,0 +1,52 @@
package com.newsblur.fragment;
import com.newsblur.R;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
public class MarkAllReadDialogFragment extends DialogFragment {
private static final String FOLDER_NAME = "folder_name";
public interface MarkAllReadDialogListener {
public void onMarkAllRead();
public void onCancel();
}
private MarkAllReadDialogListener listener;
public static MarkAllReadDialogFragment newInstance(String folderName) {
MarkAllReadDialogFragment fragment = new MarkAllReadDialogFragment();
Bundle args = new Bundle();
args.putString(FOLDER_NAME, folderName);
fragment.setArguments(args);
return fragment;
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
listener = (MarkAllReadDialogListener)activity;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(getArguments().getString(FOLDER_NAME))
.setItems(R.array.mark_all_read_options, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
if (which == 0) {
listener.onMarkAllRead();
} else {
listener.onCancel();
}
}
});
return builder.create();
}
}