From f7ee42b01ebfb577a6c74a4f0f31993710bed84b Mon Sep 17 00:00:00 2001 From: Deep Date: Thu, 22 Apr 2021 16:31:13 -0400 Subject: [PATCH] Fix privacy report theme color --- .../BraveStatsBottomSheetDialogFragment.java | 22 +++++++++++++------ android/java/res/values/brave_colors.xml | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java index ed02aafc1344e..aad2b4d1bf720 100644 --- a/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/brave_stats/BraveStatsBottomSheetDialogFragment.java @@ -20,8 +20,8 @@ import android.util.Pair; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewParent; import android.view.ViewGroup; +import android.view.ViewParent; import android.view.ViewTreeObserver; import android.widget.FrameLayout; import android.widget.ImageView; @@ -30,10 +30,10 @@ import android.widget.RadioGroup; import android.widget.TextView; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import androidx.fragment.app.FragmentTransaction; -import androidx.fragment.app.FragmentManager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; @@ -49,6 +49,7 @@ import org.chromium.chrome.browser.local_database.BraveStatsTable; import org.chromium.chrome.browser.local_database.DatabaseHelper; import org.chromium.chrome.browser.local_database.SavedBandwidthTable; +import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; import org.chromium.chrome.browser.util.ConfigurationUtils; import org.chromium.ui.base.DeviceFormFactor; @@ -330,11 +331,18 @@ protected void onPostExecute(Void result) { TextView mSiteText = (TextView) layout.findViewById(R.id.site_text); mTrackerCountText.setText(String.valueOf(statPair.second)); - mTrackerCountText.setTextColor( - mContext.getResources().getColor(R.color.brave_stats_text_color)); mSiteText.setText(statPair.first); - mSiteText.setTextColor( - mContext.getResources().getColor(R.color.brave_stats_text_color)); + if (GlobalNightModeStateProviderHolder.getInstance().isInNightMode()) { + mSiteText.setTextColor(mContext.getResources().getColor( + R.color.brave_stats_text_dark_color)); + mTrackerCountText.setTextColor(mContext.getResources().getColor( + R.color.brave_stats_text_dark_color)); + } else { + mSiteText.setTextColor(mContext.getResources().getColor( + R.color.brave_stats_text_light_color)); + mTrackerCountText.setTextColor(mContext.getResources().getColor( + R.color.brave_stats_text_light_color)); + } rootView.addView(layout); } diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index 9bac0d90746e6..fca843048e756 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -97,6 +97,8 @@ #868E96 #212529 + #212529 + #F0F2FF #212529 #C2C4CF