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

Merge pull request #416 from status-im/bug/#400 

Request icon in message is overlapped by the next message fix (#400)
This commit is contained in:
Roman Volosovskyi 2016-11-04 13:40:24 +02:00 committed by GitHub
parent 7fbda9cbab 82b3587fb0
commit ddf52a0b67
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/status_im/chat/styles/message.cljs
View File

@ -140,9 +140,9 @@
(def command-request-from-text (def command-request-from-text
(merge style-sub-text {:marginBottom 2})) (merge style-sub-text {:marginBottom 2}))
(def command-request-image-touchable (defn command-request-image-touchable [top-offset?]
{:position :absolute {:position :absolute
:top 4 :top (if top-offset? 4 -1)
:right -8 :right -8
:alignItems :center :alignItems :center
:justifyContent :center :justifyContent :center

15
src/status_im/chat/views/request_message.cljs
View File

@ -43,7 +43,7 @@
(anim/start (anim/start
(button-animation val min-scale loop? answered?))))) (button-animation val min-scale loop? answered?)))))
(defn request-button [message-id command status-initialized?] (defn request-button [message-id command status-initialized? top-offset?]
(let [scale-anim-val (anim/create-value min-scale) (let [scale-anim-val (anim/create-value min-scale)
answered? (subscribe [:is-request-answered? message-id]) answered? (subscribe [:is-request-answered? message-id])
loop? (r/atom true) loop? (r/atom true)
@ -62,7 +62,7 @@
[touchable-highlight [touchable-highlight
{:on-press (when (and (not @answered?) status-initialized?) {:on-press (when (and (not @answered?) status-initialized?)
#(set-chat-command message-id command)) #(set-chat-command message-id command))
:style st/command-request-image-touchable :style (st/command-request-image-touchable top-offset?)
:accessibility-label (label command)} :accessibility-label (label command)}
[animated-view {:style (st/command-request-image-view command scale-anim-val)} [animated-view {:style (st/command-request-image-view command scale-anim-val)}
(when command-icon (when command-icon
@ -70,7 +70,8 @@
(defn message-content-command-request (defn message-content-command-request
[{:keys [message-id content from incoming-group]}] [{:keys [message-id content from incoming-group]}]
(let [commands-atom (subscribe [:get-responses]) (let [top-offset (r/atom {:specified? false})
commands-atom (subscribe [:get-responses])
answered? (subscribe [:is-request-answered? message-id]) answered? (subscribe [:is-request-answered? message-id])
status-initialized? (subscribe [:get :status-module-initialized?])] status-initialized? (subscribe [:get :status-module-initialized?])]
(fn [{:keys [message-id content from incoming-group]}] (fn [{:keys [message-id content from incoming-group]}]
@ -86,6 +87,11 @@
:font :default} :font :default}
from]) from])
[text {:style st/style-message-text [text {:style st/style-message-text
:on-layout #(reset! top-offset {:specified? true
:value (-> (.-nativeEvent %)
(.-layout)
(.-height)

(> 25))})
:font :default} :font :default}
content]]] content]]]
(when (:request-text command) (when (:request-text command)
@ -93,4 +99,5 @@
[text {:style st/style-sub-text [text {:style st/style-sub-text
:font :default} :font :default}
(:request-text command)]]) (:request-text command)]])
[request-button message-id command @status-initialized?]])))) (when (:specified? @top-offset)
[request-button message-id command @status-initialized? (:value @top-offset)])]))))