From c2e9ef62e74f8384997e5ee2c21bf39460c421b6 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 3 Nov 2021 22:12:28 +0800 Subject: Tweak Material You dark theme on Android 12. --- .../infinityforreddit/utils/MaterialYouUtils.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java index 8c5dea51..53208622 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java @@ -78,12 +78,12 @@ public class MaterialYouUtils { lightTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = lightTheme.bottomAppBarIconColor; lightTheme.circularProgressBarBackground = context.getColor(android.R.color.system_accent1_10); lightTheme.dividerColor = context.getColor(android.R.color.system_neutral1_400); - lightTheme.isLightStatusBar = false; + lightTheme.isLightStatusBar = true; lightTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = true; lightTheme.name = "Material You"; - darkTheme.colorPrimary = context.getColor(android.R.color.system_accent1_100); - darkTheme.colorPrimaryDark = context.getColor(android.R.color.system_accent1_300); + darkTheme.colorPrimary = context.getColor(android.R.color.system_accent2_800); + darkTheme.colorPrimaryDark = context.getColor(android.R.color.system_accent2_900); darkTheme.colorAccent = context.getColor(android.R.color.system_accent3_100); darkTheme.colorPrimaryLightTheme = context.getColor(android.R.color.system_accent1_300); darkTheme.backgroundColor = context.getColor(android.R.color.system_neutral1_900); @@ -91,23 +91,23 @@ public class MaterialYouUtils { darkTheme.commentBackgroundColor = context.getColor(android.R.color.system_neutral2_800); darkTheme.awardedCommentBackgroundColor = context.getColor(android.R.color.system_neutral2_800); darkTheme.bottomAppBarBackgroundColor = context.getColor(android.R.color.system_accent2_800); - darkTheme.navBarColor = context.getColor(android.R.color.system_neutral2_800); + darkTheme.navBarColor = darkTheme.colorPrimary; darkTheme.primaryTextColor = context.getColor(android.R.color.system_neutral1_10); darkTheme.secondaryTextColor = context.getColor(android.R.color.system_neutral1_10); darkTheme.bottomAppBarIconColor = context.getColor(android.R.color.system_accent1_100);; darkTheme.primaryIconColor = context.getColor(android.R.color.system_accent1_100); darkTheme.fabIconColor = context.getColor(android.R.color.system_neutral1_900); - darkTheme.toolbarPrimaryTextAndIconColor = context.getColor(android.R.color.system_accent1_900); - darkTheme.toolbarSecondaryTextColor = context.getColor(android.R.color.system_accent1_900); - darkTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = context.getColor(android.R.color.system_accent1_800); - darkTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = context.getColor(android.R.color.system_accent1_800); - darkTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = context.getColor(android.R.color.system_accent1_100); - darkTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = context.getColor(android.R.color.system_accent1_100); - darkTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = context.getColor(android.R.color.system_accent1_800); - darkTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = context.getColor(android.R.color.system_accent1_800); + darkTheme.toolbarPrimaryTextAndIconColor = context.getColor(android.R.color.system_accent2_100); + darkTheme.toolbarSecondaryTextColor = darkTheme.toolbarPrimaryTextAndIconColor; + darkTheme.tabLayoutWithCollapsedCollapsingToolbarTabIndicator = darkTheme.toolbarPrimaryTextAndIconColor; + darkTheme.tabLayoutWithCollapsedCollapsingToolbarTextColor = darkTheme.toolbarPrimaryTextAndIconColor; + darkTheme.tabLayoutWithCollapsedCollapsingToolbarTabBackground = darkTheme.colorPrimary; + darkTheme.tabLayoutWithExpandedCollapsingToolbarTabBackground = darkTheme.backgroundColor; + darkTheme.tabLayoutWithExpandedCollapsingToolbarTabIndicator = darkTheme.bottomAppBarIconColor; + darkTheme.tabLayoutWithExpandedCollapsingToolbarTextColor = darkTheme.bottomAppBarIconColor; darkTheme.circularProgressBarBackground = context.getColor(android.R.color.system_accent1_900); darkTheme.dividerColor = context.getColor(android.R.color.system_neutral1_600); - darkTheme.isLightStatusBar = true; + darkTheme.isLightStatusBar = false; darkTheme.isChangeStatusBarIconColorAfterToolbarCollapsedInImmersiveInterface = true; darkTheme.name = "Material You Dark"; -- cgit v1.2.3