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

[#10634] Image of 'Get started' view changes height/width if navigate back from "Enter seed phrase" 

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Andrey Shovkoplyas 2020-06-16 12:47:22 +02:00
parent e59e17e6e7
commit 15ddf6d060
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
1 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/status_im/ui/screens/intro/views.cljs
View File

@ -29,7 +29,7 @@
^{:key i} ^{:key i}
[react/view {:style (styles/dot color (selected i))}]))]) [react/view {:style (styles/dot color (selected i))}]))])
(defn intro-viewer [slides window-height] (defn intro-viewer [slides window-height _]
(let [scroll-x (r/atom 0) (let [scroll-x (r/atom 0)
scroll-view-ref (atom nil) scroll-view-ref (atom nil)
width (r/atom 0) width (r/atom 0)
@ -38,13 +38,15 @@
text-temp-height (atom 0) text-temp-height (atom 0)
text-temp-timer (atom nil) text-temp-timer (atom nil)
bottom-margin (if (> window-height 600) 32 16)] bottom-margin (if (> window-height 600) 32 16)]
(fn [] (fn [_ _ view-id]
(let [current-screen? (or (nil? view-id) (= view-id :intro))]
[react/view {:style {:align-items :center [react/view {:style {:align-items :center
:flex 1 :flex 1
:margin-bottom bottom-margin :margin-bottom bottom-margin
:justify-content :flex-end} :justify-content :flex-end}
:on-layout (fn [^js e] :on-layout (fn [^js e]
(reset! width (-> e .-nativeEvent .-layout .-width)))} (when current-screen?
(reset! width (-> e .-nativeEvent .-layout .-width))))}
[react/scroll-view {:horizontal true [react/scroll-view {:horizontal true
:paging-enabled true :paging-enabled true
:ref #(reset! scroll-view-ref %) :ref #(reset! scroll-view-ref %)
@ -66,7 +68,8 @@
[react/view {:style {:flex 1} [react/view {:style {:flex 1}
:on-layout (fn [^js e] :on-layout (fn [^js e]
(let [new-height (-> e .-nativeEvent .-layout .-height)] (let [new-height (-> e .-nativeEvent .-layout .-height)]
(swap! height #(if (pos? %) (min % new-height) new-height))))} (when current-screen?
(swap! height #(if (pos? %) (min % new-height) new-height)))))}
[react/image {:source (:image s) [react/image {:source (:image s)
:resize-mode :contain :resize-mode :contain
:style {:width size :style {:width size
@ -76,7 +79,8 @@
:on-layout :on-layout
(fn [^js e] (fn [^js e]
(let [new-height (-> e .-nativeEvent .-layout .-height)] (let [new-height (-> e .-nativeEvent .-layout .-height)]
(when (and (not= new-height @text-temp-height) (when (and current-screen?
(not= new-height @text-temp-height)
(not (zero? new-height)) (not (zero? new-height))
(< new-height 200)) (< new-height 200))
(swap! text-temp-height #(if (pos? %) (max % new-height) new-height)) (swap! text-temp-height #(if (pos? %) (max % new-height) new-height))
@ -86,10 +90,11 @@
(i18n/label (:text s))]]))] (i18n/label (:text s))]]))]
(let [selected (hash-set (quot (int @scroll-x) (int @width)))] (let [selected (hash-set (quot (int @scroll-x) (int @width)))]
[dots-selector {:selected selected :n (count slides) [dots-selector {:selected selected :n (count slides)
:color colors/blue}])]))) :color colors/blue}])]))))
(defview intro [] (defview intro []
(letsubs [{window-height :height} [:dimensions/window]] (letsubs [{window-height :height} [:dimensions/window]
view-id [:view-id]]
[react/view {:style styles/intro-view} [react/view {:style styles/intro-view}
[intro-viewer [{:image (resources/get-theme-image :chat) [intro-viewer [{:image (resources/get-theme-image :chat)
:title :intro-title1 :title :intro-title1
@ -99,7 +104,7 @@
:text :intro-text2} :text :intro-text2}
{:image (resources/get-theme-image :browser) {:image (resources/get-theme-image :browser)
:title :intro-title3 :title :intro-title3
:text :intro-text3}] window-height] :text :intro-text3}] window-height view-id]
[react/view styles/buttons-container [react/view styles/buttons-container
[components.common/button {:button-style (assoc styles/bottom-button :margin-bottom 16) [components.common/button {:button-style (assoc styles/bottom-button :margin-bottom 16)
:on-press #(re-frame/dispatch [:multiaccounts.create.ui/intro-wizard]) :on-press #(re-frame/dispatch [:multiaccounts.create.ui/intro-wizard])