From 276b7aa9b5f444a22773deced1e16af331ab07e2 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 24 Oct 2024 14:05:16 +1300
Subject: [PATCH] Added material you color pulling android

---
 .vscode/settings.json                         |  3 +-
 materialious/android/app/build.gradle         |  1 +
 .../java/us/materialio/app/ColorTheme.java    | 47 +++++++++++++++++++
 .../java/us/materialio/app/MainActivity.java  | 10 +++-
 .../app/src/main/res/values/styles.xml        |  6 +--
 materialious/src/.d.ts                        |  2 +-
 .../http}/androidRequests.ts                  |  0
 .../http}/capacitorFetch.ts                   |  0
 .../src/lib/android/plugins/ColorTheme.ts     | 28 +++++++++++
 materialious/src/lib/patches/youtubejs.ts     |  2 +-
 materialious/src/routes/(app)/+layout.svelte  |  8 +++-
 materialious/svelte.config.js                 |  3 +-
 12 files changed, 98 insertions(+), 12 deletions(-)
 create mode 100644 materialious/android/app/src/main/java/us/materialio/app/ColorTheme.java
 rename materialious/src/lib/{patches => android/http}/androidRequests.ts (100%)
 rename materialious/src/lib/{patches => android/http}/capacitorFetch.ts (100%)
 create mode 100644 materialious/src/lib/android/plugins/ColorTheme.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 794cfe05..df770654 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,6 @@
     "i18n-ally.keystyle": "nested",
     "cSpell.words": [
         "Materialious"
-    ]
+    ],
+    "java.configuration.updateBuildConfiguration": "interactive"
 }
\ No newline at end of file
diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index 510caa83..1a5b7987 100644
--- a/materialious/android/app/build.gradle
+++ b/materialious/android/app/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
     implementation project(':capacitor-android')
     testImplementation "junit:junit:$junitVersion"
+    implementation 'com.google.android.material:material:1.12.0'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
diff --git a/materialious/android/app/src/main/java/us/materialio/app/ColorTheme.java b/materialious/android/app/src/main/java/us/materialio/app/ColorTheme.java
new file mode 100644
index 00000000..abd91466
--- /dev/null
+++ b/materialious/android/app/src/main/java/us/materialio/app/ColorTheme.java
@@ -0,0 +1,47 @@
+package us.materialio.app;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+
+import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.PluginMethod;
+import com.getcapacitor.PluginCall;
+import com.getcapacitor.Plugin;
+import com.getcapacitor.JSObject;
+import com.google.android.material.color.DynamicColors;
+
+@CapacitorPlugin(name = "ColorTheme")
+public class ColorTheme extends Plugin {
+    @PluginMethod()
+    public void getColorPalette(PluginCall call) {
+        JSObject colorPalette = new JSObject();
+
+        if (DynamicColors.isDynamicColorAvailable()) {
+            Context dynamicColorContext = DynamicColors.wrapContextIfAvailable(getContext(), com.google.android.material.R.style.ThemeOverlay_Material3_DynamicColors_DayNight);
+
+            int[] attrsToResolve = {
+                    com.google.android.material.R.attr.colorPrimary,
+                    com.google.android.material.R.attr.colorOnPrimary,
+                    com.google.android.material.R.attr.colorSecondary,
+                    com.google.android.material.R.attr.colorAccent
+            };
+
+            try {
+                TypedArray ta = dynamicColorContext.obtainStyledAttributes(attrsToResolve);
+
+                colorPalette.put("primary", ta.getColor(0,0));
+                colorPalette.put("onPrimary", ta.getColor(1,0));
+                colorPalette.put("secondary", ta.getColor(2,0));
+                colorPalette.put("accent", ta.getColor(3,0));
+
+                ta.recycle();
+
+                call.resolve(colorPalette);
+            } catch (Exception e) {
+                call.reject("Unable to fetch dynamic color");
+            }
+        } else {
+            call.reject("Dynamic color not available");
+        }
+    }
+}
diff --git a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java
index 9171d44e..feee75e4 100644
--- a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java
+++ b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java
@@ -1,5 +1,13 @@
 package us.materialio.app;
 
+import android.os.Bundle;
+
 import com.getcapacitor.BridgeActivity;
 
-public class MainActivity extends BridgeActivity {}
+public class MainActivity extends BridgeActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        registerPlugin(ColorTheme.class);
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/materialious/android/app/src/main/res/values/styles.xml b/materialious/android/app/src/main/res/values/styles.xml
index be874e54..e07ee615 100644
--- a/materialious/android/app/src/main/res/values/styles.xml
+++ b/materialious/android/app/src/main/res/values/styles.xml
@@ -2,11 +2,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+    <style name="AppTheme" parent="Theme.Material3.DayNight">
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
diff --git a/materialious/src/.d.ts b/materialious/src/.d.ts
index ede24701..3a8ede95 100644
--- a/materialious/src/.d.ts
+++ b/materialious/src/.d.ts
@@ -1 +1 @@
-declare module 'virtual:pwa-info';
+declare module 'virtual:pwa-info';
\ No newline at end of file
diff --git a/materialious/src/lib/patches/androidRequests.ts b/materialious/src/lib/android/http/androidRequests.ts
similarity index 100%
rename from materialious/src/lib/patches/androidRequests.ts
rename to materialious/src/lib/android/http/androidRequests.ts
diff --git a/materialious/src/lib/patches/capacitorFetch.ts b/materialious/src/lib/android/http/capacitorFetch.ts
similarity index 100%
rename from materialious/src/lib/patches/capacitorFetch.ts
rename to materialious/src/lib/android/http/capacitorFetch.ts
diff --git a/materialious/src/lib/android/plugins/ColorTheme.ts b/materialious/src/lib/android/plugins/ColorTheme.ts
new file mode 100644
index 00000000..2516bdc7
--- /dev/null
+++ b/materialious/src/lib/android/plugins/ColorTheme.ts
@@ -0,0 +1,28 @@
+import { registerPlugin } from "@capacitor/core";
+
+export interface ColorTheme {
+  getColorPalette: () => Promise<{
+    primary: number;
+    onPrimary: number;
+    secondary: number;
+    accent: number;
+  }>;
+}
+
+export function convertToHexColorCode(color: number) {
+  // Convert the negative number to a positive unsigned integer
+  const unsignedColor = color < 0 ? color + 0x100000000 : color;
+
+  // Extract the RGB components
+  const r = (unsignedColor >> 16) & 0xff;
+  const g = (unsignedColor >> 8) & 0xff;
+  const b = unsignedColor & 0xff;
+
+  // Convert to hex format and pad with zeros if necessary
+  return `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1).toUpperCase()}`;
+}
+
+
+const colorTheme = registerPlugin<ColorTheme>('ColorTheme');
+
+export default colorTheme;
\ No newline at end of file
diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts
index 4fae20e0..fc7216b3 100644
--- a/materialious/src/lib/patches/youtubejs.ts
+++ b/materialious/src/lib/patches/youtubejs.ts
@@ -5,7 +5,7 @@ import { Capacitor } from '@capacitor/core';
 import { BG } from 'bgutils-js';
 import { get } from 'svelte/store';
 import { Innertube, ProtoUtils, UniversalCache, Utils } from 'youtubei.js';
-import { capacitorFetch } from './capacitorFetch';
+import { capacitorFetch } from '../android/http/capacitorFetch';
 
 
 export interface PoTokens {
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index 45ad7392..4663e8c2 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
 	import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
 	import { navigating } from '$app/stores';
+	import '$lib/android/http/androidRequests';
+	import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/ColorTheme';
 	import { getFeed } from '$lib/Api/index';
 	import type { Notification } from '$lib/Api/model';
 	import { bookmarkletLoadFromUrl, loadSettingsFromEnv } from '$lib/externalSettings';
 	import Logo from '$lib/Logo.svelte';
 	import MiniPlayer from '$lib/MiniPlayer.svelte';
 	import PageLoading from '$lib/PageLoading.svelte';
-	import '$lib/patches/androidRequests';
 	import Search from '$lib/Search.svelte';
 	import Settings from '$lib/Settings.svelte';
 	import {
@@ -184,6 +185,11 @@
 		const themeHex = get(themeColorStore);
 		if (themeHex) {
 			await ui('theme', themeHex);
+		} else if (Capacitor.getPlatform() === 'android') {
+			try {
+				const colorPalette = await colorTheme.getColorPalette();
+				await ui('theme', convertToHexColorCode(colorPalette.primary));
+			} catch {}
 		}
 
 		setTheme();
diff --git a/materialious/svelte.config.js b/materialious/svelte.config.js
index 0227345f..9e9f6fbc 100644
--- a/materialious/svelte.config.js
+++ b/materialious/svelte.config.js
@@ -6,7 +6,6 @@ const config = {
 	// Consult https://kit.svelte.dev/docs/integrations#preprocessors
 	// for more information about preprocessors
 	preprocess: vitePreprocess(),
-
 	kit: {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported or you settled on a specific environment, switch out the adapter.
@@ -14,7 +13,7 @@ const config = {
 		adapter: adapter({
 			fallback: 'index.html'
 		})
-	}
+	},
 };
 
 export default config;