From cc00cb38b79f07058a23fd7acaf209d6caa6f155 Mon Sep 17 00:00:00 2001 From: Niklas Date: Sat, 5 Oct 2024 00:21:50 +0200 Subject: [PATCH] Icons added and hoepfully added to the front view --- assets/images/Icons/Icon_Essen.png | Bin 0 -> 511 bytes assets/images/Icons/Icon_Familie.png | Bin 0 -> 541 bytes assets/images/Icons/Icon_Gesundheit.png | Bin 0 -> 571 bytes assets/images/Icons/Icon_Kultur.png | Bin 0 -> 445 bytes assets/images/Icons/Icon_Musik.png | Bin 0 -> 661 bytes assets/images/Icons/Icon_Nachtleben.png | Bin 0 -> 599 bytes assets/images/Icons/Icon_Soziales.png | Bin 0 -> 541 bytes assets/images/Icons/Icon_Sport.png | Bin 0 -> 673 bytes assets/images/Kultur.png | Bin 0 -> 19049 bytes assets/images/filter_wann.png | Bin 2619 -> 0 bytes lib/screens/detail_widget.dart | 7 +- lib/screens/details.dart | 164 ------------------------ lib/screens/home.dart | 97 +++++++++++++- lib/screens/subheader_Datepicker.dart | 2 +- lib/utils/class.dart | 19 +-- lib/utils/data.dart | 134 +++++++------------ pubspec.lock | 32 ++--- pubspec.yaml | 2 +- 18 files changed, 170 insertions(+), 287 deletions(-) create mode 100644 assets/images/Icons/Icon_Essen.png create mode 100644 assets/images/Icons/Icon_Familie.png create mode 100644 assets/images/Icons/Icon_Gesundheit.png create mode 100644 assets/images/Icons/Icon_Kultur.png create mode 100644 assets/images/Icons/Icon_Musik.png create mode 100644 assets/images/Icons/Icon_Nachtleben.png create mode 100644 assets/images/Icons/Icon_Soziales.png create mode 100644 assets/images/Icons/Icon_Sport.png create mode 100644 assets/images/Kultur.png delete mode 100644 assets/images/filter_wann.png delete mode 100644 lib/screens/details.dart diff --git a/assets/images/Icons/Icon_Essen.png b/assets/images/Icons/Icon_Essen.png new file mode 100644 index 0000000000000000000000000000000000000000..424216c19af487e0b069031dcccb991269aa964c GIT binary patch literal 511 zcmV+vO&rO=|6IjtjJDmleAR$Nhd3| z@AA)%eLxh6ME-`vHc;1fhGs=!d?ZOyXt7c>&*&9Pz>g-kfe0``V%KFI_4^6Ed*70fLCO4@JohgViX+=2ob66L#fOq?b( z%3tIIuTb5PlPB;w!48%&CF3U%=N-I&RX)yKJ|vlSr=OF|Bwm;xEs%3oTm|H%JHuEm zVt2uU3@_>xhOt%OyjB#Ag$Qd`EH#X`TXwJsA6=9LZ9h=vU7nR}M=jsqqQ`%HQQhDo zuoBz4`q5O#3RSXQPM52%DDN_Zo4KUs#y_P6jAbSx-xpI@D=0g*txMrPh1xvZS zXnlMVU*vR7D~g)mMSF*N=bkbCn>NYy5sCa;egKVARN(6*E|vfQ002ovPDHLkV1fio B)w=)y literal 0 HcmV?d00001 diff --git a/assets/images/Icons/Icon_Familie.png b/assets/images/Icons/Icon_Familie.png new file mode 100644 index 0000000000000000000000000000000000000000..57142c45b251065fb65ad856c1cbe454b14d3bf5 GIT binary patch literal 541 zcmV+&0^-8>wr zdRwvu(G7o$WR7v)_lAd@Wyz9?BuTQS*xL&| zv09}BPM!H61QsK~C0Ik3Jg+&=dy0g`h# zp<}p`LZoRJj1}8Y*`{L?E`jqkV+S2%4$fC+c_pRX`4kxJGslt5rVI-&!}$axO}&p{ zimq2uK%l8rzQ!d;7z%*dyQ+4faP-FWUAJvNi_jcsCn%s+eUv;6*qi?A7gG~t2jN(7 zWO-z%hdLz)+ApRp{!cbE9|9Ge=^d%{QB_AQSGvqM?{^dPhAzE9Um$W->s+TwZ_%mu ze?>qVhg{9lq-u4^P)Jh>ObvIyxq!W}4U<29-pcBvy0u#_q5H<)KsPg&U_;RtqDfG%6f2T7E zl4ZSQDMUA13z#_C!;X8?V?Jh@wO!M-IBjB3ryNxgNVTB<)25;YE5t z-Y*MO_6#)psB!I7%6=zDj(fZ&TkVEwL%WGMBU^9<*&V~xC)C+g3kuj#jN{X0QFJ6rUKVwq_3iUVXc6kZ09{JmE87!j@AJT^3FRA zCZYqxi?-&TZpZfPN7E_5L8=ZDWk7F=--g;Xw^(v&!{N4DHJ~#K=)HK1WF32#hMH5V zp6yj(jVSEC2IoLUxM1VJ&dT zO<*4dy=~v0!I6sMDzJgWUgX)0OjBU8%;2C8M(Cn|HaC5^n$i002ov JPDHLkV1mi#?Q{SD literal 0 HcmV?d00001 diff --git a/assets/images/Icons/Icon_Kultur.png b/assets/images/Icons/Icon_Kultur.png new file mode 100644 index 0000000000000000000000000000000000000000..fccd9961a94905d0b4dcc474a5037da0b3638510 GIT binary patch literal 445 zcmV;u0Yd(XP)00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPsH*JoC-Q@@&Iss;O z5?6`u{GWOOgatG8fDn0!BoQQ{#L~sJkW6rz1&rNX!);X0?OiLkqskT67itB#O_hAC z<*i7I+o>`(u6M$cIBmIF_uhigsrPo;sJoc-THQ_y7K{h#|4^GS*V9qd2tVna)D9BA z{6yFkfCCaxyzEZc7vOgVz*Qlf+3+$@0+JHo^1#rfdB=&h#~P_CWI6}N#}LAjn)E`ZomOYr^PT_B>pTSZ*R^0r^Q nxK-p4u2UDcig*C&>63f|;hEup@9Z_|00000NkvXXu0mjf#U!~w literal 0 HcmV?d00001 diff --git a/assets/images/Icons/Icon_Musik.png b/assets/images/Icons/Icon_Musik.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0dc50749e93197ced87cf5b56fe54e0c3e1b5e GIT binary patch literal 661 zcmV;G0&4wqV2RZvUQ8F|A0D7N$s#Tj{vjkP8>m%0ce?9!JVOIptk@x=@QXUzIjWL4bNq<9o&8TAGi8q%L~J}k}3=PGvp3DRX28j>(G`fI-_FpSW0-1Fzy zwj+83qRxCJ>TgZE*fw$*P@6|@2NH4Kq#|F1R0Sb!IFfN*t!-29qpb3w5N)T|W_|rc zokAA~xxFeQE8%}E&$ZxNb$l--Gy=L*gdi&>Rk9zDdq>6XR7F(+QrkE3%azF9S2GSK v0eLM`w;&xQ$YMrCX47Q_T@6mM5FQzS0uOcGB?K*>00000NkvXXu0mjf2zw6| literal 0 HcmV?d00001 diff --git a/assets/images/Icons/Icon_Nachtleben.png b/assets/images/Icons/Icon_Nachtleben.png new file mode 100644 index 0000000000000000000000000000000000000000..7955bef9b20109759f5be928de996b9511d36265 GIT binary patch literal 599 zcmV-d0;v6oP)kC0v^!8uDM$s6-xzG7u`3W<(Mk9w7De3|ca2FH4I zj;f8FPf4BmnkE4BB_J(+LDMv(Pnrm}f}m4=3)>D?XFZLCQ$?1-zRaAgzuFN*wH(#h zoQUKmAX&}-uXJt3_7G%y?kKeLd5_^0D#IWGY48yUoYAdv%R!~H7Gzxf2i9^%QT6R% l=^4wvga#G#clE%%;SV`qzZP8--(mm&002ovPDHLkV1k150iFN= literal 0 HcmV?d00001 diff --git a/assets/images/Icons/Icon_Soziales.png b/assets/images/Icons/Icon_Soziales.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d3204e55fa9ddddb3e2aa7f69dbda679008941 GIT binary patch literal 541 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 literal 0 HcmV?d00001 diff --git a/assets/images/filter_wann.png b/assets/images/filter_wann.png deleted file mode 100644 index d9ea8765a4195b9e676195f361cd2fbec86572ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2619 zcmV-B3dHq^P)Q*pG1z{@~PX%EraJGW+RFIttLMlkMf-n`tTS1m5(mN6a zV}T*Ik$&gs@JB+1R}bQq1o8)Tb8f>K;$c&TzpL%7=En)0B1u<%M zF8qMe#hBXARrpwiiz+A_2Dzp$FxvmgFIx`CtMFWf+baByxKLHNhPnQ)7_ZP+Dcn`z zsS2NPI58ZGD;PaJ+4Zr=5wBL~0xQU|v_WU)#^y)INmt>+fx;hExQDs#SLkrGR23d< z!q`PjBV{mR$gv+wn9AWAae29I@BzdJ8ttku9EGISxv{S{cyB$}JdWu;hb zZS~$LSPidm-2EcQga}~~knRPkiy@SsUce5LR^ua78!tE=UeA?JiZm)54n5wFJJMVr z+%rxXkLDpDUD9fNXoP9wq$*y%$E#poZcl{47oydUG-sIZLxDLGVpAY#HAX_UaZ<42 zWpj9gL@2aXNLNF$X*eM^1(IE3Bvc#wpkex5zmAk{C%+((NF)*p;jONabe*J%H<3uh zN)9tvF5@v8rmuKgXr>$b0Z^)V6NyBWu)^H;6Mlt(@06#CH<3uh$XNZxgYx+gra{?I zqCOp(w#%ueT$~fyE=x3~l=I?f!}RvVc+d;tja0(fT;Z*j+tLmFtz*9zv|ScRjK)+I zFWv79rVr(dw_o~56!sIFhWRRtqWu%|L&4dqsKWofIPJx)VWyr-i~}{bMBU~b!PYPn zuza@rXn&c#uEa1_HeZH&9487+YacLAN|^hoFAApo2QgK}+lK|5_YjJLx#$9KD_+KJ zFdvUv+fdl;uFsH_U6xzorCGG`(r-&E@m;oT=6C9RhpBjFz(gjkhqq5WRpM8e3fpb9 zOXFSf3d74l4LmmFb;-W>?6Fd!?i_}qu}8&w=ssS05gb)~LVe!b4E0e&1viSQ;ohUu za9^zOhIp`Po-wbf7-jlHh4#Ycewk!lf>ac=)eGD_rz^Pc#UWI+NP1?<=bxm_%XT0?vc!pG+ijvUty8?Au?~DRHj6(eTBO17v44l z?MC4|z}eo9zlN)nWxm_5Uf%H1KERcOl-oYMjFe_y#J0S4Uq@VigtLeIi->Q#Thw(Y z+Yeq|QkHk#HuLoL3v}!G3GHQY<(*Tr{3PFP<;RL8^R`#s?}*(cFVWEx!sag7mnpQN z(f*3q(Ct3FOzrV1xTdmh#9i6tqfIA+M8Bh(5~fKg>tAf%3a;rR%`5JoS`<_B7tA$K z=)8G0cAuc(nw0E=WS?(o_xT>%x(b(7_~z}uwCUGgx^pi-zd4zq&L8%8DYrAs1FW=AtF<1$NI}ataivw0hFig*WH;1W|@ww0e8Teigc@!E?kFrR_9A3e7R zbI3kk5fX*X5o8XM6{rj39Igq}#-foIktcZpcf*`AJpZ+~y>7(IwJR@ZyRU6RnG((> zOBnlJG~y*+mJ97!pzdYQnG)vOMO$*+Yj0m+mvSR&xUL{S58uwxy};)AIl3vl^-J{A z^Sxa*%dfz0L`&3z!rT7a!Y)7CyubCxJK=H2ikF@+MU=x0@KB&7jM$~AD}BH|B9L=? zERVVI(m&aJ7nlcr*UEh(PHae?;3f*c!S+#SX@#)sqB-SWVS|Pnq|7lNTZT}0>tgTk z-afxFrWO_IgH*X)ik(+BUU|oKQNmPew7HaNj<7N)Z2lVc@>2oFezU(V_tkYHUam(T zAnfzakm$`+T@4gziMN$RZkKE-(_8o-+<*YnOToj&v0rmz_g}$1?I|oi$$#_m=2Q4@ zyHA>k-*KAwl_@D;9!lcDKH7NM<_$r6wq1K$S+G);w>}tmf%*tGy_pQAzkOr#ljC!{ zl|qU83Fs$nCmsOX@U3yRB&F0!F(F)ZaUA+U*|oGRrn8>!+=BoZ-m zknT0UPA0EyCBmSsc6o`(ru_)9DUj?MBca+jDOmBA82I-UkwROQJJS3>vS}YeYzic; z#z?3(P6}4M1$NJmkTCG+tFgOZr$BxBz(hCfXDb5IF-_8HT!d=lh<8KX# zc9p+VCdODI;iKRtvL3<;^ZGZ8v7pX|wg{3|=gm-U$R7b5D>v9uk0`iVhhiT+=F=&M zo5_D4=qZbr7Q6SWVfw%KeHbYutsN69zFZ)_zqnU$^Vago{{`caAzrP{1%>gn!91vk3%J?d4y6eNqfa_+ zYq+U!cg`Ho%I6Gmc@#1o;60|P7%2=+^%vXgW+kS*31ZahTqrTVHWW++EKbxRC}F1L d^rz)~[ - SliverAppBar( - expandedHeight: 200.0, - floating: false, - pinned: true, - title: Text(recipe.title), - flexibleSpace: FlexibleSpaceBar( - background: Hero( - tag: recipe.id, - child: FadeInImage( - image: NetworkImage(recipe.imageUrl), - fit: BoxFit.cover, - placeholder: AssetImage('assets/images/loading.gif'), - ), - ), - ), - ), - ]; - }, - body: Container( - color: Colors.white, - padding: EdgeInsets.only(top: 8.0), - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Column( - children: [ - Text('Nutrition', - style: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 20)), - NutritionWidget( - nutrients: recipe.nutrients, - ), - Divider(color: Colors.white, endIndent: 40.0, indent: 40.0), - Text('Ingredients', - style: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 20)), - IngredientsWidget( - ingredients: recipe.ingredients, - ), - Divider(color: Colors.white, endIndent: 40.0, indent: 40.0), - Text('Steps', - style: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 20)), - RecipeSteps( - steps: recipe.steps, - ) - ], - ), - ), - ), - ), - ); - } -} - -class RecipeSteps extends StatelessWidget { - final List steps; - RecipeSteps({this.steps = const []}); - - @override - Widget build(BuildContext context) { - return ListView.builder( - itemCount: steps.length, - padding: const EdgeInsets.all(0.0), - shrinkWrap: true, - physics: ClampingScrollPhysics(), - scrollDirection: Axis.vertical, - itemBuilder: (BuildContext context, int index) { - return ListTile( - leading: CircleAvatar( - backgroundColor: Color(0xff8DB646), - child: Text('${index + 1}', - style: TextStyle( - color: Colors.black, fontWeight: FontWeight.bold)), - ), - title: Text(steps[index], - style: TextStyle( - color: Colors.white, - fontWeight: FontWeight.bold, - fontSize: 16))); - }, - ); - } -} - -class IngredientsWidget extends StatelessWidget { - final List? ingredients; - IngredientsWidget({this.ingredients}); - - @override - Widget build(BuildContext context) { - return SizedBox( - height: 50, - width: double.infinity, - child: ListView.builder( - itemCount: ingredients!.length, - shrinkWrap: true, - scrollDirection: Axis.horizontal, - physics: BouncingScrollPhysics(), - itemBuilder: (BuildContext context, int index) { - return Padding( - padding: const EdgeInsets.all(8.0), - child: Chip( - backgroundColor: Color(0xff8DB646), - label: Text(ingredients![index], - style: TextStyle( - color: Colors.black, fontWeight: FontWeight.bold)), - ), - ); - }, - ), - ); - } -} - -class NutritionWidget extends StatelessWidget { - final List? nutrients; - NutritionWidget({this.nutrients}); - @override - Widget build(BuildContext context) { - return SizedBox( - height: 86, - width: double.infinity, - child: Center( - child: ListView.builder( - itemCount: nutrients!.length, - scrollDirection: Axis.horizontal, - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemBuilder: (BuildContext context, int index) { - return CircleIndicator( - percent: nutrients![index].percent, - nutrient: nutrients![index], - ); - }, - ), - ), - ); - } -} -final _future = Supabase.instance.client - .from('events') - .select(); \ No newline at end of file diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 8216fdf..d99f55a 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -86,8 +86,9 @@ class HomePage extends StatelessWidget { var size = MediaQuery.of(context).size; /*24 is for notification bar on Android*/ - final double itemHeight = (size.height - kToolbarHeight - 24) / 5; + final double itemHeight = (size.height - kToolbarHeight - 100) / 6; final double itemWidth = size.width / 2.3; + var appBar = AppBar( leading: SizedBox( height: 60, @@ -205,7 +206,97 @@ class HomePage extends StatelessWidget { color: Data.recipes[index].color, ))); }, - child: Card( + child: + Container( + width: itemWidth, + height: 130, + child: Stack( + children: [ + Positioned( + left: 0, + top: 0, + child: Container( + width: itemWidth, + height: 130, + decoration: ShapeDecoration( + image: DecorationImage( + image: + AssetImage(Data.recipes[index].imageUrl), + fit: BoxFit.cover, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), + shadows: [ + BoxShadow( + color: Data.recipes[index].color, + blurRadius: 0, + offset: Offset(0, 10), + spreadRadius: 0, + ) + ], + ), + ), + ), + Positioned( + left: 16, + top: 15, + child: Text( + '64', + style: TextStyle( + color: Colors.white, + fontSize: 18, + fontFamily: 'Inter', + fontWeight: FontWeight.w500, + height: 0, + ), + ), + ), + Positioned( + left: 13, + top: Data.recipes[index].textheight, //86, + child: + Container( + width: itemWidth-20,// Set a fixed width or use constraints + child: Wrap( + children: [ + Text( + Data.recipes[index].title, + style: TextStyle( + color: Colors.white, + fontSize: 24, + fontFamily: 'Inter', + fontWeight: FontWeight.w800, + height: 0, + ), + ), ], + ),), + + + ), + Positioned.fill( + left:127, + top:9, + child: Image.asset( + Data.recipes[index].iconUrl, + fit: BoxFit.cover, + ), + + ), + Positioned( + left: 127, + top: 9, + child: Container( + width: 31, + height: 31, + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration(), + ), + ), + ], + ), + ), + + /* Card( color: Data.recipes[index].color, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(6.0), @@ -248,7 +339,7 @@ class HomePage extends StatelessWidget { ], ), ), - ), + ), */ ), ); }, diff --git a/lib/screens/subheader_Datepicker.dart b/lib/screens/subheader_Datepicker.dart index 208744d..172a6bd 100644 --- a/lib/screens/subheader_Datepicker.dart +++ b/lib/screens/subheader_Datepicker.dart @@ -386,7 +386,7 @@ class GesundheitWellnes extends StatelessWidget { decoration: ShapeDecoration( image: DecorationImage( image: - NetworkImage("https://via.placeholder.com/167x130"), + AssetImage('assets/images/Musik.png'), fit: BoxFit.cover, ), shape: RoundedRectangleBorder( diff --git a/lib/utils/class.dart b/lib/utils/class.dart index d2c0dc1..e30b551 100644 --- a/lib/utils/class.dart +++ b/lib/utils/class.dart @@ -8,18 +8,21 @@ class Nutrients { } class Recipe { - String id, imageUrl, title,category; + String id, imageUrl, iconUrl,title,category; Color color; - List steps; - List ingredients; - List nutrients; + double? textheight; + //List steps; + //List ingredients; + //List nutrients; Recipe( {required this.id, required this.title, required this.imageUrl, - required this.steps, - required this.ingredients, - required this.nutrients, + required this.iconUrl, + //required this.steps, + //required this.ingredients, + //required this.nutrients, required this.color, - required this.category}); + required this.category, + required this.textheight}); } diff --git a/lib/utils/data.dart b/lib/utils/data.dart index fec3b8c..2aee178 100644 --- a/lib/utils/data.dart +++ b/lib/utils/data.dart @@ -14,9 +14,11 @@ class Data { id: '1', title: 'Musik', imageUrl: 'assets/images/Musik.png', + iconUrl:'assets/images/Icons/Icon_Musik.png', color: Color.fromARGB(255, 249, 171, 21), //FD4949 //Musik category: '34725c49-740b-45c5-8a51-7c742f92a621', - nutrients: [ + textheight: 86, + /* nutrients: [ Nutrients(name: 'Calories', weight: '200', percent: 0.7), Nutrients(name: 'Protein', weight: '10gm', percent: 0.5), Nutrients(name: 'Carb', weight: '50gm', percent: 0.9), @@ -31,120 +33,72 @@ class Data { ingredients: [ '2 shots espresso (a double shot)', '4 ounces milk' - ]), + ] */), Recipe( id: '2', title: 'Nachtleben', imageUrl: 'assets/images/Nachtleben.png', + iconUrl:'assets/images/Icons/Icon_Nachtleben.png', color: Color.fromARGB(255, 253, 73, 73), //FD4949 //Nachtleben category: '2d8c714e-3290-4d8c-8a95-e3b100ad8599', - nutrients: [ - Nutrients(name: 'Calories', weight: '200', percent: 0.7), - Nutrients(name: 'Protein', weight: '10gm', percent: 0.5), - Nutrients(name: 'Carb', weight: '50gm', percent: 0.9), - ], - steps: [ - 'Gather the ingredients.', - 'Pull a double shot of espresso into a cappuccino cup.', - 'Foam the milk to double its original volume.' - 'Top the espresso with foamed milk right after foaming. When initially poured, cappuccinos are only espresso and foam, but the liquid milk quickly settles out of the foam to create the (roughly) equal parts foam, steamed milk, and espresso for which cappuccino is known.', - 'Serve immediately.' - ], - ingredients: [ - '2 shots espresso (a double shot)', - '4 ounces milk' - ]), + textheight: 86, + ), Recipe( id: '3', title: 'Kunst & Kultur', - imageUrl: 'assets/images/Soziales.png', + imageUrl: 'assets/images/Kultur.png', + iconUrl:'assets/images/Icons/Icon_Kultur.png', color: Color.fromARGB(255, 80, 168, 250), //50A8FA//Kunst category: '09d1f862-2b56-47af-8ee6-3c50056e3fa2', - nutrients: [ - Nutrients(name: 'Calories', weight: '100', percent: 0.2), - Nutrients(name: 'Protein', weight: '10gm', percent: 0.7), - Nutrients(name: 'Carb', weight: '50gm', percent: 0.6), - Nutrients(name: 'Fat', weight: '10gm', percent: 0.3), - ], - steps: [ - 'Gather the ingredients.', - 'Pull a double shot of espresso into a cappuccino cup.', - 'Foam the milk to double its original volume.' - 'Top the espresso with foamed milk right after foaming. When initially poured, cappuccinos are only espresso and foam, but the liquid milk quickly settles out of the foam to create the (roughly) equal parts foam, steamed milk, and espresso for which cappuccino is known.', - 'Serve immediately.' - ], - ingredients: [ - '2 shots espresso (a double shot)', - '4 ounces milk' - ]), + textheight: 58, + ), Recipe( id: '4', title: 'Sport & Verein', imageUrl: 'assets/images/Sport.png', + iconUrl:'assets/images/Icons/Icon_Sport.png', color: Color.fromARGB(255, 80, 240, 250), //50F0FA //Sport - category: '', - nutrients: [ - Nutrients(name: 'Calories', weight: '200', percent: 0.7), - Nutrients(name: 'Protein', weight: '10gm', percent: 0.5), - Nutrients(name: 'Carb', weight: '50gm', percent: 0.9), - ], - steps: [ - 'Gather the ingredients.', - 'Pull a double shot of espresso into a cappuccino cup.', - 'Foam the milk to double its original volume.' - 'Top the espresso with foamed milk right after foaming. When initially poured, cappuccinos are only espresso and foam, but the liquid milk quickly settles out of the foam to create the (roughly) equal parts foam, steamed milk, and espresso for which cappuccino is known.', - 'Serve immediately.' - ], - ingredients: [ - '2 shots espresso (a double shot)', - '4 ounces milk' - ]), + category: '15119876-9ff0-41e5-8fe5-c3675af5e054', + textheight: 58, + ), Recipe( id: '5', title: 'Gesundheit', imageUrl: 'assets/images/Gesundheit.png', - color: Color.fromARGB(255, 130, 73, 253), //8249FD //Gesundheit - category: '', - nutrients: [ - Nutrients(name: 'Calories', weight: '200', percent: 0.7), - Nutrients(name: 'Protein', weight: '10gm', percent: 0.5), - Nutrients(name: 'Carb', weight: '50gm', percent: 0.9), - ], - steps: [ - 'Gather the ingredients.', - 'Pull a double shot of espresso into a cappuccino cup.', - 'Foam the milk to double its original volume.' - 'Top the espresso with foamed milk right after foaming. When initially poured, cappuccinos are only espresso and foam, but the liquid milk quickly settles out of the foam to create the (roughly) equal parts foam, steamed milk, and espresso for which cappuccino is known.', - 'Serve immediately.' - ], - ingredients: [ - '2 shots espresso (a double shot)', - '4 ounces milk' - ]), + iconUrl:'assets/images/Icons/Icon_Gesundheit.png', + color: Color.fromARGB(255,130, 73, 253), //8249FD //Gesundheit + category: '4ad3ac2d-04fc-4aa1-afae-17ec7bfc1714', + textheight: 86, + ), Recipe( id: '6', title: 'Essen & Trinken', imageUrl: 'assets/images/Essen.png', - color: Color.fromARGB(255, 253, 73, 73), //FD4949//Essen - category: '', - nutrients: [ - Nutrients(name: 'Calories', weight: '200', percent: 0.7), - Nutrients(name: 'Protein', weight: '10gm', percent: 0.5), - Nutrients(name: 'Carb', weight: '50gm', percent: 0.9), - ], - steps: [ - 'Gather the ingredients.', - 'Pull a double shot of espresso into a cappuccino cup.', - 'Foam the milk to double its original volume.' - 'Top the espresso with foamed milk right after foaming. When initially poured, cappuccinos are only espresso and foam, but the liquid milk quickly settles out of the foam to create the (roughly) equal parts foam, steamed milk, and espresso for which cappuccino is known.', - 'Serve immediately.' - ], - ingredients: [ - '2 shots espresso (a double shot)', - '4 ounces milk' - ]), + iconUrl:'assets/images/Icons/Icon_Essen.png', + color: Color.fromARGB(255,253, 73,73), //FD4949//Essen + category: 'ef83c4d3-228a-44e1-8a5d-8b47d2dfc351', + textheight: 58, +), +Recipe( + id: '7', + title: 'Soziales', + imageUrl: 'assets/images/Soziales.png', + iconUrl:'assets/images/Icons/Icon_Soziales.png', + color: Color.fromARGB(255,255,0,199), //FF00C7//Essen + category: '53a1782b-e07b-491d-b778-d99ef9cf57e2', + textheight: 86, + ), + Recipe( + id: '8', + title: 'Familie', + imageUrl: 'assets/images/Familie.png', + iconUrl:'assets/images/Icons/Icon_Familie.png', + color: Color.fromARGB(255,66,255,0), //42FF00//Essen //HSL 104 100 50 100 + category: '30cb3481-c425-4068-9714-adc86df85d3f', + textheight: 86, + ), ]; - + //color: Color.fromARGB(255, 255, 0, 199), //FF00C7//Soziales //color: Color.fromARGB(255, 66, 255, 0), //42FF00//Familie, diff --git a/pubspec.lock b/pubspec.lock index 85cab7d..b98a613 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -188,18 +188,18 @@ packages: dependency: transitive description: name: functions_client - sha256: e63f49cd3b41727f47b3bde284a11a4ac62839e0604f64077d4257487510e484 + sha256: b09f01be55ceec6a7a0916a0934e0c58d551292790901f15a24ae9d5654ea1f9 url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.3" gotrue: dependency: transitive description: name: gotrue - sha256: "8703db795511f69194fe77125a0c838bbb6befc2f95717b6e40331784a8bdecb" + sha256: f3d4b70b8df6d05be2c6d558e8887576766685918be4ef87dbb8d7e547aeb049 url: "https://pub.dev" source: hosted - version: "2.8.4" + version: "2.9.0" gtk: dependency: transitive description: @@ -444,18 +444,18 @@ packages: dependency: transitive description: name: postgrest - sha256: c4197238601c7c3103b03a4bb77f2050b17d0064bf8b968309421abdebbb7f0e + sha256: "3c6aea8d41cbb7cc33190a67fd8b0f21735a74d5871e52ada4c274aa3aa50dbb" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" realtime_client: dependency: transitive description: name: realtime_client - sha256: d897a65ee3b1b5ddc1cf606f0b83792262d38fd5679c2df7e38da29c977513da + sha256: "5d449be6dd49a413847b6da5cf48b44f7379047bc0ddc6f301d387d2ce4633b9" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.0" retry: dependency: transitive description: @@ -553,10 +553,10 @@ packages: dependency: transitive description: name: storage_client - sha256: "28c147c805304dbc2b762becd1fc26ee0cb621ace3732b9ae61ef979aab8b367" + sha256: "060aa8651ad2b30ce6fc30f4652317f45d21f8c6f6cc222b2430fc7f69f7d8ba" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.1.0" stream_channel: dependency: transitive description: @@ -577,18 +577,18 @@ packages: dependency: transitive description: name: supabase - sha256: "4ed1cf3298f39865c05b2d8557f92eb131a9b9af70e32e218672a0afce01a6bc" + sha256: c3a03d656110e13dd80ccabba7a5c591fece4c56ec3a21108e51b1e18d9c9a94 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.0" supabase_flutter: dependency: "direct main" description: name: supabase_flutter - sha256: ff6ba3048fd47d831fdc0027d3efb99346d99b95becfcb406562454bd9b229c5 + sha256: "79e5067f08572c7900bc77251e6c1e0cac80c3059b5820ba2b86469b22822b75" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.7.0" term_glyph: dependency: transitive description: @@ -737,10 +737,10 @@ packages: dependency: transitive description: name: yet_another_json_isolate - sha256: "47ed3900e6b0e4dfe378811a4402e85b7fc126a7daa94f840fef65ea9c8e46f4" + sha256: "56155e9e0002cc51ea7112857bbcdc714d4c35e176d43e4d3ee233009ff410c9" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.0.3" sdks: dart: ">=3.4.0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 45a16d7..e4880b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - supabase_flutter: ^2.5.2 + supabase_flutter: ^2.7.0 timeago: ^3.1.0 image_picker: ^1.1.2