status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-06 13:54:01 +00:00
Code Issues Projects Releases Wiki Activity

expanded toolbar buttons' touch area

Browse Source
This commit is contained in:
Gustavo Nunes 2017-04-20 17:53:43 -03:00 committed by Roman Volosovskyi
parent bafa2820e1
commit 6b524cf50d
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,10 +49,10 @@
{:flex 1 {:flex 1
:justify-content :center :justify-content :center
:android {:align-items :flex-start :android {:align-items :flex-start
:margin-left (if show-actions 56 32) :margin-left (if show-actions 66 18)
:padding-bottom 6} :padding-bottom 6}
:ios {:align-items :center :ios {:align-items :center
:margin-left (if show-actions 40 16)}}) :margin-left (if show-actions 54 6)}})
(def chat-name-text (def chat-name-text
{:color color-gray6 {:color color-gray6

8
src/status_im/components/context_menu.cljs
View File

@ -54,14 +54,14 @@
(handler))))}) (handler))))})
nil) nil)
(defn context-menu [trigger options & [customStyles]] (defn context-menu [trigger options & customStyles trigger-style]
(if ios? (if ios?
[touchable-highlight [touchable-highlight {:style trigger-style
{:on-press #(open-ios-menu options)} :on-press #(open-ios-menu options)}
[view [view
trigger]] trigger]]
[menu {:onSelect #(when % (do (%) nil))} [menu {:onSelect #(when % (do (%) nil))}
[menu-trigger trigger] [menu-trigger {:style trigger-style} trigger]
[menu-options (context-menu-options customStyles) [menu-options (context-menu-options customStyles)
(for [{:keys [style value destructive?] :as option} options] (for [{:keys [style value destructive?] :as option} options]
^{:key option} ^{:key option}

12
src/status_im/components/toolbar_new/styles.cljs
View File

@ -31,14 +31,14 @@
(defnstyle toolbar-nav-actions-container (defnstyle toolbar-nav-actions-container
[actions] [actions]
{:flex-direction :row {:flex-direction :row
:margin-left 16 :margin-left 4
:ios {:width (when (and actions (pos? (count actions))) :ios {:width (when (and actions (pos? (count actions)))
(-> (+ toolbar-icon-width toolbar-icon-spacing) (-> (+ toolbar-icon-width toolbar-icon-spacing)
(* (count actions))))}}) (* (count actions))))}})
(defstyle toolbar-title-container (defstyle toolbar-title-container
{:flex 1 {:flex 1
:android {:padding-left 30} :android {:padding-left 18}
:ios {:align-items :center}}) :ios {:align-items :center}})
(defstyle toolbar-title-text (defstyle toolbar-title-text
@ -54,14 +54,13 @@
(defn toolbar-actions-container [actions-count custom] (defn toolbar-actions-container [actions-count custom]
(merge {:flex-direction :row} (merge {:flex-direction :row}
(when-not custom {:margin-right 16}) (when-not custom {:margin-right 4})
(when (and (zero? actions-count) (not custom)) (when (and (zero? actions-count) (not custom))
{:width (+ toolbar-icon-width toolbar-icon-spacing)}))) {:width (+ toolbar-icon-width toolbar-icon-spacing)})))
(def toolbar-action (def toolbar-action
{:width toolbar-icon-width {:width toolbar-icon-width
:height toolbar-icon-height :height toolbar-icon-height
:margin-left toolbar-icon-spacing
:align-items :center :align-items :center
:justify-content :center}) :justify-content :center})
@ -70,7 +69,7 @@
(defstyle toolbar-with-search-content (defstyle toolbar-with-search-content
{:flex 1 {:flex 1
:android {:padding-left 30} :android {:padding-left 18}
:ios {:align-items :center}}) :ios {:align-items :center}})
(defstyle toolbar-search-input (defstyle toolbar-search-input
@ -90,3 +89,6 @@
{:width 24 {:width 24
:height 24}) :height 24})
(def toolbar-button
{:paddingVertical 16
:paddingHorizontal 12})

18
src/status_im/components/toolbar_new/view.cljs
View File

@ -34,10 +34,12 @@
[view (st/toolbar-nav-actions-container actions) [view (st/toolbar-nav-actions-container actions)
(when-not hide-nav? (when-not hide-nav?
(if nav-action (if nav-action
[touchable-highlight {:on-press (:handler nav-action)} [touchable-highlight {:style st/toolbar-button
:on-press (:handler nav-action)}
[view [view
[image (:image nav-action)]]] [image (:image nav-action)]]]
[touchable-highlight {:on-press #(dispatch [:navigate-back]) [touchable-highlight {:style st/toolbar-button
:on-press #(dispatch [:navigate-back])
:accessibility-label id/toolbar-back-button} :accessibility-label id/toolbar-back-button}
[view [view
[image {:source {:uri :icon_back_dark} [image {:source {:uri :icon_back_dark}
@ -55,13 +57,17 @@
(with-meta (with-meta
(cond (= action-image :blank) (cond (= action-image :blank)
[view st/toolbar-action] [view st/toolbar-action]
action-options action-options
[context-menu [context-menu
[view st/toolbar-action [view st/toolbar-action [image action-image]]
[image action-image]] action-options
action-options] nil
st/toolbar-button]
:else :else
[touchable-highlight {:on-press action-handler} [touchable-highlight {:style st/toolbar-button
:on-press action-handler}
[view st/toolbar-action [view st/toolbar-action
[image action-image]]]) [image action-image]]])
{:key (str "action-" action-image)})) {:key (str "action-" action-image)}))

2
src/status_im/transactions/styles/screens.cljs
View File

@ -12,7 +12,7 @@
(defstyle toolbar-title-container (defstyle toolbar-title-container
{:flex 1 {:flex 1
:flex-direction :row :flex-direction :row
:padding-left 30 :padding-left 18
:ios {:align-items :center :ios {:align-items :center
:justify-content :center}}) :justify-content :center}})