diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java')
3 files changed, 23 insertions, 8 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 7dcdc44e..66709fc7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -8,6 +8,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.LoaderManager; @@ -99,9 +100,9 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt // virtual cats implemented in getCategories since api level 1 if (apiLevel == 0) { - m_cats.add(new FeedCategory(-1, "Special", 0)); - m_cats.add(new FeedCategory(-2, "Labels", 0)); - m_cats.add(new FeedCategory(0, "Uncategorized", 0)); + m_cats.add(new FeedCategory(-1, getString(R.string.cat_special), 0)); + m_cats.add(new FeedCategory(-2, getString(R.string.cat_labels), 0)); + m_cats.add(new FeedCategory(0, getString(R.string.cat_uncategorized), 0)); specialCatFound = true; } @@ -304,6 +305,10 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt if (cat != null) menu.setHeaderTitle(cat.title); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + menu.findItem(R.id.create_shortcut).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 0660d339..bedd01c4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -9,6 +9,7 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.graphics.Typeface; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.LoaderManager; @@ -373,6 +374,10 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi menu.findItem(R.id.unsubscribe_feed).setVisible(false); } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + menu.findItem(R.id.create_shortcut).setVisible(false); + } + super.onCreateContextMenu(menu, v, menuInfo); } @@ -545,13 +550,16 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi m_activity.getTheme().resolveAttribute(R.attr.ic_star, tv, true); icon.setImageResource(tv.resourceId); } else if (feed.id == -2 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_checkbox_marked, tv, true); + m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); icon.setImageResource(tv.resourceId); } else if (feed.id == -3 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_coffee, tv, true); + m_activity.getTheme().resolveAttribute(R.attr.ic_fresh, tv, true); icon.setImageResource(tv.resourceId); } else if (feed.id == -4 && !feed.is_cat) { - m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); + m_activity.getTheme().resolveAttribute(R.attr.ic_inbox, tv, true); + icon.setImageResource(tv.resourceId); + } else if (feed.id == -6 && !feed.is_cat) { + m_activity.getTheme().resolveAttribute(R.attr.ic_restore, tv, true); icon.setImageResource(tv.resourceId); } else if (feed.is_cat) { m_activity.getTheme().resolveAttribute(R.attr.ic_folder_outline, tv, true); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 010949d3..8a3ef2f5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -178,7 +178,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList HeadlinesFragment hf = new HeadlinesFragment(); if (BuildConfig.DEBUG) { - hf.initialize(new Feed(-1, "Starred articles", false)); + hf.initialize(new Feed(-1, getString(R.string.feed_starred_articles), false)); } else { hf.initialize(new Feed(-3, getString(R.string.fresh_articles), false)); } @@ -547,6 +547,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } } + // TODO: remove; not supported on oreo public void createFeedShortcut(Feed feed) { final Intent shortcutIntent = new Intent(this, MasterActivity.class); shortcutIntent.putExtra("feed_id", feed.id); @@ -565,7 +566,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList toast(R.string.shortcut_has_been_placed_on_the_home_screen); } - + + // TODO: remove; not supported on oreo public void createCategoryShortcut(FeedCategory cat) { createFeedShortcut(new Feed(cat.id, cat.title, true)); } |