lib/main.dart

@@ -36,27 +36,7 @@ class MyApp extends StatelessWidget {
         primarySwatch: Colors.indigo,
       ),
       home: MyHomePage(title: 'Wind'),
-      onGenerateRoute: (settings) {
+      routes: {'/thread': (context) => ThreadScreen()},
-        Widget? pageView;
-        if (settings.name != null) {
-          var uriData = Uri.parse(settings.name!);
-
-          switch (uriData.path) {
-            case '/thread':
-              pageView = ThreadScreen(
-                  threadNumber:
-                      int.parse(uriData.queryParametersAll['num']!.first));
-              break;
-            default:
-              pageView = MyHomePage(title: 'Wind');
-              break;
-          }
-        }
-        if (pageView != null) {
-          return MaterialPageRoute(
-              settings: settings, builder: (BuildContext context) => pageView!);
-        }
-      },
     );
   }
 }

lib/message_item_view.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:wind/thread_model.dart';
 
 class MessageItemView extends StatelessWidget {
   const MessageItemView({Key? key, required this.item, required this.isOpPost})
@@ -15,6 +13,9 @@ class MessageItemView extends StatelessWidget {
         margin: this.isOpPost ? EdgeInsets.only(bottom: 10) : EdgeInsets.all(0),
         child: Card(
             elevation: 5,
+            child: InkWell(
+              splashColor: Colors.indigo.withAlpha(30),
+              onTap: () => {},
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisSize: MainAxisSize.min,
@@ -45,30 +46,23 @@ class MessageItemView extends StatelessWidget {
                           style: TextStyle(fontSize: 15),
                         ),
                         SizedBox(width: 5),
-                      InkWell(
+                        Text(
-                        child: Text(
                           "#${item.number}",
                           style: TextStyle(fontSize: 15, color: Colors.grey),
-                        ),
-                        onTap: () {
-                          var model =
-                              Provider.of<ThreadModel>(context, listen: false);
-                          model.commentTextController.text +=
-                              ">>${item.number}\n";
-                        },
                         )
                       ],
                     ),
                     margin: isOpPost
-                      ? EdgeInsets.only(top: 5, bottom: 2, left: 16, right: 16)
+                        ? EdgeInsets.only(
+                            top: 5, bottom: 2, left: 16, right: 16)
                         : EdgeInsets.only(top: 16, left: 16),
                   ),
                   Container(
-                  child:
+                    child: Text(item.body, style: TextStyle(fontSize: 17)),
-                      SelectableText(item.body, style: TextStyle(fontSize: 17)),
                     margin: EdgeInsets.all(16),
                   )
                 ],
+              ),
             )));
   }
 }

lib/newsgroup_list_view.dart

@@ -40,7 +40,6 @@ class NewsgroupListViewState extends State<NewsgroupListView> {
 
   Widget _newsgroupListView(List<GroupInfo> data) {
     return ListView.builder(
-        controller: ScrollController(),
         itemCount: data.length,
         itemBuilder: (context, index) {
           return ListTile(

lib/nntp_client.dart

@@ -127,18 +127,14 @@ class NNTPClient {
     return threads;
   }
 
-  Future<MimeMessage> getPost(int postNumber) async {
+  Future<List<Tuple2<int, MimeMessage>>> getThread(
-    var resp = await _sendCommand("ARTICLE", [postNumber.toString()]);
+      int threadNumber) async {
-    resp.lines.removeLast();
-    return MimeMessage.parseFromText(resp.lines.join("\r\n"));
-  }
-
-  Future<List<Tuple2<int, MimeMessage>>> getThread(int threadNumber) async {
     if (currentGroup == null) throw new ArgumentError("current group is null");
 
     List<Tuple2<int, MimeMessage>> threads = [];
 
-    var newThreadList = await _sendCommand("THREAD", [threadNumber.toString()]);
+    var newThreadList = await _sendCommand(
+        "THREAD", [threadNumber.toString()]);
 
     newThreadList.lines.removeAt(0);
     newThreadList.lines.removeLast(); // remove dot

lib/thread_list_view.dart

@@ -56,9 +56,7 @@ class ThreadListViewState extends State<ThreadListView> {
 
   Widget _threadView() {
     return _items.isNotEmpty
-        ? Scrollbar(
+        ? ListView.builder(
-            child: ListView.builder(
-                key: PageStorageKey("threadList"),
             itemCount: _items.length,
             itemBuilder: (context, index) {
               if (_items[index].number == -100500) {
@@ -81,8 +79,7 @@ class ThreadListViewState extends State<ThreadListView> {
                 );
               } else
                 return ThreadListItemView(item: _items[index]);
-                }),
+            })
-          )
         : Center(
             child: Text("This newsgroup is empty",
                 style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)));
@@ -100,8 +97,8 @@ class ThreadListItemView extends StatelessWidget {
         elevation: 5,
         child: InkWell(
           splashColor: Colors.indigo.withAlpha(30),
-          onTap: () =>
+          onTap: () => Navigator.pushNamed(context, "/thread",
-              Navigator.pushNamed(context, "/thread?num=${item.number}"),
+              arguments: ThreadScreenArguments(item)),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisSize: MainAxisSize.min,

lib/thread_model.dart

@@ -5,19 +5,6 @@ import 'package:wind/nntp_client.dart';
 class ThreadModel extends ChangeNotifier {
   NNTPClient? client;
 
-  var commentTextController = TextEditingController(text: "");
-
-  Future<MessageItem> getPost(int number) async {
-    var msg = await client!.getPost(number);
-    return MessageItem(
-        msg.getHeaderValue("Message-Id")!,
-        number,
-        msg.getHeaderValue("Subject")!,
-        msg.getHeaderValue("From")!,
-        msg.getHeaderValue("Date")!,
-        msg.decodeTextPlainPart()!);
-  }
-
   Future<List<MessageItem>> getThread(int threadNumber) async {
     if (client!.currentGroup == "") return [];
 

lib/thread_screen.dart

@@ -12,27 +12,24 @@ class ThreadScreenArguments {
 }
 
 class ThreadScreen extends StatefulWidget {
-  ThreadScreen({Key? key, required this.threadNumber}) : super(key: key);
-
-  late int threadNumber;
-
   @override
-  State<StatefulWidget> createState() => ThreadScreenState(threadNumber);
+  State<StatefulWidget> createState() => ThreadScreenState();
 }
 
 class ThreadScreenState extends State<ThreadScreen> {
-  ThreadScreenState(this.threadNumber);
-
   late NNTPClient client;
   late int threadNumber;
 
   @override
   Widget build(BuildContext context) {
+    var args =
+        ModalRoute.of(context)!.settings.arguments as ThreadScreenArguments;
     client = context.read<NNTPClient>();
+    threadNumber = args.item.number;
 
     return Scaffold(
       appBar: AppBar(
-        title: Text("Thread #${this.threadNumber}"),
+        title: Text("Thread #${args.item.number}"),
       ),
       body: Center(
           child: Container(
@@ -42,7 +39,10 @@ class ThreadScreenState extends State<ThreadScreen> {
           builder: (context, snapshot) {
             if (snapshot.hasData) {
               List<MessageItem> data = List.from(snapshot.data!);
-              data.insert(1, MessageItem("reply", 0, "", "", "", "")); // reply
+              data.insert(
+                  0,
+                  MessageItem(args.item.id, args.item.number, args.item.subject,
+                      args.item.author, args.item.date, args.item.body));
               return _listView(data);
             } else if (snapshot.hasError) {
               return Text("${snapshot.error}");
@@ -56,97 +56,14 @@ class ThreadScreenState extends State<ThreadScreen> {
 
   Future<List<MessageItem>> _fetch(BuildContext context) async {
     var model = context.read<ThreadModel>();
-    List<MessageItem> posts = [];
+    return await model.getThread(threadNumber);
-
-    var threadPosts = await model.getThread(threadNumber);
-    posts.addAll(threadPosts);
-    var opPost = await model.getPost(threadNumber);
-    posts.insert(0, opPost);
-
-    return posts;
   }
 
   Widget _listView(List<MessageItem> data) {
     return ListView.builder(
         itemCount: data.length,
         itemBuilder: (context, index) {
-          if (index == 1) {
-            return SendMessageForm();
-          }
           return MessageItemView(item: data[index], isOpPost: index == 0);
         });
   }
 }
-
-class SendMessageForm extends StatefulWidget {
-  const SendMessageForm({Key? key}) : super(key: key);
-
-  @override
-  SendMessageFormState createState() {
-    return SendMessageFormState();
-  }
-}
-
-// Create a corresponding State class.
-// This class holds data related to the form.
-class SendMessageFormState extends State<SendMessageForm> {
-  // Create a global key that uniquely identifies the Form widget
-  // and allows validation of the form.
-  //
-  // Note: This is a GlobalKey<FormState>,
-  // not a GlobalKey<MyCustomFormState>.
-  final _formKey = GlobalKey<FormState>();
-
-  @override
-  Widget build(BuildContext context) {
-    // Build a Form widget using the _formKey created above.
-    return Form(
-      key: _formKey,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Center(
-            child: Column(children: [
-              Consumer<ThreadModel>(
-                  builder: ((context, value, child) => TextFormField(
-                        controller: value.commentTextController,
-                        minLines: 5,
-                        keyboardType: TextInputType.multiline,
-                        maxLines: null,
-                        decoration: InputDecoration(
-                            border: OutlineInputBorder(), labelText: "Comment"),
-                        // The validator receives the text that the user has entered.
-                        validator: (value) {
-                          if (value == null || value.isEmpty) {
-                            return 'Please enter some text';
-                          }
-                          return null;
-                        },
-                      ))),
-              Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 16.0),
-                  child: Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        ElevatedButton(
-                          onPressed: () {
-                            // Validate returns true if the form is valid, or false otherwise.
-                            if (_formKey.currentState!.validate()) {
-                              // If the form is valid, display a snackbar. In the real world,
-                              // you'd often call a server or save the information in a database.
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                const SnackBar(
-                                    content: Text('Processing Data')),
-                              );
-                            }
-                          },
-                          child: const Text('Send'),
-                        )
-                      ]))
-            ]),
-          )
-        ],
-      ),
-    );
-  }
-}