fix visibility drop-down alignment in new ui (#13760)

This commit is contained in:
Parvesh Monu 2022-08-04 23:07:03 +05:30 committed by GitHub
parent 13bacd4a1e
commit ff1818d191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions

View File

@ -1576,7 +1576,7 @@
:<- [:home-items-show-number] :<- [:home-items-show-number]
(fn [[search-filter filtered-chats communities view-id home-items-show-number]] (fn [[search-filter filtered-chats communities view-id home-items-show-number]]
(if (or (= view-id :home) (if (or (= view-id :home)
(and config/new-ui-enabled? (= view-id :chat-stack))) (and @config/new-ui-enabled? (= view-id :chat-stack)))
(let [communities-count (count communities) (let [communities-count (count communities)
chats-count (count filtered-chats) chats-count (count filtered-chats)
;; If we have both communities & chats we want to display ;; If we have both communities & chats we want to display

View File

@ -1,10 +1,12 @@
(ns status-im.switcher.constants (ns status-im.switcher.constants
(:require [status-im.utils.handlers :refer [<sub]] (:require [quo.react-native :as rn]
[status-im.utils.handlers :refer [<sub]]
[status-im.utils.platform :as platform])) [status-im.utils.platform :as platform]))
;; For translucent status bar, dimensions/window also includes status bar's height, ;; For translucent status bar(android), dimensions/window also includes status bar's height,
;; this offset is used for correctly calculating switcher position ;; this offset is used for correctly calculating switcher position
(def switcher-height-offset 24) (def switcher-height-offset
(if platform/android? (:status-bar-height @rn/navigation-const) 0))
;; extra height of switcher container for show/peek hidden cards while opening animation ;; extra height of switcher container for show/peek hidden cards while opening animation
(def switcher-container-height-padding 100) (def switcher-container-height-padding 100)

View File

@ -26,10 +26,17 @@
(re-frame/dispatch (re-frame/dispatch
[:visibility-status-updates/delayed-visibility-status-update status-type])) [:visibility-status-updates/delayed-visibility-status-update status-type]))
;; In new ui, we are allowing switcher to overlap status-bar (draw over status bar)
;; that's why the measure will return height including, the height of the status bar in android
;; for calculating the correct position of the button on the profile screen, we have to decrease this height
(defn calculate-button-height-and-dispatch-popover [] (defn calculate-button-height-and-dispatch-popover []
(.measure @button-ref (.measure
(fn [_ _ _ _ _ py] @button-ref
(dispatch-popover py)))) (fn [_ _ _ _ _ py]
(dispatch-popover
(if (and platform/android? @config/new-ui-enabled?)
(- py (:status-bar-height @rn/navigation-const))
py)))))
(defn profile-visibility-status-dot [status-type color] (defn profile-visibility-status-dot [status-type color]
(let [automatic? (= status-type (let [automatic? (= status-type