Merge pull request #17255 from brave/brave_news_unfollow_button_style…

…_change_android [Android] brave news unfollow button style change
brave · Feb 16, 2023 · 09b18ce · 09b18ce
2 parents e0155b0 + 0aa59b6
commit 09b18ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
@@ -427,6 +427,7 @@ brave_java_resources = [
   "java/res/drawable/brave_news_settings_list_divider.xml",
   "java/res/drawable/brave_news_settings_publisher_bg.xml",
   "java/res/drawable/brave_news_settings_search_bg.xml",
+  "java/res/drawable/brave_news_settings_unfollow_bg.xml",
   "java/res/drawable/brave_notification_permission_rationale_dialog_header.xml",
   "java/res/drawable/brave_rating_emoji_bg.xml",
   "java/res/drawable/brave_rating_rate_now_bg.xml",
@@ -744,7 +745,6 @@ brave_java_resources = [
   "java/res/drawable/wallet_toolbar_panel_gradient_bg.xml",
   "java/res/drawable/wallet_top_banner_bg.xml",
   "java/res/drawable/wallet_verify_button.xml",
-  "java/res/drawable/white_rounded_bg.xml",
   "java/res/drawable/white_rounded_holo_button_thin.xml",
   "java/res/drawable/yearly_selector.xml",
   "java/res/font/poppins_300.ttf",

diff --git a/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java
@@ -347,13 +347,11 @@ private void setChannel(int position, NewsPreferencesViewHolder viewHolder, Chan
     private void displayFollowButton(
             boolean isFollowing, int textId, NewsPreferencesViewHolder holder) {
         if (isFollowing) {
-            holder.btnFollow.setBackgroundResource(R.drawable.white_rounded_bg);
-            holder.btnFollow.setElevation(2f);
+            holder.btnFollow.setBackgroundResource(R.drawable.brave_news_settings_unfollow_bg);
             holder.btnText.setTextColor(
-                    ContextCompat.getColor(mContext, R.color.news_settings_subtitle_color));
+                    ContextCompat.getColor(mContext, R.color.news_settings_unfollow_color));
         } else {
             holder.btnFollow.setBackgroundResource(R.drawable.blue_48_rounded_bg);
-            holder.btnFollow.setElevation(0f);
             holder.btnText.setTextColor(ContextCompat.getColor(mContext, android.R.color.white));
         }
 

diff --git a/...id/java/res/drawable/white_rounded_bg.xml → ...wable/brave_news_settings_unfollow_bg.xml b/...id/java/res/drawable/white_rounded_bg.xml → ...wable/brave_news_settings_unfollow_bg.xml
@@ -2,5 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#FFFFFF" />
+    <stroke android:color="@color/news_settings_unfollow_color" android:width="1dp"/>
     <corners android:radius="48dp" />
 </shape>
diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
@@ -110,6 +110,7 @@
     <color name="news_settings_following_count_bg_color">#1A000000</color>
     <color name="news_settings_optin_color">#CCCCCC</color>
     <color name="news_settings_switch_color">#4C54D2</color>
+    <color name="news_settings_unfollow_color">#4C54D2</color>
 
     <!-- Incognito mode colors -->
     <color name="ntp_bg_incognito">@color/incognito_modern_primary_color</color>