From 486139ddb1324748f23ec33e1e42b3a2410b5758 Mon Sep 17 00:00:00 2001 From: sorairo Date: Fri, 20 Oct 2023 06:52:39 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=82=92=E5=85=A5=E3=82=8C=E3=82=89=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/model/antenna_settings.dart | 2 + lib/model/antenna_settings.freezed.dart | 37 +- lib/router/app_router.gr.dart | 1518 ++++++++--------- lib/view/antenna_page/antenna_page.dart | 2 + .../antenna_page/antenna_settings_dialog.dart | 15 + pubspec.lock | 2 +- 6 files changed, 809 insertions(+), 767 deletions(-) diff --git a/lib/model/antenna_settings.dart b/lib/model/antenna_settings.dart index 588309e11..8cdb3ef5a 100644 --- a/lib/model/antenna_settings.dart +++ b/lib/model/antenna_settings.dart @@ -16,6 +16,7 @@ class AntennaSettings with _$AntennaSettings { @Default(false) bool withReplies, @Default(false) bool withFile, @Default(false) bool notify, + @Default(false) bool localOnly, }) = _AntennaSettings; const AntennaSettings._(); @@ -31,6 +32,7 @@ class AntennaSettings with _$AntennaSettings { withReplies: antenna.withReplies, withFile: antenna.withFile, notify: antenna.notify, + localOnly: antenna.localOnly ?? false, ); } } diff --git a/lib/model/antenna_settings.freezed.dart b/lib/model/antenna_settings.freezed.dart index 3a1bc6857..e42aae9ce 100644 --- a/lib/model/antenna_settings.freezed.dart +++ b/lib/model/antenna_settings.freezed.dart @@ -26,6 +26,7 @@ mixin _$AntennaSettings { bool get withReplies => throw _privateConstructorUsedError; bool get withFile => throw _privateConstructorUsedError; bool get notify => throw _privateConstructorUsedError; + bool get localOnly => throw _privateConstructorUsedError; @JsonKey(ignore: true) $AntennaSettingsCopyWith get copyWith => @@ -48,7 +49,8 @@ abstract class $AntennaSettingsCopyWith<$Res> { bool caseSensitive, bool withReplies, bool withFile, - bool notify}); + bool notify, + bool localOnly}); } /// @nodoc @@ -74,6 +76,7 @@ class _$AntennaSettingsCopyWithImpl<$Res, $Val extends AntennaSettings> Object? withReplies = null, Object? withFile = null, Object? notify = null, + Object? localOnly = null, }) { return _then(_value.copyWith( name: null == name @@ -116,6 +119,10 @@ class _$AntennaSettingsCopyWithImpl<$Res, $Val extends AntennaSettings> ? _value.notify : notify // ignore: cast_nullable_to_non_nullable as bool, + localOnly: null == localOnly + ? _value.localOnly + : localOnly // ignore: cast_nullable_to_non_nullable + as bool, ) as $Val); } } @@ -138,7 +145,8 @@ abstract class _$$_AntennaSettingsCopyWith<$Res> bool caseSensitive, bool withReplies, bool withFile, - bool notify}); + bool notify, + bool localOnly}); } /// @nodoc @@ -162,6 +170,7 @@ class __$$_AntennaSettingsCopyWithImpl<$Res> Object? withReplies = null, Object? withFile = null, Object? notify = null, + Object? localOnly = null, }) { return _then(_$_AntennaSettings( name: null == name @@ -204,6 +213,10 @@ class __$$_AntennaSettingsCopyWithImpl<$Res> ? _value.notify : notify // ignore: cast_nullable_to_non_nullable as bool, + localOnly: null == localOnly + ? _value.localOnly + : localOnly // ignore: cast_nullable_to_non_nullable + as bool, )); } } @@ -221,7 +234,8 @@ class _$_AntennaSettings extends _AntennaSettings { this.caseSensitive = false, this.withReplies = false, this.withFile = false, - this.notify = false}) + this.notify = false, + this.localOnly = false}) : _keywords = keywords, _excludeKeywords = excludeKeywords, _users = users, @@ -274,10 +288,13 @@ class _$_AntennaSettings extends _AntennaSettings { @override @JsonKey() final bool notify; + @override + @JsonKey() + final bool localOnly; @override String toString() { - return 'AntennaSettings(name: $name, src: $src, userListId: $userListId, keywords: $keywords, excludeKeywords: $excludeKeywords, users: $users, caseSensitive: $caseSensitive, withReplies: $withReplies, withFile: $withFile, notify: $notify)'; + return 'AntennaSettings(name: $name, src: $src, userListId: $userListId, keywords: $keywords, excludeKeywords: $excludeKeywords, users: $users, caseSensitive: $caseSensitive, withReplies: $withReplies, withFile: $withFile, notify: $notify, localOnly: $localOnly)'; } @override @@ -299,7 +316,9 @@ class _$_AntennaSettings extends _AntennaSettings { other.withReplies == withReplies) && (identical(other.withFile, withFile) || other.withFile == withFile) && - (identical(other.notify, notify) || other.notify == notify)); + (identical(other.notify, notify) || other.notify == notify) && + (identical(other.localOnly, localOnly) || + other.localOnly == localOnly)); } @override @@ -314,7 +333,8 @@ class _$_AntennaSettings extends _AntennaSettings { caseSensitive, withReplies, withFile, - notify); + notify, + localOnly); @JsonKey(ignore: true) @override @@ -334,7 +354,8 @@ abstract class _AntennaSettings extends AntennaSettings { final bool caseSensitive, final bool withReplies, final bool withFile, - final bool notify}) = _$_AntennaSettings; + final bool notify, + final bool localOnly}) = _$_AntennaSettings; const _AntennaSettings._() : super._(); @override @@ -358,6 +379,8 @@ abstract class _AntennaSettings extends AntennaSettings { @override bool get notify; @override + bool get localOnly; + @override @JsonKey(ignore: true) _$$_AntennaSettingsCopyWith<_$_AntennaSettings> get copyWith => throw _privateConstructorUsedError; diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart index cc41f0e75..51676ec6d 100644 --- a/lib/router/app_router.gr.dart +++ b/lib/router/app_router.gr.dart @@ -15,23 +15,13 @@ abstract class _$AppRouter extends RootStackRouter { @override final Map pagesMap = { - AnnouncementRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( - routeData: routeData, - child: AnnouncementPage( - key: args.key, - account: args.account, - ), - ); - }, - AntennaNotesRoute.name: (routeData) { - final args = routeData.argsAs(); + NotesAfterRenoteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: AntennaNotesPage( + child: NotesAfterRenotePage( key: args.key, - antenna: args.antenna, + note: args.note, account: args.account, ), ); @@ -46,27 +36,33 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - ChannelsRoute.name: (routeData) { - final args = routeData.argsAs(); + AntennaNotesRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ChannelsPage( + child: AntennaNotesPage( key: args.key, + antenna: args.antenna, account: args.account, ), ); }, - ChannelDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + NotificationRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ChannelDetailPage( + child: NotificationPage( key: args.key, account: args.account, - channelId: args.channelId, ), ); }, + LoginRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const LoginPage(), + ); + }, ClipDetailRoute.name: (routeData) { final args = routeData.argsAs(); return AutoRoutePage( @@ -88,241 +84,227 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - ExploreRoute.name: (routeData) { - final args = routeData.argsAs(); + NoteCreateRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ExplorePage( + child: NoteCreatePage( key: args.key, - account: args.account, + initialAccount: args.initialAccount, + initialText: args.initialText, + initialMediaFiles: args.initialMediaFiles, + channel: args.channel, + reply: args.reply, + renote: args.renote, + note: args.note, + noteCreationMode: args.noteCreationMode, ), ); }, - ExploreRoleUsersRoute.name: (routeData) { - final args = routeData.argsAs(); + HashtagRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ExploreRoleUsersPage( + child: HashtagPage( key: args.key, - item: args.item, + hashtag: args.hashtag, account: args.account, ), ); }, - FavoritedNoteRoute.name: (routeData) { - final args = routeData.argsAs(); + UserFolloweeRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: FavoritedNotePage( + child: UserFolloweePage( key: args.key, + userId: args.userId, account: args.account, ), ); }, - FederationRoute.name: (routeData) { - final args = routeData.argsAs(); + UserRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: FederationPage( + child: UserPage( key: args.key, + userId: args.userId, account: args.account, - host: args.host, ), ); }, - HashtagRoute.name: (routeData) { - final args = routeData.argsAs(); + UserFollowerRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: HashtagPage( + child: UserFollowerPage( key: args.key, - hashtag: args.hashtag, + userId: args.userId, account: args.account, ), ); }, - LoginRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const LoginPage(), - ); - }, - MisskeyRouteRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( + PhotoEditRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( routeData: routeData, - child: MisskeyPagePage( - key: args.key, + child: PhotoEditPage( account: args.account, - page: args.page, + file: args.file, + onSubmit: args.onSubmit, + key: args.key, ), ); }, - NotesAfterRenoteRoute.name: (routeData) { - final args = routeData.argsAs(); + AnnouncementRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NotesAfterRenotePage( + child: AnnouncementPage( key: args.key, - note: args.note, account: args.account, ), ); }, - NoteCreateRoute.name: (routeData) { - final args = routeData.argsAs(); + SplashRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: NoteCreatePage( - key: args.key, - initialAccount: args.initialAccount, - initialText: args.initialText, - initialMediaFiles: args.initialMediaFiles, - channel: args.channel, - reply: args.reply, - renote: args.renote, - note: args.note, - noteCreationMode: args.noteCreationMode, - ), + child: const SplashPage(), ); }, - NoteDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + SeveralAccountGeneralSettingsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NoteDetailPage( + child: SeveralAccountGeneralSettingsPage( key: args.key, - note: args.note, account: args.account, ), ); }, - NotificationRoute.name: (routeData) { - final args = routeData.argsAs(); + SeveralAccountSettingsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: NotificationPage( + child: SeveralAccountSettingsPage( key: args.key, account: args.account, ), ); }, - PhotoEditRoute.name: (routeData) { - final args = routeData.argsAs(); - return AutoRoutePage( + InstanceMuteRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( routeData: routeData, - child: PhotoEditPage( - account: args.account, - file: args.file, - onSubmit: args.onSubmit, + child: InstanceMutePage( key: args.key, + account: args.account, ), ); }, - SearchRoute.name: (routeData) { - final args = routeData.argsAs(); + HardMuteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: SearchPage( + child: HardMutePage( key: args.key, - initialSearchText: args.initialSearchText, account: args.account, ), ); }, - AccountListRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const AccountListPage(), - ); - }, - AppInfoRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const AppInfoPage(), - ); - }, - GeneralSettingsRoute.name: (routeData) { - return AutoRoutePage( - routeData: routeData, - child: const GeneralSettingsPage(), - ); - }, - ImportExportRoute.name: (routeData) { + ReactionDeckRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: const ImportExportPage(), + child: ReactionDeckPage( + key: args.key, + account: args.account, + ), ); }, - SettingsRoute.name: (routeData) { + UsersListTimelineRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: const SettingsPage(), + child: UsersListTimelinePage( + args.account, + args.list, + key: args.key, + ), ); }, - TabSettingsListRoute.name: (routeData) { + UsersListRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: const TabSettingsListPage(), + child: UsersListPage( + args.account, + key: args.key, + ), ); }, - TabSettingsRoute.name: (routeData) { - final args = routeData.argsAs( - orElse: () => const TabSettingsRouteArgs()); + UsersListDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: TabSettingsPage( + child: UsersListDetailPage( key: args.key, - tabIndex: args.tabIndex, + account: args.account, + listId: args.listId, ), ); }, - HardMuteRoute.name: (routeData) { - final args = routeData.argsAs(); + ChannelDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: HardMutePage( + child: ChannelDetailPage( key: args.key, account: args.account, + channelId: args.channelId, ), ); }, - InstanceMuteRoute.name: (routeData) { - final args = routeData.argsAs(); + ChannelsRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: InstanceMutePage( + child: ChannelsPage( key: args.key, account: args.account, ), ); }, - ReactionDeckRoute.name: (routeData) { - final args = routeData.argsAs(); + FederationRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: ReactionDeckPage( + child: FederationPage( key: args.key, account: args.account, + host: args.host, ), ); }, - SeveralAccountGeneralSettingsRoute.name: (routeData) { - final args = routeData.argsAs(); + NoteDetailRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: SeveralAccountGeneralSettingsPage( + child: NoteDetailPage( key: args.key, + note: args.note, account: args.account, ), ); }, - SeveralAccountSettingsRoute.name: (routeData) { - final args = routeData.argsAs(); + SearchRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: SeveralAccountSettingsPage( + child: SearchPage( key: args.key, + initialSearchText: args.initialSearchText, account: args.account, ), ); @@ -339,84 +321,102 @@ abstract class _$AppRouter extends RootStackRouter { ), ); }, - SplashRoute.name: (routeData) { + ImportExportRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: const SplashPage(), + child: const ImportExportPage(), ); }, - TimeLineRoute.name: (routeData) { - final args = routeData.argsAs(); + GeneralSettingsRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: TimeLinePage( - key: args.key, - initialTabSetting: args.initialTabSetting, - ), + child: const GeneralSettingsPage(), ); }, - UsersListDetailRoute.name: (routeData) { - final args = routeData.argsAs(); + TabSettingsRoute.name: (routeData) { + final args = routeData.argsAs( + orElse: () => const TabSettingsRouteArgs()); return AutoRoutePage( routeData: routeData, - child: UsersListDetailPage( + child: TabSettingsPage( key: args.key, - account: args.account, - listId: args.listId, + tabIndex: args.tabIndex, ), ); }, - UsersListRoute.name: (routeData) { - final args = routeData.argsAs(); + TabSettingsListRoute.name: (routeData) { return AutoRoutePage( routeData: routeData, - child: UsersListPage( - args.account, + child: const TabSettingsListPage(), + ); + }, + AppInfoRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const AppInfoPage(), + ); + }, + SettingsRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const SettingsPage(), + ); + }, + AccountListRoute.name: (routeData) { + return AutoRoutePage( + routeData: routeData, + child: const AccountListPage(), + ); + }, + ExploreRoleUsersRoute.name: (routeData) { + final args = routeData.argsAs(); + return AutoRoutePage( + routeData: routeData, + child: ExploreRoleUsersPage( key: args.key, + item: args.item, + account: args.account, ), ); }, - UsersListTimelineRoute.name: (routeData) { - final args = routeData.argsAs(); + ExploreRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: UsersListTimelinePage( - args.account, - args.list, + child: ExplorePage( key: args.key, + account: args.account, ), ); }, - UserFolloweeRoute.name: (routeData) { - final args = routeData.argsAs(); + TimeLineRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: UserFolloweePage( + child: TimeLinePage( key: args.key, - userId: args.userId, - account: args.account, + initialTabSetting: args.initialTabSetting, ), ); }, - UserFollowerRoute.name: (routeData) { - final args = routeData.argsAs(); + FavoritedNoteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: UserFollowerPage( + child: FavoritedNotePage( key: args.key, - userId: args.userId, account: args.account, ), ); }, - UserRoute.name: (routeData) { - final args = routeData.argsAs(); + MisskeyRouteRoute.name: (routeData) { + final args = routeData.argsAs(); return AutoRoutePage( routeData: routeData, - child: UserPage( + child: MisskeyPagePage( key: args.key, - userId: args.userId, account: args.account, + page: args.page, ), ); }, @@ -424,83 +424,45 @@ abstract class _$AppRouter extends RootStackRouter { } /// generated route for -/// [AnnouncementPage] -class AnnouncementRoute extends PageRouteInfo { - AnnouncementRoute({ - Key? key, - required Account account, - List? children, - }) : super( - AnnouncementRoute.name, - args: AnnouncementRouteArgs( - key: key, - account: account, - ), - initialChildren: children, - ); - - static const String name = 'AnnouncementRoute'; - - static const PageInfo page = - PageInfo(name); -} - -class AnnouncementRouteArgs { - const AnnouncementRouteArgs({ - this.key, - required this.account, - }); - - final Key? key; - - final Account account; - - @override - String toString() { - return 'AnnouncementRouteArgs{key: $key, account: $account}'; - } -} - -/// generated route for -/// [AntennaNotesPage] -class AntennaNotesRoute extends PageRouteInfo { - AntennaNotesRoute({ +/// [NotesAfterRenotePage] +class NotesAfterRenoteRoute extends PageRouteInfo { + NotesAfterRenoteRoute({ Key? key, - required Antenna antenna, + required Note note, required Account account, List? children, }) : super( - AntennaNotesRoute.name, - args: AntennaNotesRouteArgs( + NotesAfterRenoteRoute.name, + args: NotesAfterRenoteRouteArgs( key: key, - antenna: antenna, + note: note, account: account, ), initialChildren: children, ); - static const String name = 'AntennaNotesRoute'; + static const String name = 'NotesAfterRenoteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class AntennaNotesRouteArgs { - const AntennaNotesRouteArgs({ +class NotesAfterRenoteRouteArgs { + const NotesAfterRenoteRouteArgs({ this.key, - required this.antenna, + required this.note, required this.account, }); final Key? key; - final Antenna antenna; + final Note note; final Account account; @override String toString() { - return 'AntennaNotesRouteArgs{key: $key, antenna: $antenna, account: $account}'; + return 'NotesAfterRenoteRouteArgs{key: $key, note: $note, account: $account}'; } } @@ -543,86 +505,100 @@ class AntennaRouteArgs { } /// generated route for -/// [ChannelsPage] -class ChannelsRoute extends PageRouteInfo { - ChannelsRoute({ +/// [AntennaNotesPage] +class AntennaNotesRoute extends PageRouteInfo { + AntennaNotesRoute({ Key? key, + required Antenna antenna, required Account account, List? children, }) : super( - ChannelsRoute.name, - args: ChannelsRouteArgs( + AntennaNotesRoute.name, + args: AntennaNotesRouteArgs( key: key, + antenna: antenna, account: account, ), initialChildren: children, ); - static const String name = 'ChannelsRoute'; + static const String name = 'AntennaNotesRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ChannelsRouteArgs { - const ChannelsRouteArgs({ +class AntennaNotesRouteArgs { + const AntennaNotesRouteArgs({ this.key, + required this.antenna, required this.account, }); final Key? key; + final Antenna antenna; + final Account account; @override String toString() { - return 'ChannelsRouteArgs{key: $key, account: $account}'; + return 'AntennaNotesRouteArgs{key: $key, antenna: $antenna, account: $account}'; } } /// generated route for -/// [ChannelDetailPage] -class ChannelDetailRoute extends PageRouteInfo { - ChannelDetailRoute({ +/// [NotificationPage] +class NotificationRoute extends PageRouteInfo { + NotificationRoute({ Key? key, required Account account, - required String channelId, List? children, }) : super( - ChannelDetailRoute.name, - args: ChannelDetailRouteArgs( + NotificationRoute.name, + args: NotificationRouteArgs( key: key, account: account, - channelId: channelId, ), initialChildren: children, ); - static const String name = 'ChannelDetailRoute'; + static const String name = 'NotificationRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ChannelDetailRouteArgs { - const ChannelDetailRouteArgs({ +class NotificationRouteArgs { + const NotificationRouteArgs({ this.key, required this.account, - required this.channelId, }); final Key? key; final Account account; - final String channelId; - @override String toString() { - return 'ChannelDetailRouteArgs{key: $key, account: $account, channelId: $channelId}'; + return 'NotificationRouteArgs{key: $key, account: $account}'; } } +/// generated route for +/// [LoginPage] +class LoginRoute extends PageRouteInfo { + const LoginRoute({List? children}) + : super( + LoginRoute.name, + initialChildren: children, + ); + + static const String name = 'LoginRoute'; + + static const PageInfo page = PageInfo(name); +} + /// generated route for /// [ClipDetailPage] class ClipDetailRoute extends PageRouteInfo { @@ -705,450 +681,451 @@ class ClipListRouteArgs { } /// generated route for -/// [ExplorePage] -class ExploreRoute extends PageRouteInfo { - ExploreRoute({ +/// [NoteCreatePage] +class NoteCreateRoute extends PageRouteInfo { + NoteCreateRoute({ Key? key, - required Account account, + required Account initialAccount, + String? initialText, + List? initialMediaFiles, + CommunityChannel? channel, + Note? reply, + Note? renote, + Note? note, + NoteCreationMode? noteCreationMode, List? children, }) : super( - ExploreRoute.name, - args: ExploreRouteArgs( + NoteCreateRoute.name, + args: NoteCreateRouteArgs( key: key, - account: account, + initialAccount: initialAccount, + initialText: initialText, + initialMediaFiles: initialMediaFiles, + channel: channel, + reply: reply, + renote: renote, + note: note, + noteCreationMode: noteCreationMode, ), initialChildren: children, ); - static const String name = 'ExploreRoute'; + static const String name = 'NoteCreateRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ExploreRouteArgs { - const ExploreRouteArgs({ +class NoteCreateRouteArgs { + const NoteCreateRouteArgs({ this.key, - required this.account, - }); - - final Key? key; - - final Account account; + required this.initialAccount, + this.initialText, + this.initialMediaFiles, + this.channel, + this.reply, + this.renote, + this.note, + this.noteCreationMode, + }); + + final Key? key; + + final Account initialAccount; + + final String? initialText; + + final List? initialMediaFiles; + + final CommunityChannel? channel; + + final Note? reply; + + final Note? renote; + + final Note? note; + + final NoteCreationMode? noteCreationMode; @override String toString() { - return 'ExploreRouteArgs{key: $key, account: $account}'; + return 'NoteCreateRouteArgs{key: $key, initialAccount: $initialAccount, initialText: $initialText, initialMediaFiles: $initialMediaFiles, channel: $channel, reply: $reply, renote: $renote, note: $note, noteCreationMode: $noteCreationMode}'; } } /// generated route for -/// [ExploreRoleUsersPage] -class ExploreRoleUsersRoute extends PageRouteInfo { - ExploreRoleUsersRoute({ +/// [HashtagPage] +class HashtagRoute extends PageRouteInfo { + HashtagRoute({ Key? key, - required RolesListResponse item, + required String hashtag, required Account account, List? children, }) : super( - ExploreRoleUsersRoute.name, - args: ExploreRoleUsersRouteArgs( + HashtagRoute.name, + args: HashtagRouteArgs( key: key, - item: item, + hashtag: hashtag, account: account, ), initialChildren: children, ); - static const String name = 'ExploreRoleUsersRoute'; + static const String name = 'HashtagRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ExploreRoleUsersRouteArgs { - const ExploreRoleUsersRouteArgs({ +class HashtagRouteArgs { + const HashtagRouteArgs({ this.key, - required this.item, + required this.hashtag, required this.account, }); final Key? key; - final RolesListResponse item; + final String hashtag; final Account account; @override String toString() { - return 'ExploreRoleUsersRouteArgs{key: $key, item: $item, account: $account}'; + return 'HashtagRouteArgs{key: $key, hashtag: $hashtag, account: $account}'; } } /// generated route for -/// [FavoritedNotePage] -class FavoritedNoteRoute extends PageRouteInfo { - FavoritedNoteRoute({ +/// [UserFolloweePage] +class UserFolloweeRoute extends PageRouteInfo { + UserFolloweeRoute({ Key? key, + required String userId, required Account account, List? children, }) : super( - FavoritedNoteRoute.name, - args: FavoritedNoteRouteArgs( + UserFolloweeRoute.name, + args: UserFolloweeRouteArgs( key: key, + userId: userId, account: account, ), initialChildren: children, ); - static const String name = 'FavoritedNoteRoute'; + static const String name = 'UserFolloweeRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class FavoritedNoteRouteArgs { - const FavoritedNoteRouteArgs({ +class UserFolloweeRouteArgs { + const UserFolloweeRouteArgs({ this.key, + required this.userId, required this.account, }); final Key? key; + final String userId; + final Account account; @override String toString() { - return 'FavoritedNoteRouteArgs{key: $key, account: $account}'; + return 'UserFolloweeRouteArgs{key: $key, userId: $userId, account: $account}'; } } /// generated route for -/// [FederationPage] -class FederationRoute extends PageRouteInfo { - FederationRoute({ +/// [UserPage] +class UserRoute extends PageRouteInfo { + UserRoute({ Key? key, + required String userId, required Account account, - required String host, List? children, }) : super( - FederationRoute.name, - args: FederationRouteArgs( + UserRoute.name, + args: UserRouteArgs( key: key, + userId: userId, account: account, - host: host, ), initialChildren: children, ); - static const String name = 'FederationRoute'; + static const String name = 'UserRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = PageInfo(name); } -class FederationRouteArgs { - const FederationRouteArgs({ +class UserRouteArgs { + const UserRouteArgs({ this.key, + required this.userId, required this.account, - required this.host, }); final Key? key; - final Account account; + final String userId; - final String host; + final Account account; @override String toString() { - return 'FederationRouteArgs{key: $key, account: $account, host: $host}'; + return 'UserRouteArgs{key: $key, userId: $userId, account: $account}'; } } /// generated route for -/// [HashtagPage] -class HashtagRoute extends PageRouteInfo { - HashtagRoute({ +/// [UserFollowerPage] +class UserFollowerRoute extends PageRouteInfo { + UserFollowerRoute({ Key? key, - required String hashtag, + required String userId, required Account account, List? children, }) : super( - HashtagRoute.name, - args: HashtagRouteArgs( + UserFollowerRoute.name, + args: UserFollowerRouteArgs( key: key, - hashtag: hashtag, + userId: userId, account: account, ), initialChildren: children, ); - static const String name = 'HashtagRoute'; + static const String name = 'UserFollowerRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class HashtagRouteArgs { - const HashtagRouteArgs({ +class UserFollowerRouteArgs { + const UserFollowerRouteArgs({ this.key, - required this.hashtag, + required this.userId, required this.account, }); final Key? key; - final String hashtag; + final String userId; final Account account; @override String toString() { - return 'HashtagRouteArgs{key: $key, hashtag: $hashtag, account: $account}'; + return 'UserFollowerRouteArgs{key: $key, userId: $userId, account: $account}'; } } /// generated route for -/// [LoginPage] -class LoginRoute extends PageRouteInfo { - const LoginRoute({List? children}) - : super( - LoginRoute.name, - initialChildren: children, - ); - - static const String name = 'LoginRoute'; - - static const PageInfo page = PageInfo(name); -} - -/// generated route for -/// [MisskeyPagePage] -class MisskeyRouteRoute extends PageRouteInfo { - MisskeyRouteRoute({ - Key? key, +/// [PhotoEditPage] +class PhotoEditRoute extends PageRouteInfo { + PhotoEditRoute({ required Account account, - required Page page, + required MisskeyPostFile file, + required void Function(Uint8List) onSubmit, + Key? key, List? children, }) : super( - MisskeyRouteRoute.name, - args: MisskeyRouteRouteArgs( - key: key, + PhotoEditRoute.name, + args: PhotoEditRouteArgs( account: account, - page: page, + file: file, + onSubmit: onSubmit, + key: key, ), initialChildren: children, ); - static const String name = 'MisskeyRouteRoute'; + static const String name = 'PhotoEditRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class MisskeyRouteRouteArgs { - const MisskeyRouteRouteArgs({ - this.key, +class PhotoEditRouteArgs { + const PhotoEditRouteArgs({ required this.account, - required this.page, + required this.file, + required this.onSubmit, + this.key, }); - final Key? key; - final Account account; - final Page page; + final MisskeyPostFile file; + + final void Function(Uint8List) onSubmit; + + final Key? key; @override String toString() { - return 'MisskeyRouteRouteArgs{key: $key, account: $account, page: $page}'; + return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}'; } } /// generated route for -/// [NotesAfterRenotePage] -class NotesAfterRenoteRoute extends PageRouteInfo { - NotesAfterRenoteRoute({ +/// [AnnouncementPage] +class AnnouncementRoute extends PageRouteInfo { + AnnouncementRoute({ Key? key, - required Note note, required Account account, List? children, }) : super( - NotesAfterRenoteRoute.name, - args: NotesAfterRenoteRouteArgs( + AnnouncementRoute.name, + args: AnnouncementRouteArgs( key: key, - note: note, account: account, ), initialChildren: children, ); - static const String name = 'NotesAfterRenoteRoute'; + static const String name = 'AnnouncementRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class NotesAfterRenoteRouteArgs { - const NotesAfterRenoteRouteArgs({ +class AnnouncementRouteArgs { + const AnnouncementRouteArgs({ this.key, - required this.note, required this.account, }); final Key? key; - final Note note; - final Account account; @override String toString() { - return 'NotesAfterRenoteRouteArgs{key: $key, note: $note, account: $account}'; + return 'AnnouncementRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [NoteCreatePage] -class NoteCreateRoute extends PageRouteInfo { - NoteCreateRoute({ +/// [SplashPage] +class SplashRoute extends PageRouteInfo { + const SplashRoute({List? children}) + : super( + SplashRoute.name, + initialChildren: children, + ); + + static const String name = 'SplashRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [SeveralAccountGeneralSettingsPage] +class SeveralAccountGeneralSettingsRoute + extends PageRouteInfo { + SeveralAccountGeneralSettingsRoute({ Key? key, - required Account initialAccount, - String? initialText, - List? initialMediaFiles, - CommunityChannel? channel, - Note? reply, - Note? renote, - Note? note, - NoteCreationMode? noteCreationMode, + required Account account, List? children, }) : super( - NoteCreateRoute.name, - args: NoteCreateRouteArgs( + SeveralAccountGeneralSettingsRoute.name, + args: SeveralAccountGeneralSettingsRouteArgs( key: key, - initialAccount: initialAccount, - initialText: initialText, - initialMediaFiles: initialMediaFiles, - channel: channel, - reply: reply, - renote: renote, - note: note, - noteCreationMode: noteCreationMode, + account: account, ), initialChildren: children, ); - static const String name = 'NoteCreateRoute'; + static const String name = 'SeveralAccountGeneralSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class NoteCreateRouteArgs { - const NoteCreateRouteArgs({ +class SeveralAccountGeneralSettingsRouteArgs { + const SeveralAccountGeneralSettingsRouteArgs({ this.key, - required this.initialAccount, - this.initialText, - this.initialMediaFiles, - this.channel, - this.reply, - this.renote, - this.note, - this.noteCreationMode, + required this.account, }); final Key? key; - final Account initialAccount; - - final String? initialText; - - final List? initialMediaFiles; - - final CommunityChannel? channel; - - final Note? reply; - - final Note? renote; - - final Note? note; - - final NoteCreationMode? noteCreationMode; + final Account account; @override String toString() { - return 'NoteCreateRouteArgs{key: $key, initialAccount: $initialAccount, initialText: $initialText, initialMediaFiles: $initialMediaFiles, channel: $channel, reply: $reply, renote: $renote, note: $note, noteCreationMode: $noteCreationMode}'; + return 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [NoteDetailPage] -class NoteDetailRoute extends PageRouteInfo { - NoteDetailRoute({ +/// [SeveralAccountSettingsPage] +class SeveralAccountSettingsRoute + extends PageRouteInfo { + SeveralAccountSettingsRoute({ Key? key, - required Note note, required Account account, List? children, }) : super( - NoteDetailRoute.name, - args: NoteDetailRouteArgs( + SeveralAccountSettingsRoute.name, + args: SeveralAccountSettingsRouteArgs( key: key, - note: note, account: account, ), initialChildren: children, ); - static const String name = 'NoteDetailRoute'; + static const String name = 'SeveralAccountSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class NoteDetailRouteArgs { - const NoteDetailRouteArgs({ +class SeveralAccountSettingsRouteArgs { + const SeveralAccountSettingsRouteArgs({ this.key, - required this.note, required this.account, }); final Key? key; - final Note note; - final Account account; @override String toString() { - return 'NoteDetailRouteArgs{key: $key, note: $note, account: $account}'; + return 'SeveralAccountSettingsRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [NotificationPage] -class NotificationRoute extends PageRouteInfo { - NotificationRoute({ +/// [InstanceMutePage] +class InstanceMuteRoute extends PageRouteInfo { + InstanceMuteRoute({ Key? key, required Account account, List? children, }) : super( - NotificationRoute.name, - args: NotificationRouteArgs( + InstanceMuteRoute.name, + args: InstanceMuteRouteArgs( key: key, account: account, ), initialChildren: children, ); - static const String name = 'NotificationRoute'; + static const String name = 'InstanceMuteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class NotificationRouteArgs { - const NotificationRouteArgs({ +class InstanceMuteRouteArgs { + const InstanceMuteRouteArgs({ this.key, required this.account, }); @@ -1159,284 +1136,277 @@ class NotificationRouteArgs { @override String toString() { - return 'NotificationRouteArgs{key: $key, account: $account}'; + return 'InstanceMuteRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [PhotoEditPage] -class PhotoEditRoute extends PageRouteInfo { - PhotoEditRoute({ - required Account account, - required MisskeyPostFile file, - required void Function(Uint8List) onSubmit, +/// [HardMutePage] +class HardMuteRoute extends PageRouteInfo { + HardMuteRoute({ Key? key, + required Account account, List? children, }) : super( - PhotoEditRoute.name, - args: PhotoEditRouteArgs( - account: account, - file: file, - onSubmit: onSubmit, + HardMuteRoute.name, + args: HardMuteRouteArgs( key: key, + account: account, ), initialChildren: children, ); - static const String name = 'PhotoEditRoute'; + static const String name = 'HardMuteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class PhotoEditRouteArgs { - const PhotoEditRouteArgs({ - required this.account, - required this.file, - required this.onSubmit, +class HardMuteRouteArgs { + const HardMuteRouteArgs({ this.key, + required this.account, }); - final Account account; - - final MisskeyPostFile file; - - final void Function(Uint8List) onSubmit; - final Key? key; + final Account account; + @override String toString() { - return 'PhotoEditRouteArgs{account: $account, file: $file, onSubmit: $onSubmit, key: $key}'; + return 'HardMuteRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [SearchPage] -class SearchRoute extends PageRouteInfo { - SearchRoute({ +/// [ReactionDeckPage] +class ReactionDeckRoute extends PageRouteInfo { + ReactionDeckRoute({ Key? key, - String? initialSearchText, required Account account, List? children, }) : super( - SearchRoute.name, - args: SearchRouteArgs( + ReactionDeckRoute.name, + args: ReactionDeckRouteArgs( key: key, - initialSearchText: initialSearchText, account: account, ), initialChildren: children, ); - static const String name = 'SearchRoute'; + static const String name = 'ReactionDeckRoute'; - static const PageInfo page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class SearchRouteArgs { - const SearchRouteArgs({ +class ReactionDeckRouteArgs { + const ReactionDeckRouteArgs({ this.key, - this.initialSearchText, required this.account, }); final Key? key; - final String? initialSearchText; - final Account account; @override String toString() { - return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}'; + return 'ReactionDeckRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [AccountListPage] -class AccountListRoute extends PageRouteInfo { - const AccountListRoute({List? children}) - : super( - AccountListRoute.name, +/// [UsersListTimelinePage] +class UsersListTimelineRoute extends PageRouteInfo { + UsersListTimelineRoute({ + required Account account, + required UsersList list, + Key? key, + List? children, + }) : super( + UsersListTimelineRoute.name, + args: UsersListTimelineRouteArgs( + account: account, + list: list, + key: key, + ), initialChildren: children, ); - static const String name = 'AccountListRoute'; + static const String name = 'UsersListTimelineRoute'; - static const PageInfo page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -/// generated route for -/// [AppInfoPage] -class AppInfoRoute extends PageRouteInfo { - const AppInfoRoute({List? children}) - : super( - AppInfoRoute.name, - initialChildren: children, - ); - - static const String name = 'AppInfoRoute'; +class UsersListTimelineRouteArgs { + const UsersListTimelineRouteArgs({ + required this.account, + required this.list, + this.key, + }); - static const PageInfo page = PageInfo(name); -} + final Account account; -/// generated route for -/// [GeneralSettingsPage] -class GeneralSettingsRoute extends PageRouteInfo { - const GeneralSettingsRoute({List? children}) - : super( - GeneralSettingsRoute.name, - initialChildren: children, - ); + final UsersList list; - static const String name = 'GeneralSettingsRoute'; + final Key? key; - static const PageInfo page = PageInfo(name); + @override + String toString() { + return 'UsersListTimelineRouteArgs{account: $account, list: $list, key: $key}'; + } } /// generated route for -/// [ImportExportPage] -class ImportExportRoute extends PageRouteInfo { - const ImportExportRoute({List? children}) - : super( - ImportExportRoute.name, +/// [UsersListPage] +class UsersListRoute extends PageRouteInfo { + UsersListRoute({ + required Account account, + Key? key, + List? children, + }) : super( + UsersListRoute.name, + args: UsersListRouteArgs( + account: account, + key: key, + ), initialChildren: children, ); - static const String name = 'ImportExportRoute'; + static const String name = 'UsersListRoute'; - static const PageInfo page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -/// generated route for -/// [SettingsPage] -class SettingsRoute extends PageRouteInfo { - const SettingsRoute({List? children}) - : super( - SettingsRoute.name, - initialChildren: children, - ); - - static const String name = 'SettingsRoute'; - - static const PageInfo page = PageInfo(name); -} +class UsersListRouteArgs { + const UsersListRouteArgs({ + required this.account, + this.key, + }); -/// generated route for -/// [TabSettingsListPage] -class TabSettingsListRoute extends PageRouteInfo { - const TabSettingsListRoute({List? children}) - : super( - TabSettingsListRoute.name, - initialChildren: children, - ); + final Account account; - static const String name = 'TabSettingsListRoute'; + final Key? key; - static const PageInfo page = PageInfo(name); + @override + String toString() { + return 'UsersListRouteArgs{account: $account, key: $key}'; + } } /// generated route for -/// [TabSettingsPage] -class TabSettingsRoute extends PageRouteInfo { - TabSettingsRoute({ +/// [UsersListDetailPage] +class UsersListDetailRoute extends PageRouteInfo { + UsersListDetailRoute({ Key? key, - int? tabIndex, + required Account account, + required String listId, List? children, }) : super( - TabSettingsRoute.name, - args: TabSettingsRouteArgs( + UsersListDetailRoute.name, + args: UsersListDetailRouteArgs( key: key, - tabIndex: tabIndex, + account: account, + listId: listId, ), initialChildren: children, ); - static const String name = 'TabSettingsRoute'; + static const String name = 'UsersListDetailRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class TabSettingsRouteArgs { - const TabSettingsRouteArgs({ +class UsersListDetailRouteArgs { + const UsersListDetailRouteArgs({ this.key, - this.tabIndex, + required this.account, + required this.listId, }); final Key? key; - final int? tabIndex; + final Account account; + + final String listId; @override String toString() { - return 'TabSettingsRouteArgs{key: $key, tabIndex: $tabIndex}'; + return 'UsersListDetailRouteArgs{key: $key, account: $account, listId: $listId}'; } } /// generated route for -/// [HardMutePage] -class HardMuteRoute extends PageRouteInfo { - HardMuteRoute({ +/// [ChannelDetailPage] +class ChannelDetailRoute extends PageRouteInfo { + ChannelDetailRoute({ Key? key, required Account account, + required String channelId, List? children, }) : super( - HardMuteRoute.name, - args: HardMuteRouteArgs( + ChannelDetailRoute.name, + args: ChannelDetailRouteArgs( key: key, account: account, + channelId: channelId, ), initialChildren: children, ); - static const String name = 'HardMuteRoute'; + static const String name = 'ChannelDetailRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class HardMuteRouteArgs { - const HardMuteRouteArgs({ +class ChannelDetailRouteArgs { + const ChannelDetailRouteArgs({ this.key, required this.account, + required this.channelId, }); final Key? key; final Account account; + final String channelId; + @override String toString() { - return 'HardMuteRouteArgs{key: $key, account: $account}'; + return 'ChannelDetailRouteArgs{key: $key, account: $account, channelId: $channelId}'; } } /// generated route for -/// [InstanceMutePage] -class InstanceMuteRoute extends PageRouteInfo { - InstanceMuteRoute({ +/// [ChannelsPage] +class ChannelsRoute extends PageRouteInfo { + ChannelsRoute({ Key? key, required Account account, List? children, }) : super( - InstanceMuteRoute.name, - args: InstanceMuteRouteArgs( + ChannelsRoute.name, + args: ChannelsRouteArgs( key: key, account: account, ), initialChildren: children, ); - static const String name = 'InstanceMuteRoute'; + static const String name = 'ChannelsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class InstanceMuteRouteArgs { - const InstanceMuteRouteArgs({ +class ChannelsRouteArgs { + const ChannelsRouteArgs({ this.key, required this.account, }); @@ -1447,123 +1417,135 @@ class InstanceMuteRouteArgs { @override String toString() { - return 'InstanceMuteRouteArgs{key: $key, account: $account}'; + return 'ChannelsRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [ReactionDeckPage] -class ReactionDeckRoute extends PageRouteInfo { - ReactionDeckRoute({ +/// [FederationPage] +class FederationRoute extends PageRouteInfo { + FederationRoute({ Key? key, required Account account, + required String host, List? children, }) : super( - ReactionDeckRoute.name, - args: ReactionDeckRouteArgs( + FederationRoute.name, + args: FederationRouteArgs( key: key, account: account, + host: host, ), initialChildren: children, ); - static const String name = 'ReactionDeckRoute'; + static const String name = 'FederationRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class ReactionDeckRouteArgs { - const ReactionDeckRouteArgs({ +class FederationRouteArgs { + const FederationRouteArgs({ this.key, required this.account, + required this.host, }); final Key? key; final Account account; + final String host; + @override String toString() { - return 'ReactionDeckRouteArgs{key: $key, account: $account}'; + return 'FederationRouteArgs{key: $key, account: $account, host: $host}'; } } /// generated route for -/// [SeveralAccountGeneralSettingsPage] -class SeveralAccountGeneralSettingsRoute - extends PageRouteInfo { - SeveralAccountGeneralSettingsRoute({ +/// [NoteDetailPage] +class NoteDetailRoute extends PageRouteInfo { + NoteDetailRoute({ Key? key, + required Note note, required Account account, List? children, }) : super( - SeveralAccountGeneralSettingsRoute.name, - args: SeveralAccountGeneralSettingsRouteArgs( + NoteDetailRoute.name, + args: NoteDetailRouteArgs( key: key, + note: note, account: account, ), initialChildren: children, ); - static const String name = 'SeveralAccountGeneralSettingsRoute'; + static const String name = 'NoteDetailRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class SeveralAccountGeneralSettingsRouteArgs { - const SeveralAccountGeneralSettingsRouteArgs({ +class NoteDetailRouteArgs { + const NoteDetailRouteArgs({ this.key, + required this.note, required this.account, }); final Key? key; + final Note note; + final Account account; @override String toString() { - return 'SeveralAccountGeneralSettingsRouteArgs{key: $key, account: $account}'; + return 'NoteDetailRouteArgs{key: $key, note: $note, account: $account}'; } } /// generated route for -/// [SeveralAccountSettingsPage] -class SeveralAccountSettingsRoute - extends PageRouteInfo { - SeveralAccountSettingsRoute({ +/// [SearchPage] +class SearchRoute extends PageRouteInfo { + SearchRoute({ Key? key, + String? initialSearchText, required Account account, List? children, }) : super( - SeveralAccountSettingsRoute.name, - args: SeveralAccountSettingsRouteArgs( + SearchRoute.name, + args: SearchRouteArgs( key: key, + initialSearchText: initialSearchText, account: account, ), initialChildren: children, ); - static const String name = 'SeveralAccountSettingsRoute'; + static const String name = 'SearchRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = PageInfo(name); } -class SeveralAccountSettingsRouteArgs { - const SeveralAccountSettingsRouteArgs({ +class SearchRouteArgs { + const SearchRouteArgs({ this.key, + this.initialSearchText, required this.account, }); final Key? key; + final String? initialSearchText; + final Account account; @override String toString() { - return 'SeveralAccountSettingsRouteArgs{key: $key, account: $account}'; + return 'SearchRouteArgs{key: $key, initialSearchText: $initialSearchText, account: $account}'; } } @@ -1612,305 +1594,323 @@ class SharingAccountSelectRouteArgs { } /// generated route for -/// [SplashPage] -class SplashRoute extends PageRouteInfo { - const SplashRoute({List? children}) +/// [ImportExportPage] +class ImportExportRoute extends PageRouteInfo { + const ImportExportRoute({List? children}) : super( - SplashRoute.name, + ImportExportRoute.name, initialChildren: children, ); - static const String name = 'SplashRoute'; + static const String name = 'ImportExportRoute'; static const PageInfo page = PageInfo(name); } /// generated route for -/// [TimeLinePage] -class TimeLineRoute extends PageRouteInfo { - TimeLineRoute({ +/// [GeneralSettingsPage] +class GeneralSettingsRoute extends PageRouteInfo { + const GeneralSettingsRoute({List? children}) + : super( + GeneralSettingsRoute.name, + initialChildren: children, + ); + + static const String name = 'GeneralSettingsRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [TabSettingsPage] +class TabSettingsRoute extends PageRouteInfo { + TabSettingsRoute({ Key? key, - required TabSetting initialTabSetting, + int? tabIndex, List? children, }) : super( - TimeLineRoute.name, - args: TimeLineRouteArgs( + TabSettingsRoute.name, + args: TabSettingsRouteArgs( key: key, - initialTabSetting: initialTabSetting, + tabIndex: tabIndex, ), initialChildren: children, ); - static const String name = 'TimeLineRoute'; + static const String name = 'TabSettingsRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class TimeLineRouteArgs { - const TimeLineRouteArgs({ +class TabSettingsRouteArgs { + const TabSettingsRouteArgs({ this.key, - required this.initialTabSetting, + this.tabIndex, }); final Key? key; - final TabSetting initialTabSetting; + final int? tabIndex; @override String toString() { - return 'TimeLineRouteArgs{key: $key, initialTabSetting: $initialTabSetting}'; + return 'TabSettingsRouteArgs{key: $key, tabIndex: $tabIndex}'; } } /// generated route for -/// [UsersListDetailPage] -class UsersListDetailRoute extends PageRouteInfo { - UsersListDetailRoute({ - Key? key, - required Account account, - required String listId, - List? children, - }) : super( - UsersListDetailRoute.name, - args: UsersListDetailRouteArgs( - key: key, - account: account, - listId: listId, - ), +/// [TabSettingsListPage] +class TabSettingsListRoute extends PageRouteInfo { + const TabSettingsListRoute({List? children}) + : super( + TabSettingsListRoute.name, initialChildren: children, ); - static const String name = 'UsersListDetailRoute'; + static const String name = 'TabSettingsListRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = PageInfo(name); } -class UsersListDetailRouteArgs { - const UsersListDetailRouteArgs({ - this.key, - required this.account, - required this.listId, - }); +/// generated route for +/// [AppInfoPage] +class AppInfoRoute extends PageRouteInfo { + const AppInfoRoute({List? children}) + : super( + AppInfoRoute.name, + initialChildren: children, + ); - final Key? key; + static const String name = 'AppInfoRoute'; - final Account account; + static const PageInfo page = PageInfo(name); +} - final String listId; +/// generated route for +/// [SettingsPage] +class SettingsRoute extends PageRouteInfo { + const SettingsRoute({List? children}) + : super( + SettingsRoute.name, + initialChildren: children, + ); - @override - String toString() { - return 'UsersListDetailRouteArgs{key: $key, account: $account, listId: $listId}'; - } + static const String name = 'SettingsRoute'; + + static const PageInfo page = PageInfo(name); } /// generated route for -/// [UsersListPage] -class UsersListRoute extends PageRouteInfo { - UsersListRoute({ - required Account account, +/// [AccountListPage] +class AccountListRoute extends PageRouteInfo { + const AccountListRoute({List? children}) + : super( + AccountListRoute.name, + initialChildren: children, + ); + + static const String name = 'AccountListRoute'; + + static const PageInfo page = PageInfo(name); +} + +/// generated route for +/// [ExploreRoleUsersPage] +class ExploreRoleUsersRoute extends PageRouteInfo { + ExploreRoleUsersRoute({ Key? key, + required RolesListResponse item, + required Account account, List? children, }) : super( - UsersListRoute.name, - args: UsersListRouteArgs( - account: account, + ExploreRoleUsersRoute.name, + args: ExploreRoleUsersRouteArgs( key: key, + item: item, + account: account, ), initialChildren: children, ); - static const String name = 'UsersListRoute'; + static const String name = 'ExploreRoleUsersRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UsersListRouteArgs { - const UsersListRouteArgs({ - required this.account, +class ExploreRoleUsersRouteArgs { + const ExploreRoleUsersRouteArgs({ this.key, + required this.item, + required this.account, }); - final Account account; - final Key? key; + final RolesListResponse item; + + final Account account; + @override String toString() { - return 'UsersListRouteArgs{account: $account, key: $key}'; + return 'ExploreRoleUsersRouteArgs{key: $key, item: $item, account: $account}'; } } /// generated route for -/// [UsersListTimelinePage] -class UsersListTimelineRoute extends PageRouteInfo { - UsersListTimelineRoute({ - required Account account, - required UsersList list, +/// [ExplorePage] +class ExploreRoute extends PageRouteInfo { + ExploreRoute({ Key? key, + required Account account, List? children, }) : super( - UsersListTimelineRoute.name, - args: UsersListTimelineRouteArgs( - account: account, - list: list, + ExploreRoute.name, + args: ExploreRouteArgs( key: key, + account: account, ), initialChildren: children, ); - static const String name = 'UsersListTimelineRoute'; + static const String name = 'ExploreRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UsersListTimelineRouteArgs { - const UsersListTimelineRouteArgs({ - required this.account, - required this.list, +class ExploreRouteArgs { + const ExploreRouteArgs({ this.key, + required this.account, }); - final Account account; - - final UsersList list; - final Key? key; + final Account account; + @override String toString() { - return 'UsersListTimelineRouteArgs{account: $account, list: $list, key: $key}'; + return 'ExploreRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [UserFolloweePage] -class UserFolloweeRoute extends PageRouteInfo { - UserFolloweeRoute({ +/// [TimeLinePage] +class TimeLineRoute extends PageRouteInfo { + TimeLineRoute({ Key? key, - required String userId, - required Account account, + required TabSetting initialTabSetting, List? children, }) : super( - UserFolloweeRoute.name, - args: UserFolloweeRouteArgs( + TimeLineRoute.name, + args: TimeLineRouteArgs( key: key, - userId: userId, - account: account, + initialTabSetting: initialTabSetting, ), initialChildren: children, ); - static const String name = 'UserFolloweeRoute'; + static const String name = 'TimeLineRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UserFolloweeRouteArgs { - const UserFolloweeRouteArgs({ +class TimeLineRouteArgs { + const TimeLineRouteArgs({ this.key, - required this.userId, - required this.account, + required this.initialTabSetting, }); final Key? key; - final String userId; - - final Account account; + final TabSetting initialTabSetting; @override String toString() { - return 'UserFolloweeRouteArgs{key: $key, userId: $userId, account: $account}'; + return 'TimeLineRouteArgs{key: $key, initialTabSetting: $initialTabSetting}'; } } /// generated route for -/// [UserFollowerPage] -class UserFollowerRoute extends PageRouteInfo { - UserFollowerRoute({ +/// [FavoritedNotePage] +class FavoritedNoteRoute extends PageRouteInfo { + FavoritedNoteRoute({ Key? key, - required String userId, required Account account, List? children, }) : super( - UserFollowerRoute.name, - args: UserFollowerRouteArgs( + FavoritedNoteRoute.name, + args: FavoritedNoteRouteArgs( key: key, - userId: userId, account: account, ), initialChildren: children, ); - static const String name = 'UserFollowerRoute'; + static const String name = 'FavoritedNoteRoute'; - static const PageInfo page = - PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UserFollowerRouteArgs { - const UserFollowerRouteArgs({ +class FavoritedNoteRouteArgs { + const FavoritedNoteRouteArgs({ this.key, - required this.userId, required this.account, }); final Key? key; - final String userId; - final Account account; @override String toString() { - return 'UserFollowerRouteArgs{key: $key, userId: $userId, account: $account}'; + return 'FavoritedNoteRouteArgs{key: $key, account: $account}'; } } /// generated route for -/// [UserPage] -class UserRoute extends PageRouteInfo { - UserRoute({ +/// [MisskeyPagePage] +class MisskeyRouteRoute extends PageRouteInfo { + MisskeyRouteRoute({ Key? key, - required String userId, required Account account, + required Page page, List? children, }) : super( - UserRoute.name, - args: UserRouteArgs( + MisskeyRouteRoute.name, + args: MisskeyRouteRouteArgs( key: key, - userId: userId, account: account, + page: page, ), initialChildren: children, ); - static const String name = 'UserRoute'; + static const String name = 'MisskeyRouteRoute'; - static const PageInfo page = PageInfo(name); + static const PageInfo page = + PageInfo(name); } -class UserRouteArgs { - const UserRouteArgs({ +class MisskeyRouteRouteArgs { + const MisskeyRouteRouteArgs({ this.key, - required this.userId, required this.account, + required this.page, }); final Key? key; - final String userId; - final Account account; + final Page page; + @override String toString() { - return 'UserRouteArgs{key: $key, userId: $userId, account: $account}'; + return 'MisskeyRouteRouteArgs{key: $key, account: $account, page: $page}'; } } diff --git a/lib/view/antenna_page/antenna_page.dart b/lib/view/antenna_page/antenna_page.dart index b64a1ad20..0a38a500b 100644 --- a/lib/view/antenna_page/antenna_page.dart +++ b/lib/view/antenna_page/antenna_page.dart @@ -35,6 +35,7 @@ class AntennasListNotifier withReplies: settings.withReplies, withFile: settings.withFile, notify: settings.notify, + localOnly: settings.localOnly, ), ); state = AsyncValue.data([...?state.valueOrNull, antenna]); @@ -63,6 +64,7 @@ class AntennasListNotifier withReplies: settings.withReplies, withFile: settings.withFile, notify: settings.notify, + localOnly: settings.localOnly, ), ); state = AsyncValue.data( diff --git a/lib/view/antenna_page/antenna_settings_dialog.dart b/lib/view/antenna_page/antenna_settings_dialog.dart index d54c00cfe..3cba7eb7a 100644 --- a/lib/view/antenna_page/antenna_settings_dialog.dart +++ b/lib/view/antenna_page/antenna_settings_dialog.dart @@ -98,6 +98,12 @@ class _AntennaSettingsNotifier extends AutoDisposeNotifier { state = state.copyWith(withFile: withFile); } } + + void updateLocalOnly(bool? localOnly) { + if (localOnly != null) { + state = state.copyWith(localOnly: localOnly); + } + } } final _usersListListProvider = FutureProvider.family, Misskey>( @@ -316,6 +322,15 @@ class AntennaSettingsForm extends ConsumerWidget { .read(_antennaSettingsNotifierProvider.notifier) .updateWithFile, ), + CheckboxListTile( + title: const Text("ローカルのみ"), + subtitle: const Text("ローカルのみの指定はMisskey 2023.10.2以降で有効です。"), + value: settings.localOnly, + onChanged: ref + .read(_antennaSettingsNotifierProvider.notifier) + .updateLocalOnly, + ), + // notifyは機能していない? Center( child: ElevatedButton( diff --git a/pubspec.lock b/pubspec.lock index 8ea228a0e..6e1e7640e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -822,7 +822,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: "5962ab923b6effef3c85929a0400169a36588e1c" + resolved-ref: "440ffe8174337b99bde4af1a08ec8d2589352cc5" url: "https://github.com/shiosyakeyakini-info/misskey_dart.git" source: git version: "1.0.0"