From 66ec0e0a9ed03f424005514b9aaa629f0d765f69 Mon Sep 17 00:00:00 2001 From: jacques Date: Wed, 1 Dec 2021 19:22:34 +0100 Subject: [PATCH] Refactor tutorial slide with french text Remove unnecessary ressources --- app/src/main/res/drawable/content_save.png | Bin 403 -> 0 bytes .../drawable/ic_baseline_add_circle_24.xml | 10 --- .../drawable/ic_icon_officielle_android.xml | 31 -------- app/src/main/res/drawable/icon_small.png | Bin 1245 -> 0 bytes .../main/res/drawable/lower_stock_bitmap.png | Bin 1090 -> 0 bytes app/src/main/res/drawable/ok_stock_bitmap.png | Bin 1085 -> 0 bytes app/src/main/res/drawable/plus_icon_small.png | Bin 798 -> 0 bytes app/src/main/res/drawable/qr_code_scan.png | Bin 322 -> 0 bytes app/src/main/res/drawable/suspended_pill.png | Bin 870 -> 0 bytes .../res/drawable/suspended_pill_slide.png | Bin 1130 -> 0 bytes .../res/drawable/warning_stock_bitmap.png | Bin 971 -> 0 bytes app/src/main/res/layout/custom_button.xml | 14 ---- app/src/main/res/layout/welcome1.xml | 63 ++++++++-------- app/src/main/res/layout/welcome10.xml | 65 ++++++++--------- app/src/main/res/layout/welcome11.xml | 65 ++++++++--------- app/src/main/res/layout/welcome12.xml | 65 ++++++++--------- app/src/main/res/layout/welcome2.xml | 67 ++++++++---------- app/src/main/res/layout/welcome3.xml | 66 ++++++++--------- app/src/main/res/layout/welcome4.xml | 59 +++++++-------- app/src/main/res/layout/welcome5.xml | 59 ++++++--------- app/src/main/res/layout/welcome6.xml | 60 ++++++---------- app/src/main/res/layout/welcome7.xml | 61 ++++++---------- app/src/main/res/layout/welcome8.xml | 58 ++++++--------- app/src/main/res/layout/welcome9.xml | 61 ++++++---------- app/src/main/res/values-fr-rFR/strings.xml | 20 ++---- app/src/main/res/values/colors.xml | 2 - app/src/main/res/values/dimens.xml | 7 -- app/src/main/res/values/strings.xml | 12 +--- app/src/main/res/values/styles.xml | 11 --- 29 files changed, 316 insertions(+), 540 deletions(-) delete mode 100644 app/src/main/res/drawable/content_save.png delete mode 100644 app/src/main/res/drawable/ic_baseline_add_circle_24.xml delete mode 100644 app/src/main/res/drawable/ic_icon_officielle_android.xml delete mode 100644 app/src/main/res/drawable/icon_small.png delete mode 100644 app/src/main/res/drawable/lower_stock_bitmap.png delete mode 100644 app/src/main/res/drawable/ok_stock_bitmap.png delete mode 100644 app/src/main/res/drawable/plus_icon_small.png delete mode 100644 app/src/main/res/drawable/qr_code_scan.png delete mode 100644 app/src/main/res/drawable/suspended_pill.png delete mode 100644 app/src/main/res/drawable/suspended_pill_slide.png delete mode 100644 app/src/main/res/drawable/warning_stock_bitmap.png delete mode 100644 app/src/main/res/layout/custom_button.xml diff --git a/app/src/main/res/drawable/content_save.png b/app/src/main/res/drawable/content_save.png deleted file mode 100644 index 9749893481fb1d78276c37545164661e65964d65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&B?tI~xB_XKg8%>jr(Fv=1GGcF zB*-tAft!at&%%xCU=Rd z+(K*X@`kc^3~%o+-rC9Ra^OCH1t%kmz=!!vyZ&YwM95l&I~ev$cOMeIaQ5-JMVndP zC|gD`O`Etzm+`Pi+q;H~|MxUC{}wFk-m&?GZ*xYXl#6G541fFV - - diff --git a/app/src/main/res/drawable/ic_icon_officielle_android.xml b/app/src/main/res/drawable/ic_icon_officielle_android.xml deleted file mode 100644 index bdf8385..0000000 --- a/app/src/main/res/drawable/ic_icon_officielle_android.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_small.png b/app/src/main/res/drawable/icon_small.png deleted file mode 100644 index 93d46c2c794ae07f00f1ffdb4c6fc2aa753ef46e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmYjR3ou+~6uwI&7(&z|nohh*)@s+RRHA0QSDUqLWuw8w5TzZ8p|oT~Ln6dRJhq71 zu4o%0vk0XgZM9Jqgo#W@gb0-p-L<>cu3c-f{D1%JipiOK&;OlszH`n!=ia%TP}axB zhHo2U7-q~kMQ5Wk55M(wkzRet-M}y%&(PqoKx9I6A=v{pHH0}gH;0@Oi3Dk>RJuzb zXghjwaS=s{kX$Y&m~WEBVlgu1{ryB}X=w?W2qQsRdqPy+iy}WkLmKBSEXZUsf`e-v z9fE)Wk@6-$m2r-h6~V#NcVxE|fk`BED%#q#WHKa?l$Dj5=;)=H8DL>SblLRsl1)z| zyfizDTI@Zo?AbGDX-Skq{%t!u7!iR=Y2DnQzW$c2Es;(Tpn-u@ES90LNVL-y9|{4r zLV=H?r?=hJ1z9ZQ!A(>uG7?X>w}+07yA_Zb5<(D`mzU9o6$-`5%8F8{RH;;}tE+0Y zdTnh@qtUFduY-gHkeCRPlR;`KNKXe@S>W}-zmIgC2U``I?av_fgYinUc0~82g zbMvCXP$Bwyioa&F&R`^xj_y7^z5V+7Mn=ZQ2Tje)Ei4aPTiZA~Ivu09P^qpow-X*- z-afue*14$Y=+8d?GBx$9jJzuaoZ^zwvhwnBF1MnJ$K&&F*WYRC?)j^?udlCvU~pvQ z;ppSBvGMUIPba6QUd+zTFZ?GIi6v4Qz7Mnwl^V^zzM)03wY9Yk0Eo>fx4|&d5QFX) zc7Y@t%fA#AYkJ@@r(!xYKRfAoXUY$P6ivfhzn*ZKxx1b0-Xh7#$X%}s_t=MKc`b^` zY1T}-@ct(4F8MIWf%zwrM*?TUzn?m6RSIwA6Xlu#=ilC3m$m|ZkcSionk_Ud#?cm-?En;rG(w=0QGzA1n zIN=i$-POna>m4M`7pe+Ud#^u~o}!#Bs#6{tD&q&WG7a|^x29+fgH+vX_9~u@navB0 zo5=S2<^LuU7bBW$s8kQB*o{w1=nPgBR$+$+E2C0(e%vW_o>6TDt!yxZ}FY$Qo5!b zdf&ZhZe86@_m2GAyS=!X6(1FxaIL60&gc1uuNZ!}4XomQwC9)Fn-G_}PYxH564@guqdQE{h)1f!@6MOiA~ z_tvNzKZ3>``~eb;#sxH*04hc57qq2S(d%OFHTTY$dwb5k=T?n8oCkVH@7UxfVPJ zaB!|29IJ3Ru<&jipeIN2MhAGM4z$Q*zK2{aQk!c=k?nj*_=dAo&YvRj%THNHtwMcPUqmy>o7DBsQw|& zC+sSTdw(=j-G<*BK8o&bj*U_Qj7IgtO@zFgxc6QY+jjj9MfF%)5?^Y3ZDURBx;cq! z7>~4kktcvSd0mmmsY@7&v`pu5ir4@CZmG+G6_J*O*dW)k^lwHgfZ3?NdMSi7!KG1s zCN@X~FcsCWElo~w#BImgk^vlx>Nl1qr#RxaV{OR*jzslL@@Rp}@G#!T2_XTV$8lk; z-!3~WTH%&Ov?Vd2aps@1`1-yQPYLs<*l1D_SfLE z9Kus4yQ^F9Zj04<1bc;&0{bKU*N+u(nq&i@x-1zRsW|9;THchh?!vWhTl zhTA1HZ-4+jZXy#q4e2?3^DZCzQh2KJPvTLWz3%$N(sl?Y~7|+RWC-Rizct-e}**41h z&DtaE6gLa|p6i5fnX9VLXN3e+`^|bt*h2i{zgd^DjQ=|R0*svih)UZ1lmGw#07*qo IM6N<$g3}Qe^#A|> diff --git a/app/src/main/res/drawable/ok_stock_bitmap.png b/app/src/main/res/drawable/ok_stock_bitmap.png deleted file mode 100644 index 160eeb7cf4edf3ebee6d5347c22eeb7ddc04a54a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1085 zcmV-D1j74?P)9YL4jOe_RFB>{U45r-PhZqHUsB1fy61fLo$7j=>Shje z_yj``zd??uXPb{2Cw5GtiaO3XQ24K0vqrK&UWG1g-hEO zKZFk}Iy{JVSlA=qdK|9c+}$HzR}9FDAIE018?6Cs!9<3C_bj>p!mAnb!??8#@&aQx zp6O@TY>6MpkbW%9>9#R~1DXErX-c>h-z$%NKg3UAMEOaa!j(pnW1wEeF+XKNt^G*+q)IEP5t(SdeoN1XQn^46%}^(_y56usjGp@f|d)>pw_nZZ$>VF^PztE#Sl_~#i4#K8sq{v z5$ZRzCZ~7AzN5Bm0Ea^Tw$|kIj@Wn9mJMKEsFw~8>Cyh=@5QyXfw-+5{y!>D7r1i< zZCQ+&zVgq?@6(+b<8N47hrGbr!e`3=@r+F_m8d$CreQw54vyeJKMa% zrc?ZW>24gcA!zt=2JUHiHaH)y=wwvN5<6{=NOy;ur8f%;aZAy5B-kF6ZebCF_&nG? zU01wiND9_nkIVUaP1r=O( zNGEQm&-1;CC*?rj1)}5fk9-P?u~Eu6zmQVmacSzjjYo7p7)O=w3ny_!lK|j;>=fVH%iSpq$WN!v-Q`Vbp{|rJBZEa*RhpQE$9e&ITiR24B?_+gXm{Dd}rwW3=^|b)J+d zu904S+$g=vTvYsjUP=(BKC|wT(vN@qGwU4Y@L$KDEGqy}k_J1i00000NkvXXu0mjf D*SZEI diff --git a/app/src/main/res/drawable/plus_icon_small.png b/app/src/main/res/drawable/plus_icon_small.png deleted file mode 100644 index a313a5fbdbd535e8ce6f11e2fca7c43cce4c3922..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 798 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&eGBjjaRt&N4gCNA-}6>ZBhcFc zB|(0{3@of{>_Wm~;u4b5GAgQS>Kc9lfx%(nkx?-TDQW2$S=l+cdHKa9`$4{TXeEsqB*Y7|7cHUCC5&!_TYDA7C{)ecwpH!Ipv>T%Y#q4%b72K zaPvoI(7s6)lI`}J`F(%-J+5P`aCEe|7o7hmJnX zPsF&6&3?w%TezcK>ltGa%lAoUjD;5FceiuC@ISOwcO&Nn-W}gE#0&VZE0r;xFIcNF z-?ny3ulct5c9YJ3Dp;#C|DpPm%|bERw^_IR+uQJ9{sMtt>O6Kl&HgU4%NSo5yujpir~z+`?oFUALgajr_~I12$(B*~GUk zvi&*tU)}@lS+yF`D^Kc&OkbF1r)xiTRx`VE`qufeA$U+!+JSzc((T7RrRx%Q`% zeU%B@c{Q_l@kLL|cF(Ead4C22EJy_}E{J1ZeC^Y^7>8gTP%8Iy^>bP0l+XkKk!kvU diff --git a/app/src/main/res/drawable/qr_code_scan.png b/app/src/main/res/drawable/qr_code_scan.png deleted file mode 100644 index 619831f5a0226142b65821728e84c4e840eecbcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&83g!*xB_Y7!Tu3EGH&D(b$K7QJ3xNt5|X0xY@V@L(#+Z(KWhZuMqE}q-_eZMYWapt9n zpZwp?*GxVQwN62o{qF?XUxpzwcX&%*?Plc9)w<`kl_f**9$U17{=F{;|HUyWvAsC* z<5ow*3dY-tkH3E77Zxy0Fk$QA=#Xcqm3W_fzKw;2+u+Fwje-V0fem}R{RNBQ;Qadkc2JkxVN5z{EP8ue Q!FP~=r>mdKI;Vst0NE^RHUIzs diff --git a/app/src/main/res/drawable/suspended_pill.png b/app/src/main/res/drawable/suspended_pill.png deleted file mode 100644 index 4f2843a9bc8fb4ecc7f9d0941f1c6e2d75d76f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 870 zcmV-s1DX7ZP)TDI&n!^V1ekId)(hc+zXR;3bI-%TjL`QnrfPYq9Krg8aKVoOZ7J`&33x7e4EY8C z=mowxpuPipQovtS+;=nZ(eil%wC5G#oa6ea=7y1m1i$@Sv!oD(rvmi&zypj6MwcDGy_OO_DTE7tUifWYZNcoE;zqZr-B1)1@KT5*cvaOI zv5c01Z36stC44-@0py*Z8XnBKjXnCI;p2l76dr0f^T%_7ms)1{Hfl$uKL&pzNB9L` zUlw?P^@8!P2EeZXKMAyowb%Ls4S-*5K~}NvEYsHwf)5sAqCubwz>hpa3^o9M9`nNX zk$iZjIZ&np`CK$4e7sa9g;4LnPUQ$Ml}cBLiZ;L+;Asx}=c2CRV^x45>ha6PzyJJ+C` z({x9mySSIIOE0sr?mTT9+d0+qcYfdbd=7i<{s)nk_dXZc-7h}BGyRmKiZ!}LsR8S`}(K_8&1sKeF=KZ|bvEBfH`tozS3A5@(D zn#UyFyQX&Tq|yTmlvZ%nOIjElDgU+U$*#@EM30+2DC>Q>;MKPMcMiR+az0s7aGEvo zpHhYTqZ9Argko!@=G?z2E{j81HXdTXA(`>s z{ITR*rHI@QE5eU=H=0fFQJWik;INok_pDhwTfT4KxFqoFocXIb%2;mwx|`vq{bz>j zhr$JOEgyHT&YGNVS}0f}o$;7k`IPae>5cxG+j8$53EQ>b_09f&cFA7$pQ`1*zRHs} z|62NBSN$XXmQ6i>n0e&{+cleRPRicJEpc!epGvyiH*M=qSoY-NXS)w`3b$s@ z`D9!Z`mmpIxw4Jy8~t0nvCoYkXWgH8;^B48CVp?R+Ux_aHTRWHEqd?R{9*s1n-9;e z0*1|ht`BPpx4w_?Y_AV7j5Xoizlvkkq51k;p}N(xK1f?XS89{jYU1ay@Bhv$`;ULa z(kI*MyUNc0y3cH9t64UH*^i9*w)R5)wNeyuVxhxG{(onF+uZ%m_3TC7 kdoMhhY?4avl>ZFnyLZ?u0T}QghV&46lJM^@2ycc z8iU3i`~Zmw#s!d=C@LtZ2`>jtbX-)AX>M1~RQFU58s{XHOf~nOdu~xxx2qb;DC7Ue zI!ip2Kr_$^Gy%JTZ9p}U1(tyizyvS~i~!GpUzXyB#txtlB`zDVO#!{Y_L8dx>VaFp z4@0r}+6r(Ds4bQF6Tnvs!eyHSjzlRu2HeRbU>>*&oCH!po#PX8ey4y=;2yA$hi4F2 zZ(Dp7@XRORIM5Dk49M33O!{yR1?0<%7<%!`KsUvWRt)F?G8+D&BDw$IwuXEX*kgm- zK^mCW#2GA>__&7j1!_*)MiLm)#5)|8unzcwcjTiGpF2}5=h@0_V=j$6DPU<$D>kbfDJ;+iZn3Vmi}hw5?B)bO{EaxgUzD9C=GN8%!vL@ zYjT1^#+KT&2~3FoUTboKL&lccvpIm znzRa)zK}oJ_ zNYeH+`eHw-;<{sB4MS9ediQV>&7h8(QK13v`uj`~_om12F1|6;6tj&+)Z3`tc^^e44YQ%53(IvGjw4C?kEQ3Q7!IEQ!6XMx99yyUGypG0n5bP+6(1aJ!P zR_PXR?Q%DV82agyYm2~r;56zaRgW6sxbwRiI0HPuTVdVp3aXe!hNGyRA!y|-)II?R zqZIB&E$Xw7EOud91~uwiN+sTnByb6MXDHU)-T)U+Uo%6))@RlV)SF@(>gr<`>Mpa| t`TG*8K;=HO4x_H=*ZebU8D;$I_zmm{<9AuBIK2P>002ovPDHLkV1m44u{!_& diff --git a/app/src/main/res/layout/custom_button.xml b/app/src/main/res/layout/custom_button.xml deleted file mode 100644 index d85c631..0000000 --- a/app/src/main/res/layout/custom_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/app/src/main/res/layout/welcome1.xml b/app/src/main/res/layout/welcome1.xml index 3894641..1f8e1a3 100644 --- a/app/src/main/res/layout/welcome1.xml +++ b/app/src/main/res/layout/welcome1.xml @@ -1,42 +1,37 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen1" + android:gravity="center" + android:orientation="vertical"> - + + + android:text="@string/slide1_Pilldroid" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - + - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/welcome10.xml b/app/src/main/res/layout/welcome10.xml index be53dbb..68b297e 100644 --- a/app/src/main/res/layout/welcome10.xml +++ b/app/src/main/res/layout/welcome10.xml @@ -1,42 +1,37 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen5" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide10_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/welcome11.xml b/app/src/main/res/layout/welcome11.xml index d0e14df..07af3b1 100644 --- a/app/src/main/res/layout/welcome11.xml +++ b/app/src/main/res/layout/welcome11.xml @@ -1,42 +1,37 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen3" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide11_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/welcome12.xml b/app/src/main/res/layout/welcome12.xml index e0d64f7..de90b38 100644 --- a/app/src/main/res/layout/welcome12.xml +++ b/app/src/main/res/layout/welcome12.xml @@ -1,42 +1,37 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen1" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide12_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/welcome2.xml b/app/src/main/res/layout/welcome2.xml index 067f766..5bbb86c 100644 --- a/app/src/main/res/layout/welcome2.xml +++ b/app/src/main/res/layout/welcome2.xml @@ -1,45 +1,38 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen2" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide2_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - + - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/welcome3.xml b/app/src/main/res/layout/welcome3.xml index da85a00..2aa71b6 100644 --- a/app/src/main/res/layout/welcome3.xml +++ b/app/src/main/res/layout/welcome3.xml @@ -1,44 +1,38 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen3" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide3_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - + - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/welcome4.xml b/app/src/main/res/layout/welcome4.xml index 1347aa8..888636a 100644 --- a/app/src/main/res/layout/welcome4.xml +++ b/app/src/main/res/layout/welcome4.xml @@ -1,41 +1,34 @@ - + android:background="@color/bg_screen4" + android:gravity="center" + android:orientation="vertical"> - + + + android:text="@string/slide4_Pilldroid" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - + - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/welcome5.xml b/app/src/main/res/layout/welcome5.xml index 1297193..d3ee46a 100644 --- a/app/src/main/res/layout/welcome5.xml +++ b/app/src/main/res/layout/welcome5.xml @@ -1,44 +1,29 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen3" + android:gravity="center" + android:orientation="vertical"> - + + + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide5_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> - - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/welcome6.xml b/app/src/main/res/layout/welcome6.xml index de17969..e96397e 100644 --- a/app/src/main/res/layout/welcome6.xml +++ b/app/src/main/res/layout/welcome6.xml @@ -1,45 +1,27 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen2" + android:gravity="center" + android:orientation="vertical"> - + + - - - - - - - - - - - \ No newline at end of file + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide6_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> + diff --git a/app/src/main/res/layout/welcome7.xml b/app/src/main/res/layout/welcome7.xml index f0556d7..4e0734d 100644 --- a/app/src/main/res/layout/welcome7.xml +++ b/app/src/main/res/layout/welcome7.xml @@ -1,46 +1,25 @@ - + android:background="@color/bg_screen4" + android:gravity="center" + android:orientation="vertical"> - + + - - - - - - - - - - \ No newline at end of file + android:paddingStart="@dimen/title_padding" + android:paddingEnd="@dimen/title_padding" + android:text="@string/slide7_Pilldroid" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textSize="@dimen/slide_title" + android:textStyle="bold" /> + diff --git a/app/src/main/res/layout/welcome8.xml b/app/src/main/res/layout/welcome8.xml index 456538a..1a19152 100644 --- a/app/src/main/res/layout/welcome8.xml +++ b/app/src/main/res/layout/welcome8.xml @@ -1,43 +1,27 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen1" + android:gravity="center" + android:orientation="vertical"> - + - + + - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/welcome9.xml b/app/src/main/res/layout/welcome9.xml index c6f6a57..dbe164d 100644 --- a/app/src/main/res/layout/welcome9.xml +++ b/app/src/main/res/layout/welcome9.xml @@ -1,45 +1,26 @@ - + android:layout_centerInParent="true" + android:background="@color/bg_screen2" + android:gravity="center" + android:orientation="vertical"> - + - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 18f6fa8..1699167 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -14,27 +14,23 @@ Seuil d\'alerte Médicament trouvé dans la base de données Stock courant - Éteindre le flash - Allumer le flash Vous devez passer à la pharmacie Utilisez le clavier Vue de détail - Scanner un code barre de médicament Enrefistrez Allumez/Éteignez le Flash Enter cip 13 here.. Enter CIP 13 - Saissisez le code CIP 13 à l\'aide du clavier Bienvenue dans Pilldroid Pour ajouter un médicament, tapez sur le bouton « Plus » Vous pouvez scanner le code barre Ou le QRCode - Fond vert, visage souriant, le stock est bon - Fond orange, visage neutre - Fond rouge, visage grincheux - Les valeurs modifiables. Le stock est recalculé tous les jours vers midi + Fond vert, visage souriant, le stock est bon. + Fond orange, visage neutre, le stock diminue. + Fond rouge, visage grincheux le stock est bas. + Les valeurs modifiables. Le stock est recalculé tous les jours Les informations sur le médicament Traitement suspendu, la prise est mise à zéro, le stock n\'est plus calculé. L\'icone de sauvegarde de vos modifications. @@ -48,27 +44,21 @@ Visage souriant Icône de code barre icône de QR-Code - Le stock est suffisant - Attention le stock diminue - Alerte le stock est très bas Visage neutre Visage grincheux - Informations sur le médicament Capture d\'écran sur la partie information du médicament - Réglages du stock courant, prise et valeurs d\'attention et d\'alerte Réglages Mettre la prise à zéro suspend le traitement et les calculs de stock Icône de traitemernt suspendu Pour enregistrer les changements, utilisez l\'icône de sauvegarde l\'icône de sauvegarde - Plus de renseignements sur https://pilldroid.foucry.net + Plus de renseignements sur \n https://pilldroid.foucry.net Passer Suivant Démarrer Ajout d\'un médicament à votre liste Nom Médicament Icône de stock - Ici le cip13 lundi 1 janvier 2001 Valeur Libellé diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 599f7f3..9213a92 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,7 +4,6 @@ #303F9F #FF4081 - #66000000 #4f91ff #fb9c25 @@ -16,7 +15,6 @@ #7f7f5d #000000 - #000000 #31f623 #777 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b0d7a45..a7f3f3a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,15 +3,11 @@ 16dp 75dp 200dp - 19dp 48dp 48dp - 32dp - 16dp - 16dp 75dp 20dp 240dp @@ -19,9 +15,6 @@ 16sp 40dp 20dp - 300dp - 350dp - 250dp 250dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index febb2af..9f45b27 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,8 +7,6 @@ About Help You have to go to the pharmacy - Turn Flash On - Turn Flash Off Name Presentation Administration mode @@ -18,9 +16,7 @@ Critical therehold "Use the keyboard" Detail view - Scan a drug barcode Save - Input Cip13 with the keyboard Toggle Flash Enter cip 13 here.. Enter CIP 13 @@ -41,22 +37,17 @@ Tunable Info Treatment suspended - save icone + save icon Thanks PillDroid Icon The plus icon In order to find the CIP13 - Stock is OK - Warning stock in rising down - Alert stock too low Happy face Barre code icon qr-code icon neutral face unhappy face - Drug info Drug info screenshot - Tunables informations Tunables Take to 0 to suspend treatment Treatment suspended icon @@ -70,7 +61,6 @@ Add new drug in list Drug Name Stock Icon - cip13 goes here Monday January 1st 2001 Value Label diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 49bfb37..545b9c6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,15 +17,4 @@ - -