diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 5cfa5ea5f1b..9c423eb8106 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -634,7 +634,7 @@ brave_java_resources = [ "java/res/drawable/ic_site_settings.xml", "java/res/drawable/ic_sol_asset_icon.xml", "java/res/drawable/ic_stats_notification_background.xml", - "java/res/drawable/ic_suggested.xml", + "java/res/drawable/ic_suggestions.xml", "java/res/drawable/ic_swap_bg.xml", "java/res/drawable/ic_swap_icon.xml", "java/res/drawable/ic_sync.xml", diff --git a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java index 985f1ead4b6..c001b8dc3de 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java +++ b/android/java/org/chromium/chrome/browser/brave_news/BraveNewsUtils.java @@ -45,7 +45,7 @@ public class BraveNewsUtils { private static List mPublisherList; private static List mFollowingChannelList; private static List mFollowingPublisherList; - private static List mSuggestedList; + private static List mSuggestionsList; private static HashMap mChannelIcons = new HashMap<>(); public static String getPromotionIdItem(FeedItemsCard items) { @@ -192,20 +192,20 @@ public class BraveNewsUtils { return mPublisherList; } - private static void setSuggestedIds(List suggestedList) { - mSuggestedList = suggestedList; + private static void setSuggestionsIds(List suggestionsList) { + mSuggestionsList = suggestionsList; } - public static List getSuggestedPublisherList() { - List suggestedPublisherList = new ArrayList<>(); - if (mSuggestedList != null && mSuggestedList.size() > 0) { + public static List getSuggestionsPublisherList() { + List suggestionsPublisherList = new ArrayList<>(); + if (mSuggestionsList != null && mSuggestionsList.size() > 0) { for (Publisher publisher : mPublisherList) { - if (mSuggestedList.contains(publisher.publisherId)) { - suggestedPublisherList.add(publisher); + if (mSuggestionsList.contains(publisher.publisherId)) { + suggestionsPublisherList.add(publisher); } } } - return suggestedPublisherList; + return suggestionsPublisherList; } public static void updatePublishers(String publisherId, int userEnabled) { @@ -293,7 +293,7 @@ public class BraveNewsUtils { setLocale(locale); getChannels(braveNewsController, braveNewsPreferencesDataListener); getPublishers(braveNewsController, braveNewsPreferencesDataListener); - getSuggestedSources(braveNewsController, braveNewsPreferencesDataListener); + getSuggestionsSources(braveNewsController, braveNewsPreferencesDataListener); }); } }); @@ -365,10 +365,10 @@ public class BraveNewsUtils { setPopularSources(publisherList); } - public static void getSuggestedSources(BraveNewsController braveNewsController, + public static void getSuggestionsSources(BraveNewsController braveNewsController, BraveNewsPreferencesDataListener braveNewsPreferencesDataListener) { braveNewsController.getSuggestedPublisherIds((publisherIds) -> { - setSuggestedIds(Arrays.asList(publisherIds)); + setSuggestionsIds(Arrays.asList(publisherIds)); if (braveNewsPreferencesDataListener != null) { braveNewsPreferencesDataListener.onSuggestionsReceived(); } diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java index 5d49684a5d3..14e08c41761 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesDetails.java @@ -84,9 +84,9 @@ public class BraveNewsPreferencesDetails extends BravePreferenceFragment publisherList = BraveNewsUtils.getPopularSources(); getActivity().setTitle(R.string.popular); } else if (mBraveNewsPreferencesType.equalsIgnoreCase( - BraveNewsPreferencesType.Suggested.toString())) { - publisherList = BraveNewsUtils.getSuggestedPublisherList(); - getActivity().setTitle(R.string.suggested); + BraveNewsPreferencesType.Suggestions.toString())) { + publisherList = BraveNewsUtils.getSuggestionsPublisherList(); + getActivity().setTitle(R.string.suggestions); } else if (mBraveNewsPreferencesType.equalsIgnoreCase( BraveNewsPreferencesType.Channels.toString())) { getActivity().setTitle(R.string.channels); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesType.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesType.java index 42b7d678aab..95da0cd462f 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesType.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesType.java @@ -5,4 +5,4 @@ package org.chromium.chrome.browser.settings; -enum BraveNewsPreferencesType { Channels, PopularSources, Suggested, Following, Search } +enum BraveNewsPreferencesType { Channels, PopularSources, Suggestions, Following, Search } diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java index 5e86ed63e62..da14dcc5b35 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java @@ -93,7 +93,7 @@ public class BraveNewsPreferencesTypeAdapter extends RecyclerView.Adapter 0) { + && BraveNewsUtils.getSuggestionsPublisherList().size() > 0) { mIsSuggestionAvailable = true; } @@ -149,7 +149,7 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment if (!mIsSuggestionAvailable) { PostTask.postTask(TaskTraits.THREAD_POOL_BEST_EFFORT, () -> { if (mBraveNewsController != null) { - BraveNewsUtils.getSuggestedSources(mBraveNewsController, this); + BraveNewsUtils.getSuggestionsSources(mBraveNewsController, this); } }); } @@ -172,8 +172,8 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment openBraveNewsPreferencesDetails(BraveNewsPreferencesType.PopularSources); }); - mLayoutSuggested.setOnClickListener( - view -> { openBraveNewsPreferencesDetails(BraveNewsPreferencesType.Suggested); }); + mLayoutSuggestions.setOnClickListener( + view -> { openBraveNewsPreferencesDetails(BraveNewsPreferencesType.Suggestions); }); mLayoutChannels.setOnClickListener( view -> { openBraveNewsPreferencesDetails(BraveNewsPreferencesType.Channels); }); @@ -221,7 +221,7 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment sharedPreferencesEditor.apply(); if (mIsSuggestionAvailable) { - mLayoutSuggested.setVisibility(View.VISIBLE); + mLayoutSuggestions.setVisibility(View.VISIBLE); } } else { @@ -232,7 +232,7 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment mDivider.setVisibility(View.GONE); mTvSearch.setVisibility(View.GONE); mLayoutPopularSources.setVisibility(View.GONE); - mLayoutSuggested.setVisibility(View.GONE); + mLayoutSuggestions.setVisibility(View.GONE); mLayoutChannels.setVisibility(View.GONE); mLayoutFollowing.setVisibility(View.GONE); } @@ -302,9 +302,9 @@ public class BraveNewsPreferencesV2 extends BravePreferenceFragment @Override public void onSuggestionsReceived() { if (mSwitchShowNews != null && mSwitchShowNews.isChecked() - && BraveNewsUtils.getSuggestedPublisherList().size() > 0) { - if (mLayoutSuggested != null) { - mLayoutSuggested.setVisibility(View.VISIBLE); + && BraveNewsUtils.getSuggestionsPublisherList().size() > 0) { + if (mLayoutSuggestions != null) { + mLayoutSuggestions.setVisibility(View.VISIBLE); } } } diff --git a/android/java/res/drawable/ic_suggested.xml b/android/java/res/drawable/ic_suggestions.xml similarity index 100% rename from android/java/res/drawable/ic_suggested.xml rename to android/java/res/drawable/ic_suggestions.xml diff --git a/android/java/res/layout/brave_news_settings.xml b/android/java/res/layout/brave_news_settings.xml index 0aa027d8bf4..a77c7458b88 100644 --- a/android/java/res/layout/brave_news_settings.xml +++ b/android/java/res/layout/brave_news_settings.xml @@ -187,7 +187,7 @@ + app:layout_constraintStart_toEndOf="@id/iv_suggestions" + app:layout_constraintTop_toBottomOf="@id/tv_suggestions"/> diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 61b0a18dcfd..4410047f35a 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -453,7 +453,7 @@ This file contains all "about" strings. It is set to NOT be translated, in tran Turn on Brave News - Search for site, topic or RSS feed + Search for site, topic, or RSS feed Popular @@ -461,10 +461,10 @@ This file contains all "about" strings. It is set to NOT be translated, in tran Ranked list of sources - - Suggested + + Suggestions - + Some sources you might like