From 965a00c03dc3f19fe97f7a8df5f7c09a5420a640 Mon Sep 17 00:00:00 2001 From: NonoL3Robot Date: Tue, 15 Mar 2022 23:41:56 +0100 Subject: [PATCH] =?UTF-8?q?esth=C3=A9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 +- app/src/main/res/drawable/four.webp | Bin 0 -> 5198 bytes app/src/main/res/layout/activity_main.xml | 23 +++-- app/src/main/res/layout/afficher_fragment.xml | 34 ++++--- app/src/main/res/layout/ajouter_fragment.xml | 94 ++++++++++-------- app/src/main/res/layout/ligne_liste.xml | 18 ++-- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/colors.xml | 7 +- app/src/main/res/values/dimens.xml | 10 +- app/src/main/res/values/styles.xml | 30 +++++- app/src/main/res/values/themes.xml | 6 +- 11 files changed, 142 insertions(+), 86 deletions(-) create mode 100644 app/src/main/res/drawable/four.webp diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cbb6c24..a1a27eb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,9 +4,9 @@ pzn zeSH-nawL%>`|bPt@BMgw-k57Rl8+oS?lte4j?uRS61WasX%~^JjL9&_3~Y4bo!sR2YhkD zn&yQhQw1hy5{8z`$43bmmm9n8hiD&ol_3FhItWr}Px zyiJor2W_M;2eqcy*T3QA3;BL`h$k}Z8fJ}h=EDoea?^BJx+U@^Af*;*pf$;S}lEkJ#kix7vL0PSYprUV>n z?le8pfdAn-YB)8N_&ksDK34Nq_Ga{-P`p)R?m%wrtC zrf703=ZL#Xjg}FJ(8G#XIL&PH4#h$T>+pUUJDt_I`nQ5A-bpjH4E$D^|wnq znb*`P>dH*uO`j3P6?Y!!8PU5Z`NgE@-TC*uy#M%-1g&he<#zbN z=@O+94GUtC7WXZyG&}q83RM1w(hNFvP+tS1DLn{#(k2(4*4)Nno5nCz&w$B+MQs+s zcIO;>SE%Q;B=te$;%Scf)_ZT1Vf7shpexk(8Z)~G>)jvSGtLRI&zf*40}x zZ9)74?^S8dku^CG*V;v=`em^&PtAyXBe`#|o5Hieb$#KCUc?H{+~1! z?~5UO9b@qTHow6FFG1SoxE z<#yC9Hotl#H2RbC>8H7?5$|l6*+QiWB|;(5GR45@-B@v?odQ$GT^m2^o2MUEwnf*3 zF(yBy5uzH9t@8`v(yFL{R_;#iAafJY2@?^N56=WNh?u13s688)(C~_X4H1@)TF$HA zoWT^!6mpv?y%p+;7I+_tQpI?JK9=b|aL=d*5d7{|#%zP|HD|ZdRu;t{_F-6=?Wq}c&zJ#v>$X@jO*8Mond5+8X)PxTF2@V*ig8n%6MCD> z8igVEf$eiz;2=H&k^SugXTHe+%eNkYgQGFP{6ATS7bBl(@^)I!@w1wyZ+2KutYM^(& zOEhF4P(^IcQPdkdW|;Q+Qk=cFZ zYX!!vJqX77=Sl)=F7e2UW~s0jv$P3z9Z`bSV&*2KO)-)@;0hgf*l zY{x9vyFB*X1GbW)YTdznOudo{mo?va$-nxr%gG9N?FWj&sKtjggwo}zxnJr@pp+Bi-ykFSW ziWU-ZQ4d*dR;HWCwKbh~JJpXOWCejbsuBlmIb5fV^AJkQ{`pI*FbK1>78NU;d5f!z=i?2vvS!a2QjWvYD9c?>5Vq(w?MvH(&Yl9d?KtY zo>=f7-tvmj>6iY<8HYvd$0txXh#EjfOO_m?Eeb}o^n0e( zV^uhnV5v~`(CU~HlefKCxYP-+_#gPKOGfI5Mm&bSiGQU2DxV6sDW4D(i!dJZLJi7Gz^mz6oK7Eex zo$(i5-&k@=jiu_g{EK??dG#nn+}b)w-ZYHiOE}M<{I7T4sf?*$j?srMDlcnl?JVF@ z6QP-vdRZhGhyo?E{Yte+Bw8s{6rZEQ`SEZm$X&_#NDN`*>?F7t7h%jt2uRq|6uVrBXMb2TocCk#0=_&I zton%vqC~5-8ac{zna?%!G9x$VSEtRH`yih|{Mrp`Feu0Mf~uVhW=kp+`s2it&fO5e z{XF+FiFJh2``Zs{>I6&nYWuOvRAI+U2qx-;il2lYfG45qda4^p86X8ZzxG%Y_J7h} zGI=9i(Bqi3o~c<3#WxAnPai+0C@sU5Z9fmV9X}6)z~w5*W6y5X6{2L5nl~H@NTG?W z)(8tqz0y@xO%8?e5~_!k{$w?YkQewkI$eS|{Cgtw-%u&eM$4Yk#N9gRGN7&6Yr+Nr z!DtkEOy+}cvhS+~_)t6o-d7sTVJs-D5BYQ0pR!Er(mmuW!ovf(tQpE*$a$&`CVfyC z15RX`jO#Ntb{lD5Uh@xKePh1l1!Moe{^BCrkj?#qU)<&|(jJ0AzQ2T%96KUqZHdKx zl|#m`>F)wQR5(g;tL2;^YtD~bIU?$mlsbJl&n9eW=mm84Peu~bKmJv(yzdJf!>`kI zr*h@b%j7saCqvXJgyqN5kYyR4z-G^?eQGi=$0;zTgdrHHUCm|X5%-Le6j)-?JG8;f&eT0e5Z8)Cd*R9;?#^dJ6C=B-w$n?$mU>twd=1afW<5GhK$jC^+JBl z+mL#tON!q3G}~KGjq!RIYsqNHk*UCrS3A(#SzlZ&^Gy}^B>zpA!JlnI`&PQ}+(lYV z9U6V(mr_?EoniiYM?aH_2K9lHHC8D-8;W23(LC-rK-@_PZW6sZt z4r+W|fA1nMh_|d%iob55ztQQ5{oe3}4BaK~#Vj2L%5N`q)=zX1?Orlvl!C7=zdPUA z06bqvQf_e>Q|(Pso-_|0dvK^er%{JL>y*SWh+&_d*~;oHAKd%J_Zx(AK9(fY|6ob# zVR|lZs_ySLy_8E$jtKAkuXk}L&lJB;-$hW;bma2rn^nD3uwmjBai)}{$5$|rOb7pB z8F4h^(8#jdZ2vY4E*MDN6Nf&AYQecG@;EPjO?IOv;}RPM*%*fofw{F}68F%Djo~C= zCkRGHstUQZ{b7A-{GtJzHC|c&Igti=P8TUGH6F~vjH-j3Zb@~zQM&0LZ@1<;o58-H zBeU3wvjtw~u{?d0UMPTx((eD7wIx@+{p3rZ-6j-5>}HxbTgk{DK@X*bpx}Un=(>Ud zRq=ZFaC(D$J zITV&3m!|aryiY1=a<)zAsJ(9U=$N@H!1(Y=Bm~|6kxQRMAX0k*Jlv_QAZ`pO^M0K) z$j4Z+46v;y#dcHgiEv^-3RSFi`gWhM znA^{4X*fmxF>s|IdX2wkG)FQoYzQG)@My~U*&)c^w{&~H+Qb^M;ROHZ&uSM9eIVqu z1#8xeBc7bu;}vBre^7Ayj*%9E?zylaK~(>A!uq+QQV;PPXn1dsPsA))TS$1yk6Fh2 zP?`nUIOzk&MA4A`GSz!6#MYR`Z^%H@!W+ODjEkco-7s-fi%M*|-k{5j|2mE@Zat-I zRm96Vz6lk-$5`JQiIAhj?w=LnQ{-G;_Bnq9nQZEoV&$P>YCHkj)7fHH(5>q!4GNLFo;wwv0y&39)odKXa!?siK)Rx>KnV64c$U>A$@Q0H1JT~SNSAP5uL zoiH6tSfN_`TdDhNuf;QWo^O^>w)2W)uyp>zQ5w%NJDLUW#?ZWvUFEOCt*i62pTgE> zB3i6ICti1KdSxZimQa4|*>pjx{z-25^Yi;IQEu)Ie1^`rDV@GPS>^IvfZZ9c2V~bU z4QB%5TcSTBBgXL@k^q~LOgtA5{(WZ5=#x3;qW9eJ_1J}{_tC(IV-JEe4H~@P-Fy6G zE&OOgsA8GJU!L)VZ@G|a_6Uq?I38Va3j=a`{Ny1Q-q!w=79_K;j0BlExYB8xIQpip zH8;My4ua{)1hxj-h4C3)69e7tevMeTwbDgKe6$yD`}Gr!YtQ@-U@;Be-?YC4jbHes z8gOZO=W5brm)IJpzp!b{q*&i0r!qZL8B~&p7i!JOKRsnan+*T)o1+hoI~6(DebVSu zM6e!wi)(jC$TEt8-*dn$D37nR6do$VK%qKO%7>9~v9N@KXT9sXEi#FwaL50T23hH< zOSZxe?cu>hnEsayJ}@Y0ugOYRcXof=6t9YsJ>E0^KlSy2V5?kgjh6^Q9!&sAN}ep^ z*#IS1Y&U5=DLR4rM~gX)jNvfs<@C5z>rIj3Bk11z0F)n(1Bp+{-pN}5*2(>zgI19t zHjb7YW$8XYT~V$;1b;=sq}+H)pIy9=-$yQrSR=$j(o|bKGVqJ<8g?8P28djHz{x*p z(ZVZ!GbVD)=tFMRen>zG)L#)x4KZ2#yw5Q{TDk1-g=$)ol zHZ3OL5W55Dr-{y^uCK9TG15_M zSCVk`v`FYa$TxKY6Nz&}bV8QH`1{>HAmIU!y8@cW@nb{=hIh*Q1{U9b!3MkD9oBHR zxOckA!B~uRf1n0jtP|bxV@5mMs6C9Ug8bUUecX-_Kl(4;oSuA?Z8UnI!027=Wh?1t zU0BT_af^-jlNRn%+mutt<@j%q5jfOVor zj0ihb^#u9$u@og-<-kJRZuiQGW?kEd^6S6!kXrq0QgiK;5t9zkLu&r(ejI2Daqj6k z&DpV%VQCJmqM*j?$h%<#2i89^aC7}EnM)Hap4G~3-m|bxmd(>So~90~7P;!>Uiio1i;4e%G<9nD(6E wDE_<%DES4je>Vj5kI<5&jlK6{?({0?4$26K%EHsnc9ov$k?9lku&03k0dd8i3IG5A literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3858171..96f8ed5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,21 @@ - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:orientation="vertical"> + + + android:id="@+id/activity_main_viewpager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/afficher_fragment.xml b/app/src/main/res/layout/afficher_fragment.xml index 254f037..c1afbd8 100644 --- a/app/src/main/res/layout/afficher_fragment.xml +++ b/app/src/main/res/layout/afficher_fragment.xml @@ -1,8 +1,7 @@ + android:layout_height="wrap_content"> + style="@style/titre_style" /> + + - + style="@style/label_style" /> + + style="@style/label_style" /> + + style="@style/label_style" /> + + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/app/src/main/res/layout/ajouter_fragment.xml b/app/src/main/res/layout/ajouter_fragment.xml index b9e6c62..6572fe8 100644 --- a/app/src/main/res/layout/ajouter_fragment.xml +++ b/app/src/main/res/layout/ajouter_fragment.xml @@ -1,76 +1,84 @@ + android:layout_width="match_parent" + android:layout_height="match_parent" + android:stretchColumns="1"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/ajouter_titre" + style="@style/titre_style" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_plat" + android:layout_gravity="center" + style="@style/label_style"/> + android:id="@+id/input_plat" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2" + android:inputType="text" + android:maxLength="20" + android:maxLines="1" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_duree" + style="@style/label_style"/> + android:id="@+id/input_duree" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:timePickerMode="spinner" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ajouter_label_temperature" + android:layout_gravity="center" + style="@style/label_style"/> + android:id="@+id/input_temperature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_span="2" + android:inputType="number" />