diff --git a/assets/user.png b/assets/user.png new file mode 100644 index 0000000..a681792 Binary files /dev/null and b/assets/user.png differ 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, 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