summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2025-05-22 09:59:24 +0300
committerAndrew Dolgov <fox@fakecake.org>2025-05-22 09:59:24 +0300
commitd917d93a970d635d58bb863d623677fc5f27d51a (patch)
tree5b177c46c293564d3c88965f620cf41efa3ce048
parent51687b6f1c409f741fe44907434ba9d9b036c33e (diff)
downloadthe-epube-android-d917d93a970d635d58bb863d623677fc5f27d51a.tar.gz
the-epube-android-d917d93a970d635d58bb863d623677fc5f27d51a.tar.xz
bring back theme color stuff 25.05-d917d93a-signed
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java66
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterModel.java8
2 files changed, 59 insertions, 15 deletions
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
index 94b9cb6..59e1813 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;

 import android.content.Intent;

 import android.content.IntentFilter;

+import android.content.res.ColorStateList;

 import android.content.res.Configuration;

 import android.graphics.Color;

 import android.net.ConnectivityManager;

@@ -12,10 +13,12 @@ import android.net.Uri;
 import android.os.Build;

 import android.os.Bundle;

 import android.util.Log;

+import android.util.TypedValue;

 import android.view.Menu;

 import android.view.MenuInflater;

 import android.view.MenuItem;

 import android.view.View;

+import android.view.Window;

 import android.webkit.CookieManager;

 import android.webkit.JavascriptInterface;

 import android.webkit.WebChromeClient;

@@ -30,6 +33,8 @@ import android.widget.Toast;
 import androidx.activity.EdgeToEdge;

 import androidx.annotation.NonNull;

 import androidx.appcompat.app.AppCompatActivity;

+import androidx.core.content.ContextCompat;

+import androidx.core.view.WindowInsetsControllerCompat;

 import androidx.lifecycle.ViewModelProvider;

 import androidx.webkit.WebViewAssetLoader;

 

@@ -180,8 +185,57 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         m_model.getCurrentPage().observe(this, (page) -> {

             Log.d(TAG, "observed page change to: " + page);

 

+            // reset theme color to default unless reader is open

+            if (page != AppPage.PAGE_READER)

+                m_model.updateThemeColor(-1);

+

             updateMenu(page);

         });

+

+        m_model.getThemeColor().observe(this, (themeColor) -> {

+            Log.d(TAG, "observed theme color change=" + themeColor);

+

+            Window window = getWindow();

+

+            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, window.getDecorView());

+

+            if (themeColor != -1) {

+                float[] themeHSV = new float[3];

+                Color.colorToHSV(themeColor, themeHSV);

+

+                float[] themeHSVadjusted = new float[3];

+                Color.colorToHSV(themeColor, themeHSVadjusted);

+

+                if (isNightMode()) {

+                    themeHSVadjusted[2] = 0.3f;

+                } else {

+                    themeHSVadjusted[2] = 0.8f;

+                }

+

+                findViewById(R.id.appbarlayout).setBackgroundTintList(ColorStateList.valueOf(Color.HSVToColor(themeHSVadjusted)));

+

+                window.setStatusBarColor(themeColor);

+                wic.setAppearanceLightStatusBars(themeHSV[2] > 0.5);

+

+            } else {

+                int colorSurface = colorFromAttr(R.attr.colorSurface);

+

+                findViewById(R.id.appbarlayout).setBackgroundTintList(ColorStateList.valueOf(colorSurface));

+                getWindow().setStatusBarColor(colorSurface);

+

+                float[] colorHSV = new float[3];

+                Color.colorToHSV(colorSurface, colorHSV);

+

+                wic.setAppearanceLightStatusBars(colorHSV[2] > 0.5);

+            }

+

+        });

+    }

+

+    private int colorFromAttr(int attr) {

+        TypedValue tv = new TypedValue();

+        getTheme().resolveAttribute(attr, tv, true);

+        return ContextCompat.getColor(this, tv.resourceId);

     }

 

     private void updateMenu(AppPage page) {

@@ -380,19 +434,9 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         @JavascriptInterface

         public void setStatusBarColor(final int r, final int g, final int b) {

             runOnUiThread(() -> {

-                int argbColor = Color.argb(255, r, g, b);

-

-                float[] hsv = new float[3];

-                Color.colorToHSV(argbColor, hsv);

-

-                m_model.updateThemeColor(Color.HSVToColor(hsv));

-

-                // findViewById(R.id.appbarlayout).setBackgroundTintList(ColorStateList.valueOf(hsvColor));

-                // getWindow().setStatusBarColor(hsvColor);

-

+                m_model.updateThemeColor(Color.argb(255, r, g, b));

             });

         }

-

     }

 

     /**

diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
index 1a529a9..1dfcd9d 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
@@ -12,16 +12,16 @@ public class MasterModel extends AndroidViewModel {
         super(application);
     }
 
-    private final MutableLiveData<Integer> m_themeColorHSV = new MutableLiveData<>(-1);
+    private final MutableLiveData<Integer> m_themeColor = new MutableLiveData<>(-1);
     private final MutableLiveData<MasterActivity.AppPage> m_currentPage = new MutableLiveData<>(MasterActivity.AppPage.PAGE_UNKNOWN);
     private final MutableLiveData<Boolean> m_isOffline = new MutableLiveData<>(false);
 
     public LiveData<Integer> getThemeColor() {
-        return m_themeColorHSV;
+        return m_themeColor;
     }
 
-    public void updateThemeColor(int hsvColor) {
-        m_themeColorHSV.postValue(hsvColor);
+    public void updateThemeColor(int color) {
+        m_themeColor.postValue(color);
     }
 
     public LiveData<MasterActivity.AppPage> getCurrentPage() {