clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-02-01 22:47:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: android nav bar and status bar color (#7385)

Browse Source 
* fix(android): set nav bar and status bar color

Close #7382
This commit is contained in:
Andelf
2022-11-21 10:50:10 +08:00
committed by GitHub
parent 962998a7b2
commit e618f5d1f7
11 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/capacitor.build.gradle
View File

@@ -19,6 +19,7 @@ dependencies {
implementation project(':capacitor-splash-screen')
implementation project(':capacitor-status-bar')
implementation project(':capawesome-capacitor-background-task')
implementation project(':hugotomazi-capacitor-navigation-bar')
implementation project(':logseq-capacitor-file-sync')
implementation project(':capacitor-voice-recorder')
implementation project(':send-intent')

4
android/app/src/main/assets/capacitor.plugins.json
View File

@@ -39,6 +39,10 @@
"pkg": "@capawesome/capacitor-background-task",
"classpath": "io.capawesome.capacitorjs.plugins.backgroundtask.BackgroundTaskPlugin"
},
{
"pkg": "@hugotomazi/capacitor-navigation-bar",
"classpath": "br.com.tombus.capacitor.plugin.navigationbar.NavigationBarPlugin"
},
{
"pkg": "@logseq/capacitor-file-sync",
"classpath": "com.logseq.app.filesync.FileSyncPlugin"

2
android/app/src/main/res/values/colors.xml
View File

@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="logoPrimary">#002b36</color>
<color name="colorPrimary">#ffffff</color>
<color name="colorPrimaryDark">#002b36</color>
</resources>

2
android/app/src/main/res/values/styles.xml
View File

@@ -14,6 +14,8 @@
<item name="windowNoTitle">true</item>
<item name="android:background">@null</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:navigationBarColor">@color/colorPrimary</item>
<item name="android:statusBarColor">@color/colorPrimary</item>
</style>
<!-- App Starting -->

3
android/capacitor.settings.gradle
View File

@@ -32,6 +32,9 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
include ':capawesome-capacitor-background-task'
project(':capawesome-capacitor-background-task').projectDir = new File('../node_modules/@capawesome/capacitor-background-task/android')
include ':hugotomazi-capacitor-navigation-bar'
project(':hugotomazi-capacitor-navigation-bar').projectDir = new File('../node_modules/@hugotomazi/capacitor-navigation-bar/android')
include ':logseq-capacitor-file-sync'
project(':logseq-capacitor-file-sync').projectDir = new File('../node_modules/@logseq/capacitor-file-sync/android')

1
ios/App/Podfile
View File

@@ -21,6 +21,7 @@ def capacitor_pods
pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
pod 'CapawesomeCapacitorBackgroundTask', :path => '../../node_modules/@capawesome/capacitor-background-task'
pod 'HugotomaziCapacitorNavigationBar', :path => '../../node_modules/@hugotomazi/capacitor-navigation-bar'
pod 'LogseqCapacitorFileSync', :path => '../../node_modules/@logseq/capacitor-file-sync'
pod 'CapacitorVoiceRecorder', :path => '../../node_modules/capacitor-voice-recorder'
pod 'SendIntent', :path => '../../node_modules/send-intent'

1
package.json
View File

@@ -90,6 +90,7 @@
"@capacitor/status-bar": "^4.0.0",
"@capawesome/capacitor-background-task": "^2.0.0",
"@excalidraw/excalidraw": "0.12.0",
"@hugotomazi/capacitor-navigation-bar": "^2.0.0",
"@kanru/rage-wasm": "^0.3.0",
"@logseq/capacitor-file-sync": "0.0.13",
"@logseq/react-tweet-embed": "1.3.1-1",

8
src/main/frontend/handler.cljs
View File

@@ -219,13 +219,15 @@
(-> (p/let [repos (get-repos)
_ (state/set-repos! repos)
_ (restore-and-setup! repos)])
_ (restore-and-setup! repos)]
(when (mobile-util/native-platform?)
(p/do!
(mobile-util/hide-splash)
(state/restore-mobile-theme!))))
(p/catch (fn [e]
(js/console.error "Error while restoring repos: " e)))
(p/finally (fn []
(state/set-db-restoring! false))))
(when (mobile-util/native-platform?)
(mobile-util/hide-splash))
(db/run-batch-txs!)
(file/<ratelimit-file-writes!)

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

@@ -1114,7 +1114,7 @@ Similar to re-frame subscriptions"
(defn set-theme-mode!
[mode]
(when (mobile-util/native-ios?)
(when (mobile-util/native-platform?)
(if (= mode "light")
(util/set-theme-light)
(util/set-theme-dark)))
@@ -1137,7 +1137,7 @@ Similar to re-frame subscriptions"
(set-state! :ui/system-theme? false)
(storage/set :ui/system-theme? false))))
(defn toggle-theme
(defn- toggle-theme
[theme]
(if (= theme "dark") "light" "dark"))
@@ -1152,6 +1152,17 @@ Similar to re-frame subscriptions"
(set-state! (if mode [:ui/custom-theme (keyword mode)] :ui/custom-theme) theme)
(storage/set :ui/custom-theme (:ui/custom-theme @state))))
(defn restore-mobile-theme!
"Restore mobile theme setting from local storage"
[]
(let [mode (or (storage/get :ui/theme) "light")
system-theme? (storage/get :ui/system-theme?)]
(when (and (not system-theme?)
(mobile-util/native-platform?))
(if (= mode "light")
(util/set-theme-light)
(util/set-theme-dark)))))
(defn set-editing-block-dom-id!
[block-dom-id]
(set-state! :editor/block-dom-id block-dom-id))

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

@@ -6,6 +6,7 @@
["/frontend/selection" :as selection]
["/frontend/utils" :as utils]
["@capacitor/status-bar" :refer [^js StatusBar Style]]
["@hugotomazi/capacitor-navigation-bar" :refer [^js NavigationBar]]
["grapheme-splitter" :as GraphemeSplitter]
["remove-accents" :as removeAccents]
["sanitize-filename" :as sanitizeFilename]
@@ -16,7 +17,7 @@
[cljs-time.core :as t]
[clojure.pprint]
[dommy.core :as d]
[frontend.mobile.util :refer [native-platform?]]
[frontend.mobile.util :as mobile-util]
[logseq.graph-parser.util :as gp-util]
[goog.dom :as gdom]
[goog.object :as gobj]
@@ -91,7 +92,7 @@
#?(:cljs
(defn mobile?
"Triggering condition: Mobile phones
"Triggering condition: Mobile phones
*** Warning!!! ***
For UX logic only! Don't use for FS logic
iPad / Android Pad doesn't trigger!"
@@ -114,7 +115,7 @@
#?(:cljs
(do
(def nfs? (and (not (electron?))
(not (native-platform?))))
(not (mobile-util/native-platform?))))
(def web-platform? nfs?)))
#?(:cljs
@@ -163,17 +164,24 @@
[]
(gobj/get js/window "innerWidth")))
;; Keep the following colors in sync with common.css
#?(:cljs
(defn set-theme-light
[]
(p/do!
(.setStyle StatusBar (clj->js {:style (.-Light Style)})))))
(.setStyle StatusBar (clj->js {:style (.-Light Style)}))
(when (mobile-util/native-android?)
(.setColor NavigationBar (clj->js {:color "#ffffff"}))
(.setBackgroundColor StatusBar (clj->js {:color "#ffffff"}))))))
#?(:cljs
(defn set-theme-dark
[]
(p/do!
(.setStyle StatusBar (clj->js {:style (.-Dark Style)})))))
(.setStyle StatusBar (clj->js {:style (.-Dark Style)}))
(when (mobile-util/native-android?)
(.setColor NavigationBar (clj->js {:color "#002b36"}))
(.setBackgroundColor StatusBar (clj->js {:color "#002b36"}))))))
(defn find-first
[pred coll]
@@ -818,9 +826,9 @@
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(let [idx (dec index)]
(when (>= idx 0)
(nth-safe blocks idx))))))))
(let [idx (dec index)]
(when (>= idx 0)
(nth-safe blocks idx))))))))
#?(:cljs
(defn get-next-block-non-collapsed
@@ -829,9 +837,9 @@
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(let [idx (inc index)]
(when (>= (count blocks) idx)
(nth-safe blocks idx))))))))
(let [idx (inc index)]
(when (>= (count blocks) idx)
(nth-safe blocks idx))))))))
#?(:cljs
(defn get-next-block-non-collapsed-skip
@@ -840,14 +848,14 @@
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(loop [idx (inc index)]
(when (>= (count blocks) idx)
(let [block (nth-safe blocks idx)
nested? (->> (array-seq (gdom/getElementsByClass "selected"))
(some (fn [dom] (.contains dom block))))]
(if nested?
(recur (inc idx))
block)))))))))
(loop [idx (inc index)]
(when (>= (count blocks) idx)
(let [block (nth-safe blocks idx)
nested? (->> (array-seq (gdom/getElementsByClass "selected"))
(some (fn [dom] (.contains dom block))))]
(if nested?
(recur (inc idx))
block)))))))))
(defn rand-str
[n]
@@ -934,9 +942,9 @@
"Normalize string for searching (loose)"
[s remove-accents?]
(let [normalize-str (.normalize (string/lower-case s) "NFKC")]
(if remove-accents?
(removeAccents normalize-str)
normalize-str))))
(if remove-accents?
(removeAccents normalize-str)
normalize-str))))
#?(:cljs
(def page-name-sanity-lc
@@ -944,10 +952,10 @@
gp-util/page-name-sanity-lc))
#?(:cljs
(defn safe-page-name-sanity-lc
[s]
(if (string? s)
(page-name-sanity-lc s) s)))
(defn safe-page-name-sanity-lc
[s]
(if (string? s)
(page-name-sanity-lc s) s)))
(defn get-page-original-name
[page]
@@ -1286,7 +1294,7 @@
#?(:cljs
(defn scroll-editor-cursor
[^js/HTMLElement el & {:keys [to-vw-one-quarter?]}]
(when (and el (or (native-platform?) mobile?))
(when (and el (or (mobile-util/native-platform?) mobile?))
(let [box-rect (.getBoundingClientRect el)
box-top (.-top box-rect)
box-bottom (.-bottom box-rect)
@@ -1428,4 +1436,4 @@
(-> (.blob data)
(.then (fn [blob]
(js/navigator.clipboard.write (clj->js [(js/ClipboardItem. (clj->js {(.-type blob) blob}))]))))
(.catch js/console.error)))))))
(.catch js/console.error)))))))

12
yarn.lock
View File

@@ -358,6 +358,11 @@
dependencies:
dotenv "10.0.0"
"@hugotomazi/capacitor-navigation-bar@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@hugotomazi/capacitor-navigation-bar/-/capacitor-navigation-bar-2.0.0.tgz#d5297025da12c486e7f733e311e367eeebd8a011"
integrity sha512-hebf0ixGPugiZfH6g7HS/hrDzkKmNdJV/pV2jUz5lfoZXFMjE+7aeAr1AqwW6EGNej65WcEP8VUL5YUc3wSCjw==
"@ionic/cli-framework-output@^2.2.1", "@ionic/cli-framework-output@^2.2.5":
version "2.2.5"
resolved "https://registry.yarnpkg.com/@ionic/cli-framework-output/-/cli-framework-output-2.2.5.tgz#0db9fba7efe0c27bb5085b12ee01f22053e44152"
@@ -1616,12 +1621,7 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001370:
version "1.0.30001431"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz"
integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
version "1.0.30001431"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz#e7c59bd1bc518fae03a4656be442ce6c4887a795"
integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==