From 060685df6c6a27ea78fa0656c753f9d66a7ba177 Mon Sep 17 00:00:00 2001 From: James Pearson Date: Mon, 30 Sep 2019 14:47:34 +0100 Subject: [PATCH 1/2] Replaced the change location image --- assets/images/changeLocation.png | Bin 1519 -> 452 bytes assets/images/changeLocation@2x.png | Bin 2849 -> 729 bytes assets/images/changeLocation@3x.png | Bin 4213 -> 992 bytes 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 assets/images/changeLocation.png mode change 100644 => 100755 assets/images/changeLocation@2x.png mode change 100644 => 100755 assets/images/changeLocation@3x.png diff --git a/assets/images/changeLocation.png b/assets/images/changeLocation.png old mode 100644 new mode 100755 index 8164f38134aa5e2e6755a7b9dfbdd6dfafe32c33..c5d73376242d40099dd8861da70d537058119410 GIT binary patch literal 452 zcmV;#0XzPQP)rd{`=T=%0~_@!O=rd;@@UHGP5_M}?(rCRu=UH||8`^TC7`t|(S zxca<>{^{5K@{nx`T1N_*I>*h)mpW=~VeOCAY}qJY zM8r23F)mY}FkfU}t#6a0VC2dw-?x%M>hVrOr8!B$NR0TCcRqirL z4YrU6p$~586e%iJaYMxy1!3-;OJ-t~rYY5?CTXh@X^jeEHEmi`7wlr!x%bZ8E$G7|j1Z%Ys6lRVoDB-{PRJ9t*f3StDJHT>wB; zioZFnU|oH*bso(oB}~mh*;QT?y9F^9YcZcCf{uq&iq^ZHbds zWloQlI32hL6=X~wsr_&vYKjF5ONEvNM=M%($2Vc0!rmP!GPbJ@8t^c$I%ju|l&l7B z5=YDUxBfNM2eBVC>5#cCv8*@rR=K7EFmco$&2WoGfl~3-uV|5F6*!x-P41~wN^syW z($Us%Rz(fCbvM4R1lAjTQ#IDjwnS&;Q~3SIszCD-o0Wr_x^z~>gN09THw$w6D{ued zy)2hmq8cs+b?0g-u|c@d+824yQU=s_ncM$@dbn6`Y`~+gRN~fJ;!~_}O8$>x=>!GWZ9Jc&M zW{RxUbJvA&Gj>5YD{c|z%3PT%|ChqnEImoN??Ccs*4KSpZIbuo2~BXR#!V3KZ6a*@ z!F3Xs(Zj<(OTUWsnx~1|!v&FiZ6#?da}sAn63!zspW+&9>1hr!(|G~fHVQ|vC70Ij zsTAnDcIOqzL|bvrn8^3^I&I$}(L6cGA7< z0%5h~WFZ2I`t6J*=Y^Jq1<~ds78sLY(Pt+-+6phF8vu6@eMTo+mV%sk9+71+873dd z+4{X$=tJf#x=4cM@j#C`UxH;$@>u--ll(pwE%5rZd7lIePzeGlD3z9!0kB_0Z1Dm8 z4lQfxHc^e!O@-6GW!{K^;~apceakW(7f;7o+5v#_h+izT=v>feoxE=6U@g;RD?3i1 zZ4Wt1v?+1+0OnX$iL;=>)h$tjdew$@a!z+=tz#ha%Tr%EoXL4?z&yUbn0U#_>bEYI z@m`r!*~Viy1b>S|@D;Pn3nh5SN-v#!9GHEip`|g}^HMRyssDJ=y?`z1_d&M0`C)eS z>u?~qid1Ke4mVFuQ~DcN=O0Ra{FHeYwKJ#d)G1(@l{k-1I0nB1Z*~I){e=Ik#6n5Z zM#$RT0QaoCK_PdGd44N82CYYC5SaIV=}bs1qF_rhsjn$I8oi&g3#uou;sd|K^T4!V z2}tpx!kjN8=q2)MVxdn+gQr}N+S-F?JA|j5oB*>r&MuBMF6T1jm{&$za}lg`K(@J1 z)VCKwnP+jZ&|j|Mki9anJWs;ck+zB3Ll<=)`DyJ=+9uk1xz%VpjQ7K6e;J~$3o3ms z?*W8Gl5t?gxN*!s=v&5Zcz;3vrDf4?6DV+pbT%c+mTsMohzTE+oW=GG$t{E*Kas4< zIg56FhwF4)Dgd@qKVg*#qDCB8iUA^=-AV=vISa7jgO`P1tGV83)c~NIDd?(d@Gq25 V4Sf57rj-By002ovPDHLkV1i#f+bjS8 diff --git a/assets/images/changeLocation@2x.png b/assets/images/changeLocation@2x.png old mode 100644 new mode 100755 index cc59eeb41ee65066c5425a90fd41930704243ff7..2f184631d7b6104a6d451b73dde9077512ccbc86 GIT binary patch literal 729 zcmV;~0w(>5P)T=}S7^`u<+re64_UHPV5_@!O>rd;`_ zUihY6|NsB~^y~StasK-C`KxFC@8SH}xcawy{LQ5O>DT(ah5N^v{o~C1(yspL*ZkeW z`_r!b!jOSc=%D}r026dlPE!EiU_c-c@6V9GfR9kmub*&Ge*l$26aWAM14%?dR7l6A zm+N+_Fc5_kBoM$`&&~z0YELik|BCIh5vwyHu=4$LRyNr)8R8%!sF!ZHk@!J2+xDdt z3t0Wz;E7E)^9ibGz_KYsntg>RvPjvMm_)9oe0NCFshGNyn1L)K#w*OCViPDZn}Stm z=vP?8lmD{9BC3b_DT#$hCGK=sOqWXhJe<5S{xrBm`jQi$%*g4;*`GMGelQOVpzNcY zyMuY+(9`Ox$mYE@ghQ-(Y7!65Q~sN4$B^*XDDn1>k270*O`^BN?N<-<7kjHeS=e&k zk7Ko->PXJN=DZJK?|!VL|BbworAn+x?A=_sVC4UA_1qkn?&X-u}Ado&d7yNwAlAmvF;~v%K%*taYXY9oR z{pa`-6jHj-B>^9_p%}DuH3-hII1n1K1LcELe}J+T8WiWL+B#6$@XExpk7piU83h7& z*;#Ou;kw|jj5|J9C)b5&!SPD1Q*`{V`HkGNocA9Zq|!ftrJkBAoV}mf)Qq7jupIrg zTHXdpOzFK#4LEW_?~mY-bUdJX>t;+x8WCJntusfXyumDQEX*BBGxSC7K%W0OKv5b= zw95Y!ic`pmtoI^KQG=x^l$b@S$rI{!B^FSw+ifGS>DD{Fj_vymp(^5yb&hns00000 LNkvXXu0mjf-}HJ! literal 2849 zcmV++3*PjJP)M}pRCzaierc+bX*c-p{MHZG^x(C458m4$hyqhneh2_{184)#hK-^`k~F+`qz}0p z`#dwj)b+DWO}Q6&ZHu`D%QF@Og)4a}s#r3#Y>~?G1Eg}| zAbc;!xPF+JOCRR~Zl-A-%q#I2bUp1~F;9?E|MMU>Cwlk2G?`c%dq~AHqD8`|1H3GR z?kvT?01rDgipmFe5u@)Rb{~r$A?3rLL|6(HVl0}*u;8Y$6qQe=)@yy! z*y7~i`<&#gGA9eg)x%@3EaijRzu~@0C&T*!D}s{(>q#G2Ec@XCtjP@w4A6x3HFStq zthPUW8LP^>xd0234i^Pw+oX!!*UJyHMFCh1oZQ>pS#a!^Tx9GQY~_V^YHZ~-xG;6) zg>%lrhBbK%*4n<5ZEk`5MLV_bgqP1Gm0^qhg0`r zqX?al_5qfYD6qvr9bizwp`D5*6)jV(!9|gr%G1=!Ocd}^UbZ;c+8aNZ4JH*!`={k~ zWv#sWxeXZH);Q6shBFE%qhFfDlVkha#zFAnv8(yVW8dlHode6jLEz-ldTE*a?Vt-c zZXG%dzI}l&u$nZxZGtd9S-WXIH(*O|J;%S^Ad4Ujudrbt?{#F)s6n-3xG5CPWws-S zN1!`smp&O8TdgYs%pq_prl$dHHi2%QshL17f8f8#MZmge)2c+wE;WM*wzO)eFjv)Z z%KL*gsnv32zGp18Jz9DfDIeM$U#{-oNenHQ+Fr5tE!bc=4ves(57cA(>?)cR3zF|? z?-HZ1Nv)V=Dj!mwqE;?gSP41l|Oo-aR! zUYfabPU^cDn_k(SR^f4ga{W? zBuJ2;SVR_0xs>SnOH%23ap$+NXd=x>6FzqWdt5(&4CGeq`yS^WkqtoNLNNmoE>y4*s@r-4pg=nq^_4_Ns3L#$*b^ihI#L*~H3gJyYyfH$n={s5dRInnwd z`i+kU*pNiyexi4OBMMk2NvK5u3oGq9xW;f^)=5K?AGdV*){-iBj^xASP8P?Oit;q8 znEx5wU?p9~1z2C=k1B8=uRiuodMSng`w9&5cV3f@vw+3yDJ5c7M(qKp1-1$R3s_Zt zn&P&}wIVL$1$)4%xm-!h-{dx$vqvlFzwIs|_}p6edLOXycT&3>pOK?L)_w=RA9OOT z>)0|@KIWD&;c|x0M;XAbsBSHCstMt@BD}yasJ1eWD1g5m;sY#lB`6Z7)A!N<7J>AZ z>c}o@;J|-S*WbY4*ga;i@>^O~GJsuL1y(PNwO1jmCf1lT0oHlYd)`vY-&6$z-oDwJ z`wa_Nkg2Mv6(&?$Q92q1EIkn?(`ve!+Yu?xv4FK-0$3)&S^^)ib88h3QS;->1-WaX zufZr_LA?AJlEjma>i;v`y&E|Aftke0@hB;WBr4#6(;Zz2UrFVCRN1p(9k4H0xSUV z3rcDI8<9K<-w@hF}Qb0Tyu--aeTIeP*nZ`9DBeu z;9&s&!{3nWlA2raeYsn#R$F9&9-b>V(aehi)_F<4j&u-!OP!(+&p}Y-9cbgajFCC8 zz6mev`ffXyK%z4P;_Yg(CU>p~PzVwvNRS{wf?C;ZSy;HD5wi>JU9@xKm^pToA2SJd zHX)me>_+DkCl=uO#%k`T(Oy{o68nFV_iv8-7{hk7qfl%2!u5+V;_n_A3T*=z`u9bQ z=|#%epI-Zd>Q{Js&Ix>f-E{~?GasMxqsr@Or-BX|;R|XASi7V>;)ql9q6i^ld;saW z>)qf>_&v&uz;n>!qRyzbHxE<&@&dNe`P4@4=;f=wiyd@R|Vs(%FMtKeZ|}z-dM;OQga;ejoJpr%BhjxvG$5{&98JOEuIe z^)Xh_SQ?zr=v)Y}N#+v@ERGM{e~ zHj1;J;s|WR^Pz#Yx3Cr^H7tA4m?+Q+6X;`=X%ooObd)BlYfatL4x_z0*l2Zbao{YSa`^@7@wq@t1w`IZ%~S2EoLyC1m6Cz z{|e7h5F6+n*D#=o7{JD)A(~&PEGQG}uQB$+{+bI&f1ydkz}lUU zWK?^6U^$zBnf5Ox?uyb9D(^G|_q>LHc@~7tElgzs;H>uk?&X|D18k%7VFBx4_(A~K zMD8CfCEGo1#H9sK#V$spJeHPm&lAi?P?PBY^tOnK#HXQn00000NkvXXu0mjf8<}l! diff --git a/assets/images/changeLocation@3x.png b/assets/images/changeLocation@3x.png old mode 100644 new mode 100755 index e5c598e7b80ca25ba9bb636211905ed2b20543c5..06410862d80c4ce5370e9f416ba79ae4a96fa77d GIT binary patch literal 992 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 From f2a17d289bd55b484f7c686286f0b8b48663cfb4 Mon Sep 17 00:00:00 2001 From: James Pearson Date: Mon, 30 Sep 2019 17:07:27 +0100 Subject: [PATCH 2/2] Replaced the change location image --- App/Screens/Home/Header/Header.tsx | 27 +++++---- .../ChangeLocation/ChangeLocation.tsx | 60 +++++++++++++++++++ App/components/ChangeLocation/index.ts | 17 ++++++ App/components/index.ts | 1 + App/localization/languages/en-us.json | 3 +- App/localization/languages/en.json | 3 +- App/localization/languages/es.json | 3 +- App/localization/languages/fr.json | 3 +- 8 files changed, 101 insertions(+), 16 deletions(-) create mode 100644 App/components/ChangeLocation/ChangeLocation.tsx create mode 100644 App/components/ChangeLocation/index.ts diff --git a/App/Screens/Home/Header/Header.tsx b/App/Screens/Home/Header/Header.tsx index b37b0953..d8b03933 100644 --- a/App/Screens/Home/Header/Header.tsx +++ b/App/Screens/Home/Header/Header.tsx @@ -20,13 +20,11 @@ import { Image, StyleSheet, Text, - TouchableOpacity, View } from 'react-native'; -import changeLocation from '../../../../assets/images/changeLocation.png'; import alert from '../../../../assets/images/alert.png'; -import { CurrentLocation } from '../../../components'; +import { ChangeLocation, CurrentLocation } from '../../../components'; import { i18n } from '../../../localization'; import { ApiContext, CurrentLocationContext } from '../../../stores'; import { distanceToStation, isStationTooFar, DistanceUnit } from '../../../util/station'; @@ -67,9 +65,9 @@ export function Header (props: HeaderProps) { - - - + + + ); @@ -79,22 +77,27 @@ const styles = StyleSheet.create({ backButton: { marginBottom: theme.spacing.normal }, - changeLocation: { - marginRight: theme.spacing.tiny - }, + container: { paddingHorizontal: theme.spacing.normal, paddingTop: theme.spacing.normal }, content: { alignItems: 'center', - flexDirection: 'row', - justifyContent: 'space-between' + flexDirection: 'row' }, currentLocation: { marginRight: theme.spacing.tiny, - maxWidth: '75%' + flex: 1 }, + + changeLocation: { + alignSelf: 'stretch', + alignItems: 'flex-end', + justifyContent: 'flex-start', + maxWidth: 60 + }, + distance: { alignItems: 'center', flexDirection: 'row', diff --git a/App/components/ChangeLocation/ChangeLocation.tsx b/App/components/ChangeLocation/ChangeLocation.tsx new file mode 100644 index 00000000..31c6d46b --- /dev/null +++ b/App/components/ChangeLocation/ChangeLocation.tsx @@ -0,0 +1,60 @@ +// Sh**t! I Smoke +// Copyright (C) 2018-2019 Marcelo S. Coelho, Amaury Martiny + +// Sh**t! I Smoke is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Sh**t! I Smoke is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Sh**t! I Smoke. If not, see . + +import React from 'react'; +import { Image, StyleSheet, Text, TouchableOpacity, TouchableOpacityProps } from 'react-native'; +import { scale } from 'react-native-size-matters'; + +import { i18n } from '../../localization'; +import * as theme from '../../util/theme'; + +import changeLocation from '../../../assets/images/changeLocation.png'; + +interface ChangeLocationProps extends TouchableOpacityProps { + +} + +export function ChangeLocation (props: ChangeLocationProps) { + const { onPress } = props; + + return ( + + + {i18n.t('home_header_change_location')} + + ); +} + +const styles = StyleSheet.create({ + container: { + backgroundColor: 'yellow', + maxWidth: 60 + }, + + icon: { + alignSelf: 'center', + marginBottom: scale(4) + }, + + label: { + color: theme.primaryColor, + fontFamily: theme.gothamBlack, + fontSize: scale(7), + lineHeight: scale(8), + textAlign: 'center', + textTransform: 'uppercase' + } +}); diff --git a/App/components/ChangeLocation/index.ts b/App/components/ChangeLocation/index.ts new file mode 100644 index 00000000..dc0945f3 --- /dev/null +++ b/App/components/ChangeLocation/index.ts @@ -0,0 +1,17 @@ +// Sh**t! I Smoke +// Copyright (C) 2018-2019 Marcelo S. Coelho, Amaury Martiny + +// Sh**t! I Smoke is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Sh**t! I Smoke is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Sh**t! I Smoke. If not, see . + +export * from './ChangeLocation'; diff --git a/App/components/index.ts b/App/components/index.ts index 18664083..6962280e 100644 --- a/App/components/index.ts +++ b/App/components/index.ts @@ -19,6 +19,7 @@ export * from './Banner'; export * from './BoxButton'; export * from './Button'; export * from './Cigarettes'; +export * from './ChangeLocation'; export * from './CurrentLocation'; export * from './ListItem'; export * from './ListSeparator'; diff --git a/App/localization/languages/en-us.json b/App/localization/languages/en-us.json index 6956c9ee..f88de7c9 100644 --- a/App/localization/languages/en-us.json +++ b/App/localization/languages/en-us.json @@ -9,6 +9,7 @@ "home_share_message": "Shoot! I 'smoked' {{cigarettes}} cigarettes today by breathing urban air. And you? Find out here: https://shootismoke.github.io", "home_header_air_quality_station_distance": "Air Quality Station: {{distanceToStation}}{{distanceUnit}} away", "home_header_from_search": "from search", + "home_header_change_location": "Change Location", "home_btn_why_is_station_so_far": "Why is the station so far?", "home_btn_see_detailed_info": "See detailed info", "home_btn_see_how_it_works": "See how it works", @@ -76,4 +77,4 @@ "about_credits_available_github": "available on Github", "about_language": "Language", "current_location_unknown_station": "Unknown AQI station" -} +} \ No newline at end of file diff --git a/App/localization/languages/en.json b/App/localization/languages/en.json index 9de45eee..30ddcf32 100644 --- a/App/localization/languages/en.json +++ b/App/localization/languages/en.json @@ -9,6 +9,7 @@ "home_share_message": "Shoot! I 'smoked' {{cigarettes}} cigarettes today by breathing urban air. And you? Find out here: https://shootismoke.github.io", "home_header_air_quality_station_distance": "Air Quality Station: {{distanceToStation}}{{distanceUnit}} away", "home_header_from_search": "from search", + "home_header_change_location": "Change Location", "home_btn_why_is_station_so_far": "Why is the station so far?", "home_btn_see_detailed_info": "See detailed info", "home_btn_see_how_it_works": "See how it works", @@ -76,4 +77,4 @@ "about_credits_available_github": "available on Github", "about_language": "Language", "current_location_unknown_station": "Unknown AQI station" -} +} \ No newline at end of file diff --git a/App/localization/languages/es.json b/App/localization/languages/es.json index abe49bf0..6b45d5a8 100644 --- a/App/localization/languages/es.json +++ b/App/localization/languages/es.json @@ -8,6 +8,7 @@ "home_share_title": "¿Sabías que por vivir en una gran ciudad puedes estar fumando hasta 20 cigarrillos al día?", "home_share_message": "Rayos! 'hoy fumé'' {{cigarettes}} cigarrillos respirando aire urbano. ¿Y tú? Encuentralo aquí: https://shootismoke.github.io", "home_header_air_quality_station_distance": "Estación de calidad del aire: a {{distanceToStation}}{{distanceUnit}}", + "home_header_change_location": "Cambiar locación", "home_btn_why_is_station_so_far": "¿Estación retirada?", "home_btn_see_detailed_info": "Ver detalles", "home_btn_more_details": "Más detalles", @@ -60,4 +61,4 @@ "about_credits_source_code": "Código fuente", "about_credits_available_github": "disponible en Github", "about_language": "Idioma" -} +} \ No newline at end of file diff --git a/App/localization/languages/fr.json b/App/localization/languages/fr.json index 1286b2c8..08ded509 100644 --- a/App/localization/languages/fr.json +++ b/App/localization/languages/fr.json @@ -1,4 +1,5 @@ { + "home_header_change_location": "Changer de lieu", "error_screen_common_sorry": "Désolé!\n", "error_screen_error_cannot_load_cigarettes": "Nous n'avons pas pu\ncharger vos\ncigarettes." -} +} \ No newline at end of file