clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 14:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): sync navbar and actionbar color when theme change

Browse Source 
Close #10580
This commit is contained in:
Andelf
2023-12-07 18:12:43 +08:00
committed by Tienson Qin
parent 6fbf6c0520
commit 9f265abd70
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/frontend/state.cljs
View File

@@ -2206,7 +2206,8 @@ Similar to re-frame subscriptions"
(defn set-color-accent! [color]
(swap! state assoc :ui/radix-color color)
(storage/set :ui/radix-color color)
(colors/set-radix color))
(colors/set-radix color)
(util/set-android-theme))
(defn unset-color-accent! []
(swap! state assoc :ui/radix-color nil)

45
src/main/frontend/util.cljc
View File

@@ -204,23 +204,53 @@
(gobj/get js/window "innerWidth")))
;; Keep the following colors in sync with common.css
#?(:cljs
(defn- get-computed-bg-color
[]
;; window.getComputedStyle(document.body, null).getPropertyValue('background-color');
(let [styles (js/window.getComputedStyle (js/document.querySelector "#app-container"))
bg-color (gobj/get styles "background-color")
;; convert rgb(r,g,b) to #rrggbb
rgb2hex (fn [rgb]
(->> rgb
(map string/trim)
(map parse-long)
(map #(.toString % 16))
(map #(if (< (count %) 2)
(str "0" %)
%))
(string/join)
(str "#")))]
(when (string/starts-with? bg-color "rgb(")
(let [rgb (-> bg-color
(string/replace #"^rgb\(" "")
(string/replace #"\)$" "")
(string/split #","))
rgb (take 3 rgb)]
(rgb2hex rgb)))))
)
#?(:cljs
(defn set-android-theme
[]
(when (mobile-util/native-android?)
(when-let [bg-color (get-computed-bg-color)]
(.setNavigationBarColor NavigationBar (clj->js {:color bg-color}))
(.setBackgroundColor StatusBar (clj->js {:color bg-color}))))))
#?(:cljs
(defn set-theme-light
[]
(p/do!
(.setStyle StatusBar (clj->js {:style (.-Light Style)}))
(when (mobile-util/native-android?)
(.setNavigationBarColor NavigationBar (clj->js {:color "#ffffff"}))
(.setBackgroundColor StatusBar (clj->js {:color "#ffffff"}))))))
(set-android-theme))))
#?(:cljs
(defn set-theme-dark
[]
(p/do!
(.setStyle StatusBar (clj->js {:style (.-Dark Style)}))
(when (mobile-util/native-android?)
(.setNavigationBarColor NavigationBar (clj->js {:color "#002b36"}))
(.setBackgroundColor StatusBar (clj->js {:color "#002b36"}))))))
(set-android-theme))))
(defn find-first
[pred coll]
@@ -1032,7 +1062,8 @@
(d/set-attr! :type "text/css")
(d/set-attr! :href style)
(d/set-attr! :media "all"))]
(d/append! parent-node link))))))
(d/append! parent-node link))
(set-android-theme)))))
(defn remove-common-preceding
[col1 col2]