Merge branch 'fix/antenna-error-problem' into testing

4ster1sk · 4ster1sk · commit ee89dd08d37a · 2025-05-10T16:13:20.000+09:00
diff --git a/lib/l10n/app_ja-oj.arb b/lib/l10n/app_ja-oj.arb
@@ -18,7 +18,7 @@
     "receiveOnlyFiles": "ファイル付きのノートのみ受け取りましてよ",
     "receiveLocal": "ローカルのみを受け取りましてよ",
     "receiveLocalAvailability": "ローカルのみの指定はMisskey 2023.10.2以降で有効ですこと",
-    "confirmDeletingAntenna": "アンテナを削除いたしますこと？",
+    "confirmDeletingAntenna": "アンテナ「{antennaName}」を削除いたしますこと？",
     "channelJoinningCounts": "{usersCount}人が参加なされてますわ",
 
     "confirmDeleteClip": "クリップを削除いたしますこと？",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -79,6 +79,7 @@
     "antennaSourceHome": "ホーム",
     "antennaSourceAll": "ぜんぶ",
     "antennaSourceUser": "ユーザー",
+    "antennaSourceUsersBlackList": "指定したユーザー以外",
     "antennaSourceList": "リスト",
     "selectAntennaSource": "ソースを選択",
     "selectList": "リストを選択",
@@ -93,7 +94,7 @@
     "receiveOnlyFiles": "ファイル付きのノートのみ受信する",
     "receiveLocal": "ローカルのみ受信する",
     "receiveLocalAvailability": "ローカルのみの指定はMisskey 2023.10.2以降で有効です。",
-    "confirmDeletingAntenna": "アンテナ削除するか？",
+    "confirmDeletingAntenna": "アンテナ「{antennaName}」を削除するか？",
 
     "channelJoinningCounts": "{usersCount}人が参加中",
     "@channelJoinningCounts": {
diff --git a/lib/router/app_router.gr.dart b/lib/router/app_router.gr.dart
diff --git a/lib/view/antenna_page/antenna_list.dart b/lib/view/antenna_page/antenna_list.dart
@@ -5,8 +5,8 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:miria/providers.dart";
 import "package:miria/router/app_router.dart";
 import "package:miria/view/antenna_page/antennas_notifier.dart";
+import "package:miria/view/common/dialog/dialog_state.dart";
 import "package:miria/view/common/error_detail.dart";
-import "package:miria/view/dialogs/simple_confirm_dialog.dart";
 
 class AntennaList extends ConsumerWidget {
   const AntennaList({super.key});
@@ -25,18 +25,20 @@ class AntennaList extends ConsumerWidget {
               trailing: IconButton(
                 icon: const Icon(Icons.delete),
                 onPressed: () async {
-                  final result = await SimpleConfirmDialog.show(
-                    context: context,
-                    message: S.of(context).confirmDeletingAntenna,
-                    primary: S.of(context).delete,
-                    secondary: S.of(context).cancel,
-                  );
-                  if (!context.mounted) return;
-                  if (result ?? false) {
-                    await ref
-                        .read(antennasNotifierProvider.notifier)
-                        .delete(antenna.id);
-                  }
+                  final result = await ref
+                      .read(dialogStateNotifierProvider.notifier)
+                      .showDialog(
+                        message: (context) =>
+                            S.of(context).confirmDeletingAntenna(antenna.name),
+                        actions: (context) => [
+                          S.of(context).doDeleting,
+                          S.of(context).cancel,
+                        ],
+                      );
+                  if (result != 0) return;
+                  await ref
+                      .read(antennasNotifierProvider.notifier)
+                      .delete(antenna.id);
                 },
               ),
               onTap: () async => context.pushRoute(
diff --git a/lib/view/antenna_page/antenna_notes_page.dart b/lib/view/antenna_page/antenna_notes_page.dart
@@ -43,18 +43,14 @@ class AntennaNotesPage extends ConsumerWidget implements AutoRouteWrapper {
           IconButton(
             icon: const Icon(Icons.settings),
             onPressed: () async {
-              final settings = await context.pushRoute<AntennaSettings>(
+              await context.pushRoute<AntennaSettings>(
                 AntennaSettingsRoute(
                   title: Text(S.of(context).edit),
                   initialSettings: AntennaSettings.fromAntenna(antenna),
                   account: accountContext.postAccount,
+                  antennaId: antenna.id,
                 ),
               );
-              if (!context.mounted) return;
-              if (settings == null) return;
-              await ref
-                  .read(antennasNotifierProvider.notifier)
-                  .updateAntenna(antenna.id, settings);
             },
           ),
         ],
diff --git a/lib/view/antenna_page/antenna_page.dart b/lib/view/antenna_page/antenna_page.dart
@@ -6,7 +6,6 @@ import "package:miria/model/antenna_settings.dart";
 import "package:miria/providers.dart";
 import "package:miria/router/app_router.dart";
 import "package:miria/view/antenna_page/antenna_list.dart";
-import "package:miria/view/antenna_page/antennas_notifier.dart";
 import "package:miria/view/common/account_scope.dart";
 
 @RoutePage()
@@ -28,23 +27,18 @@ class AntennaPage extends ConsumerWidget implements AutoRouteWrapper {
           IconButton(
             icon: const Icon(Icons.add),
             onPressed: () async {
-              final settings = await context.pushRoute<AntennaSettings>(
+              await context.pushRoute<AntennaSettings>(
                 AntennaSettingsRoute(
                   title: Text(S.of(context).create),
                   account: accountContext.postAccount,
                 ),
               );
-              if (!context.mounted) return;
-              if (settings == null) return;
-              await ref
-                  .read(antennasNotifierProvider.notifier)
-                  .create(settings);
             },
           ),
         ],
       ),
       body: const Padding(
-        padding: EdgeInsets.only(left: 10, right: 10),
+        padding: EdgeInsets.symmetric(horizontal: 10),
         child: AntennaList(),
       ),
     );
diff --git a/lib/view/antenna_page/antenna_settings_dialog.dart b/lib/view/antenna_page/antenna_settings_dialog.dart
@@ -9,7 +9,9 @@ import "package:miria/model/account.dart";
 import "package:miria/model/antenna_settings.dart";
 import "package:miria/providers.dart";
 import "package:miria/router/app_router.dart";
+import "package:miria/view/antenna_page/antennas_notifier.dart";
 import "package:miria/view/common/account_scope.dart";
+import "package:miria/view/common/dialog/dialog_state.dart";
 import "package:misskey_dart/misskey_dart.dart";
 import "package:riverpod_annotation/riverpod_annotation.dart";
 
@@ -107,11 +109,13 @@ class AntennaSettingsDialog extends StatelessWidget
     super.key,
     this.title,
     this.initialSettings = const AntennaSettings(),
+    this.antennaId,
   });
 
   final Widget? title;
   final AntennaSettings initialSettings;
   final Account account;
+  final String? antennaId;
 
   @override
   Widget build(BuildContext context) {
@@ -126,6 +130,7 @@ class AntennaSettingsDialog extends StatelessWidget
           width: MediaQuery.of(context).size.width * 0.8,
           child: AntennaSettingsForm(
             account: account,
+            antennaId: antennaId,
           ),
         ),
       ),
@@ -140,10 +145,12 @@ class AntennaSettingsDialog extends StatelessWidget
 class AntennaSettingsForm extends HookConsumerWidget {
   const AntennaSettingsForm({
     required this.account,
+    this.antennaId,
     super.key,
   });
 
   final Account account;
+  final String? antennaId;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -152,6 +159,7 @@ class AntennaSettingsForm extends HookConsumerWidget {
     final settings = ref.watch(_antennaSettingsNotifierProvider);
     final list = ref.watch(_usersListListProvider);
     final controller = useTextEditingController();
+    final antennaNotifer = ref.watch(antennasNotifierProvider.notifier);
     useEffect(
       () {
         controller.text = settings.users.join("\n");
@@ -195,7 +203,7 @@ class AntennaSettingsForm extends HookConsumerWidget {
                         AntennaSource.home => S.of(context).antennaSourceHome,
                         AntennaSource.all => S.of(context).antennaSourceAll,
                         AntennaSource.users => S.of(context).antennaSourceUser,
-                        AntennaSource.usersBlackList => "指定したユーザー以外",
+                        AntennaSource.usersBlackList => S.of(context).antennaSourceUsersBlackList,
                         AntennaSource.list => S.of(context).antennaSourceList,
                       },
                     ),
@@ -334,19 +342,25 @@ class AntennaSettingsForm extends HookConsumerWidget {
           // notifyは機能していない?
           Center(
             child: ElevatedButton(
-              child: Text(S.of(context).done),
-              onPressed: () {
-                if (formKey.value.currentState!.validate()) {
-                  formKey.value.currentState!.save();
-                  final settings = ref.read(_antennaSettingsNotifierProvider);
-                  if (settings == initialSettings) {
-                    Navigator.of(context).pop();
-                  } else {
-                    Navigator.of(context).pop(settings);
+                child: Text(S.of(context).done),
+                onPressed: () async {
+                  if (formKey.value.currentState!.validate()) {
+                    formKey.value.currentState!.save();
+                    final settings = ref.read(_antennaSettingsNotifierProvider);
+                    var f = false;
+                    if (antennaId != null) {
+                      f = await antennaNotifer.updateAntenna(
+                          antennaId!, settings);
+                    } else {
+                      f = await antennaNotifer.create(settings);
+                    }
+                    if (f) {
+                      if (!context.mounted) return;
+                      Navigator.of(context).pop();
+                    }
                   }
-                }
-              },
-            ),
+                },
+              ),
           ),
         ],
       ),
diff --git a/lib/view/antenna_page/antennas_notifier.dart b/lib/view/antenna_page/antennas_notifier.dart
@@ -1,3 +1,4 @@
+import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:miria/model/antenna_settings.dart";
 import "package:miria/providers.dart";
 import "package:miria/view/common/dialog/dialog_state.dart";
@@ -16,7 +17,7 @@ class AntennasNotifier extends _$AntennasNotifier {
     return response.toList();
   }
 
-  Future<void> create(AntennaSettings settings) async {
+  Future<bool> create(AntennaSettings settings) async {
     await ref.read(dialogStateNotifierProvider.notifier).guard(() async {
       final antenna = await _misskey.antennas.create(
         AntennasCreateRequest(
@@ -33,7 +34,9 @@ class AntennasNotifier extends _$AntennasNotifier {
         ),
       );
       state = AsyncValue.data([...?state.valueOrNull, antenna]);
+      return true;
     });
+    return false;
   }
 
   Future<void> delete(String antennaId) async {
@@ -46,10 +49,11 @@ class AntennasNotifier extends _$AntennasNotifier {
     });
   }
 
-  Future<void> updateAntenna(
+  Future<bool> updateAntenna(
     String antennaId,
     AntennaSettings settings,
   ) async {
+    var f = false;
     await ref.read(dialogStateNotifierProvider.notifier).guard(() async {
       await _misskey.antennas.update(
         AntennasUpdateRequest(
@@ -66,6 +70,7 @@ class AntennasNotifier extends _$AntennasNotifier {
           localOnly: settings.localOnly,
         ),
       );
+      f = true;
     });
 
     state = AsyncValue.data([
@@ -85,5 +90,6 @@ class AntennasNotifier extends _$AntennasNotifier {
               )
             : antenna,
     ]);
+    return f;
   }
 }
diff --git a/lib/view/antenna_page/antennas_notifier.g.dart b/lib/view/antenna_page/antennas_notifier.g.dart
