update commit_check.yml (#141)

.github/workflows/commit_check.yml

@@ -11,15 +11,13 @@ jobs:
     name: Check commit
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    env:
-      FLUTTER_VERSION: "3.7.0"
     steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v2
+      - name: checkout all the submodules
+        uses: actions/checkout@v3
         with:
-          flutter-version: '3.7.0'
-          channel: 'stable'
-      - run: flutter pub get
-      - run: flutter format --set-exit-if-changed .
-      - run: flutter analyze
-      - run: flutter test
+          submodules: recursive
+      - run: submodules/flutter/bin/flutter doctor
+      - run: submodules/flutter/bin/flutter pub get
+      - run: submodules/flutter/bin/dart format --set-exit-if-changed lib test integration_test
+      - run: submodules/flutter/bin/flutter analyze lib test integration_test
+      - run: submodules/flutter/bin/flutter test

.github/workflows/publish_ios.yml

@@ -20,21 +20,21 @@ jobs:
 
     steps:
       - name: Check out from git
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - run: submodules/flutter/bin/flutter doctor
+      - run: submodules/flutter/bin/flutter pub get
+      - run: submodules/flutter/bin/dart format --set-exit-if-changed lib test integration_test
+      - run: submodules/flutter/bin/flutter analyze lib test integration_test
+      - run: submodules/flutter/bin/flutter test
+      
       # Configure ruby according to our .ruby-version
       - name: Setup ruby & Bundler
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-      # Set up flutter (feel free to adjust the version below)
-      - name: Setup flutter
-        uses: subosito/flutter-action@v2
-        with:
-          cache: true
-          flutter-version: 3.7.0
-      - run: flutter pub get
-      - run: flutter format --set-exit-if-changed .
-      - run: flutter analyze
+
       # Start an ssh-agent that will provide the SSH key from the
       # SSH_PRIVATE_KEY secret to `fastlane match`
       - name: Setup SSH key
@@ -43,8 +43,7 @@ jobs:
         run: |
             ssh-agent -a $SSH_AUTH_SOCK > /dev/null
             ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
-      - name: Download dependencies
-        run: flutter pub get
+
       - name: Build & Publish to TestFlight with Fastlane
         env:
           APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}

fastlane/metadata/android/en-US/changelogs/84.txt

@@ -0,0 +1,3 @@
+- Customization of tab bar.
+- Option to enable swipe gesture for switching between tabs.
+- Access to action menu from home screen.

ios/fastlane/Fastfile

@@ -49,7 +49,7 @@ latest_testflight_build_number
 
     # Prep the xcodeproject from Flutter without building (`--config-only`)
     sh(
-      "flutter", "build", "ios", "--config-only",
+      "/Users/runner/work/Hacki/Hacki/submodules/flutter/bin/flutter", "build", "ios", "--config-only",
       "--release", "--no-pub", "--no-codesign",
       "--build-number", new_build_number.to_s
     )

lib/config/constants.dart

@@ -56,6 +56,8 @@ abstract class Constants {
     'ʕ•́ᴥ•̀ʔっ',
     '(ㆆ_ㆆ)',
   ].pickRandomly()!;
+
+  static final String errorMessage = 'Something went wrong...$sadFace';
 }
 
 abstract class RegExpConstants {

lib/config/custom_router.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/screens/screens.dart';
 
 /// Custom router.
@@ -39,8 +40,8 @@ class CustomRouter {
         appBar: AppBar(
           title: const Text('Error'),
         ),
-        body: const Center(
-          child: Text('Something went wrong!'),
+        body: Center(
+          child: Text(Constants.errorMessage),
         ),
       ),
     );

lib/config/locator.dart

@@ -20,7 +20,7 @@ Future<void> setUpLocator() async {
       Logger(
         filter: CustomLogFilter(),
         printer: LogUtil.logPrinter,
-        output: LogUtil.getLogOutput(logOutputFile),
+        output: LogUtil.logOutput(logOutputFile),
       ),
     )
     ..registerSingleton<StoriesRepository>(StoriesRepository())

lib/extensions/context_extension.dart

@@ -2,6 +2,8 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/config/constants.dart';
+import 'package:hacki/styles/styles.dart';
 
 extension ContextExtension on BuildContext {
   T? tryRead<T>() {
@@ -12,6 +14,31 @@ extension ContextExtension on BuildContext {
     }
   }
 
+  void showSnackBar({
+    required String content,
+    VoidCallback? action,
+    String? label,
+  }) {
+    ScaffoldMessenger.of(this).showSnackBar(
+      SnackBar(
+        backgroundColor: Palette.deepOrange,
+        content: Text(content),
+        action: action != null && label != null
+            ? SnackBarAction(
+                label: label,
+                onPressed: action,
+                textColor: Theme.of(this).textTheme.bodyLarge?.color,
+              )
+            : null,
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
+  void showErrorSnackBar() => showSnackBar(
+        content: Constants.errorMessage,
+      );
+
   Rect? get rect {
     final RenderBox? box = findRenderObject() as RenderBox?;
     final Rect? rect =

lib/extensions/state_extension.dart

@@ -21,22 +21,15 @@ extension StateExtension on State {
     VoidCallback? action,
     String? label,
   }) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Palette.deepOrange,
-        content: Text(content),
-        action: action != null && label != null
-            ? SnackBarAction(
-                label: label,
-                onPressed: action,
-                textColor: Theme.of(context).textTheme.bodyLarge?.color,
-              )
-            : null,
-        behavior: SnackBarBehavior.floating,
-      ),
+    context.showSnackBar(
+      content: content,
+      action: action,
+      label: label,
     );
   }
 
+  void showErrorSnackBar() => context.showErrorSnackBar();
+
   Future<void>? goToItemScreen({
     required ItemScreenArgs args,
     bool forceNewScreen = false,
@@ -70,7 +63,6 @@ extension StateExtension on State {
         return MorePopupMenu(
           item: item,
           isBlocked: isBlocked,
-          showSnackBar: showSnackBar,
           onStoryLinkTapped: onStoryLinkTapped,
           onLoginTapped: onLoginTapped,
         );
@@ -119,11 +111,45 @@ extension StateExtension on State {
     }
   }
 
-  void onShareTapped(Item item, Rect? rect) {
-    Share.share(
-      'https://news.ycombinator.com/item?id=${item.id}',
-      sharePositionOrigin: rect,
-    );
+  Future<void> onShareTapped(Item item, Rect? rect) async {
+    late final String? linkToShare;
+    if (item.url.isNotEmpty) {
+      linkToShare = await showModalBottomSheet<String>(
+        context: context,
+        builder: (BuildContext context) {
+          return Container(
+            height: 140,
+            color: Theme.of(context).canvasColor,
+            child: Material(
+              child: Column(
+                children: <Widget>[
+                  ListTile(
+                    onTap: () => Navigator.pop(context, item.url),
+                    title: const Text('Link to article'),
+                  ),
+                  ListTile(
+                    onTap: () => Navigator.pop(
+                      context,
+                      'https://news.ycombinator.com/item?id=${item.id}',
+                    ),
+                    title: const Text('Link to HN'),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      );
+    } else {
+      linkToShare = 'https://news.ycombinator.com/item?id=${item.id}';
+    }
+
+    if (linkToShare != null) {
+      await Share.share(
+        linkToShare,
+        sharePositionOrigin: rect,
+      );
+    }
   }
 
   void onFlagTapped(Item item) {

lib/models/models.dart

@@ -9,4 +9,5 @@ export 'post_data.dart';
 export 'preference.dart';
 export 'search_params.dart';
 export 'story.dart';
+export 'story_type.dart';
 export 'user.dart';

lib/models/poll_option.dart

@@ -24,22 +24,7 @@ class PollOption extends Item {
 
   PollOption.empty()
       : ratio = 0,
-        super(
-          id: 0,
-          score: 0,
-          descendants: 0,
-          time: 0,
-          by: '',
-          title: '',
-          url: '',
-          kids: <int>[],
-          dead: false,
-          parts: <int>[],
-          deleted: false,
-          parent: 0,
-          text: '',
-          type: '',
-        );
+        super.empty();
 
   PollOption.fromJson(super.json)
       : ratio = 0,

lib/models/preference.dart

@@ -1,3 +1,4 @@
+import 'dart:collection';
 import 'dart:io';
 
 import 'package:equatable/equatable.dart';
@@ -13,26 +14,29 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
 
   Preference<T> copyWith({required T? val});
 
-  static List<Preference<dynamic>> allPreferences = <Preference<dynamic>>[
-    // Order of these first three preferences does not matter.
-    FetchModePreference(),
-    CommentsOrderPreference(),
-    FontSizePreference(),
-    TabOrderPreference(),
-    // Order of items below matters and
-    // reflects the order on settings screen.
-    const DisplayModePreference(),
-    const MetadataModePreference(),
-    const StoryUrlModePreference(),
-    const NotificationModePreference(),
-    const SwipeGesturePreference(),
-    const CollapseModePreference(),
-    NavigationModePreference(),
-    const ReaderModePreference(),
-    const MarkReadStoriesModePreference(),
-    const EyeCandyModePreference(),
-    const TrueDarkModePreference(),
-  ];
+  static final List<Preference<dynamic>> allPreferences =
+      UnmodifiableListView<Preference<dynamic>>(
+    <Preference<dynamic>>[
+      // Order of these first four preferences does not matter.
+      FetchModePreference(),
+      CommentsOrderPreference(),
+      FontSizePreference(),
+      TabOrderPreference(),
+      // Order of items below matters and
+      // reflects the order on settings screen.
+      const DisplayModePreference(),
+      const MetadataModePreference(),
+      const StoryUrlModePreference(),
+      const NotificationModePreference(),
+      const SwipeGesturePreference(),
+      const CollapseModePreference(),
+      NavigationModePreference(),
+      const ReaderModePreference(),
+      const MarkReadStoriesModePreference(),
+      const EyeCandyModePreference(),
+      const TrueDarkModePreference(),
+    ],
+  );
 
   @override
   List<Object?> get props => <Object?>[key];
@@ -81,7 +85,7 @@ class SwipeGesturePreference extends BooleanPreference {
 
   @override
   String get subtitle =>
-      '''Enable swipe gesture for switching between tabs. If enabled, long press on Story tile to trigger the action menu.''';
+      '''enable swipe gesture for switching between tabs. If enabled, long press on Story tile to trigger the action menu.''';
 }
 
 class NotificationModePreference extends BooleanPreference {
@@ -118,6 +122,10 @@ class CollapseModePreference extends BooleanPreference {
 
   @override
   String get title => 'Tap Anywhere to Collapse';
+
+  @override
+  String get subtitle =>
+      '''if disabled, tap on the top of comment tile to collapse.''';
 }
 
 /// The value deciding whether or not the story

lib/models/story.dart

@@ -1,41 +1,6 @@
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/item.dart';
 
-enum StoryType {
-  top('topstories'),
-  best('beststories'),
-  latest('newstories'),
-  ask('askstories'),
-  show('showstories');
-
-  const StoryType(this.path);
-
-  final String path;
-
-  String get label {
-    switch (this) {
-      case StoryType.top:
-        return 'TOP';
-      case StoryType.best:
-        return 'BEST';
-      case StoryType.latest:
-        return 'NEW';
-      case StoryType.ask:
-        return 'ASK';
-      case StoryType.show:
-        return 'SHOW';
-    }
-  }
-
-  static int convertToSettingsValue(List<StoryType> tabs) {
-    return int.parse(
-      tabs
-          .map((StoryType e) => e.index.toString())
-          .reduce((String value, String element) => '$value$element'),
-    );
-  }
-}
-
 class Story extends Item {
   const Story({
     required super.descendants,
@@ -55,23 +20,7 @@ class Story extends Item {
           parent: 0,
         );
 
-  Story.empty()
-      : super(
-          id: 0,
-          score: 0,
-          descendants: 0,
-          time: 0,
-          by: '',
-          title: '',
-          url: '',
-          kids: <int>[],
-          dead: false,
-          parts: <int>[],
-          deleted: false,
-          parent: 0,
-          text: '',
-          type: '',
-        );
+  Story.empty() : super.empty();
 
   Story.placeholder()
       : super(

lib/models/story_type.dart

@@ -0,0 +1,34 @@
+enum StoryType {
+  top('topstories'),
+  best('beststories'),
+  latest('newstories'),
+  ask('askstories'),
+  show('showstories');
+
+  const StoryType(this.path);
+
+  final String path;
+
+  String get label {
+    switch (this) {
+      case StoryType.top:
+        return 'TOP';
+      case StoryType.best:
+        return 'BEST';
+      case StoryType.latest:
+        return 'NEW';
+      case StoryType.ask:
+        return 'ASK';
+      case StoryType.show:
+        return 'SHOW';
+    }
+  }
+
+  static int convertToSettingsValue(List<StoryType> tabs) {
+    return int.parse(
+      tabs
+          .map((StoryType e) => e.index.toString())
+          .reduce((String value, String element) => '$value$element'),
+    );
+  }
+}

lib/screens/home/home_screen.dart

@@ -301,7 +301,7 @@ class _HomeScreenState extends State<HomeScreen>
         .fetchStoryBy(storyId)
         .then((Story? story) {
       if (story == null) {
-        showSnackBar(content: 'Something went wrong...');
+        showErrorSnackBar();
         return;
       }
       final ItemScreenArgs args = ItemScreenArgs(item: story);
@@ -326,7 +326,7 @@ class _HomeScreenState extends State<HomeScreen>
           .fetchStoryBy(storyId)
           .then((Story? story) {
         if (story == null) {
-          showSnackBar(content: 'Something went wrong...');
+          showErrorSnackBar();
           return;
         }
         final ItemScreenArgs args = ItemScreenArgs(item: story);

lib/screens/item/item_screen.dart

@@ -239,12 +239,7 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
                   context.read<EditCubit>().onReplySubmittedSuccessfully();
                   context.read<PostCubit>().reset();
                 } else if (postState.status == PostStatus.failure) {
-                  showSnackBar(
-                    content: 'Something went wrong...'
-                        '${Constants.sadFace}',
-                    label: 'Okay',
-                    action: ScaffoldMessenger.of(context).hideCurrentSnackBar,
-                  );
+                  showErrorSnackBar();
                   context.read<PostCubit>().reset();
                 }
               },

lib/screens/item/widgets/login_dialog.dart

@@ -87,13 +87,13 @@ class LoginDialog extends StatelessWidget {
                 height: Dimens.pt16,
               ),
               if (state.status == AuthStatus.failure)
-                const Padding(
-                  padding: EdgeInsets.only(
+                Padding(
+                  padding: const EdgeInsets.only(
                     left: Dimens.pt18,
                   ),
                   child: Text(
-                    'Something went wrong...',
-                    style: TextStyle(
+                    Constants.errorMessage,
+                    style: const TextStyle(
                       color: Palette.grey,
                       fontSize: TextDimens.pt12,
                     ),

lib/screens/item/widgets/more_popup_menu.dart

@@ -15,18 +15,12 @@ class MorePopupMenu extends StatelessWidget {
     super.key,
     required this.item,
     required this.isBlocked,
-    required this.showSnackBar,
     required this.onStoryLinkTapped,
     required this.onLoginTapped,
   });
 
   final Item item;
   final bool isBlocked;
-  final void Function({
-    required String content,
-    VoidCallback? action,
-    String? label,
-  }) showSnackBar;
   final ValueChanged<String> onStoryLinkTapped;
   final VoidCallback onLoginTapped;
 
@@ -43,24 +37,26 @@ class MorePopupMenu extends StatelessWidget {
         },
         listener: (BuildContext context, VoteState voteState) {
           if (voteState.status == VoteStatus.submitted) {
-            showSnackBar(content: 'Vote submitted successfully.');
+            context.showSnackBar(content: 'Vote submitted successfully.');
           } else if (voteState.status == VoteStatus.canceled) {
-            showSnackBar(content: 'Vote canceled.');
+            context.showSnackBar(content: 'Vote canceled.');
           } else if (voteState.status == VoteStatus.failure) {
-            showSnackBar(content: 'Something went wrong...');
+            context.showErrorSnackBar();
           } else if (voteState.status ==
               VoteStatus.failureKarmaBelowThreshold) {
-            showSnackBar(
+            context.showSnackBar(
               content: "You can't downvote because you are karmaly broke.",
             );
           } else if (voteState.status == VoteStatus.failureNotLoggedIn) {
-            showSnackBar(
+            context.showSnackBar(
               content: 'Not logged in, no voting! (;｀O´)o',
               action: onLoginTapped,
               label: 'Log in',
             );
           } else if (voteState.status == VoteStatus.failureBeHumble) {
-            showSnackBar(content: 'No voting on your own post! (;｀O´)o');
+            context.showSnackBar(
+              content: 'No voting on your own post! (;｀O´)o',
+            );
           }
 
           Navigator.pop(

lib/screens/item/widgets/poll_view.dart

@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:hacki/blocs/auth/auth_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/context_extension.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/styles/styles.dart';
 
@@ -66,23 +67,18 @@ class PollView extends StatelessWidget {
                           content: 'Vote submitted successfully.',
                         );
                       } else if (voteState.status == VoteStatus.canceled) {
-                        showSnackBar(context, content: 'Vote canceled.');
+                        context.showSnackBar(content: 'Vote canceled.');
                       } else if (voteState.status == VoteStatus.failure) {
-                        showSnackBar(
-                          context,
-                          content: 'Something went wrong...',
-                        );
+                        context.showErrorSnackBar();
                       } else if (voteState.status ==
                           VoteStatus.failureKarmaBelowThreshold) {
-                        showSnackBar(
-                          context,
+                        context.showSnackBar(
                           content: "You can't downvote because"
                               ' you are karmaly broke.',
                         );
                       } else if (voteState.status ==
                           VoteStatus.failureNotLoggedIn) {
-                        showSnackBar(
-                          context,
+                        context.showSnackBar(
                           content: 'Not logged in, no voting! (;｀O´)o',
                           action: onLoginTapped,
                           label: 'Log in',

lib/screens/profile/profile_screen.dart

@@ -453,13 +453,13 @@ class _ProfileScreenState extends State<ProfileScreen>
                     height: Dimens.pt16,
                   ),
                   if (state.status == AuthStatus.failure)
-                    const Padding(
-                      padding: EdgeInsets.only(
+                    Padding(
+                      padding: const EdgeInsets.only(
                         left: Dimens.pt18,
                       ),
                       child: Text(
-                        'Something went wrong...',
-                        style: TextStyle(
+                        Constants.errorMessage,
+                        style: const TextStyle(
                           color: Palette.grey,
                           fontSize: TextDimens.pt12,
                         ),

lib/screens/submit/submit_screen.dart

@@ -50,9 +50,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
             content: 'Post submitted successfully.',
           );
         } else if (state.status == SubmitStatus.failure) {
-          showSnackBar(
-            content: 'Something went wrong...',
-          );
+          showErrorSnackBar();
         }
       },
       builder: (BuildContext context, SubmitState state) {

lib/screens/widgets/comment_tile.dart

@@ -157,167 +157,182 @@ class CommentTile extends StatelessWidget {
                             ],
                           ),
                         ),
-                        if (actionable && state.collapsed)
-                          Center(
-                            child: Padding(
-                              padding: const EdgeInsets.only(
-                                bottom: Dimens.pt12,
-                              ),
-                              child: Text(
-                                'collapsed '
-                                '(${state.collapsedCount + 1})',
-                                style: const TextStyle(
-                                  color: Palette.orangeAccent,
-                                ),
-                              ),
-                            ),
-                          )
-                        else if (comment.deleted)
-                          const Center(
-                            child: Padding(
-                              padding: EdgeInsets.only(
-                                bottom: Dimens.pt12,
-                              ),
-                              child: Text(
-                                'deleted',
-                                style: TextStyle(
-                                  color: Palette.grey,
-                                ),
-                              ),
-                            ),
-                          )
-                        else if (comment.dead)
-                          const Center(
-                            child: Padding(
-                              padding: EdgeInsets.only(
-                                bottom: Dimens.pt12,
-                              ),
-                              child: Text(
-                                'dead',
-                                style: TextStyle(
-                                  color: Palette.grey,
-                                ),
-                              ),
-                            ),
-                          )
-                        else if (blocklistState.blocklist.contains(comment.by))
-                          const Center(
-                            child: Padding(
-                              padding: EdgeInsets.only(
-                                bottom: Dimens.pt12,
-                              ),
-                              child: Text(
-                                'blocked',
-                                style: TextStyle(
-                                  color: Palette.grey,
-                                ),
-                              ),
-                            ),
-                          )
-                        else
-                          Padding(
-                            padding: const EdgeInsets.only(
-                              left: Dimens.pt8,
-                              right: Dimens.pt8,
-                              top: Dimens.pt6,
-                              bottom: Dimens.pt12,
-                            ),
-                            child: comment is BuildableComment
-                                ? SelectableText.rich(
-                                    key: ValueKey<int>(comment.id),
-                                    buildTextSpan(
-                                      (comment as BuildableComment).elements,
+                        AnimatedSize(
+                          duration: const Duration(milliseconds: 200),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: <Widget>[
+                              if (actionable && state.collapsed)
+                                Center(
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(
+                                      bottom: Dimens.pt12,
+                                    ),
+                                    child: Text(
+                                      'collapsed '
+                                      '(${state.collapsedCount + 1})',
+                                      style: const TextStyle(
+                                        color: Palette.orangeAccent,
+                                      ),
+                                    ),
+                                  ),
+                                )
+                              else if (comment.deleted)
+                                const Center(
+                                  child: Padding(
+                                    padding: EdgeInsets.only(
+                                      bottom: Dimens.pt12,
+                                    ),
+                                    child: Text(
+                                      'deleted',
                                       style: TextStyle(
-                                        fontSize: MediaQuery.of(
-                                              context,
-                                            ).textScaleFactor *
-                                            prefState.fontSize.fontSize,
+                                        color: Palette.grey,
                                       ),
-                                      linkStyle: TextStyle(
-                                        fontSize: MediaQuery.of(
-                                              context,
-                                            ).textScaleFactor *
-                                            prefState.fontSize.fontSize,
-                                        decoration: TextDecoration.underline,
-                                        color: Palette.orange,
-                                      ),
-                                      onOpen: (LinkableElement link) {
-                                        if (link.url.isStoryLink) {
-                                          onStoryLinkTapped.call(link.url);
-                                        } else {
-                                          LinkUtil.launch(link.url);
-                                        }
-                                      },
                                     ),
-                                    onTap: () => onTextTapped(context),
-                                  )
-                                : SelectableLinkify(
-                                    key: ValueKey<int>(comment.id),
-                                    text: comment.text,
-                                    style: TextStyle(
-                                      fontSize: MediaQuery.of(context)
-                                              .textScaleFactor *
-                                          prefState.fontSize.fontSize,
-                                    ),
-                                    linkStyle: TextStyle(
-                                      fontSize: MediaQuery.of(context)
-                                              .textScaleFactor *
-                                          prefState.fontSize.fontSize,
-                                      color: Palette.orange,
-                                    ),
-                                    onOpen: (LinkableElement link) {
-                                      if (link.url.isStoryLink) {
-                                        onStoryLinkTapped.call(link.url);
-                                      } else {
-                                        LinkUtil.launch(link.url);
-                                      }
-                                    },
-                                    onTap: () => onTextTapped(context),
                                   ),
-                          ),
-                        if (!state.collapsed &&
-                            fetchMode == FetchMode.lazy &&
-                            comment.kids.isNotEmpty &&
-                            !context
-                                .read<CommentsCubit>()
-                                .state
-                                .commentIds
-                                .contains(comment.kids.first) &&
-                            !context
-                                .read<CommentsCubit>()
-                                .state
-                                .onlyShowTargetComment)
-                          Center(
-                            child: Padding(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: Dimens.pt12,
-                              ),
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: <Widget>[
-                                  Expanded(
-                                    child: TextButton(
-                                      onPressed: () {
-                                        HapticFeedback.selectionClick();
-                                        context.read<CommentsCubit>().loadMore(
-                                              comment: comment,
-                                            );
-                                      },
-                                      child: Text(
-                                        '''Load ${comment.kids.length} ${comment.kids.length > 1 ? 'replies' : 'reply'}''',
-                                        style: const TextStyle(
-                                          fontSize: TextDimens.pt12,
+                                )
+                              else if (comment.dead)
+                                const Center(
+                                  child: Padding(
+                                    padding: EdgeInsets.only(
+                                      bottom: Dimens.pt12,
+                                    ),
+                                    child: Text(
+                                      'dead',
+                                      style: TextStyle(
+                                        color: Palette.grey,
+                                      ),
+                                    ),
+                                  ),
+                                )
+                              else if (blocklistState.blocklist
+                                  .contains(comment.by))
+                                const Center(
+                                  child: Padding(
+                                    padding: EdgeInsets.only(
+                                      bottom: Dimens.pt12,
+                                    ),
+                                    child: Text(
+                                      'blocked',
+                                      style: TextStyle(
+                                        color: Palette.grey,
+                                      ),
+                                    ),
+                                  ),
+                                )
+                              else
+                                Padding(
+                                  padding: const EdgeInsets.only(
+                                    left: Dimens.pt8,
+                                    right: Dimens.pt8,
+                                    top: Dimens.pt6,
+                                    bottom: Dimens.pt12,
+                                  ),
+                                  child: comment is BuildableComment
+                                      ? SelectableText.rich(
+                                          key: ValueKey<int>(comment.id),
+                                          buildTextSpan(
+                                            (comment as BuildableComment)
+                                                .elements,
+                                            style: TextStyle(
+                                              fontSize: MediaQuery.of(
+                                                    context,
+                                                  ).textScaleFactor *
+                                                  prefState.fontSize.fontSize,
+                                            ),
+                                            linkStyle: TextStyle(
+                                              fontSize: MediaQuery.of(
+                                                    context,
+                                                  ).textScaleFactor *
+                                                  prefState.fontSize.fontSize,
+                                              decoration:
+                                                  TextDecoration.underline,
+                                              color: Palette.orange,
+                                            ),
+                                            onOpen: (LinkableElement link) {
+                                              if (link.url.isStoryLink) {
+                                                onStoryLinkTapped
+                                                    .call(link.url);
+                                              } else {
+                                                LinkUtil.launch(link.url);
+                                              }
+                                            },
+                                          ),
+                                          onTap: () => onTextTapped(context),
+                                        )
+                                      : SelectableLinkify(
+                                          key: ValueKey<int>(comment.id),
+                                          text: comment.text,
+                                          style: TextStyle(
+                                            fontSize: MediaQuery.of(context)
+                                                    .textScaleFactor *
+                                                prefState.fontSize.fontSize,
+                                          ),
+                                          linkStyle: TextStyle(
+                                            fontSize: MediaQuery.of(context)
+                                                    .textScaleFactor *
+                                                prefState.fontSize.fontSize,
+                                            color: Palette.orange,
+                                          ),
+                                          onOpen: (LinkableElement link) {
+                                            if (link.url.isStoryLink) {
+                                              onStoryLinkTapped.call(link.url);
+                                            } else {
+                                              LinkUtil.launch(link.url);
+                                            }
+                                          },
+                                          onTap: () => onTextTapped(context),
                                         ),
-                                      ),
+                                ),
+                              if (!state.collapsed &&
+                                  fetchMode == FetchMode.lazy &&
+                                  comment.kids.isNotEmpty &&
+                                  !context
+                                      .read<CommentsCubit>()
+                                      .state
+                                      .commentIds
+                                      .contains(comment.kids.first) &&
+                                  !context
+                                      .read<CommentsCubit>()
+                                      .state
+                                      .onlyShowTargetComment)
+                                Center(
+                                  child: Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                      horizontal: Dimens.pt12,
+                                    ),
+                                    child: Row(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Expanded(
+                                          child: TextButton(
+                                            onPressed: () {
+                                              HapticFeedback.selectionClick();
+                                              context
+                                                  .read<CommentsCubit>()
+                                                  .loadMore(
+                                                    comment: comment,
+                                                  );
+                                            },
+                                            child: Text(
+                                              '''Load ${comment.kids.length} ${comment.kids.length > 1 ? 'replies' : 'reply'}''',
+                                              style: const TextStyle(
+                                                fontSize: TextDimens.pt12,
+                                              ),
+                                            ),
+                                          ),
+                                        ),
+                                      ],
                                     ),
                                   ),
-                                ],
+                                ),
+                              const Divider(
+                                height: Dimens.zero,
                               ),
-                            ),
+                            ],
                           ),
-                        const Divider(
-                          height: Dimens.zero,
-                        ),
+                        )
                       ],
                     ),
                   ),

lib/screens/widgets/countdown_reminder.dart

@@ -111,7 +111,7 @@ class _CountDownReminderState extends State<CountdownReminder>
                           .fetchStoryBy(state.storyId!)
                           .then((Story? story) {
                         if (story == null) {
-                          showSnackBar(content: 'Something went wrong...');
+                          showErrorSnackBar();
                           return;
                         }
                         final ItemScreenArgs args = ItemScreenArgs(item: story);

lib/screens/widgets/link_preview/link_preview.dart

@@ -5,7 +5,7 @@ import 'package:hacki/config/constants.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/link_preview/link_view.dart';
-import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
+import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -119,7 +119,7 @@ class _LinkPreviewState extends State<LinkPreview> {
 
   @override
   void initState() {
-    _errorTitle = widget.errorTitle ?? 'Something went wrong!';
+    _errorTitle = widget.errorTitle ?? Constants.errorMessage;
     _errorBody = widget.errorBody ??
         'Oops! Unable to parse the url. We have '
             'sent feedback to our developers & '

lib/screens/widgets/offline_banner.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/cubits/cubits.dart';
-import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
+import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 
 class OfflineBanner extends StatelessWidget {

lib/services/services.dart

@@ -3,3 +3,4 @@ export 'custom_bloc_observer.dart';
 export 'fetcher.dart';
 export 'firebase_client.dart';
 export 'local_notification.dart';
+export 'web_analyzer.dart';

lib/utils/log_util.dart

@@ -14,7 +14,7 @@ abstract class LogUtil {
           colors: false,
         );
 
-  static LogOutput getLogOutput(File outputFile) => MultiOutput(
+  static LogOutput logOutput(File outputFile) => MultiOutput(
         <LogOutput>[
           ConsoleOutput(),
           CustomFileOutput(
@@ -43,7 +43,7 @@ abstract class LogUtil {
 
     final Uint8List fileContent = await currentSessionLog.readAsBytes();
     await previousSessionLog.writeAsString(
-      'Current session logs:',
+      'Current session logs:\n',
       mode: FileMode.append,
     );
     return previousSessionLog.writeAsBytes(

pubspec.lock

@@ -1358,5 +1358,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.7.3"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 1.0.5+83
+version: 1.0.9+87
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
-  flutter: "3.7.0"
+  flutter: "3.7.3"
 
 dependencies:
   adaptive_theme: ^3.0.0