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

[#11651] No spinner when pressing "Fetch more messages" in public chat + white toggles in Sync settings on Android 

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
andrey 2021-01-27 10:51:46 +01:00
parent ff961bbfe8
commit 6469ff912a
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/ui/components/react.cljs
View File

@ -59,10 +59,10 @@
(def activity-indicator-class (reagent/adapt-react-class (.-ActivityIndicator react-native))) (def activity-indicator-class (reagent/adapt-react-class (.-ActivityIndicator react-native)))
(defn activity-indicator [props] (defn activity-indicator [props]
[activity-indicator-class props]) [activity-indicator-class (update props :color #(or % colors/gray))])
(defn small-loading-indicator [color] (defn small-loading-indicator [color]
[activity-indicator {:color (if color color :colors/gray) [activity-indicator {:color color
:ios {:size :small} :ios {:size :small}
:android {:size :16}}]) :android {:size :16}}])

2
src/status_im/ui/screens/profile/components/views.cljs
View File

@ -46,7 +46,7 @@
[react/view styles/settings-item [react/view styles/settings-item
[react/view styles/settings-item-text-wrapper [react/view styles/settings-item-text-wrapper
[react/i18n-text {:style styles/settings-item-text :key label-kw}]] [react/i18n-text {:style styles/settings-item-text :key label-kw}]]
[react/switch {:track-color #js {:true colors/blue :false nil} [react/switch {:track-color #js {:true colors/blue :false colors/gray-lighter}
:value (boolean value) :value (boolean value)
:on-value-change action-fn :on-value-change action-fn
:disabled (not active?)}]]) :disabled (not active?)}]])