public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable nonFinalResIds

Browse source
This commit is contained in:
sictiru 2023-06-04 14:51:20 -07:00
parent d1ccad7293
commit 1ad15e8b91
5 changed files with 66 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
clients/android/NewsBlur/app/src/main/java/com/newsblur/activity/FeedChooser.java
View file

@ -101,44 +101,44 @@ abstract public class FeedChooser extends NbActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
case R.id.menu_sort_order_ascending:
replaceListOrderFilter(ListOrderFilter.ASCENDING);
return true;
case R.id.menu_sort_order_descending:
replaceListOrderFilter(ListOrderFilter.DESCENDING);
return true;
case R.id.menu_sort_by_name:
replaceFeedOrderFilter(FeedOrderFilter.NAME);
return true;
case R.id.menu_sort_by_subs:
replaceFeedOrderFilter(FeedOrderFilter.SUBSCRIBERS);
return true;
case R.id.menu_sort_by_recent_story:
replaceFeedOrderFilter(FeedOrderFilter.RECENT_STORY);
return true;
case R.id.menu_sort_by_stories_month:
replaceFeedOrderFilter(FeedOrderFilter.STORIES_MONTH);
return true;
case R.id.menu_sort_by_number_opens:
replaceFeedOrderFilter(FeedOrderFilter.OPENS);
return true;
case R.id.menu_folder_view_nested:
replaceFolderView(FolderViewFilter.NESTED);
return true;
case R.id.menu_folder_view_flat:
replaceFolderView(FolderViewFilter.FLAT);
return true;
case R.id.menu_widget_background_default:
setWidgetBackground(WidgetBackground.DEFAULT);
return true;
case R.id.menu_widget_background_transparent:
setWidgetBackground(WidgetBackground.TRANSPARENT);
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == android.R.id.home) {
finish();
return true;
} else if (item.getItemId() == R.id.menu_sort_order_ascending) {
replaceListOrderFilter(ListOrderFilter.ASCENDING);
return true;
} else if (item.getItemId() == R.id.menu_sort_order_descending) {
replaceListOrderFilter(ListOrderFilter.DESCENDING);
return true;
} else if (item.getItemId() == R.id.menu_sort_by_name) {
replaceFeedOrderFilter(FeedOrderFilter.NAME);
return true;
} else if (item.getItemId() == R.id.menu_sort_by_subs) {
replaceFeedOrderFilter(FeedOrderFilter.SUBSCRIBERS);
return true;
} else if (item.getItemId() == R.id.menu_sort_by_recent_story) {
replaceFeedOrderFilter(FeedOrderFilter.RECENT_STORY);
return true;
} else if (item.getItemId() == R.id.menu_sort_by_stories_month) {
replaceFeedOrderFilter(FeedOrderFilter.STORIES_MONTH);
return true;
} else if (item.getItemId() == R.id.menu_sort_by_number_opens) {
replaceFeedOrderFilter(FeedOrderFilter.OPENS);
return true;
} else if (item.getItemId() == R.id.menu_folder_view_nested) {
replaceFolderView(FolderViewFilter.NESTED);
return true;
} else if (item.getItemId() == R.id.menu_folder_view_flat) {
replaceFolderView(FolderViewFilter.FLAT);
return true;
} else if (item.getItemId() == R.id.menu_widget_background_default) {
setWidgetBackground(WidgetBackground.DEFAULT);
return true;
} else if (item.getItemId() == R.id.menu_widget_background_transparent) {
setWidgetBackground(WidgetBackground.TRANSPARENT);
return true;
} else {
return super.onOptionsItemSelected(item);
}
}

17
clients/android/NewsBlur/app/src/main/java/com/newsblur/activity/MuteConfig.java
View file

@ -59,15 +59,14 @@ public class MuteConfig extends FeedChooser implements MuteConfigAdapter.FeedSta
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_mute_all:
setFeedsState(true);
return true;
case R.id.menu_mute_none:
setFeedsState(false);
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_mute_all) {
setFeedsState(true);
return true;
} else if (item.getItemId() == R.id.menu_mute_none) {
setFeedsState(false);
return true;
} else {
return super.onOptionsItemSelected(item);
}
}

17
clients/android/NewsBlur/app/src/main/java/com/newsblur/activity/WidgetConfig.java
View file

@ -62,15 +62,14 @@ public class WidgetConfig extends FeedChooser {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_select_all:
selectAllFeeds();
return true;
case R.id.menu_select_none:
replaceWidgetFeedIds(Collections.emptySet());
return true;
default:
return super.onOptionsItemSelected(item);
if (item.getItemId() == R.id.menu_select_all) {
selectAllFeeds();
return true;
} else if (item.getItemId() == R.id.menu_select_none) {
replaceWidgetFeedIds(Collections.emptySet());
return true;
} else {
return super.onOptionsItemSelected(item);
}
}

32
clients/android/NewsBlur/app/src/main/java/com/newsblur/database/StoryViewAdapter.java
View file

@ -413,52 +413,42 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_mark_story_as_read:
if (item.getItemId() == R.id.menu_mark_story_as_read) {
feedUtils.markStoryAsRead(story, context);
return true;
case R.id.menu_mark_story_as_unread:
} else if (item.getItemId() == R.id.menu_mark_story_as_unread) {
feedUtils.markStoryUnread(story, context);
return true;
case R.id.menu_mark_older_stories_as_read:
} else if (item.getItemId() == R.id.menu_mark_older_stories_as_read) {
feedUtils.markRead(context, fs, story.timestamp, null, R.array.mark_older_read_options);
return true;
case R.id.menu_mark_newer_stories_as_read:
} else if (item.getItemId() == R.id.menu_mark_newer_stories_as_read) {
feedUtils.markRead(context, fs, null, story.timestamp, R.array.mark_newer_read_options);
return true;
case R.id.menu_send_story:
} else if (item.getItemId() == R.id.menu_send_story) {
feedUtils.sendStoryUrl(story, context);
return true;
case R.id.menu_send_story_full:
} else if (item.getItemId() == R.id.menu_send_story_full) {
feedUtils.sendStoryFull(story, context);
return true;
case R.id.menu_save_story:
} else if (item.getItemId() == R.id.menu_save_story) {
//TODO get folder name
feedUtils.setStorySaved(story, true, context, null);
return true;
case R.id.menu_unsave_story:
} else if (item.getItemId() == R.id.menu_unsave_story) {
feedUtils.setStorySaved(story, false, context, null);
return true;
case R.id.menu_intel:
} else if (item.getItemId() == R.id.menu_intel) {
if (story.feedId.equals("0")) return true; // cannot train on feedless stories
StoryIntelTrainerFragment intelFrag = StoryIntelTrainerFragment.newInstance(story, fs);
intelFrag.show(context.getSupportFragmentManager(), StoryIntelTrainerFragment.class.getName());
return true;
case R.id.menu_go_to_feed:
} else if (item.getItemId() == R.id.menu_go_to_feed) {
FeedSet fs = FeedSet.singleFeed(story.feedId);
FeedItemsList.startActivity(context, fs,
feedUtils.getFeed(story.feedId), null, null);
return true;
default:
} else {
return false;
}
}

2
clients/android/NewsBlur/gradle.properties
View file

@ -3,4 +3,4 @@ kotlin.code.style=obsolete
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=true
android.nonFinalResIds=false
android.nonFinalResIds=true