Merge pull request #202 from krawieck/small-fixes

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ### Changed
 
+- Disable commenting on locked posts
+
+### Fixed
+
+- When writing a comment the parent text is now selectable
+- Text of a post is now selectable
 - Account actions in settings are more obvious to access: long press an account/instance to see possible actions such as setting as default or removal
 
 ## v0.4.1 - 2021-04-06

lib/main.dart

@@ -94,9 +94,16 @@ class MyHomePage extends HookWidget {
 
     return Scaffold(
       extendBody: true,
-      body: IndexedStack(
+      body: Column(
-        index: currentTab.value,
+        children: [
-        children: pages,
+          Expanded(
+            child: IndexedStack(
+              index: currentTab.value,
+              children: pages,
+            ),
+          ),
+          const SizedBox(height: kMinInteractiveDimension / 2),
+        ],
       ),
       floatingActionButton: const CreatePostFab(),
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,

lib/pages/full_post.dart

@@ -115,9 +115,12 @@ class FullPostPage extends HookWidget {
                 onPressed: () => PostWidget.showMoreMenu(context, post)),
           ],
         ),
-        floatingActionButton: FloatingActionButton(
+        floatingActionButton: post.post.locked
-            onPressed: loggedInAction((_) => comment()),
+            ? null
-            child: const Icon(Icons.comment)),
+            : FloatingActionButton(
+                onPressed: loggedInAction((_) => comment()),
+                child: const Icon(Icons.comment),
+              ),
         body: RefreshIndicator(
           onRefresh: refresh,
           child: ListView(

lib/pages/manage_account.dart

@@ -39,7 +39,7 @@ class ManageAccountPage extends HookWidget {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('@$instanceHost@$username'),
+        title: Text('$username@$instanceHost'),
       ),
       body: FutureBuilder<LocalUserSettingsView>(
         future: userFuture,

lib/widgets/comment.dart

@@ -297,7 +297,9 @@ class CommentWidget extends HookWidget {
               tooltip: L10n.of(context).more,
             ),
             _SaveComment(commentTree.comment),
-            if (!isDeleted.value && !comment.comment.removed)
+            if (!isDeleted.value &&
+                !comment.comment.removed &&
+                !comment.post.locked)
               TileAction(
                 icon: Icons.reply,
                 onPressed: loggedInAction((_) => reply()),

lib/widgets/post.dart

@@ -415,9 +415,13 @@ class PostWidget extends HookWidget {
                 linkPreview(),
               if (post.post.body != null && fullPost)
                 Padding(
-                    padding: const EdgeInsets.all(10),
+                  padding: const EdgeInsets.all(10),
-                    child: MarkdownText(post.post.body,
+                  child: MarkdownText(
-                        instanceHost: instanceHost)),
+                    post.post.body,
+                    instanceHost: instanceHost,
+                    selectable: true,
+                  ),
+                ),
               if (post.post.body != null && !fullPost)
                 LayoutBuilder(
                   builder: (context, constraints) {

lib/widgets/write_comment.dart

@@ -31,13 +31,17 @@ class WriteComment extends HookWidget {
       final body = () {
         final text = comment?.content ?? post.body;
         if (text == null) return const SizedBox.shrink();
-        return MarkdownText(text, instanceHost: post.instanceHost);
+        return MarkdownText(
+          text,
+          instanceHost: post.instanceHost,
+          selectable: true,
+        );
       }();
 
       if (post != null) {
         return Column(
           children: [
-            Text(
+            SelectableText(
               post.name,
               style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w600),
             ),