Merge branch 'shiosyakeyakini-info:develop' into buildsnap1

Npepperlinux · Dec 18, 2023 · 5aa9404 · 5aa9404
2 parents ffa608c + 92b13c0
commit 5aa9404
Show file tree

Hide file tree

Showing 23 changed files with 1,190 additions and 1,107 deletions.
diff --git a/lib/model/account_settings.freezed.dart b/lib/model/account_settings.freezed.dart
@@ -324,7 +324,7 @@ class _$AccountSettingsImpl extends _AccountSettings {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$AccountSettingsImpl &&

diff --git a/lib/model/acct.freezed.dart b/lib/model/acct.freezed.dart
@@ -115,7 +115,7 @@ class _$AcctImpl extends _Acct {
   final String username;
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$AcctImpl &&

diff --git a/lib/model/antenna_settings.freezed.dart b/lib/model/antenna_settings.freezed.dart
@@ -298,7 +298,7 @@ class _$AntennaSettingsImpl extends _AntennaSettings {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$AntennaSettingsImpl &&

diff --git a/lib/model/clip_settings.freezed.dart b/lib/model/clip_settings.freezed.dart
@@ -133,7 +133,7 @@ class _$ClipSettingsImpl extends _ClipSettings {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ClipSettingsImpl &&

diff --git a/lib/model/color_theme.freezed.dart b/lib/model/color_theme.freezed.dart
@@ -394,7 +394,7 @@ class _$ColorThemeImpl implements _ColorTheme {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ColorThemeImpl &&

diff --git a/lib/model/exported_setting.freezed.dart b/lib/model/exported_setting.freezed.dart
@@ -175,7 +175,7 @@ class _$ExportedSettingImpl implements _ExportedSetting {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ExportedSettingImpl &&

diff --git a/lib/model/federation_data.freezed.dart b/lib/model/federation_data.freezed.dart
@@ -487,7 +487,7 @@ class _$FederationDataImpl implements _FederationData {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$FederationDataImpl &&

diff --git a/lib/model/general_settings.freezed.dart b/lib/model/general_settings.freezed.dart
@@ -443,7 +443,7 @@ class _$GeneralSettingsImpl implements _GeneralSettings {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$GeneralSettingsImpl &&

diff --git a/lib/model/misskey_theme.freezed.dart b/lib/model/misskey_theme.freezed.dart
@@ -200,7 +200,7 @@ class _$MisskeyThemeImpl implements _MisskeyTheme {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$MisskeyThemeImpl &&

diff --git a/lib/model/summaly_result.freezed.dart b/lib/model/summaly_result.freezed.dart
@@ -239,7 +239,7 @@ class _$SummalyResultImpl implements _SummalyResult {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$SummalyResultImpl &&
@@ -454,7 +454,7 @@ class _$PlayerImpl implements _Player {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$PlayerImpl &&

diff --git a/lib/model/tab_icon.freezed.dart b/lib/model/tab_icon.freezed.dart
@@ -121,7 +121,7 @@ class _$TabIconImpl implements _TabIcon {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$TabIconImpl &&

diff --git a/lib/model/tab_setting.freezed.dart b/lib/model/tab_setting.freezed.dart
@@ -371,7 +371,7 @@ class _$TabSettingImpl extends _TabSetting {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$TabSettingImpl &&

diff --git a/lib/model/unicode_emoji.freezed.dart b/lib/model/unicode_emoji.freezed.dart
@@ -160,7 +160,7 @@ class _$UnicodeEmojiImpl implements _UnicodeEmoji {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$UnicodeEmojiImpl &&

diff --git a/lib/model/users_list_settings.freezed.dart b/lib/model/users_list_settings.freezed.dart
@@ -119,7 +119,7 @@ class _$UsersListSettingsImpl extends _UsersListSettings {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$UsersListSettingsImpl &&

diff --git a/lib/repository/note_repository.freezed.dart b/lib/repository/note_repository.freezed.dart
@@ -200,7 +200,7 @@ class _$NoteStatusImpl with DiagnosticableTreeMixin implements _NoteStatus {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$NoteStatusImpl &&

diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart
diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.freezed.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.freezed.dart
@@ -567,7 +567,7 @@ class _$NoteCreateImpl implements _NoteCreate {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$NoteCreateImpl &&
@@ -829,7 +829,7 @@ class _$NoteCreateChannelImpl implements _NoteCreateChannel {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$NoteCreateChannelImpl &&

diff --git a/lib/state_notifier/photo_edit_page/image_meta_dialog.freezed.dart b/lib/state_notifier/photo_edit_page/image_meta_dialog.freezed.dart
@@ -129,7 +129,7 @@ class _$ImageMetaImpl implements _ImageMeta {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ImageMetaImpl &&

diff --git a/lib/state_notifier/photo_edit_page/photo_edit_state_notifier.freezed.dart b/lib/state_notifier/photo_edit_page/photo_edit_state_notifier.freezed.dart
@@ -347,7 +347,7 @@ class _$PhotoEditImpl implements _PhotoEdit {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$PhotoEditImpl &&
@@ -557,7 +557,7 @@ class _$ColorFilterPreviewImpl implements _ColorFilterPreview {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ColorFilterPreviewImpl &&
@@ -726,7 +726,7 @@ class _$EditedEmojiDataImpl implements _EditedEmojiData {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$EditedEmojiDataImpl &&

diff --git a/lib/view/notification_page/notification_page.dart b/lib/view/notification_page/notification_page.dart
@@ -57,6 +57,9 @@ class NotificationPageState extends ConsumerState<NotificationPage> {
                     ref
                         .read(notesProvider(widget.account))
                         .registerAll(result.map((e) => e.note).whereNotNull());
+                    ref
+                        .read(accountRepositoryProvider.notifier)
+                        .readAllNotification(widget.account);
                     return result.toNotificationData();
                   },
                   nextFuture: (lastElement, _) async {

diff --git a/pubspec.lock b/pubspec.lock
@@ -884,10 +884,10 @@ packages:
     dependency: "direct main"
     description:
       name: mfm
-      sha256: b60cde9c69144d3c97cf18fa1a8df55c5da3febeed5994e9c54351b01664a5aa
+      sha256: a7ed9a185f607d95701a207ada8d40fc9cb25dc63cd1bbf0fa0da774208140d6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.5+1"
   mfm_parser:
     dependency: "direct main"
     description:
@@ -909,7 +909,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "639e89bb6dfa05b9ac34ebe86f063dcd61b840fe"
+      resolved-ref: "7e4e27950ba8c0db1513e42f773f6577407ed35e"
       url: "https://github.com/shiosyakeyakini-info/misskey_dart.git"
     source: git
     version: "1.0.0"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: miria
 description: Miria is Misskey Client for Mobile App.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.13+90
+version: 1.0.13+91
 
 environment:
   sdk: '>=3.0.0 <4.0.0'