Skip to content

Commit

Permalink
review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Parveshdhull committed Mar 4, 2024
1 parent 163a542 commit 0c62ea3
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 83 deletions.
3 changes: 2 additions & 1 deletion src/status_im/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
[status-im.contexts.profile.push-notifications.events :as notifications]
[status-im.contexts.shell.jump-to.state :as shell.state]
[status-im.contexts.shell.jump-to.utils :as shell.utils]
[status-im.navigation.core :as navigation]
status-im.contexts.wallet.signals
status-im.events
status-im.navigation.core
Expand All @@ -44,7 +45,7 @@

(defn init
[]

(navigation/init)
(native-module/init #(re-frame/dispatch [:signals/signal-received %]))
(when platform/android?
(native-module/set-soft-input-mode adjust-resize))
Expand Down
164 changes: 82 additions & 82 deletions src/status_im/navigation/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,88 +11,88 @@
[status-im.navigation.view :as views]
[utils.re-frame :as rf]))

(defonce
_
[(navigation/set-lazy-component-registrator
(fn [screen-key]
(let [screen (views/screen screen-key)]
(navigation/register-component screen-key
(fn [] (gesture/gesture-handler-root-hoc screen))
(fn [] screen)))))

;; APP LAUNCHED
(navigation/reg-app-launched-listener
(fn []
(navigation/set-default-options options/default-options)
(reset! state/curr-modal false)
(reset! state/dissmissing false)
(re-frame/dispatch [:bottom-sheet-hidden])
(if (= @state/root-id :multiaccounts-stack)
(re-frame/dispatch-sync [:set-multiaccount-root])
(when @state/root-id
(reset! theme/device-theme (rn/get-color-scheme))
(re-frame/dispatch [:init-root @state/root-id])
(re-frame/dispatch [:chat/check-last-chat])))
(rn/hide-splash-screen)))

(navigation/reg-component-did-appear-listener
(fn [view-id]
(when (get views/screens view-id)
;;NOTE when back from the background on Android, this event happens for all screens, but we
;;need only for active one
(when (and @state/curr-modal (= @state/curr-modal view-id))
(effects/set-view-id view-id))
(when-not @state/curr-modal
(effects/set-view-id view-id)
(reset! state/pushed-screen-id view-id)))))

;;;; Modal

(navigation/reg-button-pressed-listener
(fn [id]
(if (= "dismiss-modal" id)
(do
(when-let [event (get-in views/screens [(last @state/modals) :on-dissmiss])]
(rf/dispatch event))
(effects/dismiss-modal))
(when-let [handler (get-in views/screens [(keyword id) :right-handler])]
(handler)))))

(navigation/reg-modal-dismissed-listener
(fn []
(if (> (count @state/modals) 1)
(let [new-modals (butlast @state/modals)]
(reset! state/modals (vec new-modals))
(effects/set-view-id (last new-modals)))
(do
(reset! state/modals [])
(reset! state/curr-modal false)
(effects/set-view-id @state/pushed-screen-id)))

(let [component @state/dissmissing]
(reset! state/dissmissing false)
(when (keyword? component)
(effects/open-modal component)))))

;;;; Toast

(navigation/register-component
"toasts"
; `:flex 0` is the same as `flex: 0 0 auto` in CSS.
; We need this to override the HOC default layout which is
; flex 1. If we don't override this property, this HOC
; will catch all touches/gestures while the toast is shown,
; preventing the user doing any action in the app
#(gesture/gesture-handler-root-hoc views/toasts
#js {:flex 0})
(fn [] views/toasts))

;;;; Bottom sheet

(navigation/register-component
"bottom-sheet"
(fn [] (gesture/gesture-handler-root-hoc views/bottom-sheet))
(fn [] views/bottom-sheet))])
(defn init
[]
(navigation/set-lazy-component-registrator
(fn [screen-key]
(let [screen (views/screen screen-key)]
(navigation/register-component screen-key
(fn [] (gesture/gesture-handler-root-hoc screen))
(fn [] screen)))))

;; APP LAUNCHED
(navigation/reg-app-launched-listener
(fn []
(navigation/set-default-options options/default-options)
(reset! state/curr-modal false)
(reset! state/dissmissing false)
(re-frame/dispatch [:bottom-sheet-hidden])
(if (= @state/root-id :multiaccounts-stack)
(re-frame/dispatch-sync [:set-multiaccount-root])
(when @state/root-id
(reset! theme/device-theme (rn/get-color-scheme))
(re-frame/dispatch [:init-root @state/root-id])
(re-frame/dispatch [:chat/check-last-chat])))
(rn/hide-splash-screen)))

(navigation/reg-component-did-appear-listener
(fn [view-id]
(when (get views/screens view-id)
;;NOTE when back from the background on Android, this event happens for all screens, but we
;;need only for active one
(when (and @state/curr-modal (= @state/curr-modal view-id))
(effects/set-view-id view-id))
(when-not @state/curr-modal
(effects/set-view-id view-id)
(reset! state/pushed-screen-id view-id)))))

;;;; Modal

(navigation/reg-button-pressed-listener
(fn [id]
(if (= "dismiss-modal" id)
(do
(when-let [event (get-in views/screens [(last @state/modals) :on-dissmiss])]
(rf/dispatch event))
(effects/dismiss-modal))
(when-let [handler (get-in views/screens [(keyword id) :right-handler])]
(handler)))))

(navigation/reg-modal-dismissed-listener
(fn []
(if (> (count @state/modals) 1)
(let [new-modals (butlast @state/modals)]
(reset! state/modals (vec new-modals))
(effects/set-view-id (last new-modals)))
(do
(reset! state/modals [])
(reset! state/curr-modal false)
(effects/set-view-id @state/pushed-screen-id)))

(let [component @state/dissmissing]
(reset! state/dissmissing false)
(when (keyword? component)
(effects/open-modal component)))))

;;;; Toast

(navigation/register-component
"toasts"
; `:flex 0` is the same as `flex: 0 0 auto` in CSS.
; We need this to override the HOC default layout which is
; flex 1. If we don't override this property, this HOC
; will catch all touches/gestures while the toast is shown,
; preventing the user doing any action in the app
#(gesture/gesture-handler-root-hoc views/toasts
#js {:flex 0})
(fn [] views/toasts))

;;;; Bottom sheet

(navigation/register-component
"bottom-sheet"
(fn [] (gesture/gesture-handler-root-hoc views/bottom-sheet))
(fn [] views/bottom-sheet)))

;; LEGACY (should be removed in status 2.0)

Expand Down

0 comments on commit 0c62ea3

Please sign in to comment.