Merge pull request #218 from poppingmoon/reaction-deck-paste-scrollable

リアクションデッキ一括追加ダイアログをスクロールできるように
shiosyakeyakini-info · Aug 5, 2023 · c7bfd87 · c7bfd87
2 parents 6a97e6b + e1d827a
commit c7bfd87
Showing 1 changed file with 77 additions and 100 deletions.
diff --git a/lib/view/several_account_settings_page/reaction_deck_page/add_reactions_dialog.dart b/lib/view/several_account_settings_page/reaction_deck_page/add_reactions_dialog.dart
@@ -17,7 +17,6 @@ class AddReactionsDialog extends StatefulWidget {
 class _AddReactionsDialogState extends State<AddReactionsDialog> {
   final controller = TextEditingController();
   final formKey = GlobalKey<FormState>();
-  bool showDescription = true;
 
   @override
   void dispose() {
@@ -42,112 +41,90 @@ class _AddReactionsDialogState extends State<AddReactionsDialog> {
     );
     return AlertDialog(
       title: const Text("一括追加"),
-      content: SizedBox(
-        width: MediaQuery.of(context).size.width * 0.8,
-        height: MediaQuery.of(context).size.height * 0.8,
-        child: Form(
-          key: formKey,
-          child: Column(
-            children: [
-              Visibility(
-                visible: showDescription,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    const ListTile(
-                      title: Text("1"),
-                      subtitle: Text(
-                        "お使いのブラウザでリアクションデッキをコピーしたい"
-                        "アカウントにログインしてください",
-                      ),
-                    ),
-                    ListTile(
-                      title: const Text("2"),
-                      subtitle: Text.rich(
+      scrollable: true,
+      content: Form(
+        key: formKey,
+        child: Column(
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const ListTile(
+                  title: Text("1"),
+                  subtitle: Text(
+                    "お使いのブラウザでリアクションデッキをコピーしたい"
+                    "アカウントにログインしてください",
+                  ),
+                ),
+                ListTile(
+                  title: const Text("2"),
+                  subtitle: Text.rich(
+                    TextSpan(
+                      children: [
+                        const TextSpan(text: "同じブラウザで "),
                         TextSpan(
-                          children: [
-                            const TextSpan(text: "同じブラウザで "),
-                            TextSpan(
-                              text: uri.toString(),
-                              style: AppTheme.of(context).linkStyle,
-                              recognizer: TapGestureRecognizer()
-                                ..onTap = () => launchUrl(
-                                      uri,
-                                      mode: LaunchMode.externalApplication,
-                                    ),
-                            ),
-                            const TextSpan(
-                              text: //
-                                  " にアクセスして「値 (JSON)」の内容をすべて選択して"
-                                  "コピーしてください",
-                            )
-                          ],
+                          text: uri.toString(),
+                          style: AppTheme.of(context).linkStyle,
+                          recognizer: TapGestureRecognizer()
+                            ..onTap = () => launchUrl(
+                                  uri,
+                                  mode: LaunchMode.externalApplication,
+                                ),
                         ),
-                      ),
+                        const TextSpan(
+                          text: //
+                              " にアクセスして「値 (JSON)」の内容をすべて選択して"
+                              "コピーしてください",
+                        )
+                      ],
                     ),
-                    const ListTile(
-                      title: Text("3"),
-                      subtitle: Text(
-                        "コピーしたものを下のテキストボックスに貼り付けてください",
-                      ),
-                    ),
-                  ],
+                  ),
                 ),
-              ),
-              TextButton(
-                onPressed: () => setState(() {
-                  showDescription = !showDescription;
-                }),
-                child: Text((showDescription) ? "説明を隠す" : "説明を表示する"),
-              ),
-              Expanded(
-                child: Focus(
-                  onFocusChange: (focus) {
-                    if (focus) {
-                      setState(() {
-                        showDescription = false;
-                      });
-                    }
-                  },
-                  child: TextFormField(
-                    decoration: const InputDecoration(
-                      hintText: "ここに貼り付け",
-                      contentPadding: EdgeInsets.all(10),
-                      isDense: true,
-                    ),
-                    keyboardType: TextInputType.multiline,
-                    maxLines: null,
-                    expands: true,
-                    textAlignVertical: TextAlignVertical.top,
-                    validator: (value) {
-                      if (value == null || value.isEmpty) {
-                        return "値が入力されていません";
-                      }
-                      try {
-                        final emojiNames = JSON5.parse(value) as List;
-                        emojiNames.map((name) => name as String);
-                      } catch (e) {
-                        return "入力が有効な値ではありません";
-                      }
-                      return null;
-                    },
-                    autovalidateMode: AutovalidateMode.onUserInteraction,
-                    onSaved: (value) {
-                      if (formKey.currentState!.validate()) {
-                        final emojiNames = JSON5.parse(value!) as List;
-                        Navigator.of(context).pop(
-                            emojiNames.map((name) => name as String).toList());
-                      }
-                    },
+                const ListTile(
+                  title: Text("3"),
+                  subtitle: Text(
+                    "コピーしたものを下のテキストボックスに貼り付けてください",
                   ),
                 ),
+              ],
+            ),
+            const SizedBox(height: 10),
+            TextFormField(
+              decoration: const InputDecoration(
+                hintText: "ここに貼り付け",
+                contentPadding: EdgeInsets.all(10),
+                isDense: true,
               ),
-              ElevatedButton(
-                onPressed: () => formKey.currentState?.save.call(),
-                child: const Text("確定"),
-              ),
-            ],
-          ),
+              keyboardType: TextInputType.multiline,
+              maxLines: null,
+              minLines: 10,
+              textAlignVertical: TextAlignVertical.top,
+              validator: (value) {
+                if (value == null || value.isEmpty) {
+                  return "値が入力されていません";
+                }
+                try {
+                  final emojiNames = JSON5.parse(value) as List;
+                  emojiNames.map((name) => name as String);
+                } catch (e) {
+                  return "入力が有効な値ではありません";
+                }
+                return null;
+              },
+              autovalidateMode: AutovalidateMode.onUserInteraction,
+              onSaved: (value) {
+                if (formKey.currentState!.validate()) {
+                  final emojiNames = JSON5.parse(value!) as List;
+                  Navigator.of(context)
+                      .pop(emojiNames.map((name) => name as String).toList());
+                }
+              },
+            ),
+            ElevatedButton(
+              onPressed: () => formKey.currentState?.save.call(),
+              child: const Text("確定"),
+            ),
+          ],
         ),
       ),
     );