status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#12309] Appearance changes do not apply to the action bar color on Browser screen on Android 

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
andrey 2021-07-23 09:55:07 +02:00
parent 6d67e93fa3
commit 11d9a16e7d
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/status_im/ui/screens/appearance/views.cljs
View File

@ -14,10 +14,11 @@
(defn button [label icon theme selected?] (defn button [label icon theme selected?]
[react/touchable-highlight [react/touchable-highlight
{:on-press #(do (re-frame/dispatch [:multiaccounts.ui/appearance-switched theme]) {:on-press (fn []
(re-frame/dispatch [:multiaccounts.ui/appearance-switched theme])
(re-frame/dispatch [:init-root :chat-stack]) (re-frame/dispatch [:init-root :chat-stack])
(re-frame/dispatch [:navigate-change-tab :profile]) (re-frame/dispatch [:navigate-change-tab :profile])
(re-frame/dispatch [:navigate-to :appearance]))} (js/setTimeout #(re-frame/dispatch [:navigate-to :appearance]) 1000))}
[react/view (merge {:align-items :center :padding 8 :border-radius 20} [react/view (merge {:align-items :center :padding 8 :border-radius 20}
(when selected? (when selected?
{:background-color colors/blue-light})) {:background-color colors/blue-light}))

12
src/status_im/ui/screens/browser/views.cljs
View File

@ -75,14 +75,12 @@
:disabled empty-tab :disabled empty-tab
:style (when empty-tab styles/disabled-button) :style (when empty-tab styles/disabled-button)
:accessibility-label :previous-page-button} :accessibility-label :previous-page-button}
[react/view [icons/icon :main-icons/arrow-left {:color colors/black}]]
[icons/icon :main-icons/arrow-left]]]
[react/touchable-highlight {:on-press #(re-frame/dispatch [:browser.ui/next-page-button-pressed]) [react/touchable-highlight {:on-press #(re-frame/dispatch [:browser.ui/next-page-button-pressed])
:disabled (not can-go-forward?) :disabled (not can-go-forward?)
:style (when-not can-go-forward? styles/disabled-button) :style (when-not can-go-forward? styles/disabled-button)
:accessibility-label :next-page-button} :accessibility-label :next-page-button}
[react/view [icons/icon :main-icons/arrow-right {:color colors/black}]]
[icons/icon :main-icons/arrow-right]]]
[react/touchable-highlight [react/touchable-highlight
{:accessibility-label :select-account {:accessibility-label :select-account
:on-press #(re-frame/dispatch [:bottom-sheet/show-sheet :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet
@ -92,7 +90,7 @@
[react/touchable-highlight [react/touchable-highlight
{:on-press #(re-frame/dispatch [:set-stack-root :browser-stack :browser-tabs]) {:on-press #(re-frame/dispatch [:set-stack-root :browser-stack :browser-tabs])
:accessibility-label :browser-open-tabs} :accessibility-label :browser-open-tabs}
[icons/icon :main-icons/tabs]] [icons/icon :main-icons/tabs {:color colors/black}]]
(if empty-tab (if empty-tab
[react/touchable-highlight [react/touchable-highlight
@ -100,7 +98,7 @@
:on-press #(re-frame/dispatch :on-press #(re-frame/dispatch
[::qr-scanner/scan-code [::qr-scanner/scan-code
{:handler ::qr-scanner/on-scan-success}])} {:handler ::qr-scanner/on-scan-success}])}
[icons/icon :main-icons/qr]] [icons/icon :main-icons/qr {:color colors/black}]]
[react/touchable-highlight [react/touchable-highlight
{:on-press #(re-frame/dispatch {:on-press #(re-frame/dispatch
[:bottom-sheet/show-sheet [:bottom-sheet/show-sheet
@ -110,7 +108,7 @@
empty-tab empty-tab
name)}]) name)}])
:accessibility-label :browser-options} :accessibility-label :browser-options}
[icons/icon :main-icons/more]])])) [icons/icon :main-icons/more {:color colors/black}]])]))
(def resources-to-permissions-map {"android.webkit.resource.VIDEO_CAPTURE" :camera (def resources-to-permissions-map {"android.webkit.resource.VIDEO_CAPTURE" :camera
"android.webkit.resource.AUDIO_CAPTURE" :record-audio}) "android.webkit.resource.AUDIO_CAPTURE" :record-audio})