From 3b90be2477a4817f8e1c54e6a376ec99034846df Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Wed, 1 May 2019 09:31:48 +0300 Subject: [PATCH] [#7859] Allow to select chat item below plus button --- src/status_im/ui/screens/home/styles.cljs | 7 ++-- src/status_im/ui/screens/home/views.cljs | 39 ++++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/status_im/ui/screens/home/styles.cljs b/src/status_im/ui/screens/home/styles.cljs index 589cbc2ed7..78a3971e3e 100644 --- a/src/status_im/ui/screens/home/styles.cljs +++ b/src/status_im/ui/screens/home/styles.cljs @@ -179,12 +179,11 @@ {:position :absolute :align-items :center :bottom (+ tabs.styles/tabs-diff 6) - :right 0 - :left 0}) + :width 40 + :height 40}) (def action-button - {:margin 10 - :width 40 + {:width 40 :height 40 :background-color colors/blue :border-radius 20 diff --git a/src/status_im/ui/screens/home/views.cljs b/src/status_im/ui/screens/home/views.cljs index ea30be725d..c2ff85b224 100644 --- a/src/status_im/ui/screens/home/views.cljs +++ b/src/status_im/ui/screens/home/views.cljs @@ -118,29 +118,32 @@ (when loading? (utils/set-timeout #(re-frame/dispatch [:init-rest-of-chats]) 100))))} [react/view {:flex 1} [status-bar/status-bar {:type :main}] - [react/keyboard-avoiding-view {:style {:flex 1} + [react/keyboard-avoiding-view {:style {:flex 1 + :align-items :center} :on-layout (fn [e] (re-frame/dispatch [:set-once :content-layout-height (-> e .-nativeEvent .-layout .-height)]))} - [toolbar/toolbar nil nil [toolbar/content-title (i18n/label :t/chat)]] - [les-debug-info] - (cond loading? - [react/view {:style {:flex 1 - :justify-content :center - :align-items :center}} - [connectivity/connectivity-view] - [react/activity-indicator {:flex 1 - :animating true}]] + [react/view {:style {:flex 1 + :align-self :stretch}} + [toolbar/toolbar nil nil [toolbar/content-title (i18n/label :t/chat)]] + [les-debug-info] + (cond loading? + [react/view {:style {:flex 1 + :justify-content :center + :align-items :center}} + [connectivity/connectivity-view] + [react/activity-indicator {:flex 1 + :animating true}]] - :else - [react/view {:style {:flex 1}} - [connectivity/connectivity-view] - [filter.views/animated-search-input search-filter] - (if (and (not search-filter) - (empty? all-home-items)) - [home-empty-view] - [home-items-view search-filter chats all-home-items])]) + :else + [react/view {:style {:flex 1}} + [connectivity/connectivity-view] + [filter.views/animated-search-input search-filter] + (if (and (not search-filter) + (empty? all-home-items)) + [home-empty-view] + [home-items-view search-filter chats all-home-items])])] [home-action-button]]])) (views/defview home-wrapper []