diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d314512..cc64c3a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -42,10 +42,10 @@ PODS: - Firebase/Messaging (11.10.0): - Firebase/CoreOnly - FirebaseMessaging (~> 11.10.0) - - firebase_core (3.13.0): + - firebase_core (3.13.1): - Firebase/CoreOnly (= 11.10.0) - Flutter - - firebase_messaging (15.2.5): + - firebase_messaging (15.2.6): - Firebase/Messaging (= 11.10.0) - firebase_core - Flutter @@ -77,6 +77,8 @@ PODS: - flutter_inappwebview_ios/Core (0.0.1): - Flutter - OrderedSet (~> 6.0.3) + - flutter_native_splash (2.4.3): + - Flutter - flutter_platform_alert (0.0.1): - Flutter - flutter_udid (0.0.1): @@ -180,6 +182,7 @@ DEPENDENCIES: - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) + - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) - flutter_platform_alert (from `.symlinks/plugins/flutter_platform_alert/ios`) - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) @@ -232,6 +235,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_inappwebview_ios: :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" + flutter_native_splash: + :path: ".symlinks/plugins/flutter_native_splash/ios" flutter_platform_alert: :path: ".symlinks/plugins/flutter_platform_alert/ios" flutter_udid: @@ -270,14 +275,15 @@ SPEC CHECKSUMS: DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 - firebase_core: 2d4534e7b489907dcede540c835b48981d890943 - firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64 + firebase_core: ba71b44041571da878cb624ce0d80250bcbe58ad + firebase_messaging: 13129fe2ca166d1ed2d095062d76cee88943d067 FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 + flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf flutter_platform_alert: bf3b5fcd4ac14bd637e20527e9c471633071afd3 flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 diff --git a/lib/models/post.dart b/lib/models/post.dart index a344892..b10aa15 100644 --- a/lib/models/post.dart +++ b/lib/models/post.dart @@ -49,7 +49,7 @@ abstract class SnPublisher with _$SnPublisher { required int type, required String name, required String nick, - required String bio, + @Default('') String bio, required String? pictureId, required SnCloudFile? picture, required String? backgroundId, diff --git a/lib/models/post.freezed.dart b/lib/models/post.freezed.dart index 7e342a7..7164be5 100644 --- a/lib/models/post.freezed.dart +++ b/lib/models/post.freezed.dart @@ -471,14 +471,14 @@ $SnCloudFileCopyWith<$Res>? get background { @JsonSerializable() class _SnPublisher implements SnPublisher { - const _SnPublisher({required this.id, required this.type, required this.name, required this.nick, required this.bio, required this.pictureId, required this.picture, required this.backgroundId, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt, required this.realmId}); + const _SnPublisher({required this.id, required this.type, required this.name, required this.nick, this.bio = '', required this.pictureId, required this.picture, required this.backgroundId, required this.background, required this.accountId, required this.createdAt, required this.updatedAt, required this.deletedAt, required this.realmId}); factory _SnPublisher.fromJson(Map json) => _$SnPublisherFromJson(json); @override final String id; @override final int type; @override final String name; @override final String nick; -@override final String bio; +@override@JsonKey() final String bio; @override final String? pictureId; @override final SnCloudFile? picture; @override final String? backgroundId; diff --git a/lib/models/post.g.dart b/lib/models/post.g.dart index a6a33ed..d0fc3cb 100644 --- a/lib/models/post.g.dart +++ b/lib/models/post.g.dart @@ -99,7 +99,7 @@ _SnPublisher _$SnPublisherFromJson(Map json) => _SnPublisher( type: (json['type'] as num).toInt(), name: json['name'] as String, nick: json['nick'] as String, - bio: json['bio'] as String, + bio: json['bio'] as String? ?? '', pictureId: json['picture_id'] as String?, picture: json['picture'] == null diff --git a/lib/models/user.dart b/lib/models/user.dart index 8de652a..d11d70f 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -30,7 +30,7 @@ abstract class SnAccountProfile with _$SnAccountProfile { required String? firstName, required String? middleName, required String? lastName, - required String? bio, + @Default('') String bio, required String? pictureId, required int experience, required int level, diff --git a/lib/models/user.freezed.dart b/lib/models/user.freezed.dart index 3c241d5..9423b21 100644 --- a/lib/models/user.freezed.dart +++ b/lib/models/user.freezed.dart @@ -200,7 +200,7 @@ $SnAccountProfileCopyWith<$Res> get profile { /// @nodoc mixin _$SnAccountProfile { - String get id; String? get firstName; String? get middleName; String? get lastName; String? get bio; String? get pictureId; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; String? get backgroundId; SnCloudFile? get background; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; + String get id; String? get firstName; String? get middleName; String? get lastName; String get bio; String? get pictureId; int get experience; int get level; double get levelingProgress; SnCloudFile? get picture; String? get backgroundId; SnCloudFile? get background; DateTime get createdAt; DateTime get updatedAt; DateTime? get deletedAt; /// Create a copy of SnAccountProfile /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -233,7 +233,7 @@ abstract mixin class $SnAccountProfileCopyWith<$Res> { factory $SnAccountProfileCopyWith(SnAccountProfile value, $Res Function(SnAccountProfile) _then) = _$SnAccountProfileCopyWithImpl; @useResult $Res call({ - String id, String? firstName, String? middleName, String? lastName, String? bio, String? pictureId, int experience, int level, double levelingProgress, SnCloudFile? picture, String? backgroundId, SnCloudFile? background, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt + String id, String? firstName, String? middleName, String? lastName, String bio, String? pictureId, int experience, int level, double levelingProgress, SnCloudFile? picture, String? backgroundId, SnCloudFile? background, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt }); @@ -250,14 +250,14 @@ class _$SnAccountProfileCopyWithImpl<$Res> /// Create a copy of SnAccountProfile /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? firstName = freezed,Object? middleName = freezed,Object? lastName = freezed,Object? bio = freezed,Object? pictureId = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? backgroundId = freezed,Object? background = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? id = null,Object? firstName = freezed,Object? middleName = freezed,Object? lastName = freezed,Object? bio = null,Object? pictureId = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? backgroundId = freezed,Object? background = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { return _then(_self.copyWith( id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as String,firstName: freezed == firstName ? _self.firstName : firstName // ignore: cast_nullable_to_non_nullable as String?,middleName: freezed == middleName ? _self.middleName : middleName // ignore: cast_nullable_to_non_nullable as String?,lastName: freezed == lastName ? _self.lastName : lastName // ignore: cast_nullable_to_non_nullable -as String?,bio: freezed == bio ? _self.bio : bio // ignore: cast_nullable_to_non_nullable -as String?,pictureId: freezed == pictureId ? _self.pictureId : pictureId // ignore: cast_nullable_to_non_nullable +as String?,bio: null == bio ? _self.bio : bio // ignore: cast_nullable_to_non_nullable +as String,pictureId: freezed == pictureId ? _self.pictureId : pictureId // ignore: cast_nullable_to_non_nullable as String?,experience: null == experience ? _self.experience : experience // ignore: cast_nullable_to_non_nullable as int,level: null == level ? _self.level : level // ignore: cast_nullable_to_non_nullable as int,levelingProgress: null == levelingProgress ? _self.levelingProgress : levelingProgress // ignore: cast_nullable_to_non_nullable @@ -302,14 +302,14 @@ $SnCloudFileCopyWith<$Res>? get background { @JsonSerializable() class _SnAccountProfile implements SnAccountProfile { - const _SnAccountProfile({required this.id, required this.firstName, required this.middleName, required this.lastName, required this.bio, required this.pictureId, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.backgroundId, required this.background, required this.createdAt, required this.updatedAt, required this.deletedAt}); + const _SnAccountProfile({required this.id, required this.firstName, required this.middleName, required this.lastName, this.bio = '', required this.pictureId, required this.experience, required this.level, required this.levelingProgress, required this.picture, required this.backgroundId, required this.background, required this.createdAt, required this.updatedAt, required this.deletedAt}); factory _SnAccountProfile.fromJson(Map json) => _$SnAccountProfileFromJson(json); @override final String id; @override final String? firstName; @override final String? middleName; @override final String? lastName; -@override final String? bio; +@override@JsonKey() final String bio; @override final String? pictureId; @override final int experience; @override final int level; @@ -354,7 +354,7 @@ abstract mixin class _$SnAccountProfileCopyWith<$Res> implements $SnAccountProfi factory _$SnAccountProfileCopyWith(_SnAccountProfile value, $Res Function(_SnAccountProfile) _then) = __$SnAccountProfileCopyWithImpl; @override @useResult $Res call({ - String id, String? firstName, String? middleName, String? lastName, String? bio, String? pictureId, int experience, int level, double levelingProgress, SnCloudFile? picture, String? backgroundId, SnCloudFile? background, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt + String id, String? firstName, String? middleName, String? lastName, String bio, String? pictureId, int experience, int level, double levelingProgress, SnCloudFile? picture, String? backgroundId, SnCloudFile? background, DateTime createdAt, DateTime updatedAt, DateTime? deletedAt }); @@ -371,14 +371,14 @@ class __$SnAccountProfileCopyWithImpl<$Res> /// Create a copy of SnAccountProfile /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? firstName = freezed,Object? middleName = freezed,Object? lastName = freezed,Object? bio = freezed,Object? pictureId = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? backgroundId = freezed,Object? background = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? id = null,Object? firstName = freezed,Object? middleName = freezed,Object? lastName = freezed,Object? bio = null,Object? pictureId = freezed,Object? experience = null,Object? level = null,Object? levelingProgress = null,Object? picture = freezed,Object? backgroundId = freezed,Object? background = freezed,Object? createdAt = null,Object? updatedAt = null,Object? deletedAt = freezed,}) { return _then(_SnAccountProfile( id: null == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as String,firstName: freezed == firstName ? _self.firstName : firstName // ignore: cast_nullable_to_non_nullable as String?,middleName: freezed == middleName ? _self.middleName : middleName // ignore: cast_nullable_to_non_nullable as String?,lastName: freezed == lastName ? _self.lastName : lastName // ignore: cast_nullable_to_non_nullable -as String?,bio: freezed == bio ? _self.bio : bio // ignore: cast_nullable_to_non_nullable -as String?,pictureId: freezed == pictureId ? _self.pictureId : pictureId // ignore: cast_nullable_to_non_nullable +as String?,bio: null == bio ? _self.bio : bio // ignore: cast_nullable_to_non_nullable +as String,pictureId: freezed == pictureId ? _self.pictureId : pictureId // ignore: cast_nullable_to_non_nullable as String?,experience: null == experience ? _self.experience : experience // ignore: cast_nullable_to_non_nullable as int,level: null == level ? _self.level : level // ignore: cast_nullable_to_non_nullable as int,levelingProgress: null == levelingProgress ? _self.levelingProgress : levelingProgress // ignore: cast_nullable_to_non_nullable diff --git a/lib/models/user.g.dart b/lib/models/user.g.dart index 7d5faa2..514e5de 100644 --- a/lib/models/user.g.dart +++ b/lib/models/user.g.dart @@ -46,7 +46,7 @@ _SnAccountProfile _$SnAccountProfileFromJson(Map json) => firstName: json['first_name'] as String?, middleName: json['middle_name'] as String?, lastName: json['last_name'] as String?, - bio: json['bio'] as String?, + bio: json['bio'] as String? ?? '', pictureId: json['picture_id'] as String?, experience: (json['experience'] as num).toInt(), level: (json['level'] as num).toInt(), diff --git a/lib/widgets/alert.dart b/lib/widgets/alert.dart index d821040..b314987 100644 --- a/lib/widgets/alert.dart +++ b/lib/widgets/alert.dart @@ -11,7 +11,9 @@ void showSnackBar( String message, { SnackBarAction? action, }) { - showSnackBar(context, message, action: action); + ScaffoldMessenger.of( + context, + ).showSnackBar(SnackBar(content: Text(message), action: action)); } void clearSnackBar(BuildContext context) {