From 47e1686705a3e3cc693e3f128995b687c67cae6e Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Wed, 6 Jan 2021 15:32:57 +0800
Subject: [PATCH] Make custom tabs follow app theme

---
 app/src/main/java/com/hippo/ehviewer/UrlOpener.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java
index ce1d9f438..53f76ba45 100644
--- a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java
+++ b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java
@@ -19,6 +19,7 @@ package com.hippo.ehviewer;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -59,12 +60,14 @@ public final class UrlOpener {
             }
         }
 
+        boolean isNight = (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0;
         CustomTabsIntent.Builder customTabsIntent = new CustomTabsIntent.Builder();
         customTabsIntent.setShowTitle(true);
-        CustomTabColorSchemeParams darkParams = new CustomTabColorSchemeParams.Builder()
-                .setToolbarColor(AttrResources.getAttrColor(context, R.attr.colorPrimary))
+        CustomTabColorSchemeParams params = new CustomTabColorSchemeParams.Builder()
+                .setToolbarColor(AttrResources.getAttrColor(context, R.attr.toolbarColor))
                 .build();
-        customTabsIntent.setColorSchemeParams(CustomTabsIntent.COLOR_SCHEME_LIGHT, darkParams);
+        customTabsIntent.setDefaultColorSchemeParams(params);
+        customTabsIntent.setColorScheme(isNight ? CustomTabsIntent.COLOR_SCHEME_DARK : CustomTabsIntent.COLOR_SCHEME_LIGHT);
         try {
             customTabsIntent.build().launchUrl(context, uri);
         } catch (ActivityNotFoundException e) {