From 274e2b9c948c76e50266000b691d3583dbc9ffde Mon Sep 17 00:00:00 2001 From: Athanasios Lagopoulos Date: Thu, 20 May 2021 18:41:54 +0300 Subject: [PATCH 1/2] User picture as asset --- assets/user.png | Bin 0 -> 5185 bytes lib/pages/user_profile/UserProfile.dart | 3 +-- pubspec.yaml | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 assets/user.png diff --git a/assets/user.png b/assets/user.png new file mode 100644 index 0000000000000000000000000000000000000000..a68179243bc9bee9c6f85601b89287ebb12132a5 GIT binary patch literal 5185 zcmZu#2~ZPRx9(0zzyJ}&2nc}~6vlw;Dtm%#K?Iad7LlkJKtO{;0tnJU85|u2T#!Ws zA%G|#LqLJ31eIlm9XGZ}=Es3VBt%8o47_Iks#o=@UaC^v_w+g6{rcQ<&pCa6JK*W6 zjM;(#06^J|>f{XoAbbk~3TXIp_{@Dee36UW>*lKf|B@BLF2Un<3~FE;0H8mw{Xy-s zmb+k~2Gco!>2sRSWF0+o0${ONMvoG?0lCcHpmy9EGLpSw9Z_$J($5hP}X z`z5x2nN`$PS|&!Vv+M*WUTjgvsW5!`>B5a9!`OAf7B1C@?Zg2JQDNX0^ubnTrQ++< zCfXlYiXB{#C`{X?G`S678oLX@UjskHx$pIq zWKu%ilRKQlkLPzEE$V^JLT3y5`rki9Di-vm9bL6w_j7Zjd?Ro1XA#fXXz>|UqZ|>T zZyu~Rq&c*HNM|U|qA4z5AL(Kd;yv;`Z+X`2>ULBm5cI112Lij*V?n@=DO0X3ve++X(DY#WQc20NO;6EzJwigB|(V%*GZv> z6+LVBG6@2Ec0SZuUR?0D1j#JSo00pu(PPDL7|e~Lcfevz9L0qmZ(*XAiz_Tcl_RI} zhn;&ayJ7l`D0=jGYw_IO{bQ?$)6DtB0f%N!lnIUg*g7(Gbx35mlcmOhc;jk#PM0r$ zd~Am1uo4pzZ>MD2DZ+wK9?-e8{E&%(~$ZJcMb$5(T)rEnU7jq zQ*Yk~$|v^^I@)l4uZA9We@=(V?M0cm(c^8U*&;1Fi!1du{TZVb+}93#HxsUm9YxK2 zm!lpUH-EguvAz&POUtjAAHzg%D0EJ!;DxH=OL}|(RT}+aw&%R~a4LQ?aISgzsfZ9$ zb{tTR!{q}`=Px+Taro~YV7-BM&HzuSx}C~Wd85y=VB!}*m)|e zs{Vy$I);#VmI?gnNuD@(AGnS$K~m#wT;%U(V+eT~cuL*qyY6!5jQdwHgkd9VC~O`< zb75W@xesit29_LVuSB|PV%q`u=^60&{m~`FWyap z<}OEyfUE_|;rc zSs!*7%W4VMlo(%t1lb3w|6k*lO(`Wfz5)q=NjaS$r(po?wV6fXcJS>AV2j7^y}aPT zghpU`V*>WL%m0$y!g7_*BF@EWJD{>eYNgBCOjaRE9Uj~Vn!UPK*IW|3=8`?G|GK0J zRj4az)`U4xQ9$Fex3C>{|5YUUD)yi*j(=uJaUg`%xI8hi^&|&g0#tv<((pA0cwvm8 z@KQ(W=JznlElly>k}Hr7%z=Fl-Dqp=RP75GG@DpMN@ME@ z5`5wdd3`W78~47KS$}tbMsaN9p8VEJyzwK6)w0{#X{H{b?i^<#H6O4F8=O4(H8ay6 zIBvpifR-VTQf}u(Ss8D-q$ai>4u8ptl5`lxKl%i`?VJ&z`0t)6N3sB87;oZn5pR03 zD0UD-!;Q%Tg%@DFF{3vhi`1)u_SWv_@>&}U9sR{SXs)bOOKWNYyyEscM1h~)_oYU? z)mN3Ul3*5TuTkjO&NPs=iBw`ZAyBLt_boe$Ei2)6Vm2erHU66{I5@uLuJu?urG7K6 zQEJ7XR0olb?@m2}ePHP#mQ!p!!1?E0gKDGZO8NY-b*hPXs#=MQ20chuKo9QD6 z$&BoxgoEhLZaR1f40a6{Upm2;7s&322q9$%b-3o_`y#j{-1@ONzKtMcHnNk7%3|j| z%bLr%XIILte}fRlNX~mOvua+OLQ45uWL$rji~huUTB^s2nJA5DX zoDD0-&Ud)+3rEQBo zG>cGMYclGDwq{rolw-mTfppy}HnJ41nSYEGo)iZ2|B7>m-Fd8;ajBctRkH)pA#)IjYHQ5$Ok-GR7!bfEp7->beo#WSdrb}J(-*= zn>?4iqt;H0>2ifK1hUG0+Rl53h}>ZVXb&)oDBvd7oyJCYi(DsW5vR7<0UvFwrG744 zMW#jV9w~|T^59DN73v9-xx~iBF{Q&Z60aP$;3pq8!(4%<+Lrehqj$A=e86apKeeKo z!8?@tN0pSbywsLa>Tg2{bva)d??;{ z7n!Ha_A>omqTQp*zr`_YeDEWL=kO^Rv}m!-xc*^kzHaYJBXlo%#m~K`(v+J5^?6Ia zoOFj2-N?N0&0Ea(hbtE6EzA-;ejbu*OHf#lXRV&M3 zsx9pWk$2@h8S{@^sA(tJxkI-R<&H85W~z_XPv=PvwH)3AVI)c@N})lV+U>u1Fek1TyFP}CZEN_c!LC=j4O)|2Y+ zV+R7!G*bqeQO+~|9qW^p*Q1Aczl>y&>?{S&YE-Zs7d%Y8*qG;`zw^tuWApHX%*?ywUO~%7{4v`H#?a)E zpR>r*mwUb0!ETS#ctZjm<=(oqNm<4$xUyx4u-l`tj2|qJ)rkmw70M{7-+yZ4AH6*` zSim&iY6pF59R%}_eNeUp64buiR@83xLdK1yoMLAARjzs0SExE*6(rOaR&b`i3xtw+ zr6g$b&2;o&>0k4xA4I!AYWr@Tp)NtHDn88cEga~0M6$89tGgYQbfIWZD0$z~i973U zCnfGK%j8`hLA$rwtwi6LdwsBDA$U#8B_cv;WgXn>>I$)+8a1n;?l6xJ z9@x4+e3A2Bu5Ut#Mc!fkD&pi$=o^~_7Xyu~GQNR8HYpr4sJkSQT?jnS2^4qdm*zkVlxshLXS!=C{>oj6Ji<4Gs&7Y zoe6@y*4ieY@^S|s451>7NQ-9qKL=BI$k|M+Dd#eR5aRYYg{hFe*Yo6&GaHSb!f+@) z*?CH3M?{=(w$zb=LQ$I8VWT1yVtV1w;Y1BmJq)f)vfV}W=F@!{hJ+*(W0UkhLM7rs z`(yNbdwkPzlsMLKM@hR{C0~y(uZwi50j{ARW3@s#Xnm&|1W{3#!ajcG&9UQyJ~#JX z+yv##IE-nYb3Xa)$w8!RHSps3(QM3241KHG3mhB*!tuY$I&hU^=ZNU50iYHldXq^F zwdcbLdfU`-Cop2sxUQ}m+H+I8J_58jec7t`V=i&0_s`7ZVjTZ(@c8BWwqW;A)dNXp zpJwcd$AeW9LjDA=zznBee<*8LjjX(|59@yhB@LooO`G_w{ve!1M0@lGz0JF${VQAd zZRWF49UCLL$5IWiz(ix@yA4fqsPa$$cta`k2bQLd&CW09Bt=A2B658qw6cwIJ@1** z%P_)Q>FpcDmx*zD=iu~_!_zxNC`DN-KEHs|GQSna7ns8j~qz@f7nKSX^0!#Sy>5Jd@U4zo+!F^DujbILXx z6amGZZyMrJ#j@1w%F&T-|GtJ;97GkAgTtpV-r%J-r(J549|BIFZpRo^!k70o@TR>A zDaS0pf+X4-owrN?2`>9}omyQu2R@p&0zX#?t8Wnagu;OSCk5{D4gQ+H7{$kC(!( zjz0iinhVIWDnqD5%EMD7?O&q|Ke!ttlJtEXs>M(^=L1)k9G@c+2(ROvmwp*d{>u+| z0(ymwJf@Bxz8&>45W^ST1`kaQJ*KV?$%}f~AWWQQbWaU+$n7e(f<==Gq!0 z&$qpA=i(sVs&=F9n*aZE`Hp5^69Sk)U)t~Y&WZ!C&wE?AWb}e()cDGxzX`+}w`A)h z-XY-6eD;;NYg-2oVv}{}36qjUd6Q9eqhf&hG=(Vmif54x=LtX%vteA)rN-}})Tk7tdf9@hz%HGi6Pz8!WZDY&3RL#OE z$^5M?RRLh*vJb!I))p^L`dzfAffemf9Kau@{1LAjnU~6%&)A2}m01Y)A@gStKa~QW zi1@^_JT1#1!R;Ka`Z)~1YEib-3h+;g&fX`$YWXL9b)C$IAgMgYJ{yq#hAEUb>robrI@C_Qp1(0Jw_z8dAWHs70R*OQycCiM67$QZ{#z*wXzKv_j z(>Ly3`U;;|5O370SiTdq;MQ_|HSlZWvW`H8=bQ4M4J110@!9TdyOVc+9{7TxHBKh6 zb)ihq2Hmkiqsv=p10VH#xXe0MUjqD^JA9HK3hEj1b?2J-Jra>>#c{glD8PmpB2XLZZ^J?YWaZ-C;+IGs&rNlugMYT?+fJKOAC$@UylU)cbhL8xVDfJKkMGjHBnQ*7 ur)8WepI)6WiOg52;}XfdYr5gztKeMQ`S{TGzOV3cAK>Qf=~T0qmi9l{9ZgLD literal 0 HcmV?d00001 diff --git a/lib/pages/user_profile/UserProfile.dart b/lib/pages/user_profile/UserProfile.dart index 59ba20a..aefaa51 100644 --- a/lib/pages/user_profile/UserProfile.dart +++ b/lib/pages/user_profile/UserProfile.dart @@ -52,8 +52,7 @@ class _UserProfileState extends PageState { BlankPadding(), CircleAvatar( backgroundColor: Colors.lightBlue.shade100, - backgroundImage: NetworkImage( - 'https://aux2.iconspalace.com/uploads/manager-icon-256.png'), + backgroundImage: Image.asset("assets/user.png").image, radius: 32, ), BlankPadding(), diff --git a/pubspec.yaml b/pubspec.yaml index dbe9d68..525214f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ flutter: - assets/fireworks.png - assets/baby.png - assets/contact.png + - assets/user.png - assets/signup_instructions1.png - assets/signup_instructions2.png - assets/swipe.png From a9441714a74234b447009d925b948a0e80a0405e Mon Sep 17 00:00:00 2001 From: Athanasios Lagopoulos Date: Thu, 20 May 2021 19:46:14 +0300 Subject: [PATCH 2/2] SchoolData Persistence fix --- lib/entities/user/SchoolData.dart | 12 ++++++------ lib/entities/user/SchoolData.g.dart | 18 ------------------ lib/entities/user/UserData.dart | 2 +- 3 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 lib/entities/user/SchoolData.g.dart diff --git a/lib/entities/user/SchoolData.dart b/lib/entities/user/SchoolData.dart index 2fb232e..94fede7 100644 --- a/lib/entities/user/SchoolData.dart +++ b/lib/entities/user/SchoolData.dart @@ -1,9 +1,6 @@ -import 'package:json_annotation/json_annotation.dart'; import 'package:meta/meta.dart'; -part 'SchoolData.g.dart'; -@JsonSerializable(explicitToJson: true) class SchoolData { const SchoolData({ @required this.school, @@ -11,8 +8,11 @@ class SchoolData { final String school; - factory SchoolData.fromJson(Map json) => - _$SchoolDataFromJson(json); + factory SchoolData.fromJson(Map json) { + return SchoolData(school: json['school'] as String); + } - Map toJson() => _$SchoolDataToJson(this); + Map toJson() => { + 'school': school + }; } diff --git a/lib/entities/user/SchoolData.g.dart b/lib/entities/user/SchoolData.g.dart deleted file mode 100644 index 622c6b5..0000000 --- a/lib/entities/user/SchoolData.g.dart +++ /dev/null @@ -1,18 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'SchoolData.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -SchoolData _$SchoolDataFromJson(Map json) { - return SchoolData( - school: json['school'] as String, - ); -} - -Map _$SchoolDataToJson(SchoolData instance) => - { - 'school': instance.school, - }; diff --git a/lib/entities/user/UserData.dart b/lib/entities/user/UserData.dart index fd688fe..3134f6b 100644 --- a/lib/entities/user/UserData.dart +++ b/lib/entities/user/UserData.dart @@ -45,7 +45,7 @@ class UserData { 'bio': { 'name': name, 'semester': semester, - 'school': schoolData?.toJson() + 'school': schoolData.school }, 'favorite_subjects': favSubjects, 'favorite_teachers': favTeachers,