Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2656 from ByteHamster/mark-all-played

Browse Source 
Added warning to 'Mark all played'
This commit is contained in:
Martin Fietz 2018-04-22 09:37:10 +02:00 committed by GitHub
commit 0a4bdfe65a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -572,10 +572,29 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset()); Feed feed = navDrawerData.feeds.get(position - navAdapter.getSubscriptionOffset());
switch(item.getItemId()) { switch(item.getItemId()) {
case R.id.mark_all_seen_item: case R.id.mark_all_seen_item:
DBWriter.markFeedSeen(feed.getId()); ConfirmationDialog markAllSeenConfirmationDialog = new ConfirmationDialog(this,
R.string.mark_all_seen_label,
R.string.mark_all_seen_confirmation_msg) {
@Override
public void onConfirmButtonPressed(DialogInterface dialog) {
dialog.dismiss();
DBWriter.markFeedSeen(feed.getId());
}
};
markAllSeenConfirmationDialog.createNewDialog().show();
return true; return true;
case R.id.mark_all_read_item: case R.id.mark_all_read_item:
DBWriter.markFeedRead(feed.getId()); ConfirmationDialog markAllReadConfirmationDialog = new ConfirmationDialog(this,
R.string.mark_all_read_label,
R.string.mark_all_read_confirmation_msg) {
@Override
public void onConfirmButtonPressed(DialogInterface dialog) {
dialog.dismiss();
DBWriter.markFeedRead(feed.getId());
}
};
markAllReadConfirmationDialog.createNewDialog().show();
return true; return true;
case R.id.rename_item: case R.id.rename_item:
new RenameFeedDialog(this, feed).show(); new RenameFeedDialog(this, feed).show();

41
app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
View File

@ -152,18 +152,39 @@ public class SubscriptionFragment extends Fragment {
Feed feed = (Feed)selectedObject; Feed feed = (Feed)selectedObject;
switch(item.getItemId()) { switch(item.getItemId()) {
case R.id.mark_all_seen_item: case R.id.mark_all_seen_item:
Observable.fromCallable(() -> DBWriter.markFeedSeen(feed.getId())) ConfirmationDialog markAllSeenConfirmationDialog = new ConfirmationDialog(getActivity(),
.subscribeOn(Schedulers.newThread()) R.string.mark_all_seen_label,
.observeOn(AndroidSchedulers.mainThread()) R.string.mark_all_seen_confirmation_msg) {
.subscribe(result -> loadSubscriptions(),
error -> Log.e(TAG, Log.getStackTraceString(error))); @Override
public void onConfirmButtonPressed(DialogInterface dialog) {
dialog.dismiss();
Observable.fromCallable(() -> DBWriter.markFeedSeen(feed.getId()))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(result -> loadSubscriptions(),
error -> Log.e(TAG, Log.getStackTraceString(error)));
}
};
markAllSeenConfirmationDialog.createNewDialog().show();
return true; return true;
case R.id.mark_all_read_item: case R.id.mark_all_read_item:
Observable.fromCallable(() -> DBWriter.markFeedRead(feed.getId())) ConfirmationDialog markAllReadConfirmationDialog = new ConfirmationDialog(getActivity(),
.subscribeOn(Schedulers.newThread()) R.string.mark_all_read_label,
.observeOn(AndroidSchedulers.mainThread()) R.string.mark_all_read_confirmation_msg) {
.subscribe(result -> loadSubscriptions(),
error -> Log.e(TAG, Log.getStackTraceString(error))); @Override
public void onConfirmButtonPressed(DialogInterface dialog) {
dialog.dismiss();
Observable.fromCallable(() -> DBWriter.markFeedRead(feed.getId()))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(result -> loadSubscriptions(),
error -> Log.e(TAG, Log.getStackTraceString(error)));
}
};
markAllReadConfirmationDialog.createNewDialog().show();
return true; return true;
case R.id.rename_item: case R.id.rename_item:
new RenameFeedDialog(getActivity(), feed).show(); new RenameFeedDialog(getActivity(), feed).show();