From 54861d729d98864b38d639c690d44e41b5637b7b Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Thu, 16 Apr 2020 16:04:22 +0200 Subject: [PATCH] Added new home tab icon --- assets/tab-icon-outline.png | Bin 0 -> 2571 bytes assets/tab-icon.png | Bin 0 -> 2156 bytes src/navigation/MainTabNavigator.js | 24 ++++++++++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 assets/tab-icon-outline.png create mode 100644 assets/tab-icon.png diff --git a/assets/tab-icon-outline.png b/assets/tab-icon-outline.png new file mode 100644 index 0000000000000000000000000000000000000000..3f5db226735196dedaa0c66cf53575d2d94b6db1 GIT binary patch literal 2571 zcmZvec{tQ-6vuyKUx&glhBEfdMY2t{>>1Y;k~NvJWFKNggdq*G&R8N#VbZP02wk#G zDSK!xH#3q^W0|sKxw6Hb{=esW&wI}KocBD>_n-H9PL`A7c~K!*ApihGQFhiYoQVJB z0(_ji*9SeUb*d|YueWB4dkZi5L3}_9{=cjTZ<)&Oe zvn0yLH&^alIkX!cVV9=@ZEByH{lMm;cqv%q(#DYQKyUlO8I8N2v0U+GqSM6-aLv_U z0?@ON%{T_8&9))3Y1`_3^oZUDQoQ4KJ4G^@^GJ_D57n)qA5mH55z@on8>U|P& z6^wf1TyDU95$`-@x?3!`tEq=OfKAPeJ9`U{y94{&(;`915!QRzIW0iH%#ChUi~fC4 z`4d1Tuw(gpIDRs7E0GpY9I#up8~E@w<~Ku@DZt>B5j&WPVr3_+Q2!;2TxSAGYrBLz zINHtnlX0p%6NlQD34s{w%(jv;2Xct(D0Maj<*hh&i!3H%RB;_h4xFgzaXMqcZGs*+ zl*oK{DA+bL-UJCoo?&a6mjjI#o2-rdK8wH3BL(Gp5r__jTUe!BeG5GwGm9dACZv|{ zr?k2}l*g7k#Q=BEN5M!^7~|L6v+Coxym_Z!Q+~+r<$?)XIyk(}6aJf@3TA~I!W0%k z;~LaJLG97Yz2|k1E%fo`k#QaFsgR`|YwojRcsHQW1^3L)WGcNICgS6*Qy1T~DC4GI zu6f*+rsG8qho{U(xZCm{=De89PzY!{uK-vHPGpM*g&xVh@b+ zYJ7dtC!muz7=q3te}D}_GQ?jPK4ygKY!_}ld!7ML*Cb(eaU;E@3eh5XSgu#|Z9iCi zb3#85CNd)iHOf29!n`4j8F}NYc&3EoN23^jF~*O|(xrF2torS(4iArom;(1eJGj@v zq3yN24!vN?Lqc9Ybi;}Y@8z^ys)K9ppOM?n2D4%ciTx1tTIPZ4GUy2+CxuyA6`lQzn2P zP}uZgZRQ@_H;f==Tdy0ga84pIZQx$k766!)eOIg}zH-}`$*(Et^YB~RX@VcM@tgD9 znWd?Ts+p2>j;3=u8+g@%WH%t(CxJ)GNcM8hZVw!Ol&!QOK~c*z0fwkm{wcEl@2~QQ z@3dliL+v3+;9>36K458&Zq7W7>W2=Nh>X3S4bsBNIge>(hRdF{3=TuUGMxkecNW z)|8D^7Tig7Mi@9%a9_@d=+O<|R~n~8JBx&ReuMIL@IIKbPf8;$!vj%*T z-$B4K_+U87QaA3qt58%fX5aBnhcIlg&O!X&B%q?)Nto0a*C30AY!A&oRoeK6=i)5C z`LO@D8Lp^CXF`yASqJdx>Y$rX)ew-UFC-RaF>~DuP*W+Yom)R6xzFt%B;VRaZw&*j z8dN|keb*rBd`*YwqIu_`bAtZ95^IlNniQKisf2dS>4hycgi*~T0OmWD=c#^!^nnX= z5!6Q-TDGx(J9JdG#zX3(M8OM!PC}*JThCiT&fyL-JsQ)9jFw9;&eczkUIjs*feg^d zpVOlZ(5Q|a@AuJ{E8!5P({lTv_GCoR3V;w%vx#Hibg4}UlLT*43?^__lhHWv@#TSL#R-2QGo%V!MdkMPs zk=tJ{;pc73-oXaCAWgW2NEP|g4VV*$TM~?YOu!5za%7e zICHh>RZAhCZ~*A0)+^Ba%^!(S+Nxn&JBOHao}7C+J^B&&UG!wBA?aUbYNABw5j%Fe z42E`0J895U#LzHCt@ZH~DFW`z716-uPnDmCD~!?r+wU zPr=jW+jWQNTyjOuaXq>yTGge1B37mMw zetUryePzT2Rjhe@Fqr{)t5qtY{Ksgedww&DcEL*E=~sg{|GV{YARBYYe~Lv}E^u;W QauzoLW#ef5%o3gUA8%5yWdHyG literal 0 HcmV?d00001 diff --git a/assets/tab-icon.png b/assets/tab-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8e127c8ebb7677572b0aaa234186a5251925430f GIT binary patch literal 2156 zcmZuzc|6mP8~@Cf%^6c+az-rV&e_Z?Hhq!nYjPLM5W^g?YLnb-jvT3ctGS}G$Ou_- zlpK*Gl%stkUuVC5jU4q`zrVlF>p5P}^UwP^UeEJ-GR`>JONb&w0RWJ|$3Vb6lkQfZ!9VQ?uEGS*zi;!_%F#sUh^;v$oNQn=O4hG`m zbP12OaZk9ldfTht*W+OCRk3Nc5zz|qVGOj6*&||1 zfa2=!nVm-S0J9WPjP@3bflyA5M9C>X^)L>-CwEU|*tn=9AQ`S;fN(rE+H~kX46E{X zgunh0<@l!edD9Q$EcO#ZiO@r; zyj5;6x27E#mu$-|;9e#+nI`Z4z>XZnx5g%SoZj9jG#q3$x{=J(mbBS3y*{c-Ci!-6wcMM;@TV9tv z2vYY2`Al7__TXxsz0;zQP?z@niGc+)plLMns24E~w&lXu)41R+sj_r~YjQHP4LkB# zcSt-@PVNR6;DAmi6-^%6_Y+uIYZ(g4?g6Ra77fo(**=S3D z8h=IqaMG;E?h(3DyI}&9NjXmTO@1_^MRN1KU#bXxUWR7)$+rnofiF@9)u+@3;yPzK zU+8}sL*q}2Xh+w|#9opkgb{y*z9ngH4BpxKKE_3$Fcv(p4mcv>67fvIi@Wx;S)oYB z53BdN7Dkp(g%vg`G_$InQ(*+|z~3gQ#&wISJWNKnVKYpHBof%V zxv$j298zb{aMd}quu*hNbB}s|14f2VFlV=<#FKv4wO0(%k&+k&xl%XR`^Nt{@2=Rr zE+bb6#wF^KPeq(`I%l$RHz+xe2!X0l z!>(S6(5Pe~y<4*C)7{0pEzq&jZm$IsFVCm+uu?2`Xg{!xtbythN256F6kf%N{`u6|m)RMfb*>{ic`;I_srvtcIyPv_9;Tc46h zV>MMcs0z!i;-B#wl?=~W;X;SJqnQdq>bg)#Kt|IQjN#fD?M!#skz~oi_Fge25bDi& z1?5ggEiwyv&XC{^sdnwKmT_p#rdPoxhJHl`+QvfXZ8{}BU+i~;G-rO5Qx4c?GBM;S zhP8I89n3-wfKu!KG1ZMX_OUL%ET<*di--GWioF>yAM8L>l+li&ew4P?vCJr-^RadJ zz_fWtX1JGW&LIPl!v7j}rVcekFT*pYGJ_PIrE;#o6OQmqP$`?#>HqgcmNaH=gOt?& z`Z+th>;WRRAf!wjHOn#VeZ2I6g6#p_4s~&G?C#U6u|kuIw5ZA}v47Oz zh(vq3rNYlOg|F^?=`6wNT(9loqnn>B_?ECN5B5zeFV?g4x*KiAbX$QlIvVCj z(7A>y6&rH%iKQ1}wDUEDv_|JkJ$c|;5>zV=oEZr#sTzHpI~}79$fp9=`}~rYI-1`} zwS4Gb8>&I)!pPbYySyMq3jPR<6`V4vXBSna8Vw;t5~0yZriD<~gB26^qPJJ}sP3-z zG$_rqY9$8PO=H4|NXud!0oHUBucIUec3tlYGaB{^HIFQ5$_yID8A7z&`BV1KJ~`P2 zxjn@jBWu*Si%~pIo(9H_0XX>k$vql%xsJ0LxGW$q$-M_z;h zzlUyg{7WnY0XlFjspV_yJ3^k0Fgp!!-mBDHvdlUGsm|{6v#nsOd6jo%1Kwobki(N} zh6YE_<+0xua;j(z{VTYY+;es`6X{^a?Sqt7^Pu4_3hm@?uebK|c41_QTrs XcFIs!+P6KyX8_<&Ibk1R0+Rm+2iM*k literal 0 HcmV?d00001 diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js index 7f1f53e..26a826e 100644 --- a/src/navigation/MainTabNavigator.js +++ b/src/navigation/MainTabNavigator.js @@ -13,7 +13,7 @@ import ProximoAboutScreen from "../screens/Proximo/ProximoAboutScreen"; import PlanexScreen from '../screens/Websites/PlanexScreen'; import {MaterialCommunityIcons} from "@expo/vector-icons"; import AsyncStorageManager from "../managers/AsyncStorageManager"; -import {useTheme, withTheme} from 'react-native-paper'; +import {FAB, useTheme, withTheme} from 'react-native-paper'; import i18n from "i18n-js"; import ClubDisplayScreen from "../screens/Amicale/Clubs/ClubDisplayScreen"; import ScannerScreen from "../screens/ScannerScreen"; @@ -22,7 +22,6 @@ import FeedItemScreen from "../screens/FeedItemScreen"; import {createCollapsibleStack} from "react-navigation-collapsible"; import GroupSelectionScreen from "../screens/GroupSelectionScreen"; - const TAB_ICONS = { home: 'triangle', planning: 'calendar-range', @@ -330,18 +329,31 @@ class TabNavigator extends React.Component { this.createHomeStackComponent = () => HomeStackComponent(props.defaultRoute, props.defaultData); } + getHomeButton(focused: boolean) { + let icon = focused ? require('../../assets/tab-icon.png') : require('../../assets/tab-icon-outline.png') + return ( + + ); + } + render() { return ( ({ - tabBarIcon: ({focused, color, size}) => { + tabBarIcon: ({focused, color}) => { let icon = TAB_ICONS[route.name]; - // tintColor is ignoring activeColor and inactiveColor for some reason icon = focused ? icon : icon + ('-outline'); - return ; + if (route.name !== "home") + return ; + else + return this.getHomeButton(focused); }, + tabBarLabel: route.name !== 'home' ? undefined : '' })} activeColor={this.props.theme.colors.primary} inactiveColor={this.props.theme.colors.tabIcon}