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

Change font 

Former-commit-id: d02af8907d
This commit is contained in:
virvar 2016-04-15 14:33:14 +03:00
parent 37d7249170
commit bd44680981
10 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/syng_im/android/core.cljs
View File

@ -37,8 +37,8 @@
(fn [] (fn []
(let [signed-up @signed-up-atom] (let [signed-up @signed-up-atom]
[navigator {:initial-route (clj->js {:view-id [navigator {:initial-route (clj->js {:view-id
;:chat-list :chat-list
:chat ;:chat
}) })
:render-scene (fn [route nav] :render-scene (fn [route nav]
(log/debug "route" route) (log/debug "route" route)

18
src/syng_im/components/chat/chat_message.cljs
View File

@ -7,6 +7,7 @@
touchable-highlight touchable-highlight
navigator navigator
toolbar-android]] toolbar-android]]
[syng-im.components.styles :refer [font]]
[syng-im.models.commands :refer [parse-command-msg-content [syng-im.models.commands :refer [parse-command-msg-content
parse-command-request-msg-content]] parse-command-request-msg-content]]
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
@ -16,10 +17,9 @@
content-type-command content-type-command
content-type-command-request]])) content-type-command-request]]))
(defn message-date [{:keys [date]}] (defn message-date [{:keys [date]}]
[text {:style {:marginVertical 10 [text {:style {:marginVertical 10
:fontFamily "Avenir-Roman" :fontFamily font
:fontSize 11 :fontSize 11
:color "#AAB2B2" :color "#AAB2B2"
:letterSpacing 1 :letterSpacing 1
@ -57,7 +57,7 @@
[text {:style {:position "absolute" [text {:style {:position "absolute"
:left 1 :left 1
:top 11 :top 11
:fontFamily "Avenir-Roman" :fontFamily font
:fontSize 11 :fontSize 11
:color "#4A5258" :color "#4A5258"
:letterSpacing 1 :letterSpacing 1
@ -79,7 +79,7 @@
:paddingTop 2 :paddingTop 2
:paddingHorizontal 12}} :paddingHorizontal 12}}
[text {:style {:fontSize 12 [text {:style {:fontSize 12
:fontFamily "Avenir-Roman" :fontFamily font
:color "white"}} :color "white"}}
(:text command)]]] (:text command)]]]
[image {:source (:icon command) [image {:source (:icon command)
@ -89,7 +89,7 @@
[text {:style {:marginTop 5 [text {:style {:marginTop 5
:marginHorizontal 0 :marginHorizontal 0
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "black"}} :color "black"}}
;; TODO isn't smart ;; TODO isn't smart
(if (= (:command command) :keypair-password) (if (= (:command command) :keypair-password)
@ -113,7 +113,7 @@
{:backgroundColor "white"} {:backgroundColor "white"}
{:backgroundColor background-color}))} {:backgroundColor background-color}))}
[text {:style (merge {:fontSize 14 [text {:style (merge {:fontSize 14
:fontFamily "Avenir-Roman"} :fontFamily font}
(if outgoing (if outgoing
{:color "#4A5258"} {:color "#4A5258"}
{:color text-color}))} {:color text-color}))}
@ -130,7 +130,7 @@
:top 9 :top 9
:left 10}}]] :left 10}}]]
[text {:style {:marginTop 2 [text {:style {:marginTop 2
:fontFamily "Avenir-Roman" :fontFamily font
:fontSize 12 :fontSize 12
:color "#AAB2B2" :color "#AAB2B2"
:opacity 0.8 }} :opacity 0.8 }}
@ -147,7 +147,7 @@
(cond (cond
(= content-type text-content-type) (= content-type text-content-type)
[text {:style (merge {:fontSize 14 [text {:style (merge {:fontSize 14
:fontFamily "Avenir-Roman"} :fontFamily font}
(if outgoing (if outgoing
{:color "#4A5258"} {:color "#4A5258"}
{:color text-color}))} {:color text-color}))}
@ -166,7 +166,7 @@
:failed res/delivery-failed-icon) :failed res/delivery-failed-icon)
:style {:marginTop 6 :style {:marginTop 6
:opacity 0.6}}] :opacity 0.6}}]
[text {:style {:fontFamily "Avenir-Roman" [text {:style {:fontFamily font
:fontSize 12 :fontSize 12
:color "#AAB2B2" :color "#AAB2B2"
:opacity 0.8 :opacity 0.8

3
src/syng_im/components/chat/input/money.cljs
View File

@ -1,6 +1,7 @@
(ns syng-im.components.chat.input.money (ns syng-im.components.chat.input.money
(:require (:require
[re-frame.core :refer [subscribe dispatch dispatch-sync]] [re-frame.core :refer [subscribe dispatch dispatch-sync]]
[syng-im.components.styles :refer [font]]
[syng-im.components.chat.input.simple-command :refer [simple-command-input-view]] [syng-im.components.chat.input.simple-command :refer [simple-command-input-view]]
[syng-im.utils.utils :refer [log toast http-post]] [syng-im.utils.utils :refer [log toast http-post]]
[syng-im.utils.logging :as log])) [syng-im.utils.logging :as log]))
@ -11,5 +12,5 @@
:marginLeft 8 :marginLeft 8
:lineHeight 42 :lineHeight 42
:fontSize 32 :fontSize 32
:fontFamily "Avenir-Roman" :fontFamily font
:color "black"}}]) :color "black"}}])

5
src/syng_im/components/chat/input/simple_command.cljs
View File

@ -6,6 +6,7 @@
text text
text-input text-input
touchable-highlight]] touchable-highlight]]
[syng-im.components.styles :refer [font]]
[syng-im.utils.utils :refer [log toast http-post]] [syng-im.utils.utils :refer [log toast http-post]]
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
[syng-im.resources :as res] [syng-im.resources :as res]
@ -44,7 +45,7 @@
[text {:style {:marginTop -2 [text {:style {:marginTop -2
:marginHorizontal 10 :marginHorizontal 10
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "white"}} :color "white"}}
(:text command)]] (:text command)]]
[touchable-highlight {:style {:marginTop 14 [touchable-highlight {:style {:marginTop 14
@ -61,7 +62,7 @@
:marginLeft 8 :marginLeft 8
:lineHeight 42 :lineHeight 42
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "black"} :color "black"}
:underlineColorAndroid "transparent" :underlineColorAndroid "transparent"
:autoFocus true :autoFocus true

3
src/syng_im/components/chat/plain_message_input.cljs
View File

@ -4,6 +4,7 @@
view view
image image
text-input]] text-input]]
[syng-im.components.styles :refer [font]]
[syng-im.components.chat.suggestions :refer [suggestions-view]] [syng-im.components.chat.suggestions :refer [suggestions-view]]
[syng-im.utils.utils :refer [log toast http-post]] [syng-im.utils.utils :refer [log toast http-post]]
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
@ -35,7 +36,7 @@
:marginLeft 18 :marginLeft 18
:lineHeight 42 :lineHeight 42
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "#9CBFC0"} :color "#9CBFC0"}
:autoFocus false :autoFocus false
:placeholder "Type your message here" :placeholder "Type your message here"

5
src/syng_im/components/chat/suggestions.cljs
View File

@ -10,6 +10,7 @@
touchable-highlight touchable-highlight
list-view list-view
list-item]] list-item]]
[syng-im.components.styles :refer [font]]
[syng-im.utils.listview :refer [to-datasource]] [syng-im.utils.listview :refer [to-datasource]]
[syng-im.utils.utils :refer [log toast http-post]] [syng-im.utils.utils :refer [log toast http-post]]
[syng-im.utils.logging :as log])) [syng-im.utils.logging :as log]))
@ -34,7 +35,7 @@
[text {:style {:marginTop -2 [text {:style {:marginTop -2
:marginHorizontal 10 :marginHorizontal 10
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "white"}} :color "white"}}
(:text suggestion)]] (:text suggestion)]]
[text {:style {:flex 1 [text {:style {:flex 1
@ -43,7 +44,7 @@
:left 190 :left 190
:lineHeight 18 :lineHeight 18
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "black"}} :color "black"}}
(:description suggestion)]]]) (:description suggestion)]]])

5
src/syng_im/components/chats/chat_list_item.cljs
View File

@ -4,6 +4,7 @@
text text
image image
touchable-highlight]] touchable-highlight]]
[syng-im.components.styles :refer [font]]
[syng-im.utils.logging :as log] [syng-im.utils.logging :as log]
[syng-im.resources :as res])) [syng-im.resources :as res]))
@ -21,6 +22,6 @@
:marginRight 5 :marginRight 5
:marginLeft 5}}] :marginLeft 5}}]
[text {:style {:fontSize 14 [text {:style {:fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "#4A5258"}} :color "#4A5258"}}
(subs (aget chat-obj "name") 0 30)]]]) (subs (aget chat-obj "name") 0 30)]]])

3
src/syng_im/components/chats/new_group.cljs
View File

@ -2,6 +2,7 @@
(:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
[syng-im.resources :as res] [syng-im.resources :as res]
[syng-im.components.react :refer [view toolbar-android android? text-input]] [syng-im.components.react :refer [view toolbar-android android? text-input]]
[syng-im.components.styles :refer [font]]
[syng-im.components.realm :refer [list-view]] [syng-im.components.realm :refer [list-view]]
[syng-im.utils.listview :refer [to-realm-datasource]] [syng-im.utils.listview :refer [to-realm-datasource]]
[syng-im.components.chats.new-group-contact :refer [new-group-contact]] [syng-im.components.chats.new-group-contact :refer [new-group-contact]]
@ -35,7 +36,7 @@
:style {:marginLeft 5 :style {:marginLeft 5
:marginRight 5 :marginRight 5
:fontSize 14 :fontSize 14
:fontFamily "Avenir-Roman" :fontFamily font
:color "#9CBFC0"} :color "#9CBFC0"}
:autoFocus true :autoFocus true
:placeholder "Group Name" :placeholder "Group Name"

9
src/syng_im/components/contact_list/contact_inner.cljs
View File

@ -1,6 +1,7 @@
(ns syng-im.components.contact-list.contact-inner (ns syng-im.components.contact-list.contact-inner
(:require [clojure.string :as s] (:require [clojure.string :as s]
[syng-im.components.react :refer [view image text]] [syng-im.components.react :refer [view image text]]
[syng-im.components.styles :refer [font]]
[syng-im.resources :as res])) [syng-im.resources :as res]))
(defn contact-photo [{:keys [photo-path]}] (defn contact-photo [{:keys [photo-path]}]
@ -54,10 +55,10 @@
:position "relative"}} :position "relative"}}
;;; name ;;; name
[text {:style {:fontSize 15 [text {:style {:fontSize 15
:fontFamily "Avenir-Roman"}} name] :fontFamily font}} name]
;;; last message ;;; last message
[text {:style {:color "#AAB2B2" [text {:style {:color "#AAB2B2"
:fontFamily "Avenir-Roman" :fontFamily font
:fontSize 14 :fontSize 14
:marginTop 2 :marginTop 2
:paddingRight 10}} :paddingRight 10}}
@ -74,7 +75,7 @@
res/delivered-icon) res/delivered-icon)
:style {:marginTop 5}}]) :style {:marginTop 5}}])
;;; datetime ;;; datetime
[text {:style {:fontFamily "Avenir-Roman" [text {:style {:fontFamily font
:fontSize 11 :fontSize 11
:color "#AAB2B2" :color "#AAB2B2"
:letterSpacing 1 :letterSpacing 1
@ -94,7 +95,7 @@
:alignSelf "flex-end"}} :alignSelf "flex-end"}}
[text {:style {:width 18 [text {:style {:width 18
:height 17 :height 17
:fontFamily "Avenir-Roman" :fontFamily font
:fontSize 10 :fontSize 10
:color "#FFFFFF" :color "#FFFFFF"
:lineHeight 19 :lineHeight 19

3
src/syng_im/components/styles.cljs Normal file
View File

@ -0,0 +1,3 @@
(ns syng-im.components.styles)
(def font "Robot-Regular")