From a9d2ed271114274a3bde5cad7f0fcc41e858e10b Mon Sep 17 00:00:00 2001 From: Adrian Tiberius Date: Tue, 21 Jun 2016 17:15:46 +0300 Subject: [PATCH] applied new design Former-commit-id: 9f405ee18d9407198a6752040ccb9342f3d7be87 --- .../main/res/drawable-hdpi/icon_ok_blue.png | Bin 0 -> 647 bytes .../res/drawable-hdpi/icon_ok_disabled.png | Bin 0 -> 604 bytes .../src/main/res/drawable-hdpi/scan_blue.png | Bin 0 -> 358 bytes .../main/res/drawable-mdpi/icon_ok_blue.png | Bin 0 -> 501 bytes .../res/drawable-mdpi/icon_ok_disabled.png | Bin 0 -> 436 bytes .../src/main/res/drawable-mdpi/scan_blue.png | Bin 0 -> 227 bytes .../main/res/drawable-xhdpi/icon_ok_blue.png | Bin 0 -> 930 bytes .../res/drawable-xhdpi/icon_ok_disabled.png | Bin 0 -> 836 bytes .../src/main/res/drawable-xhdpi/scan_blue.png | Bin 0 -> 361 bytes .../main/res/drawable-xxhdpi/icon_ok_blue.png | Bin 0 -> 1464 bytes .../res/drawable-xxhdpi/icon_ok_disabled.png | Bin 0 -> 1263 bytes .../main/res/drawable-xxhdpi/scan_blue.png | Bin 0 -> 578 bytes .../res/drawable-xxxhdpi/icon_ok_blue.png | Bin 0 -> 2050 bytes .../res/drawable-xxxhdpi/icon_ok_disabled.png | Bin 0 -> 1718 bytes .../main/res/drawable-xxxhdpi/scan_blue.png | Bin 0 -> 787 bytes src/status_im/components/styles.cljs | 10 ++-- src/status_im/contacts/styles.cljs | 14 +++++- src/status_im/contacts/views/new_contact.cljs | 43 ++++++++---------- src/status_im/qr_scanner/styles.cljs | 22 +++++++++ ...port-qr-button.cljs => import-button.cljs} | 0 .../qr_scanner/views/scan-button.cljs | 23 ++++++++++ src/status_im/translations/en.cljs | 7 ++- 22 files changed, 87 insertions(+), 32 deletions(-) create mode 100644 android/app/src/main/res/drawable-hdpi/icon_ok_blue.png create mode 100644 android/app/src/main/res/drawable-hdpi/icon_ok_disabled.png create mode 100644 android/app/src/main/res/drawable-hdpi/scan_blue.png create mode 100644 android/app/src/main/res/drawable-mdpi/icon_ok_blue.png create mode 100644 android/app/src/main/res/drawable-mdpi/icon_ok_disabled.png create mode 100644 android/app/src/main/res/drawable-mdpi/scan_blue.png create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_ok_blue.png create mode 100644 android/app/src/main/res/drawable-xhdpi/icon_ok_disabled.png create mode 100644 android/app/src/main/res/drawable-xhdpi/scan_blue.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_ok_blue.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/icon_ok_disabled.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/scan_blue.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_ok_blue.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/icon_ok_disabled.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/scan_blue.png rename src/status_im/qr_scanner/views/{import-qr-button.cljs => import-button.cljs} (100%) create mode 100644 src/status_im/qr_scanner/views/scan-button.cljs diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok_blue.png b/android/app/src/main/res/drawable-hdpi/icon_ok_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..66e62ce1a3afdf162c35e4950145ce0f5c3601cb GIT binary patch literal 647 zcmV;20(kw2P)Px%K}keGR7efAluK{ZKoG}wwjgn$=2V+AMSO)GIU*sH3lUPPs#WEfG)Q1qh^x6F zgp!I!i)~7HKY}3Q#E~O>2H;#fTu81!Jj@tx+&rK(#B=a$W_SO;%Pdr(QTf_O~=a}lNO?bvPu52=lR^9*u=&=VM2Y8?pqWZ{Uh^d}IngJu(FK6b)~ zF^Uou`<;EEU;}dy6=Kz1>yd+r@RZdAIT+6@%( zq7tLGE+CM#9}w>yfN|iGAKe}3GJr3X@iCrD45U{#=PLUJ@!k;_cbgqV_o-ydiTJ<= zw(4cQIthqnMlLlA@uAb-c)puMO>}3&GS(&qjfHWLn?jp6s2Si*vIyW-%`z_VI5+b= hJV+(YF7JPmegOhJ??J0h8Y}<+002ovPDHLkV1n#;5{Uo+ literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok_disabled.png b/android/app/src/main/res/drawable-hdpi/icon_ok_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6068da44c3f22be04cc096d17b83ffde376769 GIT binary patch literal 604 zcmV-i0;BzjP)Px%7D+@wR7efAl;2MiK@i7xcCV#xMnS|M(J1BDUq<9gReZ6r#wBgi7ofT8RfB(+ zpe+w3Mn#|vJ}Gy%W9OPVTR39dT=!*fXJ@{je0S$oh$#=fvonW?Ko~hqR;AH+EM<1B z>biLXM#O0Vb-n&XqPox83c~hOoYm^@hCsao?D*&B$Em{zvM zr#NAfnc6vbV?K`qAS(kWuZ#AlK}W1T@tqMU`hNs0#9{_cN`*oqh;pKCq(bew4>aOP z-Ps52=P~>T0%`p$y}TYoFrdQiU2jE7ysZ>={ciUowJB{TjVOPwxg^2d;e7&?pFRDY zbab3Uv)tbOFiRj>gdyC_-db2CL0VrP6t6WegUm=E(uzc@p7+RHn1?K$)J+7cI?gg0 zInQ}kRvwpZyY)XuoFCm$xls558TiUU#Bi?aykBOAeNb;b05Uiph_r`}i(UW>MEqlt z;M*;`6@g6^d8w9L*-byOd(42hv-1o4zL2Hw_XEHO{q;2f0000Px$AW1|)R7ef&R?P~+Fbq!0@D&8F>brRKE#`5czJeDOyw0ca=)>rB;48>jO*#U# ztoxyJAZ(X!Ns}*4Xq#Yi%?=2#)fy(?`4I6DX|+1W)2C~)PhayKi@Vl(;jW2{2yf7E zQcZ!_fr)Y`*5Yg<>+1rQ{*(y9PSs^3q$V>^H<4|ONYCrGuIiuTV3KB97BBIP67Bc1 z`BlHv^=xCX`uen79kz^eYz13xvbCA;GDiF|@Wmvoyhp8BJ%+#L_kH)q(~m*V;eFzGA+kZG{>Er0-DSM=0=%_KNqQt!-mvnegFUf07*qoM6N<$ Ef+0erWdHyG literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/icon_ok_blue.png b/android/app/src/main/res/drawable-mdpi/icon_ok_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..8b6c5482cf652f6bbc2bb0534c9e8b6213d38972 GIT binary patch literal 501 zcmVPx$uSrBfR45gtlS?lHQ546|xieE0Qtwtjf_Np^8){`GHg<%d3!6S9UYl;PKv=LC z6+&3}3`oC$h(|oaQl?d}HcE+^;|^)lHf^HJ=H7em`Tz1i=iCAK$2X=tmU#R@mw~{) za(o+4rIC;L9s#v5WRrgajqf~{y~kenh@hE!xiK-5oHxk57AXfU#+^VDB3?s*Bro<= z-m-j3o7jw2kRChufxwj{h^+=BuO4}oXr&G>`yA59g_i(Q+mf?NO&Ixh6HHw}RIACj>y2qqghutDVN> zq(5ZS-Y7sswS2^PGIOmR^<3C#2|hF&B&Zy&!5-400000NkvXXu0mjfqu|`R literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-mdpi/icon_ok_disabled.png b/android/app/src/main/res/drawable-mdpi/icon_ok_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..62a6bdebf489b75fca2b9bd16694e787b96b88ed GIT binary patch literal 436 zcmV;l0ZaagP)Px$Zb?KzR45gt(#=Z4Ko9`n-N{dBDrhArQc)0*9?a|X6$(NFo&+z>q2Q&|i$4^6 zg1kiEp}B}4N(D=>P!Mg6-DJ%ax2DCv*1hcR%;aNsH;nybAU5@C{h~kwpVz@=QwQI7 zm|zQ#(eCDg8jXe#gyAkB47ArJh+6ur9TC#$4;_#!rx4e5Lv0p_kZyu78RvlU!J-!X zgpl#)qbVf%Kz7zwTcuLzO*I0vkW&5#P9tIpA%lCKXI`~Cj&Abyq3b?UFg*~_gnZs% z5x3|#gkY)@RSUO4U^C#B5Uhx`nynHvBYFw4GD4W9_r=rK2-U(trSf2KoG(Dten1hbs2nJbE>iJlfy8i6sQIp9N9hPt5cyRBNZ3 e^yCwXUpDW5F{8BQvMRX%0000@7ndHw(Y|Gg3y7?hbGU;9_$DWCH2(9HAO|D^wT->bux)O^J#(U>JxaSs0##&l&v zhc;ueGd17jRm>D)xmGKwe2tiC@Yg3I^`wAI4co>Br#U?H4{QxsC7*YJBf+3)69=7y7Dl>#vvRpdt5+uZ~<+fem2>VP% ZhH0@Djz@0`O#?cV!PC{xWt~$(69A+!QpNxP literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok_blue.png b/android/app/src/main/res/drawable-xhdpi/icon_ok_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..df4ddc7541de4b4aa9539237759ec3775028fe74 GIT binary patch literal 930 zcmV;T16}-yP)|00001b5ch_0Itp) z=>Px&TuDShR7efQm(6PvQ4ql2yi_f{)C!uU=&=`19=sGqsftn*QEOZJVXd~=pok=! z7CcD~dJs#tA|ksnja6Dys9L`&DE!-9vkR{hArTKW(g=F0*Y21CkVC-{QmiCb|{fa?dvbqjUlcjD#Asm~vWRlU0y4DEK`T403#+>t3#<2A5mfDiI_hVrIY3Hm0BttmxkACoW+tEmyngNSP(ux~ZM_l*R6 zvzA_tr~1%jNwT#c3IfSetL{-GKh>YLi|tUjpadMEvhMCL$hK!q{2-5g-yv*dE!AHP zhW=UidSQfr*A58Af`uaFM}!=b&LFd}|YAaSFk1C076 zUk}x!X)$*S>Hctl)6@^#hiGXMYp07*qoM6N<$ Ef+umOV*mgE literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok_disabled.png b/android/app/src/main/res/drawable-xhdpi/icon_ok_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..07c323e77e1e9d0dfd6a2dc9e04990b0f2dfe7d8 GIT binary patch literal 836 zcmV-K1H1f*P)|00001b5ch_0Itp) z=>Px%{z*hZR7efQm+4OvK@`AuW@p_tDqa=zqfrq7js8!XrWV#hzypX`6QE$5(h?TZ zsNsA68{<#vO|Yaa-qT{A zY`}(8NY6Yv&P>tahoOr@y?(5OI6Uq?e6Z+-duHU>d~pG z6TcB#U^qh;y_J!X`g*V@x)c<5T^V9daB3c>n?j0MNiE%W7)jmb%n#q%l=qw#cThUjv?s* zS$*ePC^#Vub;8S&%kEKvU^uG{2Evz*?9R>Tdj%;UocTDV%1^9b%47;*r`?vJ=c-i( zVD$c-SH_N8xn*~IVs8~hDnD|t03%6R$19g-XJPx$BS}O-R9Fe^SW6DVAP^nUOK8;lc#*m_@f=Ouwioe08a;)@p(#kQ=?n>|i(ymR z`MlxLOn9hM``AChv|wNZoT1>h09Do1>N4kU^LEBG24Fkq=WRn?om7mC#=`p;pJ{qx zeb~hWc{Q7vY23VDaj`lzqXM|vEu-RkAKV7YFSe^=b4O<1<9t{n=J!U7pUhC{Ql%h@ zVPQxZq8Om;8p7rk&Z)>;_7D^2+ILiZ;dJ0!b+|mg#&>ndQy35igaOBZ@~Q*B*d|4( z2^W~_8RIWQ)zN`z5NMYRjFTtEAE}Nc*}_5N_yl^;;>!VzB25?)hA0Lo```UTAKIQ; zfjxtBI(qW`&;XpyP^tSNUr>1JC+R8dFj5^%tYY^=!>{lH7PD=4)A#3T00000NkvXX Hu0mjfg4v<> literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_ok_blue.png b/android/app/src/main/res/drawable-xxhdpi/icon_ok_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8661249d229565a03af452b324bb9009e22575 GIT binary patch literal 1464 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_ok_blue.png b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..f8a9b938b49673e6796132c029f3351176c0717e GIT binary patch literal 2050 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 M07*qoM6N<$f_^M8SpWb4 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable-xxxhdpi/scan_blue.png b/android/app/src/main/res/drawable-xxxhdpi/scan_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..2365f04fc5c3ebe27c74237049bc68e1058b2fe7 GIT binary patch literal 787 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-HD>U^?sR;uuoF z_;$|5B4I;;wsOeDs2oV+DJ#!|8yfjB?F3Og79dY{ALPBep1+ zKlVBI%W{6nw}b0v_PmY0oAv$kuPKq4ONDN~+&^Je+-+?`dbi`0|KLY&eUJG<_meQWu#xKfMh+y3OJvHLEUTEFU3@uJO- z_f2TqW?u2+O55WDwLRXS^Y_L}Uy760{&9ZQ{FAcp%q(AC*uC}jgm1qh7XC0^esyhO zT!~qt$K}5duUFel{d~{LN<%{E!lCpwzHM8}=DzsSYX2d+RaEa9yU6lN(Mo&X&A)5Y z4Zhzm{gI=gC9m?AJFxN8EU(&c-ws`~yI=A9*~`E$@9*cH`2S1Lq-Yxp%RUDtB?SkD z4oOEA77hkO<&FjhMujvMK>-DZBRvXCOe_sE1YH~&7zB))6c)r>(o|>ea#ue0QzEr6 zRC&7kHpkEVcQbv^hUdJ%l{AOzx~_6{V!|r_o}sr_DRKES~uta&Zyqjd$Z*B*VX)v z_Duff8@}wD^3VCJuUbrrU;T5RWyr00K5yMW*{|z9I%yH_*^&cReY|E@_RsllpYnPw z*Y%{UKW7eM$1pUqb%Q6;ph_G1}H^uj7AlYSPBJ@>dvScmkvfQl7K#JbTc* z&wR^|s<{oDIbF|v*}1O#@p7eP-io>jx25;UEnXXzymjH=uKW}^%a1vWmW4ev=iDlz+cdeY2$;$lJYD@<);T3K0RSC2WcmOA literal 0 HcmV?d00001 diff --git a/src/status_im/components/styles.cljs b/src/status_im/components/styles.cljs index a1176d46bf..0498011c07 100644 --- a/src/status_im/components/styles.cljs +++ b/src/status_im/components/styles.cljs @@ -63,6 +63,10 @@ {:width 23 :height 22}) +(def icon-scan + {:width 18 + :height 18}) + (def icon-plus {:width 18 :height 18}) @@ -92,10 +96,8 @@ (def button-input-container {:flex 1 - :flexDirection :row - :height 50}) + :flexDirection :row}) (def button-input {:flex 1 - :flexDirection :column - :height 50}) \ No newline at end of file + :flexDirection :column}) \ No newline at end of file diff --git a/src/status_im/contacts/styles.cljs b/src/status_im/contacts/styles.cljs index 4b64148fc9..410adf7ed2 100644 --- a/src/status_im/contacts/styles.cljs +++ b/src/status_im/contacts/styles.cljs @@ -71,7 +71,8 @@ (def contact-form-container {:flex 1 - :color :white}) + :color :white + :backgroundColor :white}) (def gradient-background {:position :absolute @@ -82,4 +83,13 @@ (def form-container {:marginLeft 16 - :margin-top 50}) \ No newline at end of file + :margin-top 16}) + +(def address-explication-container + {:flex 1 + :paddingLeft 16 + :paddingRight 16}) + +(def address-explication + {:textAlign :center + :color "#838c93de"}) \ No newline at end of file diff --git a/src/status_im/contacts/views/new_contact.cljs b/src/status_im/contacts/views/new_contact.cljs index 469ed6b914..9c09c3a806 100644 --- a/src/status_im/contacts/views/new_contact.cljs +++ b/src/status_im/contacts/views/new_contact.cljs @@ -19,8 +19,8 @@ toolbar-title-text button-input-container button-input - white-form-text-input]] - [status-im.qr-scanner.views.import-button :refer [import-button]] + form-text-input]] + [status-im.qr-scanner.views.scan-button :refer [scan-button]] [status-im.i18n :refer [label]] [status-im.contacts.styles :as st])) @@ -28,51 +28,46 @@ (def toolbar-title [view toolbar-title-container - [text {:style (merge toolbar-title-text {:color color-white})} - (label :t/new-contact)]]) + [text {:style toolbar-title-text} + (label :t/add-new-contact)]]) (defview contact-name-input [name] [] [text-input - {:underlineColorAndroid color-white - :placeholderTextColor color-white - :style white-form-text-input + {:underlineColorAndroid "#0000001f" + :placeholderTextColor "#838c93de" + :style form-text-input :autoFocus true - :placeholder (label :t/contact-name) + :placeholder (label :t/name) :onChangeText #(dispatch [:set-in [:new-contact :name] %])} name]) (defview contact-whisper-id-input [whisper-identity] [view button-input-container [text-input - {:underlineColorAndroid color-white - :placeholderTextColor color-white - :style (merge white-form-text-input button-input) + {:underlineColorAndroid "#0000001f" + :placeholderTextColor "#838c93de" + :style (merge form-text-input button-input) :autoFocus true - :placeholder (label :t/whisper-identity) + :placeholder (label :t/address) :onChangeText #(dispatch [:set-in [:new-contact :whisper-identity] %])} whisper-identity] - [import-button #(dispatch [:scan-qr-code {:toolbar-title (label :t/new-contact)} :set-new-contact-from-qr])]]) + [scan-button #(dispatch [:scan-qr-code {:toolbar-title (label :t/new-contact)} :set-new-contact-from-qr])]]) (defview new-contact [] [{:keys [name whisper-identity phone-number] :as new-contact} [:get :new-contact]] [drawer-view [view st/contact-form-container - [linear-gradient {:colors ["rgba(182, 116, 241, 1)" "rgba(107, 147, 231, 1)" "rgba(43, 171, 238, 1)"] - :start [0, 0] - :end [0.5, 1] - :locations [0, 0.8 ,1] - :style st/gradient-background}] - - [toolbar {:background-color :transparent - :nav-action {:image {:source {:uri :icon_back_white} + [toolbar {:background-color :white + :nav-action {:image {:source {:uri :icon_back} :style icon-back} :handler #(dispatch [:navigate-back])} :custom-content toolbar-title - :action {:image {:source {:uri :icon_add} + :action {:image {:source {:uri :icon_ok_blue} :style icon-search} :handler #(dispatch [:add-new-contact new-contact])}}] [view st/form-container - [contact-whisper-id-input whisper-identity] [contact-name-input name] - ]]]) + [contact-whisper-id-input whisper-identity]] + [view st/address-explication-container + [text {:style st/address-explication} (label :t/address-explication)]]]]) diff --git a/src/status_im/qr_scanner/styles.cljs b/src/status_im/qr_scanner/styles.cljs index 05198031b1..65838b9ec6 100644 --- a/src/status_im/qr_scanner/styles.cljs +++ b/src/status_im/qr_scanner/styles.cljs @@ -74,3 +74,25 @@ :flexDirection :column :color color-white :margin-left 8}) + + +(def scan-button + {:position :absolute + :top 5 + :right 16 + :flex 1 + :height 50 + :alignItems :center}) + +(def scan-button-content + {:flex 1 + :flexDirection :row + :height 50 + :alignItems :center + :alignSelf :center}) + +(def scan-text + {:flex 1 + :flexDirection :column + :color "#7099e6" + :margin-left 8}) \ No newline at end of file diff --git a/src/status_im/qr_scanner/views/import-qr-button.cljs b/src/status_im/qr_scanner/views/import-button.cljs similarity index 100% rename from src/status_im/qr_scanner/views/import-qr-button.cljs rename to src/status_im/qr_scanner/views/import-button.cljs diff --git a/src/status_im/qr_scanner/views/scan-button.cljs b/src/status_im/qr_scanner/views/scan-button.cljs new file mode 100644 index 0000000000..9ed1fd39e5 --- /dev/null +++ b/src/status_im/qr_scanner/views/scan-button.cljs @@ -0,0 +1,23 @@ +(ns status-im.qr-scanner.views.scan-button + (:require-macros [status-im.utils.views :refer [defview]]) + (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]] + [status-im.components.react :refer [view + text + image + touchable-highlight]] + [status-im.components.toolbar :refer [toolbar]] + [status-im.components.drawer.view :refer [drawer-view open-drawer]] + [status-im.components.styles :refer [icon-scan]] + [status-im.i18n :refer [label]] + [status-im.qr-scanner.styles :as st])) + + +(defview scan-button [handler] + [] + [view st/scan-button + [touchable-highlight + {:on-press handler} + [view st/scan-button-content + [image {:source {:uri :scan_blue} + :style icon-scan}] + [text {:style st/scan-text} (label :t/scan-qr)]]]]) \ No newline at end of file diff --git a/src/status_im/translations/en.cljs b/src/status_im/translations/en.cljs index 8ec3ba3fb7..3206eeca42 100644 --- a/src/status_im/translations/en.cljs +++ b/src/status_im/translations/en.cljs @@ -115,9 +115,12 @@ :You "You" ;new-contact + :add-new-contact "Add new contact" :import-qr "Import" - :contact-name "Contact Name" + :scan-qr "Scan QR" + :name "Name" :whisper-identity "Whisper Identity" + :address-explication "Maybe here should be some text explaining what an address is and where to look for it" ;login :recover-from-passphrase "Recover from passphrase" @@ -127,6 +130,6 @@ :login "Login" ;users - :add-account "Add account" + :add-account "Add account" }) \ No newline at end of file