summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2025-05-23 15:45:36 +0300
committerAndrew Dolgov <fox@fakecake.org>2025-05-23 15:45:36 +0300
commitf77d4c651e4dd4d4d3f022706eff554ad07adc47 (patch)
tree43f59b6503e1516afbbf8fbce5c6fcdd9220146a
parentd917d93a970d635d58bb863d623677fc5f27d51a (diff)
downloadthe-epube-android-25.05-f77d4c65-signed.tar.gz
the-epube-android-25.05-f77d4c65-signed.tar.xz
add support for separate accent color 25.05-f77d4c65-signed
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java70
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterModel.java7
2 files changed, 53 insertions, 24 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 59e1813..1923523 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
@@ -192,44 +192,59 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
             updateMenu(page);

         });

 

+        m_model.getAccentColor().observe(this, (accentColor) -> {

+            Log.d(TAG, "observed accent color change=" + accentColor);

+

+            updateTheme(m_model.getThemeColor().getValue(), m_model.getAccentColor().getValue());

+

+        });

+

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

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

 

-            Window window = getWindow();

+            updateTheme(m_model.getThemeColor().getValue(), m_model.getAccentColor().getValue());

+        });

+    }

 

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

+    private void updateTheme(final Integer themeColor, final Integer accentColor) {

+        Log.d(TAG, "updateTheme:" + themeColor + " " + accentColor);

 

-            if (themeColor != -1) {

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

-                Color.colorToHSV(themeColor, themeHSV);

+        Window window = getWindow();

 

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

-                Color.colorToHSV(themeColor, themeHSVadjusted);

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

 

-                if (isNightMode()) {

-                    themeHSVadjusted[2] = 0.3f;

-                } else {

-                    themeHSVadjusted[2] = 0.8f;

-                }

+        if (themeColor != -1) {

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

+            Color.colorToHSV(themeColor, themeHSV);

 

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

+            window.setStatusBarColor(themeColor);

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

 

-                window.setStatusBarColor(themeColor);

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

+            int appbarColor = accentColor != -1 ? accentColor : themeColor;

 

-            } else {

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

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

+            Color.colorToHSV(appbarColor, appbarHSV);

 

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

-                getWindow().setStatusBarColor(colorSurface);

+            if (isNightMode() && appbarHSV[2] > 0.4f) {

+                appbarHSV[2] = 0.4f;

+            } else if (appbarHSV[2] < 0.95f) {

+                appbarHSV[2] = 0.95f;

+            }

 

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

-                Color.colorToHSV(colorSurface, colorHSV);

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

 

-                wic.setAppearanceLightStatusBars(colorHSV[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) {

@@ -432,6 +447,13 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         }

 

         @JavascriptInterface

+        public void setAccentColor(final int r, final int g, final int b) {

+            runOnUiThread(() -> {

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

+            });

+        }

+

+        @JavascriptInterface

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

             runOnUiThread(() -> {

                 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 1dfcd9d..ec92707 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
@@ -13,16 +13,23 @@ public class MasterModel extends AndroidViewModel {
     }
 
     private final MutableLiveData<Integer> m_themeColor = new MutableLiveData<>(-1);
+    private final MutableLiveData<Integer> m_accentColor = 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_themeColor;
     }
+    public LiveData<Integer> getAccentColor() {
+        return m_accentColor;
+    }
 
     public void updateThemeColor(int color) {
         m_themeColor.postValue(color);
     }
+    public void updateAccentColor(int color) {
+        m_accentColor.postValue(color);
+    }
 
     public LiveData<MasterActivity.AppPage> getCurrentPage() {
         return m_currentPage;