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

kebab-case re-agent attributes that were formerly camelCased 

Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
This commit is contained in:
Rob Culliton 2018-02-16 19:08:35 -05:00 committed by Julien Eluard
parent 5f5412d91b
commit 2d6d7d1327
No known key found for this signature in database
GPG Key ID: 6FD7DB5437FCBEF6
20 changed files with 316 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/chat/styles/animations.cljs
View File

@ -25,7 +25,7 @@
(def header-container (def header-container
{:min-height 19 {:min-height 19
:background-color common/color-white :background-color common/color-white
:alignItems :center}) :align-items :center})
(def header-icon (def header-icon
{:background-color header-draggable-icon {:background-color header-draggable-icon

4
src/status_im/chat/styles/input/box_header.cljs
View File

@ -5,8 +5,8 @@
(def header-container (def header-container
{:background-color common/color-white {:background-color common/color-white
:alignItems :center :align-items :center
:justifyContent :center :justify-content :center
:height header-height}) :height header-height})
(def header-title-container (def header-title-container

6
src/status_im/chat/styles/message/command_pill.cljs
View File

@ -3,13 +3,13 @@
[status-im.ui.components.styles :refer [color-white]])) [status-im.ui.components.styles :refer [color-white]]))
(defn pill [command] (defn pill [command]
{:backgroundColor (:color command) {:background-color (:color command)
:height 24 :height 24
:borderRadius 50 :border-radius 50
:padding-top (if p/ios? 4 3) :padding-top (if p/ios? 4 3)
:paddingHorizontal 12 :paddingHorizontal 12
:text-align :left}) :text-align :left})
(def pill-text (def pill-text
{:fontSize 12 {:font-size 12
:color color-white}) :color color-white})

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

@ -4,16 +4,16 @@
[status-im.constants :as constants])) [status-im.constants :as constants]))
(defstyle style-message-text (defstyle style-message-text
{:fontSize 15 {:font-size 15
:color styles/text1-color :color styles/text1-color
:android {:line-height 22} :android {:line-height 22}
:ios {:line-height 23}}) :ios {:line-height 23}})
(def style-sub-text (def style-sub-text
{:top -2 {:top -2
:fontSize 12 :font-size 12
:color styles/text2-color :color styles/text2-color
:lineHeight 14 :line-height 14
:height 16}) :height 16})
(defn message-padding-top (defn message-padding-top
@ -27,7 +27,7 @@
(defn last-message-padding (defn last-message-padding
[{:keys [last? typing]}] [{:keys [last? typing]}]
(when (and last? (not typing)) (when (and last? (not typing))
{:paddingBottom 16})) {:padding-bottom 16}))
(def message-datemark (def message-datemark
{:margin-top 10 {:margin-top 10
@ -45,64 +45,64 @@
(let [align (if outgoing :flex-end :flex-start) (let [align (if outgoing :flex-end :flex-start)
direction (if outgoing :row-reverse :row)] direction (if outgoing :row-reverse :row)]
(merge message-body-base (merge message-body-base
{:flexDirection direction {:flex-direction direction
:width 260 :width 260
:paddingTop (message-padding-top message) :padding-top (message-padding-top message)
:alignSelf align :align-self align
:alignItems align} :align-items align}
(last-message-padding message)))) (last-message-padding message))))
(def selected-message (def selected-message
{:marginTop 18 {:margin-top 18
:marginLeft 40 :margin-left 40
:fontSize 12 :font-size 12
:color styles/text2-color}) :color styles/text2-color})
(def group-message-wrapper (def group-message-wrapper
{:flexDirection :column}) {:flex-direction :column})
(defn group-message-view (defn group-message-view
[{:keys [outgoing] :as message}] [{:keys [outgoing] :as message}]
(let [align (if outgoing :flex-end :flex-start)] (let [align (if outgoing :flex-end :flex-start)]
{:flexDirection :column {:flex-direction :column
:width 260 :width 260
:padding-left 10 :padding-left 10
:padding-right 10 :padding-right 10
:alignItems align})) :align-items align}))
(def message-author (def message-author
{:width 36 {:width 36
:alignSelf :flex-start}) :align-self :flex-start})
(def photo (def photo
{:borderRadius 18 {:border-radius 18
:width 36 :width 36
:height 36}) :height 36})
(def delivery-view (def delivery-view
{:flexDirection :row {:flex-direction :row
:marginTop 2 :margin-top 2
:opacity 0.5}) :opacity 0.5})
(defstyle delivery-text (defstyle delivery-text
{:color styles/color-gray4 {:color styles/color-gray4
:marginLeft 5 :margin-left 5
:android {:font-size 13} :android {:font-size 13}
:ios {:font-size 14}}) :ios {:font-size 14}})
(defn text-message (defn text-message
[{:keys [outgoing group-chat incoming-group]}] [{:keys [outgoing group-chat incoming-group]}]
(merge style-message-text (merge style-message-text
{:marginTop (if incoming-group 4 0)})) {:margin-top (if incoming-group 4 0)}))
(defn message-view (defn message-view
[{:keys [content-type outgoing group-chat selected]}] [{:keys [content-type outgoing group-chat selected]}]
(merge {:padding 12 (merge {:padding 12
:backgroundColor styles/color-white :background-color styles/color-white
:border-radius 8} :border-radius 8}
(when (= content-type constants/content-type-command) (when (= content-type constants/content-type-command)
{:paddingTop 10 {:padding-top 10
:paddingBottom 14}))) :padding-bottom 14})))
(defstyle author (defstyle author
{:color styles/color-gray4 {:color styles/color-gray4
@ -111,31 +111,31 @@
:ios {:font-size 14}}) :ios {:font-size 14}})
(def command-request-view (def command-request-view
{:paddingRight 16}) {:padding-right 16})
(def command-request-message-view (def command-request-message-view
{:borderRadius 14 {:border-radius 14
:padding-vertical 10 :padding-vertical 10
:paddingRight 28 :padding-right 28
:backgroundColor styles/color-white}) :background-color styles/color-white})
(def command-request-from-text (def command-request-from-text
(merge style-sub-text {:marginBottom 2})) (merge style-sub-text {:margin-bottom 2}))
(defn command-request-image-touchable [] (defn command-request-image-touchable []
{:position :absolute {:position :absolute
:top 0 :top 0
:right -8 :right -8
:alignItems :center :align-items :center
:justifyContent :center :justify-content :center
:width 48 :width 48
:height 48}) :height 48})
(defn command-request-image-view [command scale] (defn command-request-image-view [command scale]
{:width 32 {:width 32
:height 32 :height 32
:borderRadius 16 :border-radius 16
:backgroundColor (:color command) :background-color (:color command)
:transform [{:scale scale}]}) :transform [{:scale scale}]})
(def command-image-view (def command-image-view
@ -144,7 +144,7 @@
:right 0 :right 0
:width 24 :width 24
:height 24 :height 24
:alignItems :center}) :align-items :center})
(def command-request-image (def command-request-image
{:position :absolute {:position :absolute
@ -154,17 +154,17 @@
:height 13}) :height 13})
(def command-request-text-view (def command-request-text-view
{:marginTop 4 {:margin-top 4
:height 14}) :height 14})
(def content-command-view (def content-command-view
{:flexDirection :column {:flex-direction :column
:alignItems :flex-start}) :align-items :flex-start})
(def command-container (def command-container
{:flexDirection :row {:flex-direction :row
:margin-top 4 :margin-top 4
:marginRight 32}) :margin-right 32})
(def command-image (def command-image
{:margin-top 9 {:margin-top 9
@ -174,17 +174,17 @@
(def command-text (def command-text
(merge style-message-text (merge style-message-text
{:marginTop 8 {:margin-top 8
:marginHorizontal 0})) :margin-horizontal 0}))
(def audio-container (def audio-container
{:flexDirection :row {:flex-direction :row
:alignItems :center}) :align-items :center})
(def play-view (def play-view
{:width 33 {:width 33
:height 33 :height 33
:borderRadius 16 :border-radius 16
:elevation 1}) :elevation 1})
(def play-image (def play-image
@ -192,8 +192,8 @@
:height 33}) :height 33})
(def track-container (def track-container
{:marginTop 10 {:margin-top 10
:marginLeft 10 :margin-left 10
:width 120 :width 120
:height 26 :height 26
:elevation 1}) :elevation 1})
@ -203,7 +203,7 @@
:top 4 :top 4
:width 120 :width 120
:height 2 :height 2
:backgroundColor :#EC7262}) :background-color :#EC7262})
(def track-mark (def track-mark
{:position :absolute {:position :absolute
@ -211,37 +211,37 @@
:top 0 :top 0
:width 2 :width 2
:height 10 :height 10
:backgroundColor :#4A5258}) :background-color :#4A5258})
(def track-duration-text (def track-duration-text
{:position :absolute {:position :absolute
:left 1 :left 1
:top 11 :top 11
:fontSize 11 :font-size 11
:color :#4A5258 :color :#4A5258
:letterSpacing 1 :letter-spacing 1
:lineHeight 15}) :line-height 15})
(def status-container (def status-container
{:flex 1 {:flex 1
:alignSelf :center :align-self :center
:alignItems :center :align-items :center
:width 249 :width 249
:padding-bottom 16}) :padding-bottom 16})
(def status-image-view (def status-image-view
{:marginTop 20}) {:margin-top 20})
(def status-from (def status-from
{:marginTop 20 {:margin-top 20
:fontSize 18 :font-size 18
:color styles/text1-color}) :color styles/text1-color})
(def status-text (def status-text
{:marginTop 10 {:margin-top 10
:fontSize 14 :font-size 14
:lineHeight 20 :line-height 20
:textAlign :center :text-align :center
:color styles/text2-color}) :color styles/text2-color})
(defn message-animated-container [height] (defn message-animated-container [height]

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

@ -15,25 +15,25 @@
:margin-bottom 0}) :margin-bottom 0})
(def toolbar-view (def toolbar-view
{:flexDirection :row {:flex-direction :row
:height 56 :height 56
:backgroundColor component.styles/color-white :background-color component.styles/color-white
:elevation 2}) :elevation 2})
(def action (def action
{:width 56 {:width 56
:height 56 :height 56
:top 0 :top 0
:alignItems :center :align-items :center
:justifyContent :center}) :justify-content :center})
(def icon-view (def icon-view
{:width 56 {:width 56
:height 56}) :height 56})
(def back-icon (def back-icon
{:marginTop 21 {:margin-top 21
:marginLeft 23 :margin-left 23
:width 8 :width 8
:height 14}) :height 14})
@ -47,7 +47,7 @@
(def chat-name-text (def chat-name-text
{:color component.styles/color-gray6 {:color component.styles/color-gray6
:fontSize 16}) :font-size 16})
(def group-icon (def group-icon
{:margin-top 4 {:margin-top 4
@ -72,7 +72,7 @@
:android {:font-size 13}}) :android {:font-size 13}})
(defn actions-wrapper [status-bar-height] (defn actions-wrapper [status-bar-height]
{:backgroundColor component.styles/color-white {:background-color component.styles/color-white
:elevation 2 :elevation 2
:position :absolute :position :absolute
:top (+ 55 status-bar-height) :top (+ 55 status-bar-height)
@ -80,26 +80,26 @@
:right 0}) :right 0})
(def actions-separator (def actions-separator
{:marginLeft 16 {:margin-left 16
:height 1.5 :height 1.5
:backgroundColor component.styles/separator-color}) :background-color component.styles/separator-color})
(def actions-view (def actions-view
{:marginVertical 10}) {:margin-vertical 10})
(def action-icon-row (def action-icon-row
{:flexDirection :row {:flex-direction :row
:height 56}) :height 56})
(def action-icon-view (def action-icon-view
(merge icon-view (merge icon-view
{:alignItems :center {:align-items :center
:justifyContent :center})) :justify-content :center}))
(def action-view (def action-view
{:flex 1 {:flex 1
:alignItems :flex-start :align-items :flex-start
:justifyContent :center}) :justify-content :center})
(def action-title (def action-title
{:margin-top -2.5 {:margin-top -2.5
@ -116,15 +116,15 @@
(def typing-view (def typing-view
{:width 260 {:width 260
:marginTop 10 :margin-top 10
:paddingLeft 8 :padding-left 8
:paddingRight 8 :padding-right 8
:alignItems :flex-start :align-items :flex-start
:alignSelf :flex-start}) :align-self :flex-start})
(def typing-text (def typing-text
{:marginTop -2 {:margin-top -2
:fontSize 12 :font-size 12
:color component.styles/text2-color}) :color component.styles/text2-color})
(def overlay-highlight (def overlay-highlight
@ -142,7 +142,7 @@
:elevation 8}) :elevation 8})
(defn bottom-info-container [height] (defn bottom-info-container [height]
{:backgroundColor component.styles/color-white {:background-color component.styles/color-white
:elevation 2 :elevation 2
:position :absolute :position :absolute
:bottom 16 :bottom 16
@ -166,7 +166,7 @@
(def bottom-info-row-photo (def bottom-info-row-photo
{:width 42 {:width 42
:height 42 :height 42
:borderRadius 21}) :border-radius 21})
(def bottom-info-row-text-container (def bottom-info-row-text-container
{:margin-left 16 {:margin-left 16

2
src/status_im/chat/views/message/message.cljs
View File

@ -199,7 +199,7 @@
(identicon/identicon whisper-identity))} (identicon/identicon whisper-identity))}
:style {:width 16 :style {:width 16
:height 16 :height 16
:borderRadius 8}}]) :border-radius 8}}])
(if (> delivery-statuses-count 3) (if (> delivery-statuses-count 3)
[react/text {:style style/delivery-text [react/text {:style style/delivery-text
:font :default} :font :default}

10
src/status_im/native_module/impl/non_status_go_module.cljs
View File

@ -37,11 +37,11 @@
:returned {:markup ["text" :returned {:markup ["text"
{:style {:style
{:color "black", {:color "black",
:fontSize 8, :font-size 8,
:letterSpacing 1, :letter-spacing 1,
:marginBottom 2, :margin-bottom 2,
:marginHorizontal 0, :margin-horizontal 0,
:marginTop 10}} :margin-top 10}}
"●●●●●●●●●●"]}}}) "●●●●●●●●●●"]}}})
:else (callback {:result nil}))) :else (callback {:result nil})))
(-call-function! [this params]) (-call-function! [this params])

10
src/status_im/ui/components/carousel/styles.cljs
View File

@ -4,8 +4,8 @@
{:flex 1}) {:flex 1})
(defn content-container [gap] (defn content-container [gap]
{:paddingLeft (quot gap 2) {:padding-left (quot gap 2)
:paddingRight (quot gap 2)}) :padding-right (quot gap 2)})
(defn page [index count page-width gap] (defn page [index count page-width gap]
(let [margin (quot gap 2) (let [margin (quot gap 2)
@ -14,6 +14,6 @@
(> count 1)) (> count 1))
gap 0)] gap 0)]
{:width page-width {:width page-width
:justifyContent :center :justify-content :center
:marginLeft (+ margin left-spacing) :margin-left (+ margin left-spacing)
:marginRight (+ margin right-spacing)})) :margin-right (+ margin right-spacing)}))

18
src/status_im/ui/components/chat_icon/styles.cljs
View File

@ -6,10 +6,10 @@
{:margin 0 {:margin 0
:width 40 :width 40
:height 40 :height 40
:alignItems :center :align-items :center
:justifyContent :center :justify-content :center
:borderRadius 20 :border-radius 20
:backgroundColor color}) :background-color color})
(defn default-chat-icon-chat-list [color] (defn default-chat-icon-chat-list [color]
(merge (default-chat-icon color) (merge (default-chat-icon color)
@ -36,15 +36,15 @@
:border-radius 32})) :border-radius 32}))
(def default-chat-icon-text (def default-chat-icon-text
{:marginTop -2 {:margin-top -2
:color color-white :color color-white
:fontSize 16 :font-size 16
:lineHeight 20}) :line-height 20})
(def message-status-icon-text (def message-status-icon-text
{:marginTop -2 {:margin-top -2
:color color-white :color color-white
:fontSize 24}) :font-size 24})
(def chat-icon (def chat-icon
{:margin 4 {:margin 4

4
src/status_im/ui/components/checkbox/styles.cljs
View File

@ -6,8 +6,8 @@
(defn icon-check-container [checked?] (defn icon-check-container [checked?]
{:background-color (if checked? colors/blue colors/gray-lighter) {:background-color (if checked? colors/blue colors/gray-lighter)
:alignItems :center :align-items :center
:justifyContent :center :justify-content :center
:border-radius 2 :border-radius 2
:width 24 :width 24
:height 24}) :height 24})

8
src/status_im/ui/components/common/styles.cljs
View File

@ -4,18 +4,18 @@
[status-im.ui.components.colors :as colors])) [status-im.ui.components.colors :as colors]))
(def gradient-top (def gradient-top
{:flexDirection :row {:flex-direction :row
:height 3 :height 3
:backgroundColor colors/gray-lighter}) :background-color colors/gray-lighter})
(def gradient-top-colors (def gradient-top-colors
["rgba(25, 53, 76, 0.01)" ["rgba(25, 53, 76, 0.01)"
"rgba(25, 53, 76, 0.1)"]) "rgba(25, 53, 76, 0.1)"])
(def gradient-bottom (def gradient-bottom
{:flexDirection :row {:flex-direction :row
:height 2 :height 2
:backgroundColor colors/gray-lighter}) :background-color colors/gray-lighter})
(def gradient-bottom-colors (def gradient-bottom-colors
["rgba(25, 53, 76, 0.1)" ["rgba(25, 53, 76, 0.1)"

14
src/status_im/ui/components/contact/styles.cljs
View File

@ -15,7 +15,7 @@
(def info-container (def info-container
{:flex 1 {:flex 1
:flexDirection :column :flex-direction :column
:margin-left 16 :margin-left 16
:margin-right 5 :margin-right 5
:justify-content :center}) :justify-content :center})
@ -27,8 +27,8 @@
:letter-spacing -0.2}}) :letter-spacing -0.2}})
(def info-text (def info-text
{:marginTop 1 {:margin-top 1
:fontSize 12 :font-size 12
:color common/text2-color}) :color common/text2-color})
(def contact-container (def contact-container
@ -39,12 +39,12 @@
(def forward-btn (def forward-btn
{:opacity 0.4 {:opacity 0.4
:padding 12 :padding 12
:alignItems :center :align-items :center
:justifyContent :center}) :justify-content :center})
(def more-btn-container (def more-btn-container
{:alignItems :center {:align-items :center
:justifyContent :center}) :justify-content :center})
(def more-btn (def more-btn
{:padding 16}) {:padding 16})

10
src/status_im/ui/components/image_button/styles.cljs
View File

@ -7,18 +7,18 @@
:right 16 :right 16
:flex 1 :flex 1
:height 50 :height 50
:alignItems :center}) :align-items :center})
(def image-button-content (def image-button-content
{:flex 1 {:flex 1
:flexDirection :row :flex-direction :row
:height 50 :height 50
:alignItems :center :align-items :center
:alignSelf :center}) :align-self :center})
(def image-button-text (def image-button-text
{:flex 1 {:flex 1
:flexDirection :column :flex-direction :column
:letter-spacing -0.3 :letter-spacing -0.3
:margin-left 8}) :margin-left 8})

10
src/status_im/ui/components/styles.cljs
View File

@ -85,7 +85,7 @@
{:flex 1}) {:flex 1})
(def create-icon (def create-icon
{:fontSize 20 {:font-size 20
:height 22 :height 22
:color :white}) :color :white})
@ -122,17 +122,17 @@
:height 12}) :height 12})
(def white-form-text-input (def white-form-text-input
{:marginLeft -4 {:margin-left -4
:fontSize 14 :font-size 14
:color color-white}) :color color-white})
(def button-input-container (def button-input-container
{:flex 1 {:flex 1
:flexDirection :row}) :flex-direction :row})
(def button-input (def button-input
{:flex 1 {:flex 1
:flexDirection :column}) :flex-direction :column})
(def modal (def modal
{:position :absolute {:position :absolute

4
src/status_im/ui/components/toolbar/styles.cljs
View File

@ -77,8 +77,8 @@
:padding-horizontal 16}) :padding-horizontal 16})
(defstyle item (defstyle item
{:ios {:marginHorizontal 12 {:ios {:margin-horizontal 12
:marginVertical 16} :margin-vertical 16}
:android {:margin 16}}) :android {:margin 16}})
(def item-text (def item-text

14
src/status_im/ui/screens/contacts/styles.cljs
View File

@ -37,9 +37,9 @@
:opacity 0.6}) :opacity 0.6})
(defstyle show-all (defstyle show-all
{:flexDirection :row {:flex-direction :row
:alignItems :center :align-items :center
:backgroundColor common/color-white :background-color common/color-white
:padding-left 72 :padding-left 72
:android {:height 56} :android {:height 56}
:ios {:height 64}}) :ios {:height 64}})
@ -67,7 +67,7 @@
(def contact-form-container (def contact-form-container
{:flex 1 {:flex 1
:color :white :color :white
:backgroundColor :white}) :background-color :white})
(def gradient-background (def gradient-background
{:position :absolute {:position :absolute
@ -84,11 +84,11 @@
(def address-explication-container (def address-explication-container
{:flex 1 {:flex 1
:margin-top 30 :margin-top 30
:paddingLeft 16 :padding-left 16
:paddingRight 16}) :padding-right 16})
(def address-explication (def address-explication
{:textAlign :center {:text-align :center
:color common/color-gray}) :color common/color-gray})
(def qr-input (def qr-input

4
src/status_im/ui/screens/home/styles.cljs
View File

@ -129,7 +129,7 @@
(defstyle new-messages-text (defstyle new-messages-text
{:left 0 {:left 0
:fontSize 12 :font-size 12
:color colors/blue :color colors/blue
:text-align :center :text-align :center
:android {:top 2} :android {:top 2}
@ -145,7 +145,7 @@
:padding-right 14}) :padding-right 14})
(def create-icon (def create-icon
{:fontSize 20 {:font-size 20
:height 22 :height 22
:color colors/white}) :color colors/white})

24
src/status_im/ui/screens/qr_scanner/styles.cljs
View File

@ -5,12 +5,12 @@
(def barcode-scanner-container (def barcode-scanner-container
{:flex 1 {:flex 1
:backgroundColor :white}) :background-color :white})
(def barcode-scanner (def barcode-scanner
{:flex 1 {:flex 1
:justifyContent :flex-end :justify-content :flex-end
:alignItems :center}) :align-items :center})
(def rectangle-container (def rectangle-container
{:position :absolute {:position :absolute
@ -19,14 +19,14 @@
:bottom 0 :bottom 0
:right 0 :right 0
:flex 1 :flex 1
:alignItems :center :align-items :center
:justifyContent :center :justify-content :center
:backgroundColor :transparent}) :background-color :transparent})
(def rectangle (def rectangle
{:height 250 {:height 250
:width 250 :width 250
:backgroundColor :transparent}) :background-color :transparent})
(def corner-left-top (def corner-left-top
{:position :absolute {:position :absolute
@ -61,17 +61,17 @@
:right 16 :right 16
:flex 1 :flex 1
:height 50 :height 50
:alignItems :center}) :align-items :center})
(def import-button-content (def import-button-content
{:flex 1 {:flex 1
:flexDirection :row :flex-direction :row
:height 50 :height 50
:alignItems :center :align-items :center
:alignSelf :center}) :align-self :center})
(def import-text (def import-text
{:flex 1 {:flex 1
:flexDirection :column :flex-direction :column
:color color-white :color color-white
:margin-left 8}) :margin-left 8})

4
src/status_im/ui/screens/wallet/choose_recipient/styles.cljs
View File

@ -28,8 +28,8 @@
(def preview (def preview
{:flex 1 {:flex 1
:justifyContent :flex-end :justify-content :flex-end
:alignItems :center}) :align-items :center})
(def corner-dimensions (def corner-dimensions
{:position :absolute {:position :absolute

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

@ -15,7 +15,7 @@
styles/color-gray10-transparent)}) styles/color-gray10-transparent)})
(def tabs-container (def tabs-container
{:flexDirection :row {:flex-direction :row
:height tabs.styles/tab-height}) :height tabs.styles/tab-height})
(defnstyle tab-title [active?] (defnstyle tab-title [active?]