diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml index a3d1aeac5c..be85415f4e 100644 --- a/android/app/lint-baseline.xml +++ b/android/app/lint-baseline.xml @@ -1,12 +1,12 @@ - + + file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.2.0/9232bb3c71f231e8228f570071c0e1ea29d40115/tika-core-3.2.0.jar"/> diff --git a/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt b/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt index 39207e3470..56c2f99aaf 100644 --- a/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt +++ b/android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v25.3.1), do not edit directly. +// Autogenerated from Pigeon (v25.3.2), do not edit directly. // See also: https://pub.dev/packages/pigeon @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass") diff --git a/android/gradle.properties b/android/gradle.properties index bf7487203d..6e0f68603b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -6,7 +6,7 @@ android.enableJetifier=true # Defining them here makes them available both in # settings.gradle and in the build.gradle files. -agpVersion=8.10.0 +agpVersion=8.10.1 # Generally update this to the version found in recent releases # of Android Studio, as listed in this table: diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0af2956cea..877fe51457 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -6,7 +6,7 @@ # the wrapper is the one from the new Gradle too.) distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1bd78a4b7f..009b8fb7c6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -37,37 +37,37 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/CoreOnly (11.10.0): - - FirebaseCore (~> 11.10.0) - - Firebase/Messaging (11.10.0): + - Firebase/CoreOnly (11.13.0): + - FirebaseCore (~> 11.13.0) + - Firebase/Messaging (11.13.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.10.0) - - firebase_core (3.13.0): - - Firebase/CoreOnly (= 11.10.0) + - FirebaseMessaging (~> 11.13.0) + - firebase_core (3.14.0): + - Firebase/CoreOnly (= 11.13.0) - Flutter - - firebase_messaging (15.2.5): - - Firebase/Messaging (= 11.10.0) + - firebase_messaging (15.2.7): + - Firebase/Messaging (= 11.13.0) - firebase_core - Flutter - - FirebaseCore (11.10.0): - - FirebaseCoreInternal (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.10.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.10.0): - - FirebaseCore (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseCore (11.13.0): + - FirebaseCoreInternal (~> 11.13.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Logger (~> 8.1) + - FirebaseCoreInternal (11.13.0): + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - FirebaseInstallations (11.13.0): + - FirebaseCore (~> 11.13.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.10.0): - - FirebaseCore (~> 11.10.0) + - FirebaseMessaging (11.13.0): + - FirebaseCore (~> 11.13.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Reachability (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Reachability (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - Flutter (1.0.0) - GoogleDataTransport (10.1.0): @@ -112,28 +112,28 @@ PODS: - Flutter - FlutterMacOS - PromisesObjC (2.4.0) - - SDWebImage (5.21.0): - - SDWebImage/Core (= 5.21.0) - - SDWebImage/Core (5.21.0) + - SDWebImage (5.21.1): + - SDWebImage/Core (= 5.21.1) + - SDWebImage/Core (5.21.1) - share_plus (0.0.1): - Flutter - - sqlite3 (3.49.1): - - sqlite3/common (= 3.49.1) - - sqlite3/common (3.49.1) - - sqlite3/dbstatvtab (3.49.1): + - sqlite3 (3.50.1): + - sqlite3/common (= 3.50.1) + - sqlite3/common (3.50.1) + - sqlite3/dbstatvtab (3.50.1): - sqlite3/common - - sqlite3/fts5 (3.49.1): + - sqlite3/fts5 (3.50.1): - sqlite3/common - - sqlite3/math (3.49.1): + - sqlite3/math (3.50.1): - sqlite3/common - - sqlite3/perf-threadsafe (3.49.1): + - sqlite3/perf-threadsafe (3.50.1): - sqlite3/common - - sqlite3/rtree (3.49.1): + - sqlite3/rtree (3.50.1): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (~> 3.49.1) + - sqlite3 (~> 3.50.1) - sqlite3/dbstatvtab - sqlite3/fts5 - sqlite3/math @@ -220,13 +220,13 @@ SPEC CHECKSUMS: DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be - Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 - firebase_core: 2d4534e7b489907dcede540c835b48981d890943 - firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64 - FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 - FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 - FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 - FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9 + Firebase: 3435bc66b4d494c2f22c79fd3aae4c1db6662327 + firebase_core: 700bac7ed92bb754fd70fbf01d72b36ecdd6d450 + firebase_messaging: 860c017fcfbb5e27c163062d1d3135388f3ef954 + FirebaseCore: c692c7f1c75305ab6aff2b367f25e11d73aa8bd0 + FirebaseCoreInternal: 29d7b3af4aaf0b8f3ed20b568c13df399b06f68c + FirebaseInstallations: 0ee9074f2c1e86561ace168ee1470dc67aabaf02 + FirebaseMessaging: 195bbdb73e6ca1dbc76cd46e73f3552c084ef6e4 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 @@ -236,10 +236,10 @@ SPEC CHECKSUMS: package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868 + SDWebImage: f29024626962457f3470184232766516dee8dfea share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983 - sqlite3_flutter_libs: f6acaa2172e6bb3e2e70c771661905080e8ebcf2 + sqlite3: 1d85290c3321153511f6e900ede7a1608718bbd5 + sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 url_launcher_ios: 694010445543906933d732453a59da0a173ae33d video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b diff --git a/l10n.yaml b/l10n.yaml index 6d15a20096..563219f948 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -1,7 +1,6 @@ # Docs on this config file: # https://docs.flutter.dev/ui/accessibility-and-localization/internationalization#configuring-the-l10nyaml-file -synthetic-package: false arb-dir: assets/l10n output-dir: lib/generated/l10n template-arb-file: app_en.arb diff --git a/lib/api/model/events.g.dart b/lib/api/model/events.g.dart index 94fe288150..ef8a214566 100644 --- a/lib/api/model/events.g.dart +++ b/lib/api/model/events.g.dart @@ -29,10 +29,9 @@ Map _$RealmEmojiUpdateEventToJson( AlertWordsEvent _$AlertWordsEventFromJson(Map json) => AlertWordsEvent( id: (json['id'] as num).toInt(), - alertWords: - (json['alert_words'] as List) - .map((e) => e as String) - .toList(), + alertWords: (json['alert_words'] as List) + .map((e) => e as String) + .toList(), ); Map _$AlertWordsEventToJson(AlertWordsEvent instance) => @@ -74,10 +73,9 @@ CustomProfileFieldsEvent _$CustomProfileFieldsEventFromJson( Map json, ) => CustomProfileFieldsEvent( id: (json['id'] as num).toInt(), - fields: - (json['fields'] as List) - .map((e) => CustomProfileField.fromJson(e as Map)) - .toList(), + fields: (json['fields'] as List) + .map((e) => CustomProfileField.fromJson(e as Map)) + .toList(), ); Map _$CustomProfileFieldsEventToJson( @@ -122,8 +120,8 @@ RealmUserUpdateEvent _$RealmUserUpdateEventFromJson( Map json, ) => RealmUserUpdateEvent( id: (json['id'] as num).toInt(), - userId: - (RealmUserUpdateEvent._readFromPerson(json, 'user_id') as num).toInt(), + userId: (RealmUserUpdateEvent._readFromPerson(json, 'user_id') as num) + .toInt(), fullName: RealmUserUpdateEvent._readFromPerson(json, 'full_name') as String?, avatarUrl: RealmUserUpdateEvent._readFromPerson(json, 'avatar_url') as String?, @@ -151,11 +149,11 @@ RealmUserUpdateEvent _$RealmUserUpdateEventFromJson( ), customProfileField: RealmUserUpdateEvent._readFromPerson(json, 'custom_profile_field') == null - ? null - : RealmUserUpdateCustomProfileField.fromJson( - RealmUserUpdateEvent._readFromPerson(json, 'custom_profile_field') - as Map, - ), + ? null + : RealmUserUpdateCustomProfileField.fromJson( + RealmUserUpdateEvent._readFromPerson(json, 'custom_profile_field') + as Map, + ), newEmail: RealmUserUpdateEvent._readFromPerson(json, 'new_email') as String?, isActive: RealmUserUpdateEvent._readFromPerson(json, 'is_active') as bool?, ); @@ -255,10 +253,9 @@ Map _$SavedSnippetsRemoveEventToJson( ChannelCreateEvent _$ChannelCreateEventFromJson(Map json) => ChannelCreateEvent( id: (json['id'] as num).toInt(), - streams: - (json['streams'] as List) - .map((e) => ZulipStream.fromJson(e as Map)) - .toList(), + streams: (json['streams'] as List) + .map((e) => ZulipStream.fromJson(e as Map)) + .toList(), ); Map _$ChannelCreateEventToJson(ChannelCreateEvent instance) => @@ -272,10 +269,9 @@ Map _$ChannelCreateEventToJson(ChannelCreateEvent instance) => ChannelDeleteEvent _$ChannelDeleteEventFromJson(Map json) => ChannelDeleteEvent( id: (json['id'] as num).toInt(), - streams: - (json['streams'] as List) - .map((e) => ZulipStream.fromJson(e as Map)) - .toList(), + streams: (json['streams'] as List) + .map((e) => ZulipStream.fromJson(e as Map)) + .toList(), ); Map _$ChannelDeleteEventToJson(ChannelDeleteEvent instance) => @@ -331,10 +327,9 @@ SubscriptionAddEvent _$SubscriptionAddEventFromJson( Map json, ) => SubscriptionAddEvent( id: (json['id'] as num).toInt(), - subscriptions: - (json['subscriptions'] as List) - .map((e) => Subscription.fromJson(e as Map)) - .toList(), + subscriptions: (json['subscriptions'] as List) + .map((e) => Subscription.fromJson(e as Map)) + .toList(), ); Map _$SubscriptionAddEventToJson( @@ -403,14 +398,12 @@ SubscriptionPeerAddEvent _$SubscriptionPeerAddEventFromJson( Map json, ) => SubscriptionPeerAddEvent( id: (json['id'] as num).toInt(), - streamIds: - (json['stream_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), - userIds: - (json['user_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + streamIds: (json['stream_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), + userIds: (json['user_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$SubscriptionPeerAddEventToJson( @@ -427,14 +420,12 @@ SubscriptionPeerRemoveEvent _$SubscriptionPeerRemoveEventFromJson( Map json, ) => SubscriptionPeerRemoveEvent( id: (json['id'] as num).toInt(), - streamIds: - (json['stream_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), - userIds: - (json['user_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + streamIds: (json['stream_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), + userIds: (json['user_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$SubscriptionPeerRemoveEventToJson( @@ -498,14 +489,12 @@ UpdateMessageEvent _$UpdateMessageEventFromJson(Map json) => userId: (json['user_id'] as num?)?.toInt(), renderingOnly: json['rendering_only'] as bool?, messageId: (json['message_id'] as num).toInt(), - messageIds: - (json['message_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), - flags: - (json['flags'] as List) - .map((e) => $enumDecode(_$MessageFlagEnumMap, e)) - .toList(), + messageIds: (json['message_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), + flags: (json['flags'] as List) + .map((e) => $enumDecode(_$MessageFlagEnumMap, e)) + .toList(), editTimestamp: (json['edit_timestamp'] as num?)?.toInt(), moveData: UpdateMessageMoveData.tryParseFromJson( UpdateMessageEvent._readMoveData(json, 'move_data') @@ -549,18 +538,16 @@ const _$MessageFlagEnumMap = { DeleteMessageEvent _$DeleteMessageEventFromJson(Map json) => DeleteMessageEvent( id: (json['id'] as num).toInt(), - messageIds: - (json['message_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + messageIds: (json['message_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), messageType: const MessageTypeConverter().fromJson( json['message_type'] as String, ), streamId: (json['stream_id'] as num?)?.toInt(), - topic: - json['topic'] == null - ? null - : TopicName.fromJson(json['topic'] as String), + topic: json['topic'] == null + ? null + : TopicName.fromJson(json['topic'] as String), ); Map _$DeleteMessageEventToJson(DeleteMessageEvent instance) => @@ -582,10 +569,9 @@ UpdateMessageFlagsAddEvent _$UpdateMessageFlagsAddEventFromJson( json['flag'], unknownValue: MessageFlag.unknown, ), - messages: - (json['messages'] as List) - .map((e) => (e as num).toInt()) - .toList(), + messages: (json['messages'] as List) + .map((e) => (e as num).toInt()) + .toList(), all: json['all'] as bool, ); @@ -609,10 +595,9 @@ UpdateMessageFlagsRemoveEvent _$UpdateMessageFlagsRemoveEventFromJson( json['flag'], unknownValue: MessageFlag.unknown, ), - messages: - (json['messages'] as List) - .map((e) => (e as num).toInt()) - .toList(), + messages: (json['messages'] as List) + .map((e) => (e as num).toInt()) + .toList(), messageDetails: (json['message_details'] as Map?)?.map( (k, e) => MapEntry( int.parse(k), @@ -639,15 +624,13 @@ UpdateMessageFlagsMessageDetail _$UpdateMessageFlagsMessageDetailFromJson( ) => UpdateMessageFlagsMessageDetail( type: const MessageTypeConverter().fromJson(json['type'] as String), mentioned: json['mentioned'] as bool?, - userIds: - (json['user_ids'] as List?) - ?.map((e) => (e as num).toInt()) - .toList(), + userIds: (json['user_ids'] as List?) + ?.map((e) => (e as num).toInt()) + .toList(), streamId: (json['stream_id'] as num?)?.toInt(), - topic: - json['topic'] == null - ? null - : TopicName.fromJson(json['topic'] as String), + topic: json['topic'] == null + ? null + : TopicName.fromJson(json['topic'] as String), ); Map _$UpdateMessageFlagsMessageDetailToJson( @@ -699,10 +682,9 @@ TypingEvent _$TypingEventFromJson(Map json) => TypingEvent( senderId: (TypingEvent._readSenderId(json, 'sender_id') as num).toInt(), recipientIds: TypingEvent._recipientIdsFromJson(json['recipients']), streamId: (json['stream_id'] as num?)?.toInt(), - topic: - json['topic'] == null - ? null - : TopicName.fromJson(json['topic'] as String), + topic: json['topic'] == null + ? null + : TopicName.fromJson(json['topic'] as String), ); Map _$TypingEventToJson(TypingEvent instance) => diff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart index 36afb0a39f..5574f8dde7 100644 --- a/lib/api/model/initial_snapshot.g.dart +++ b/lib/api/model/initial_snapshot.g.dart @@ -16,12 +16,12 @@ InitialSnapshot _$InitialSnapshotFromJson( zulipFeatureLevel: (json['zulip_feature_level'] as num).toInt(), zulipVersion: json['zulip_version'] as String, zulipMergeBase: json['zulip_merge_base'] as String?, - alertWords: - (json['alert_words'] as List).map((e) => e as String).toList(), - customProfileFields: - (json['custom_profile_fields'] as List) - .map((e) => CustomProfileField.fromJson(e as Map)) - .toList(), + alertWords: (json['alert_words'] as List) + .map((e) => e as String) + .toList(), + customProfileFields: (json['custom_profile_fields'] as List) + .map((e) => CustomProfileField.fromJson(e as Map)) + .toList(), emailAddressVisibility: $enumDecodeNullable( _$EmailAddressVisibilityEnumMap, json['email_address_visibility'], @@ -45,38 +45,31 @@ InitialSnapshot _$InitialSnapshotFromJson( (json['recent_private_conversations'] as List) .map((e) => RecentDmConversation.fromJson(e as Map)) .toList(), - savedSnippets: - (json['saved_snippets'] as List?) - ?.map((e) => SavedSnippet.fromJson(e as Map)) - .toList(), - subscriptions: - (json['subscriptions'] as List) - .map((e) => Subscription.fromJson(e as Map)) - .toList(), + savedSnippets: (json['saved_snippets'] as List?) + ?.map((e) => SavedSnippet.fromJson(e as Map)) + .toList(), + subscriptions: (json['subscriptions'] as List) + .map((e) => Subscription.fromJson(e as Map)) + .toList(), unreadMsgs: UnreadMessagesSnapshot.fromJson( json['unread_msgs'] as Map, ), - streams: - (json['streams'] as List) - .map((e) => ZulipStream.fromJson(e as Map)) - .toList(), - userSettings: - json['user_settings'] == null - ? null - : UserSettings.fromJson( - json['user_settings'] as Map, - ), - userTopics: - (json['user_topics'] as List?) - ?.map((e) => UserTopicItem.fromJson(e as Map)) - .toList(), + streams: (json['streams'] as List) + .map((e) => ZulipStream.fromJson(e as Map)) + .toList(), + userSettings: json['user_settings'] == null + ? null + : UserSettings.fromJson(json['user_settings'] as Map), + userTopics: (json['user_topics'] as List?) + ?.map((e) => UserTopicItem.fromJson(e as Map)) + .toList(), realmWildcardMentionPolicy: $enumDecode( _$RealmWildcardMentionPolicyEnumMap, json['realm_wildcard_mention_policy'], ), realmMandatoryTopics: json['realm_mandatory_topics'] as bool, - realmWaitingPeriodThreshold: - (json['realm_waiting_period_threshold'] as num).toInt(), + realmWaitingPeriodThreshold: (json['realm_waiting_period_threshold'] as num) + .toInt(), realmAllowMessageEditing: json['realm_allow_message_editing'] as bool, realmMessageContentEditLimitSeconds: (json['realm_message_content_edit_limit_seconds'] as num?)?.toInt(), @@ -88,10 +81,9 @@ InitialSnapshot _$InitialSnapshotFromJson( ), ), maxFileUploadSizeMib: (json['max_file_upload_size_mib'] as num).toInt(), - serverEmojiDataUrl: - json['server_emoji_data_url'] == null - ? null - : Uri.parse(json['server_emoji_data_url'] as String), + serverEmojiDataUrl: json['server_emoji_data_url'] == null + ? null + : Uri.parse(json['server_emoji_data_url'] as String), realmEmptyTopicDisplayName: json['realm_empty_topic_display_name'] as String?, realmUsers: (InitialSnapshot._readUsersIsActiveFallbackTrue(json, 'realm_users') @@ -192,10 +184,9 @@ RecentDmConversation _$RecentDmConversationFromJson( Map json, ) => RecentDmConversation( maxMessageId: (json['max_message_id'] as num).toInt(), - userIds: - (json['user_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + userIds: (json['user_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$RecentDmConversationToJson( @@ -263,22 +254,18 @@ UnreadMessagesSnapshot _$UnreadMessagesSnapshotFromJson( Map json, ) => UnreadMessagesSnapshot( count: (json['count'] as num).toInt(), - dms: - (json['pms'] as List) - .map((e) => UnreadDmSnapshot.fromJson(e as Map)) - .toList(), - channels: - (json['streams'] as List) - .map((e) => UnreadChannelSnapshot.fromJson(e as Map)) - .toList(), - huddles: - (json['huddles'] as List) - .map((e) => UnreadHuddleSnapshot.fromJson(e as Map)) - .toList(), - mentions: - (json['mentions'] as List) - .map((e) => (e as num).toInt()) - .toList(), + dms: (json['pms'] as List) + .map((e) => UnreadDmSnapshot.fromJson(e as Map)) + .toList(), + channels: (json['streams'] as List) + .map((e) => UnreadChannelSnapshot.fromJson(e as Map)) + .toList(), + huddles: (json['huddles'] as List) + .map((e) => UnreadHuddleSnapshot.fromJson(e as Map)) + .toList(), + mentions: (json['mentions'] as List) + .map((e) => (e as num).toInt()) + .toList(), oldUnreadsMissing: json['old_unreads_missing'] as bool, ); @@ -298,10 +285,9 @@ UnreadDmSnapshot _$UnreadDmSnapshotFromJson(Map json) => otherUserId: (UnreadDmSnapshot._readOtherUserId(json, 'other_user_id') as num) .toInt(), - unreadMessageIds: - (json['unread_message_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + unreadMessageIds: (json['unread_message_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$UnreadDmSnapshotToJson(UnreadDmSnapshot instance) => @@ -315,10 +301,9 @@ UnreadChannelSnapshot _$UnreadChannelSnapshotFromJson( ) => UnreadChannelSnapshot( topic: TopicName.fromJson(json['topic'] as String), streamId: (json['stream_id'] as num).toInt(), - unreadMessageIds: - (json['unread_message_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + unreadMessageIds: (json['unread_message_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$UnreadChannelSnapshotToJson( @@ -333,10 +318,9 @@ UnreadHuddleSnapshot _$UnreadHuddleSnapshotFromJson( Map json, ) => UnreadHuddleSnapshot( userIdsString: json['user_ids_string'] as String, - unreadMessageIds: - (json['unread_message_ids'] as List) - .map((e) => (e as num).toInt()) - .toList(), + unreadMessageIds: (json['unread_message_ids'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$UnreadHuddleSnapshotToJson( diff --git a/lib/api/model/model.g.dart b/lib/api/model/model.g.dart index 67fc606031..6f351d0a6f 100644 --- a/lib/api/model/model.g.dart +++ b/lib/api/model/model.g.dart @@ -107,14 +107,14 @@ User _$UserFromJson(Map json) => User( timezone: json['timezone'] as String, avatarUrl: json['avatar_url'] as String?, avatarVersion: (json['avatar_version'] as num).toInt(), - profileData: (User._readProfileData(json, 'profile_data') - as Map?) - ?.map( - (k, e) => MapEntry( - int.parse(k), - ProfileFieldUserData.fromJson(e as Map), - ), - ), + profileData: + (User._readProfileData(json, 'profile_data') as Map?) + ?.map( + (k, e) => MapEntry( + int.parse(k), + ProfileFieldUserData.fromJson(e as Map), + ), + ), isSystemBot: User._readIsSystemBot(json, 'is_system_bot') as bool, ); diff --git a/lib/api/route/channels.g.dart b/lib/api/route/channels.g.dart index f12b4db05f..c43f0f50f0 100644 --- a/lib/api/route/channels.g.dart +++ b/lib/api/route/channels.g.dart @@ -11,10 +11,9 @@ part of 'channels.dart'; GetStreamTopicsResult _$GetStreamTopicsResultFromJson( Map json, ) => GetStreamTopicsResult( - topics: - (json['topics'] as List) - .map((e) => GetStreamTopicsEntry.fromJson(e as Map)) - .toList(), + topics: (json['topics'] as List) + .map((e) => GetStreamTopicsEntry.fromJson(e as Map)) + .toList(), ); Map _$GetStreamTopicsResultToJson( diff --git a/lib/api/route/events.g.dart b/lib/api/route/events.g.dart index 5866787fc6..3c77877ae8 100644 --- a/lib/api/route/events.g.dart +++ b/lib/api/route/events.g.dart @@ -10,10 +10,9 @@ part of 'events.dart'; GetEventsResult _$GetEventsResultFromJson(Map json) => GetEventsResult( - events: - (json['events'] as List) - .map((e) => Event.fromJson(e as Map)) - .toList(), + events: (json['events'] as List) + .map((e) => Event.fromJson(e as Map)) + .toList(), queueId: json['queue_id'] as String?, ); diff --git a/lib/api/route/messages.g.dart b/lib/api/route/messages.g.dart index 21729f04da..0df3e678e6 100644 --- a/lib/api/route/messages.g.dart +++ b/lib/api/route/messages.g.dart @@ -58,10 +58,9 @@ Map _$UploadFileResultToJson(UploadFileResult instance) => UpdateMessageFlagsResult _$UpdateMessageFlagsResultFromJson( Map json, ) => UpdateMessageFlagsResult( - messages: - (json['messages'] as List) - .map((e) => (e as num).toInt()) - .toList(), + messages: (json['messages'] as List) + .map((e) => (e as num).toInt()) + .toList(), ); Map _$UpdateMessageFlagsResultToJson( diff --git a/lib/host/android_notifications.g.dart b/lib/host/android_notifications.g.dart index 5f46d154e9..de56806a4b 100644 --- a/lib/host/android_notifications.g.dart +++ b/lib/host/android_notifications.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v25.3.1), do not edit directly. +// Autogenerated from Pigeon (v25.3.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/lib/host/notifications.g.dart b/lib/host/notifications.g.dart index a83b67c804..ce1a74d446 100644 --- a/lib/host/notifications.g.dart +++ b/lib/host/notifications.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v25.3.1), do not edit directly. +// Autogenerated from Pigeon (v25.3.2), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/lib/model/database.g.dart b/lib/model/database.g.dart index 19c9f35c5a..9ff8b71b65 100644 --- a/lib/model/database.g.dart +++ b/lib/model/database.g.dart @@ -22,26 +22,28 @@ class $GlobalSettingsTable extends GlobalSettings ).withConverter($GlobalSettingsTable.$converterthemeSettingn); @override late final GeneratedColumnWithTypeConverter - browserPreference = GeneratedColumn( - 'browser_preference', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ).withConverter( - $GlobalSettingsTable.$converterbrowserPreferencen, - ); + browserPreference = + GeneratedColumn( + 'browser_preference', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ).withConverter( + $GlobalSettingsTable.$converterbrowserPreferencen, + ); @override late final GeneratedColumnWithTypeConverter - visitFirstUnread = GeneratedColumn( - 'visit_first_unread', - aliasedName, - true, - type: DriftSqlType.string, - requiredDuringInsert: false, - ).withConverter( - $GlobalSettingsTable.$convertervisitFirstUnreadn, - ); + visitFirstUnread = + GeneratedColumn( + 'visit_first_unread', + aliasedName, + true, + type: DriftSqlType.string, + requiredDuringInsert: false, + ).withConverter( + $GlobalSettingsTable.$convertervisitFirstUnreadn, + ); @override List get $columns => [ themeSetting, @@ -150,18 +152,15 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), - browserPreference: - browserPreference == null && nullToAbsent - ? const Value.absent() - : Value(browserPreference), - visitFirstUnread: - visitFirstUnread == null && nullToAbsent - ? const Value.absent() - : Value(visitFirstUnread), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), + browserPreference: browserPreference == null && nullToAbsent + ? const Value.absent() + : Value(browserPreference), + visitFirstUnread: visitFirstUnread == null && nullToAbsent + ? const Value.absent() + : Value(visitFirstUnread), ); } @@ -206,29 +205,24 @@ class GlobalSettingsData extends DataClass Value visitFirstUnread = const Value.absent(), }) => GlobalSettingsData( themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting, - browserPreference: - browserPreference.present - ? browserPreference.value - : this.browserPreference, - visitFirstUnread: - visitFirstUnread.present - ? visitFirstUnread.value - : this.visitFirstUnread, + browserPreference: browserPreference.present + ? browserPreference.value + : this.browserPreference, + visitFirstUnread: visitFirstUnread.present + ? visitFirstUnread.value + : this.visitFirstUnread, ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, - browserPreference: - data.browserPreference.present - ? data.browserPreference.value - : this.browserPreference, - visitFirstUnread: - data.visitFirstUnread.present - ? data.visitFirstUnread.value - : this.visitFirstUnread, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, + browserPreference: data.browserPreference.present + ? data.browserPreference.value + : this.browserPreference, + visitFirstUnread: data.visitFirstUnread.present + ? data.visitFirstUnread.value + : this.visitFirstUnread, ); } @@ -405,16 +399,14 @@ class $BoolGlobalSettingsTable extends BoolGlobalSettings BoolGlobalSettingRow map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BoolGlobalSettingRow( - name: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - value: - attachedDatabase.typeMapping.read( - DriftSqlType.bool, - data['${effectivePrefix}value'], - )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + value: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}value'], + )!, ); } @@ -771,46 +763,40 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> { Account map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return Account( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, realmUrl: $AccountsTable.$converterrealmUrl.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}realm_url'], )!, ), - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -893,15 +879,13 @@ class Account extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -955,11 +939,13 @@ class Account extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); Account copyWithCompanion(AccountsCompanion data) { return Account( @@ -968,22 +954,18 @@ class Account extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } @@ -1314,16 +1296,12 @@ class $$GlobalSettingsTableTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $$GlobalSettingsTableFilterComposer($db: db, $table: table), - createOrderingComposer: - () => - $$GlobalSettingsTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $$GlobalSettingsTableAnnotationComposer( - $db: db, - $table: table, - ), + createFilteringComposer: () => + $$GlobalSettingsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GlobalSettingsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GlobalSettingsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value themeSetting = const Value.absent(), @@ -1352,16 +1330,9 @@ class $$GlobalSettingsTableTableManager visitFirstUnread: visitFirstUnread, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); @@ -1482,18 +1453,12 @@ class $$BoolGlobalSettingsTableTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $$BoolGlobalSettingsTableFilterComposer( - $db: db, - $table: table, - ), - createOrderingComposer: - () => $$BoolGlobalSettingsTableOrderingComposer( - $db: db, - $table: table, - ), - createComputedFieldComposer: - () => $$BoolGlobalSettingsTableAnnotationComposer( + createFilteringComposer: () => + $$BoolGlobalSettingsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$BoolGlobalSettingsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$BoolGlobalSettingsTableAnnotationComposer( $db: db, $table: table, ), @@ -1517,16 +1482,9 @@ class $$BoolGlobalSettingsTableTableManager value: value, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); @@ -1754,12 +1712,12 @@ class $$AccountsTableTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $$AccountsTableFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $$AccountsTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $$AccountsTableAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $$AccountsTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$AccountsTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$AccountsTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), @@ -1804,16 +1762,9 @@ class $$AccountsTableTableManager zulipFeatureLevel: zulipFeatureLevel, ackedPushToken: ackedPushToken, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart index a1956295eb..676b30a45c 100644 --- a/lib/widgets/autocomplete.dart +++ b/lib/widgets/autocomplete.dart @@ -130,7 +130,7 @@ class _AutocompleteFieldState) - fieldViewBuilder: (context, _, __, ___) => widget.fieldViewBuilder(context), + fieldViewBuilder: (context, _, _, _) => widget.fieldViewBuilder(context), ); } } diff --git a/lib/widgets/emoji_reaction.dart b/lib/widgets/emoji_reaction.dart index 0f6d490a97..1f5dc557ec 100644 --- a/lib/widgets/emoji_reaction.dart +++ b/lib/widgets/emoji_reaction.dart @@ -330,7 +330,7 @@ class _ImageEmoji extends StatelessWidget { // Unicode and text emoji get scaled; it would look weird if image emoji didn't. textScaler: _squareEmojiScalerClamped(context), emojiDisplay: emojiDisplay, - errorBuilder: (context, _, __) => _TextEmoji( + errorBuilder: (context, _, _) => _TextEmoji( emojiDisplay: TextEmojiDisplay(emojiName: emojiName), selected: selected), ); } diff --git a/macos/Podfile.lock b/macos/Podfile.lock index bb5fd1a927..eb96189d39 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -7,38 +7,38 @@ PODS: - FlutterMacOS - file_selector_macos (0.0.1): - FlutterMacOS - - Firebase/CoreOnly (11.10.0): - - FirebaseCore (~> 11.10.0) - - Firebase/Messaging (11.10.0): + - Firebase/CoreOnly (11.13.0): + - FirebaseCore (~> 11.13.0) + - Firebase/Messaging (11.13.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.10.0) - - firebase_core (3.13.0): - - Firebase/CoreOnly (~> 11.10.0) + - FirebaseMessaging (~> 11.13.0) + - firebase_core (3.14.0): + - Firebase/CoreOnly (~> 11.13.0) - FlutterMacOS - - firebase_messaging (15.2.5): - - Firebase/CoreOnly (~> 11.10.0) - - Firebase/Messaging (~> 11.10.0) + - firebase_messaging (15.2.7): + - Firebase/CoreOnly (~> 11.13.0) + - Firebase/Messaging (~> 11.13.0) - firebase_core - FlutterMacOS - - FirebaseCore (11.10.0): - - FirebaseCoreInternal (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.10.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.10.0): - - FirebaseCore (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseCore (11.13.0): + - FirebaseCoreInternal (~> 11.13.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Logger (~> 8.1) + - FirebaseCoreInternal (11.13.0): + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - FirebaseInstallations (11.13.0): + - FirebaseCore (~> 11.13.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.10.0): - - FirebaseCore (~> 11.10.0) + - FirebaseMessaging (11.13.0): + - FirebaseCore (~> 11.13.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Reachability (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Reachability (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - nanopb (~> 3.30910.0) - FlutterMacOS (1.0.0) - GoogleDataTransport (10.1.0): @@ -81,23 +81,23 @@ PODS: - PromisesObjC (2.4.0) - share_plus (0.0.1): - FlutterMacOS - - sqlite3 (3.49.1): - - sqlite3/common (= 3.49.1) - - sqlite3/common (3.49.1) - - sqlite3/dbstatvtab (3.49.1): + - sqlite3 (3.50.1): + - sqlite3/common (= 3.50.1) + - sqlite3/common (3.50.1) + - sqlite3/dbstatvtab (3.50.1): - sqlite3/common - - sqlite3/fts5 (3.49.1): + - sqlite3/fts5 (3.50.1): - sqlite3/common - - sqlite3/math (3.49.1): + - sqlite3/math (3.50.1): - sqlite3/common - - sqlite3/perf-threadsafe (3.49.1): + - sqlite3/perf-threadsafe (3.50.1): - sqlite3/common - - sqlite3/rtree (3.49.1): + - sqlite3/rtree (3.50.1): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (~> 3.49.1) + - sqlite3 (~> 3.50.1) - sqlite3/dbstatvtab - sqlite3/fts5 - sqlite3/math @@ -175,13 +175,13 @@ SPEC CHECKSUMS: device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76 file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31 - Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 - firebase_core: efd50ad8177dc489af1b9163a560359cf1b30597 - firebase_messaging: acf2566068a55d7eb8cddfee5b094754070a5b88 - FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 - FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 - FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 - FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9 + Firebase: 3435bc66b4d494c2f22c79fd3aae4c1db6662327 + firebase_core: 1095fcf33161d99bc34aa10f7c0d89414a208d15 + firebase_messaging: 6417056ffb85141607618ddfef9fec9f3caab3ea + FirebaseCore: c692c7f1c75305ab6aff2b367f25e11d73aa8bd0 + FirebaseCoreInternal: 29d7b3af4aaf0b8f3ed20b568c13df399b06f68c + FirebaseInstallations: 0ee9074f2c1e86561ace168ee1470dc67aabaf02 + FirebaseMessaging: 195bbdb73e6ca1dbc76cd46e73f3552c084ef6e4 FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 @@ -190,8 +190,8 @@ SPEC CHECKSUMS: path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc - sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983 - sqlite3_flutter_libs: f6acaa2172e6bb3e2e70c771661905080e8ebcf2 + sqlite3: 1d85290c3321153511f6e900ede7a1608718bbd5 + sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2 url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673 video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497 diff --git a/pubspec.lock b/pubspec.lock index 4784adf19a..e3025cdc6b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: de9ecbb3ddafd446095f7e833c853aff2fa1682b017921fe63a833f9d6f0e422 + sha256: dda4fd7909a732a014239009aa52537b136f8ce568de23c212587097887e2307 url: "https://pub.dev" source: hosted - version: "1.3.54" + version: "1.3.56" analyzer: dependency: transitive description: @@ -117,10 +117,10 @@ packages: dependency: transitive description: name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 + sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27" url: "https://pub.dev" source: hosted - version: "8.9.5" + version: "8.10.1" characters: dependency: transitive description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.4" checks: dependency: "direct dev" description: @@ -214,10 +214,10 @@ packages: dependency: transitive description: name: coverage - sha256: "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d" + sha256: aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080 url: "https://pub.dev" source: hosted - version: "1.13.1" + version: "1.14.1" cross_file: dependency: transitive description: @@ -246,10 +246,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" + sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" dbus: dependency: transitive description: @@ -318,10 +318,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964" + sha256: ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a url: "https://pub.dev" source: hosted - version: "10.1.9" + version: "10.2.0" file_selector_linux: dependency: transitive description: @@ -334,10 +334,10 @@ packages: dependency: transitive description: name: file_selector_macos - sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc" + sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711" url: "https://pub.dev" source: hosted - version: "0.9.4+2" + version: "0.9.4+3" file_selector_platform_interface: dependency: transitive description: @@ -358,10 +358,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe" + sha256: "420d9111dcf095341f1ea8fdce926eef750cf7b9745d21f38000de780c94f608" url: "https://pub.dev" source: hosted - version: "3.13.0" + version: "3.14.0" firebase_core_platform_interface: dependency: transitive description: @@ -374,34 +374,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "129a34d1e0fb62e2b488d988a1fc26cc15636357e50944ffee2862efe8929b23" + sha256: ddd72baa6f727e5b23f32d9af23d7d453d67946f380bd9c21daf474ee0f7326e url: "https://pub.dev" source: hosted - version: "2.22.0" + version: "2.23.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "5f8918848ee0c8eb172fc7698619b2bcd7dda9ade8b93522c6297dd8f9178356" + sha256: "758461f67b96aa5ad27625aaae39882fd6d1961b1c7e005301f9a74b6336100b" url: "https://pub.dev" source: hosted - version: "15.2.5" + version: "15.2.7" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "0bbea00680249595fc896e7313a2bd90bd55be6e0abbe8b9a39d81b6b306acb6" + sha256: "614db1b0df0f53e541e41cc182b6d7ede5763c400f6ba232a5f8d0e1b5e5de32" url: "https://pub.dev" source: hosted - version: "4.6.5" + version: "4.6.7" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: ffb392ce2a7e8439cd0a9a80e3c702194e73c927e5c7b4f0adf6faa00b245b17 + sha256: b5fbbcdd3e0e7f3fde72b0c119410f22737638fed5fc428b54bba06bc1455d81 url: "https://pub.dev" source: hosted - version: "3.10.5" + version: "3.10.7" fixnum: dependency: transitive description: @@ -441,10 +441,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "6.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -682,10 +682,10 @@ packages: dependency: transitive description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -834,10 +834,10 @@ packages: dependency: "direct dev" description: name: pigeon - sha256: "3e4e6258f22760fa11f86d2a5202fb3f8367cb361d33bd9a93de85a7959e9976" + sha256: a093af76026160bb5ff6eb98e3e678a301ffd1001ac0d90be558bc133a0c73f5 url: "https://pub.dev" source: hosted - version: "25.3.1" + version: "25.3.2" platform: dependency: transitive description: @@ -874,10 +874,10 @@ packages: dependency: transitive description: name: process - sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" + sha256: "44b4226c0afd4bc3b7c7e67d44c4801abd97103cf0c84609e2654b664ca2798c" url: "https://pub.dev" source: hosted - version: "5.0.3" + version: "5.0.4" pub_semver: dependency: transitive description: @@ -1007,18 +1007,18 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e" + sha256: c0503c69b44d5714e6abbf4c1f51a3c3cc42b75ce785f44404765e4635481d38 url: "https://pub.dev" source: hosted - version: "2.7.5" + version: "2.7.6" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: "1a96b59227828d9eb1463191d684b37a27d66ee5ed7597fcf42eee6452c88a14" + sha256: e07232b998755fe795655c56d1f5426e0190c9c435e1752d39e7b1cd33699c71 url: "https://pub.dev" source: hosted - version: "0.5.32" + version: "0.5.34" sqlparser: dependency: transitive description: @@ -1079,26 +1079,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.26.2" test_api: dependency: "direct dev" description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.6" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.11" timing: dependency: transitive description: @@ -1191,10 +1191,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" video_player: dependency: "direct main" description: @@ -1207,10 +1207,10 @@ packages: dependency: transitive description: name: video_player_android - sha256: "1f4e8e0e02403452d699ef7cf73fe9936fac8f6f0605303d111d71acb375d1bc" + sha256: "4a5135754a62dbc827a64a42ef1f8ed72c962e191c97e2d48744225c2b9ebb73" url: "https://pub.dev" source: hosted - version: "2.8.3" + version: "2.8.7" video_player_avfoundation: dependency: transitive description: @@ -1239,10 +1239,10 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" wakelock_plus: dependency: "direct main" description: @@ -1263,10 +1263,10 @@ packages: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" web: dependency: transitive description: @@ -1311,10 +1311,10 @@ packages: dependency: transitive description: name: win32 - sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba" + sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "5.14.0" win32_registry: dependency: transitive description: @@ -1355,5 +1355,5 @@ packages: source: path version: "0.0.1" sdks: - dart: ">=3.9.0-114.0.dev <4.0.0" - flutter: ">=3.33.0-1.0.pre.44" + dart: ">=3.9.0-220.0.dev <4.0.0" + flutter: ">=3.33.0-1.0.pre.465" diff --git a/pubspec.yaml b/pubspec.yaml index 68ad256356..c5777527c2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,8 +14,8 @@ environment: # We use a recent version of Flutter from its main channel, and # the corresponding recent version of the Dart SDK. # Feel free to update these regularly; see README.md for instructions. - sdk: '>=3.9.0-114.0.dev <4.0.0' - flutter: '>=3.33.0-1.0.pre.44' # 358b0726882869cd917e1e2dc07b6c298e6c2992 + sdk: '>=3.9.0-220.0.dev <4.0.0' + flutter: '>=3.33.0-1.0.pre.465' # ee089d09b21ec3ccc20d179c5be100d2a9d9f866 # To update dependencies, see instructions in README.md. dependencies: @@ -61,7 +61,7 @@ dependencies: sqlite3_flutter_libs: ^0.5.13 url_launcher: ^6.1.11 url_launcher_android: ">=6.1.0" - video_player: ^2.8.3 + video_player: 2.9.5 # TODO unpin and upgrade to latest version wakelock_plus: ^1.2.8 zulip_plugin: path: ./packages/zulip_plugin @@ -98,7 +98,7 @@ dev_dependencies: drift_dev: ^2.5.2 fake_async: ^1.3.1 flutter_checks: ^0.1.2 - flutter_lints: ^5.0.0 + flutter_lints: ^6.0.0 ini: ^2.1.0 json_serializable: ^6.5.4 legacy_checks: ^0.1.0 diff --git a/test/model/schemas/schema_v1.dart b/test/model/schemas/schema_v1.dart index a3f326e1d3..9629b868f7 100644 --- a/test/model/schemas/schema_v1.dart +++ b/test/model/schemas/schema_v1.dart @@ -95,45 +95,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ); } @@ -186,10 +179,9 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), ); } @@ -241,8 +233,9 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, ); AccountsData copyWithCompanion(AccountsCompanion data) { @@ -252,18 +245,15 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, ); } diff --git a/test/model/schemas/schema_v2.dart b/test/model/schemas/schema_v2.dart index f31a7934e0..61c69dd90c 100644 --- a/test/model/schemas/schema_v2.dart +++ b/test/model/schemas/schema_v2.dart @@ -103,45 +103,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -203,15 +196,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -265,11 +256,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -278,22 +271,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } diff --git a/test/model/schemas/schema_v3.dart b/test/model/schemas/schema_v3.dart index 7a78e85840..862ea42c18 100644 --- a/test/model/schemas/schema_v3.dart +++ b/test/model/schemas/schema_v3.dart @@ -57,10 +57,9 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), ); } @@ -88,10 +87,9 @@ class GlobalSettingsData extends DataClass ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, ); } @@ -264,45 +262,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -364,15 +355,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -426,11 +415,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -439,22 +430,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } diff --git a/test/model/schemas/schema_v4.dart b/test/model/schemas/schema_v4.dart index e53e4fbe2a..631d37ab82 100644 --- a/test/model/schemas/schema_v4.dart +++ b/test/model/schemas/schema_v4.dart @@ -73,14 +73,12 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), - browserPreference: - browserPreference == null && nullToAbsent - ? const Value.absent() - : Value(browserPreference), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), + browserPreference: browserPreference == null && nullToAbsent + ? const Value.absent() + : Value(browserPreference), ); } @@ -110,21 +108,18 @@ class GlobalSettingsData extends DataClass Value browserPreference = const Value.absent(), }) => GlobalSettingsData( themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting, - browserPreference: - browserPreference.present - ? browserPreference.value - : this.browserPreference, + browserPreference: browserPreference.present + ? browserPreference.value + : this.browserPreference, ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, - browserPreference: - data.browserPreference.present - ? data.browserPreference.value - : this.browserPreference, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, + browserPreference: data.browserPreference.present + ? data.browserPreference.value + : this.browserPreference, ); } @@ -311,45 +306,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -411,15 +399,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -473,11 +459,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -486,22 +474,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } diff --git a/test/model/schemas/schema_v5.dart b/test/model/schemas/schema_v5.dart index 3bf383ef27..1d3bc4d895 100644 --- a/test/model/schemas/schema_v5.dart +++ b/test/model/schemas/schema_v5.dart @@ -73,14 +73,12 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), - browserPreference: - browserPreference == null && nullToAbsent - ? const Value.absent() - : Value(browserPreference), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), + browserPreference: browserPreference == null && nullToAbsent + ? const Value.absent() + : Value(browserPreference), ); } @@ -110,21 +108,18 @@ class GlobalSettingsData extends DataClass Value browserPreference = const Value.absent(), }) => GlobalSettingsData( themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting, - browserPreference: - browserPreference.present - ? browserPreference.value - : this.browserPreference, + browserPreference: browserPreference.present + ? browserPreference.value + : this.browserPreference, ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, - browserPreference: - data.browserPreference.present - ? data.browserPreference.value - : this.browserPreference, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, + browserPreference: data.browserPreference.present + ? data.browserPreference.value + : this.browserPreference, ); } @@ -311,45 +306,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -411,15 +399,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -473,11 +459,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -486,22 +474,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } diff --git a/test/model/schemas/schema_v6.dart b/test/model/schemas/schema_v6.dart index 17ff55be21..aac90f3ae3 100644 --- a/test/model/schemas/schema_v6.dart +++ b/test/model/schemas/schema_v6.dart @@ -73,14 +73,12 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), - browserPreference: - browserPreference == null && nullToAbsent - ? const Value.absent() - : Value(browserPreference), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), + browserPreference: browserPreference == null && nullToAbsent + ? const Value.absent() + : Value(browserPreference), ); } @@ -110,21 +108,18 @@ class GlobalSettingsData extends DataClass Value browserPreference = const Value.absent(), }) => GlobalSettingsData( themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting, - browserPreference: - browserPreference.present - ? browserPreference.value - : this.browserPreference, + browserPreference: browserPreference.present + ? browserPreference.value + : this.browserPreference, ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, - browserPreference: - data.browserPreference.present - ? data.browserPreference.value - : this.browserPreference, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, + browserPreference: data.browserPreference.present + ? data.browserPreference.value + : this.browserPreference, ); } @@ -247,16 +242,14 @@ class BoolGlobalSettings extends Table BoolGlobalSettingsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BoolGlobalSettingsData( - name: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - value: - attachedDatabase.typeMapping.read( - DriftSqlType.bool, - data['${effectivePrefix}value'], - )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + value: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}value'], + )!, ); } @@ -499,45 +492,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -599,15 +585,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -661,11 +645,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -674,22 +660,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); } diff --git a/test/model/schemas/schema_v7.dart b/test/model/schemas/schema_v7.dart index dd3951b800..b74f391386 100644 --- a/test/model/schemas/schema_v7.dart +++ b/test/model/schemas/schema_v7.dart @@ -96,18 +96,15 @@ class GlobalSettingsData extends DataClass GlobalSettingsCompanion toCompanion(bool nullToAbsent) { return GlobalSettingsCompanion( - themeSetting: - themeSetting == null && nullToAbsent - ? const Value.absent() - : Value(themeSetting), - browserPreference: - browserPreference == null && nullToAbsent - ? const Value.absent() - : Value(browserPreference), - visitFirstUnread: - visitFirstUnread == null && nullToAbsent - ? const Value.absent() - : Value(visitFirstUnread), + themeSetting: themeSetting == null && nullToAbsent + ? const Value.absent() + : Value(themeSetting), + browserPreference: browserPreference == null && nullToAbsent + ? const Value.absent() + : Value(browserPreference), + visitFirstUnread: visitFirstUnread == null && nullToAbsent + ? const Value.absent() + : Value(visitFirstUnread), ); } @@ -140,29 +137,24 @@ class GlobalSettingsData extends DataClass Value visitFirstUnread = const Value.absent(), }) => GlobalSettingsData( themeSetting: themeSetting.present ? themeSetting.value : this.themeSetting, - browserPreference: - browserPreference.present - ? browserPreference.value - : this.browserPreference, - visitFirstUnread: - visitFirstUnread.present - ? visitFirstUnread.value - : this.visitFirstUnread, + browserPreference: browserPreference.present + ? browserPreference.value + : this.browserPreference, + visitFirstUnread: visitFirstUnread.present + ? visitFirstUnread.value + : this.visitFirstUnread, ); GlobalSettingsData copyWithCompanion(GlobalSettingsCompanion data) { return GlobalSettingsData( - themeSetting: - data.themeSetting.present - ? data.themeSetting.value - : this.themeSetting, - browserPreference: - data.browserPreference.present - ? data.browserPreference.value - : this.browserPreference, - visitFirstUnread: - data.visitFirstUnread.present - ? data.visitFirstUnread.value - : this.visitFirstUnread, + themeSetting: data.themeSetting.present + ? data.themeSetting.value + : this.themeSetting, + browserPreference: data.browserPreference.present + ? data.browserPreference.value + : this.browserPreference, + visitFirstUnread: data.visitFirstUnread.present + ? data.visitFirstUnread.value + : this.visitFirstUnread, ); } @@ -299,16 +291,14 @@ class BoolGlobalSettings extends Table BoolGlobalSettingsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BoolGlobalSettingsData( - name: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - value: - attachedDatabase.typeMapping.read( - DriftSqlType.bool, - data['${effectivePrefix}value'], - )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + value: attachedDatabase.typeMapping.read( + DriftSqlType.bool, + data['${effectivePrefix}value'], + )!, ); } @@ -551,45 +541,38 @@ class Accounts extends Table with TableInfo { AccountsData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return AccountsData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}id'], - )!, - realmUrl: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}realm_url'], - )!, - userId: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}user_id'], - )!, - email: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}email'], - )!, - apiKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}api_key'], - )!, - zulipVersion: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}zulip_version'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}id'], + )!, + realmUrl: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}realm_url'], + )!, + userId: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}user_id'], + )!, + email: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}email'], + )!, + apiKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}api_key'], + )!, + zulipVersion: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}zulip_version'], + )!, zulipMergeBase: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}zulip_merge_base'], ), - zulipFeatureLevel: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}zulip_feature_level'], - )!, + zulipFeatureLevel: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}zulip_feature_level'], + )!, ackedPushToken: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}acked_push_token'], @@ -651,15 +634,13 @@ class AccountsData extends DataClass implements Insertable { email: Value(email), apiKey: Value(apiKey), zulipVersion: Value(zulipVersion), - zulipMergeBase: - zulipMergeBase == null && nullToAbsent - ? const Value.absent() - : Value(zulipMergeBase), + zulipMergeBase: zulipMergeBase == null && nullToAbsent + ? const Value.absent() + : Value(zulipMergeBase), zulipFeatureLevel: Value(zulipFeatureLevel), - ackedPushToken: - ackedPushToken == null && nullToAbsent - ? const Value.absent() - : Value(ackedPushToken), + ackedPushToken: ackedPushToken == null && nullToAbsent + ? const Value.absent() + : Value(ackedPushToken), ); } @@ -713,11 +694,13 @@ class AccountsData extends DataClass implements Insertable { email: email ?? this.email, apiKey: apiKey ?? this.apiKey, zulipVersion: zulipVersion ?? this.zulipVersion, - zulipMergeBase: - zulipMergeBase.present ? zulipMergeBase.value : this.zulipMergeBase, + zulipMergeBase: zulipMergeBase.present + ? zulipMergeBase.value + : this.zulipMergeBase, zulipFeatureLevel: zulipFeatureLevel ?? this.zulipFeatureLevel, - ackedPushToken: - ackedPushToken.present ? ackedPushToken.value : this.ackedPushToken, + ackedPushToken: ackedPushToken.present + ? ackedPushToken.value + : this.ackedPushToken, ); AccountsData copyWithCompanion(AccountsCompanion data) { return AccountsData( @@ -726,22 +709,18 @@ class AccountsData extends DataClass implements Insertable { userId: data.userId.present ? data.userId.value : this.userId, email: data.email.present ? data.email.value : this.email, apiKey: data.apiKey.present ? data.apiKey.value : this.apiKey, - zulipVersion: - data.zulipVersion.present - ? data.zulipVersion.value - : this.zulipVersion, - zulipMergeBase: - data.zulipMergeBase.present - ? data.zulipMergeBase.value - : this.zulipMergeBase, - zulipFeatureLevel: - data.zulipFeatureLevel.present - ? data.zulipFeatureLevel.value - : this.zulipFeatureLevel, - ackedPushToken: - data.ackedPushToken.present - ? data.ackedPushToken.value - : this.ackedPushToken, + zulipVersion: data.zulipVersion.present + ? data.zulipVersion.value + : this.zulipVersion, + zulipMergeBase: data.zulipMergeBase.present + ? data.zulipMergeBase.value + : this.zulipMergeBase, + zulipFeatureLevel: data.zulipFeatureLevel.present + ? data.zulipFeatureLevel.value + : this.zulipFeatureLevel, + ackedPushToken: data.ackedPushToken.present + ? data.ackedPushToken.value + : this.ackedPushToken, ); }