fix url rendering. (#323)

README.md

@@ -1,7 +1,7 @@
 
 # <img width="64" src="https://user-images.githubusercontent.com/7277662/167775086-0b234f28-dee4-44f6-aae4-14a28ed4bbb6.png"> Hacki for Hacker News
 
-A [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
+A [Hacker News](https://news.ycombinator.com/) client built with Flutter.
 
 [![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
 [![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)

components/synced_shared_preferences/ios/Classes/SwiftSyncedSharedPreferencesPlugin.swift

@@ -76,6 +76,15 @@ final class SharedPrefsCore {
 
         return true
     }
+
+    fileprivate func remove(key: String?) -> Bool{
+        if let key = key {
+            let keyStore = NSUbiquitousKeyValueStore()
+            keyStore.removeObject(forKey: key)
+        }
+
+        return true
+    }
 }
 
 public class SwiftSyncedSharedPreferencesPlugin: NSObject, FlutterPlugin {
@@ -87,6 +96,14 @@ public class SwiftSyncedSharedPreferencesPlugin: NSObject, FlutterPlugin {
 
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         switch call.method {
+        case "remove":
+            if let params  = call.arguments as? [String: Any] {
+                let key = params[keyKey] as? String
+
+                let res = SharedPrefsCore.shared.remove(key: key)
+                result(res)
+            }
+
         case "setBool":
             if let params  = call.arguments as? [String: Any] {
                 let val = params[valKey] as? Bool

components/synced_shared_preferences/lib/synced_shared_preferences.dart

@@ -15,6 +15,14 @@ class SyncedSharedPreferences {
     const MethodChannel(channel),
   );
 
+  Future<bool?> remove({
+    required String key,
+  }) async {
+    return _channel.invokeMethod('remove', <String, dynamic>{
+      'key': key,
+    });
+  }
+
   Future<bool?> setBool({
     required String key,
     required bool val,

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

@@ -0,0 +1,4 @@
+- Ability to use Material 3.
+- Ability to search in thread.
+- Ability to customize text scale factor.
+- Ability to customize app's accent color.

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

@@ -0,0 +1,5 @@
+- Ability to use pagination on home screen.
+- Ability to use Material 3 (experimental).
+- Ability to search in thread.
+- Ability to customize text scale factor.
+- Ability to customize app's accent color.

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

@@ -0,0 +1,5 @@
+- Ability to use manual pagination on home screen.
+- Ability to use Material 3 (experimental).
+- Ability to search in thread.
+- Ability to customize text scale factor.
+- Ability to customize app's accent color.

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

@@ -0,0 +1,4 @@
+- New comment indicator.
+- Ability to mark stories as read from home page.
+- Text rendering improvements.
+- Performance improvements.

ios/Podfile.lock

@@ -159,7 +159,7 @@ SPEC CHECKSUMS:
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
   workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6

lib/blocs/auth/auth_bloc.dart

@@ -11,13 +11,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   AuthBloc({
     AuthRepository? authRepository,
     PreferenceRepository? preferenceRepository,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
     SembastRepository? sembastRepository,
   })  : _authRepository = authRepository ?? locator.get<AuthRepository>(),
         _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
         super(const AuthState.init()) {
@@ -31,7 +31,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   final AuthRepository _authRepository;
   final PreferenceRepository _preferenceRepository;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   final SembastRepository _sembastRepository;
 
   Future<void> onInitialize(
@@ -41,7 +41,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     await _authRepository.loggedIn.then((bool loggedIn) async {
       if (loggedIn) {
         final String? username = await _authRepository.username;
-        User? user = await _storiesRepository.fetchUser(id: username!);
+        User? user = await _hackerNewsRepository.fetchUser(id: username!);
 
         /// According to Hacker News' API documentation,
         /// if user has no public activity (posting a comment or story),
@@ -89,7 +89,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     );
 
     if (successful) {
-      final User? user = await _storiesRepository.fetchUser(id: event.username);
+      final User? user =
+          await _hackerNewsRepository.fetchUser(id: event.username);
       emit(
         state.copyWith(
           user: user ?? User.emptyWithId(event.username),

lib/blocs/stories/stories_bloc.dart

@@ -19,15 +19,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     required PreferenceCubit preferenceCubit,
     required FilterCubit filterCubit,
     OfflineRepository? offlineRepository,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
     PreferenceRepository? preferenceRepository,
     Logger? logger,
   })  : _preferenceCubit = preferenceCubit,
         _filterCubit = filterCubit,
         _offlineRepository =
             offlineRepository ?? locator.get<OfflineRepository>(),
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
         _logger = logger ?? locator.get<Logger>(),
@@ -37,6 +37,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     on<StoriesLoadMore>(onLoadMore);
     on<StoryLoaded>(onStoryLoaded);
     on<StoryRead>(onStoryRead);
+    on<StoryUnread>(onStoryUnread);
     on<StoriesLoaded>(onStoriesLoaded);
     on<StoriesDownload>(onDownload);
     on<StoriesCancelDownload>(onCancelDownload);
@@ -49,7 +50,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   final PreferenceCubit _preferenceCubit;
   final FilterCubit _filterCubit;
   final OfflineRepository _offlineRepository;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   final PreferenceRepository _preferenceRepository;
   final Logger _logger;
   DeviceScreenType? deviceScreenType;
@@ -113,13 +114,14 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         add(StoriesLoaded(type: type));
       });
     } else {
-      final List<int> ids = await _storiesRepository.fetchStoryIds(type: type);
+      final List<int> ids =
+          await _hackerNewsRepository.fetchStoryIds(type: type);
       emit(
         state
             .copyWithStoryIdsUpdated(type: type, to: ids)
             .copyWithCurrentPageUpdated(type: type, to: 0),
       );
-      _storiesRepository
+      _hackerNewsRepository
           .fetchStoriesStream(ids: ids.sublist(0, state.currentPageSize))
           .listen((Story story) {
         add(StoryLoaded(story: story, type: type));
@@ -196,7 +198,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
           add(StoriesLoaded(type: event.type));
         });
       } else {
-        _storiesRepository
+        _hackerNewsRepository
             .fetchStoriesStream(
           ids: state.storyIdsByType[event.type]!.sublist(
             lower,
@@ -273,7 +275,8 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       ..remove(StoryType.latest);
 
     for (final StoryType type in prioritizedTypes) {
-      final List<int> ids = await _storiesRepository.fetchStoryIds(type: type);
+      final List<int> ids =
+          await _hackerNewsRepository.fetchStoryIds(type: type);
       await _offlineRepository.cacheStoryIds(type: type, ids: ids);
       prioritizedIds.addAll(ids);
     }
@@ -293,7 +296,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       );
 
       final Set<int> latestIds = <int>{};
-      final List<int> ids = await _storiesRepository.fetchStoryIds(
+      final List<int> ids = await _hackerNewsRepository.fetchStoryIds(
         type: StoryType.latest,
       );
       await _offlineRepository.cacheStoryIds(type: StoryType.latest, ids: ids);
@@ -347,7 +350,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       }
 
       _logger.d('fetching story $id');
-      final Story? story = await _storiesRepository.fetchStory(id: id);
+      final Story? story = await _hackerNewsRepository.fetchStory(id: id);
 
       if (story == null) {
         if (isPrioritized) {
@@ -377,7 +380,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       /// In other words, we are prioritizing the story itself instead of
       /// the comments in the story.
       late final StreamSubscription<Comment>? downloadStream;
-      downloadStream = _storiesRepository
+      downloadStream = _hackerNewsRepository
           .fetchAllChildrenComments(ids: story.kids)
           .whereType<Comment>()
           .listen(
@@ -460,7 +463,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     StoryRead event,
     Emitter<StoriesState> emit,
   ) async {
-    unawaited(_preferenceRepository.updateHasRead(event.story.id));
+    unawaited(_preferenceRepository.addHasRead(event.story.id));
 
     emit(
       state.copyWith(
@@ -469,6 +472,19 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     );
   }
 
+  Future<void> onStoryUnread(
+    StoryUnread event,
+    Emitter<StoriesState> emit,
+  ) async {
+    unawaited(_preferenceRepository.removeHasRead(event.story.id));
+
+    emit(
+      state.copyWith(
+        readStoriesIds: <int>{...state.readStoriesIds}..remove(event.story.id),
+      ),
+    );
+  }
+
   Future<void> onClearAllReadStories(
     ClearAllReadStories event,
     Emitter<StoriesState> emit,

lib/blocs/stories/stories_event.dart

@@ -95,6 +95,15 @@ class StoryRead extends StoriesEvent {
   List<Object?> get props => <Object?>[story];
 }
 
+class StoryUnread extends StoriesEvent {
+  StoryUnread({required this.story});
+
+  final Story story;
+
+  @override
+  List<Object?> get props => <Object?>[story];
+}
+
 class ClearAllReadStories extends StoriesEvent {
   @override
   List<Object?> get props => <Object?>[];

lib/config/constants.dart

@@ -20,6 +20,8 @@ abstract class Constants {
       '$githubLink/issues/new?title=Found+a+bug+in+Hacki&body=Please+describe+the+problem.';
   static const String wikipediaLink = 'https://en.wikipedia.org/wiki/';
   static const String wiktionaryLink = 'https://en.wiktionary.org/wiki/';
+  static const String hackerNewsItemLinkPrefix =
+      'https://news.ycombinator.com/item?id=';
   static const String supportEmail = 'georgefung98@gmail.com';
 
   static const String _imagePath = 'assets/images';

lib/config/locator.dart

@@ -23,12 +23,12 @@ Future<void> setUpLocator() async {
         output: LogUtil.logOutput(logOutputFile),
       ),
     )
-    ..registerSingleton<StoriesRepository>(StoriesRepository())
+    ..registerSingleton<SembastRepository>(SembastRepository())
+    ..registerSingleton<HackerNewsRepository>(HackerNewsRepository())
     ..registerSingleton<PreferenceRepository>(PreferenceRepository())
     ..registerSingleton<SearchRepository>(SearchRepository())
     ..registerSingleton<AuthRepository>(AuthRepository())
     ..registerSingleton<PostRepository>(PostRepository())
-    ..registerSingleton<SembastRepository>(SembastRepository())
     ..registerSingleton<OfflineRepository>(OfflineRepository())
     ..registerSingleton<DraftCache>(DraftCache())
     ..registerSingleton<CommentCache>(CommentCache())

lib/cubits/comments/comments_cubit.dart

@@ -9,6 +9,7 @@ import 'package:hacki/config/constants.dart';
 import 'package:hacki/config/custom_router.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/screens/screens.dart';
@@ -31,18 +32,15 @@ class CommentsCubit extends Cubit<CommentsState> {
     required CommentsOrder defaultCommentsOrder,
     CommentCache? commentCache,
     OfflineRepository? offlineRepository,
-    StoriesRepository? storiesRepository,
-    SembastRepository? sembastRepository,
+    HackerNewsRepository? hackerNewsRepository,
     Logger? logger,
   })  : _filterCubit = filterCubit,
         _collapseCache = collapseCache,
         _commentCache = commentCache ?? locator.get<CommentCache>(),
         _offlineRepository =
             offlineRepository ?? locator.get<OfflineRepository>(),
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
-        _sembastRepository =
-            sembastRepository ?? locator.get<SembastRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         _logger = logger ?? locator.get<Logger>(),
         super(
           CommentsState.init(
@@ -57,10 +55,13 @@ class CommentsCubit extends Cubit<CommentsState> {
   final CollapseCache _collapseCache;
   final CommentCache _commentCache;
   final OfflineRepository _offlineRepository;
-  final StoriesRepository _storiesRepository;
-  final SembastRepository _sembastRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   final Logger _logger;
 
+  final ItemScrollController itemScrollController = ItemScrollController();
+  final ItemPositionsListener itemPositionsListener =
+      ItemPositionsListener.create();
+
   /// The [StreamSubscription] for stream (both lazy or eager)
   /// fetching comments posted directly to the story.
   StreamSubscription<Comment>? _streamSubscription;
@@ -91,7 +92,7 @@ class CommentsCubit extends Cubit<CommentsState> {
         ),
       );
 
-      _streamSubscription = _storiesRepository
+      _streamSubscription = _hackerNewsRepository
           .fetchAllCommentsRecursivelyStream(
             ids: targetAncestors!.last.kids,
             level: targetAncestors.last.level + 1,
@@ -108,6 +109,8 @@ class CommentsCubit extends Cubit<CommentsState> {
       state.copyWith(
         status: CommentsStatus.inProgress,
         comments: <Comment>[],
+        matchedComments: <int>[],
+        inThreadSearchQuery: '',
         currentPage: 0,
       ),
     );
@@ -115,7 +118,10 @@ class CommentsCubit extends Cubit<CommentsState> {
     final Item item = state.item;
     final Item updatedItem = state.isOfflineReading
         ? item
-        : await _storiesRepository.fetchItem(id: item.id).then(_toBuildable) ??
+        : await _hackerNewsRepository
+                .fetchItem(id: item.id)
+                .then(_toBuildable)
+                .onError((_, __) => item) ??
             item;
     final List<int> kids = _sortKids(updatedItem.kids);
 
@@ -128,12 +134,13 @@ class CommentsCubit extends Cubit<CommentsState> {
     } else {
       switch (state.fetchMode) {
         case FetchMode.lazy:
-          commentStream = _storiesRepository.fetchCommentsStream(
+          commentStream = _hackerNewsRepository.fetchCommentsStream(
             ids: kids,
             getFromCache: useCommentCache ? _commentCache.getComment : null,
           );
         case FetchMode.eager:
-          commentStream = _storiesRepository.fetchAllCommentsRecursivelyStream(
+          commentStream =
+              _hackerNewsRepository.fetchAllCommentsRecursivelyStream(
             ids: kids,
             getFromCache: useCommentCache ? _commentCache.getComment : null,
           );
@@ -180,16 +187,16 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     final Item item = state.item;
     final Item updatedItem =
-        await _storiesRepository.fetchItem(id: item.id) ?? item;
+        await _hackerNewsRepository.fetchItem(id: item.id) ?? item;
     final List<int> kids = _sortKids(updatedItem.kids);
 
     late final Stream<Comment> commentStream;
     if (state.fetchMode == FetchMode.lazy) {
-      commentStream = _storiesRepository.fetchCommentsStream(
+      commentStream = _hackerNewsRepository.fetchCommentsStream(
         ids: kids,
       );
     } else {
-      commentStream = _storiesRepository.fetchAllCommentsRecursivelyStream(
+      commentStream = _hackerNewsRepository.fetchAllCommentsRecursivelyStream(
         ids: kids,
       );
     }
@@ -213,6 +220,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       state.copyWith(
         onlyShowTargetComment: false,
         item: story,
+        matchedComments: <int>[],
       ),
     );
     init();
@@ -237,14 +245,17 @@ class CommentsCubit extends Cubit<CommentsState> {
         /// Ignoring because the subscription will be cancelled in close()
         // ignore: cancel_subscriptions
         final StreamSubscription<Comment> streamSubscription =
-            _storiesRepository
+            _hackerNewsRepository
                 .fetchCommentsStream(ids: comment.kids)
                 .asyncMap(_toBuildableComment)
                 .whereNotNull()
                 .listen((Comment cmt) {
           _collapseCache.addKid(cmt.id, to: cmt.parent);
           _commentCache.cacheComment(cmt);
-          _sembastRepository.cacheComment(cmt);
+
+          final Map<int, Comment> updatedIdToCommentMap =
+              Map<int, Comment>.from(state.idToCommentMap);
+          updatedIdToCommentMap[comment.id] = comment;
 
           emit(
             state.copyWith(
@@ -252,6 +263,7 @@ class CommentsCubit extends Cubit<CommentsState> {
                   state.comments.indexOf(comment) + offset + 1,
                   cmt.copyWith(level: level),
                 ),
+              idToCommentMap: updatedIdToCommentMap,
             ),
           );
           offset++;
@@ -281,7 +293,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     HapticFeedbackUtil.light();
     emit(state.copyWith(fetchParentStatus: CommentsStatus.inProgress));
     final Item? parent =
-        await _storiesRepository.fetchItem(id: state.item.parent);
+        await _hackerNewsRepository.fetchItem(id: state.item.parent);
 
     if (parent == null) {
       return;
@@ -302,7 +314,7 @@ class CommentsCubit extends Cubit<CommentsState> {
   Future<void> loadRootThread() async {
     HapticFeedbackUtil.light();
     emit(state.copyWith(fetchRootStatus: CommentsStatus.inProgress));
-    final Story? parent = await _storiesRepository
+    final Story? parent = await _hackerNewsRepository
         .fetchParentStory(id: state.item.id)
         .then(_toBuildableStory);
 
@@ -349,11 +361,20 @@ class CommentsCubit extends Cubit<CommentsState> {
     init(useCommentCache: true);
   }
 
+  void scrollTo({
+    required int index,
+    double alignment = 0.0,
+  }) {
+    debugPrint('Scrolling to: $index, alignment: $alignment');
+    itemScrollController.scrollTo(
+      index: index,
+      alignment: alignment,
+      duration: Durations.ms400,
+    );
+  }
+
   /// Scroll to next root level comment.
-  void scrollToNextRoot(
-    ItemScrollController itemScrollController,
-    ItemPositionsListener itemPositionsListener,
-  ) {
+  void scrollToNextRoot({VoidCallback? onError}) {
     final int totalComments = state.comments.length;
     final List<Comment> onScreenComments = itemPositionsListener
         .itemPositions.value
@@ -378,10 +399,20 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
-    /// The index of first root level comment visible on screen.
-    final int firstVisibleRootIndex = state.comments
-        .indexOf(onScreenComments.firstWhere((Comment e) => e.isRoot));
-    final int startIndex = min(firstVisibleRootIndex + 1, totalComments);
+    final Comment? firstVisibleRootComment =
+        onScreenComments.firstWhereOrNull((Comment e) => e.isRoot);
+    late int startIndex;
+
+    if (firstVisibleRootComment != null) {
+      /// The index of first root level comment visible on screen.
+      final int firstVisibleRootCommentIndex =
+          state.comments.indexOf(firstVisibleRootComment);
+      startIndex = min(firstVisibleRootCommentIndex + 1, totalComments);
+    } else {
+      final int lastVisibleCommentIndex =
+          state.comments.indexOf(onScreenComments.last);
+      startIndex = min(lastVisibleCommentIndex + 1, totalComments);
+    }
 
     for (int i = startIndex; i < totalComments; i++) {
       final Comment cmt = state.comments.elementAt(i);
@@ -395,13 +426,14 @@ class CommentsCubit extends Cubit<CommentsState> {
         return;
       }
     }
+
+    if (state.status == CommentsStatus.allLoaded) {
+      onError?.call();
+    }
   }
 
   /// Scroll to previous root level comment.
-  void scrollToPreviousRoot(
-    ItemScrollController itemScrollController,
-    ItemPositionsListener itemPositionsListener,
-  ) {
+  void scrollToPreviousRoot() {
     final List<Comment> onScreenComments = itemPositionsListener
         .itemPositions.value
         // The header is also a part of the list view,
@@ -436,6 +468,50 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
+  void search(String query, {String author = ''}) {
+    resetSearch();
+
+    late final bool Function(Comment cmt) conditionSatisfied;
+    final String lowercaseQuery = query.toLowerCase();
+    if (query.isEmpty && author.isEmpty) {
+      return;
+    } else if (author.isEmpty) {
+      conditionSatisfied =
+          (Comment cmt) => cmt.text.toLowerCase().contains(lowercaseQuery);
+    } else if (query.isEmpty) {
+      conditionSatisfied = (Comment cmt) => cmt.by == author;
+    } else {
+      conditionSatisfied = (Comment cmt) =>
+          cmt.text.toLowerCase().contains(lowercaseQuery) && cmt.by == author;
+    }
+
+    emit(
+      state.copyWith(
+        inThreadSearchQuery: query,
+        inThreadSearchAuthor: author,
+      ),
+    );
+
+    for (final int i in 0.to(state.comments.length, inclusive: false)) {
+      final Comment cmt = state.comments.elementAt(i);
+      if (conditionSatisfied(cmt)) {
+        emit(
+          state.copyWith(
+            matchedComments: <int>[...state.matchedComments, i],
+          ),
+        );
+      }
+    }
+  }
+
+  void resetSearch() => emit(
+        state.copyWith(
+          matchedComments: <int>[],
+          inThreadSearchQuery: '',
+          inThreadSearchAuthor: '',
+        ),
+      );
+
   List<int> _sortKids(List<int> kids) {
     switch (state.order) {
       case CommentsOrder.natural:
@@ -461,8 +537,8 @@ class CommentsCubit extends Cubit<CommentsState> {
     if (comment != null) {
       _collapseCache.addKid(comment.id, to: comment.parent);
       _commentCache.cacheComment(comment);
-      _sembastRepository.cacheComment(comment);
 
+      // Hide comment that matches any of the filter keywords.
       final bool hidden = _filterCubit.state.keywords.any(
         (String keyword) => comment.text.toLowerCase().contains(keyword),
       );
@@ -471,7 +547,16 @@ class CommentsCubit extends Cubit<CommentsState> {
         comment.copyWith(hidden: hidden),
       ];
 
-      emit(state.copyWith(comments: updatedComments));
+      final Map<int, Comment> updatedIdToCommentMap =
+          Map<int, Comment>.from(state.idToCommentMap);
+      updatedIdToCommentMap[comment.id] = comment;
+
+      emit(
+        state.copyWith(
+          comments: updatedComments,
+          idToCommentMap: updatedIdToCommentMap,
+        ),
+      );
     }
   }
 

lib/cubits/comments/comments_state.dart

@@ -12,6 +12,8 @@ class CommentsState extends Equatable {
   const CommentsState({
     required this.item,
     required this.comments,
+    required this.matchedComments,
+    required this.idToCommentMap,
     required this.status,
     required this.fetchParentStatus,
     required this.fetchRootStatus,
@@ -20,6 +22,8 @@ class CommentsState extends Equatable {
     required this.onlyShowTargetComment,
     required this.isOfflineReading,
     required this.currentPage,
+    required this.inThreadSearchQuery,
+    required this.inThreadSearchAuthor,
   });
 
   CommentsState.init({
@@ -28,14 +32,19 @@ class CommentsState extends Equatable {
     required this.fetchMode,
     required this.order,
   })  : comments = <Comment>[],
+        matchedComments = <int>[],
+        idToCommentMap = <int, Comment>{},
         status = CommentsStatus.idle,
         fetchParentStatus = CommentsStatus.idle,
         fetchRootStatus = CommentsStatus.idle,
         onlyShowTargetComment = false,
-        currentPage = 0;
+        currentPage = 0,
+        inThreadSearchQuery = '',
+        inThreadSearchAuthor = '';
 
   final Item item;
   final List<Comment> comments;
+  final Map<int, Comment> idToCommentMap;
   final CommentsStatus status;
   final CommentsStatus fetchParentStatus;
   final CommentsStatus fetchRootStatus;
@@ -44,10 +53,17 @@ class CommentsState extends Equatable {
   final bool onlyShowTargetComment;
   final bool isOfflineReading;
   final int currentPage;
+  final String inThreadSearchQuery;
+  final String inThreadSearchAuthor;
+
+  /// Indexes of comments that matches the query for in-thread search.
+  final List<int> matchedComments;
 
   CommentsState copyWith({
     Item? item,
     List<Comment>? comments,
+    List<int>? matchedComments,
+    Map<int, Comment>? idToCommentMap,
     CommentsStatus? status,
     CommentsStatus? fetchParentStatus,
     CommentsStatus? fetchRootStatus,
@@ -56,10 +72,13 @@ class CommentsState extends Equatable {
     bool? onlyShowTargetComment,
     bool? isOfflineReading,
     int? currentPage,
+    String? inThreadSearchQuery,
+    String? inThreadSearchAuthor,
   }) {
     return CommentsState(
       item: item ?? this.item,
       comments: comments ?? this.comments,
+      matchedComments: matchedComments ?? this.matchedComments,
       fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
       fetchRootStatus: fetchRootStatus ?? this.fetchRootStatus,
       status: status ?? this.status,
@@ -69,11 +88,41 @@ class CommentsState extends Equatable {
           onlyShowTargetComment ?? this.onlyShowTargetComment,
       isOfflineReading: isOfflineReading ?? this.isOfflineReading,
       currentPage: currentPage ?? this.currentPage,
+      inThreadSearchQuery: inThreadSearchQuery ?? this.inThreadSearchQuery,
+      inThreadSearchAuthor: inThreadSearchAuthor ?? this.inThreadSearchAuthor,
+      idToCommentMap: idToCommentMap ?? this.idToCommentMap,
     );
   }
 
   Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
 
+  static final Map<int, bool> _isResponseCache = <int, bool>{};
+
+  bool isResponse(Comment comment) {
+    if (_isResponseCache.containsKey(comment.id)) {
+      return _isResponseCache[comment.id]!;
+    }
+
+    if (comment.isRoot) {
+      _isResponseCache[comment.id] = false;
+      return false;
+    }
+    final Comment? precedingComment = idToCommentMap[comment.parent];
+    if (precedingComment == null) {
+      _isResponseCache[comment.id] = false;
+      return false;
+    } else if (item.id == precedingComment.parent && item.by == comment.by) {
+      _isResponseCache[comment.id] = true;
+      return true;
+    } else if (idToCommentMap[precedingComment.parent]?.by == comment.by) {
+      _isResponseCache[comment.id] = true;
+      return true;
+    } else {
+      _isResponseCache[comment.id] = false;
+      return false;
+    }
+  }
+
   @override
   List<Object?> get props => <Object?>[
         item,
@@ -86,5 +135,9 @@ class CommentsState extends Equatable {
         isOfflineReading,
         currentPage,
         comments,
+        matchedComments,
+        inThreadSearchQuery,
+        inThreadSearchAuthor,
+        idToCommentMap,
       ];
 }

lib/cubits/fav/fav_cubit.dart

@@ -12,13 +12,13 @@ class FavCubit extends Cubit<FavState> {
     required AuthBloc authBloc,
     AuthRepository? authRepository,
     PreferenceRepository? preferenceRepository,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
   })  : _authBloc = authBloc,
         _authRepository = authRepository ?? locator.get<AuthRepository>(),
         _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         super(FavState.init()) {
     init();
   }
@@ -26,7 +26,7 @@ class FavCubit extends Cubit<FavState> {
   final AuthBloc _authBloc;
   final AuthRepository _authRepository;
   final PreferenceRepository _preferenceRepository;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   static const int _pageSize = 20;
   String? _username;
 
@@ -43,7 +43,7 @@ class FavCubit extends Cubit<FavState> {
               currentPage: 0,
             ),
           );
-          _storiesRepository
+          _hackerNewsRepository
               .fetchItemsStream(
                 ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
               )
@@ -73,7 +73,7 @@ class FavCubit extends Cubit<FavState> {
       ),
     );
 
-    final Item? item = await _storiesRepository.fetchItem(id: id);
+    final Item? item = await _hackerNewsRepository.fetchItem(id: id);
 
     if (item == null) return;
 
@@ -119,7 +119,7 @@ class FavCubit extends Cubit<FavState> {
         upper = len;
       }
 
-      _storiesRepository
+      _hackerNewsRepository
           .fetchItemsStream(
             ids: state.favIds.sublist(
               lower,
@@ -149,7 +149,7 @@ class FavCubit extends Cubit<FavState> {
 
     _preferenceRepository.favList(of: username).then((List<int> favIds) {
       emit(state.copyWith(favIds: favIds));
-      _storiesRepository
+      _hackerNewsRepository
           .fetchItemsStream(
             ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
           )

lib/cubits/history/history_cubit.dart

@@ -10,16 +10,16 @@ part 'history_state.dart';
 class HistoryCubit extends Cubit<HistoryState> {
   HistoryCubit({
     required AuthBloc authBloc,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
   })  : _authBloc = authBloc,
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         super(HistoryState.init()) {
     init();
   }
 
   final AuthBloc _authBloc;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   static const int _pageSize = 20;
 
   void init() {
@@ -27,7 +27,7 @@ class HistoryCubit extends Cubit<HistoryState> {
       if (authState.isLoggedIn) {
         final String username = authState.username;
 
-        _storiesRepository
+        _hackerNewsRepository
             .fetchSubmitted(userId: username)
             .then((List<int>? submittedIds) {
           emit(
@@ -38,7 +38,7 @@ class HistoryCubit extends Cubit<HistoryState> {
             ),
           );
           if (submittedIds != null) {
-            _storiesRepository
+            _hackerNewsRepository
                 .fetchItemsStream(
                   ids: submittedIds.sublist(
                     0,
@@ -66,7 +66,7 @@ class HistoryCubit extends Cubit<HistoryState> {
         upper = len;
       }
 
-      _storiesRepository
+      _hackerNewsRepository
           .fetchItemsStream(
             ids: state.submittedIds.sublist(
               lower,
@@ -93,12 +93,12 @@ class HistoryCubit extends Cubit<HistoryState> {
       ),
     );
 
-    _storiesRepository
+    _hackerNewsRepository
         .fetchSubmitted(userId: username)
         .then((List<int>? submittedIds) {
       emit(state.copyWith(submittedIds: submittedIds));
       if (submittedIds != null) {
-        _storiesRepository
+        _hackerNewsRepository
             .fetchItemsStream(
               ids: submittedIds.sublist(
                 0,

lib/cubits/notification/notification_cubit.dart

@@ -16,13 +16,13 @@ class NotificationCubit extends Cubit<NotificationState> {
   NotificationCubit({
     required AuthBloc authBloc,
     required PreferenceCubit preferenceCubit,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
     PreferenceRepository? preferenceRepository,
     SembastRepository? sembastRepository,
   })  : _authBloc = authBloc,
         _preferenceCubit = preferenceCubit,
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
         _sembastRepository =
@@ -54,7 +54,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
   final AuthBloc _authBloc;
   final PreferenceCubit _preferenceCubit;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   final PreferenceRepository _preferenceRepository;
   final SembastRepository _sembastRepository;
   String? _username;
@@ -82,7 +82,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
     for (final int id in commentsToBeLoaded) {
       Comment? comment = await _sembastRepository.getComment(id: id);
-      comment ??= await _storiesRepository.fetchComment(id: id);
+      comment ??= await _hackerNewsRepository.fetchComment(id: id);
       if (comment != null) {
         emit(
           state.copyWith(
@@ -160,7 +160,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
       for (final int id in commentsToBeLoaded) {
         Comment? comment = await _sembastRepository.getComment(id: id);
-        comment ??= await _storiesRepository.fetchComment(id: id);
+        comment ??= await _hackerNewsRepository.fetchComment(id: id);
         if (comment != null) {
           emit(state.copyWith(comments: <Comment>[...state.comments, comment]));
         }
@@ -184,7 +184,7 @@ class NotificationCubit extends Cubit<NotificationState> {
   }
 
   Future<void> _fetchReplies() {
-    return _storiesRepository
+    return _hackerNewsRepository
         .fetchSubmitted(userId: _authBloc.state.username)
         .then((List<int>? submittedItems) async {
       if (submittedItems != null) {
@@ -194,7 +194,9 @@ class NotificationCubit extends Cubit<NotificationState> {
         );
 
         for (final int id in subscribedItems) {
-          await _storiesRepository.fetchItem(id: id).then((Item? item) async {
+          await _hackerNewsRepository
+              .fetchItem(id: id)
+              .then((Item? item) async {
             final List<int> kids = item?.kids ?? <int>[];
             final List<int> previousKids =
                 (await _sembastRepository.kids(of: id)) ?? <int>[];
@@ -216,7 +218,7 @@ class NotificationCubit extends Cubit<NotificationState> {
                       ...state.unreadCommentsIds,
                     ]..sort((int lhs, int rhs) => rhs.compareTo(lhs)),
                   );
-                  await _storiesRepository
+                  await _hackerNewsRepository
                       .fetchComment(id: newCommentId)
                       .then((Comment? comment) {
                     if (comment != null && !comment.dead && !comment.deleted) {

lib/cubits/pin/pin_cubit.dart

@@ -1,5 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
@@ -9,28 +10,33 @@ part 'pin_state.dart';
 class PinCubit extends Cubit<PinState> {
   PinCubit({
     PreferenceRepository? preferenceRepository,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
   })  : _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         super(PinState.init()) {
     init();
   }
 
   final PreferenceRepository _preferenceRepository;
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
 
   void init() {
     emit(PinState.init());
     _preferenceRepository.pinnedStoriesIds.then((List<int> ids) {
       emit(state.copyWith(pinnedStoriesIds: ids));
 
-      _storiesRepository.fetchStoriesStream(ids: ids).listen(_onStoryFetched);
+      _hackerNewsRepository
+          .fetchStoriesStream(ids: ids)
+          .listen(_onStoryFetched);
     }).whenComplete(() => emit(state.copyWith(status: Status.success)));
   }
 
-  void pinStory(Story story) {
+  void pinStory(
+    Story story, {
+    VoidCallback? onDone,
+  }) {
     if (!state.pinnedStoriesIds.contains(story.id)) {
       emit(
         state.copyWith(
@@ -39,10 +45,14 @@ class PinCubit extends Cubit<PinState> {
         ),
       );
       _preferenceRepository.updatePinnedStoriesIds(state.pinnedStoriesIds);
+      onDone?.call();
     }
   }
 
-  void unpinStory(Story story) {
+  void unpinStory(
+    Story story, {
+    VoidCallback? onDone,
+  }) {
     emit(
       state.copyWith(
         pinnedStoriesIds: <int>[...state.pinnedStoriesIds]..remove(story.id),
@@ -50,6 +60,7 @@ class PinCubit extends Cubit<PinState> {
       ),
     );
     _preferenceRepository.updatePinnedStoriesIds(state.pinnedStoriesIds);
+    onDone?.call();
   }
 
   void refresh() {

lib/cubits/poll/poll_cubit.dart

@@ -11,13 +11,13 @@ part 'poll_state.dart';
 class PollCubit extends Cubit<PollState> {
   PollCubit({
     required Story story,
-    StoriesRepository? storiesRepository,
+    HackerNewsRepository? hackerNewsRepository,
   })  : _story = story,
-        _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+        _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         super(PollState.init());
 
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
   final Story _story;
 
   Future<void> init({
@@ -33,7 +33,7 @@ class PollCubit extends Cubit<PollState> {
 
     if (pollOptionsIds.isEmpty || refresh) {
       final Story? updatedStory =
-          await _storiesRepository.fetchStory(id: _story.id);
+          await _hackerNewsRepository.fetchStory(id: _story.id);
 
       if (updatedStory != null) {
         pollOptionsIds = updatedStory.parts;
@@ -47,7 +47,7 @@ class PollCubit extends Cubit<PollState> {
     }
 
     if (pollOptionsIds.isNotEmpty) {
-      final List<PollOption> pollOptions = (await _storiesRepository
+      final List<PollOption> pollOptions = (await _hackerNewsRepository
               .fetchPollOptionsStream(ids: pollOptionsIds)
               .toSet())
           .toList();

lib/cubits/preference/preference_state.dart

@@ -70,6 +70,14 @@ class PreferenceState extends Equatable {
 
   bool get customTabEnabled => _isOn<CustomTabPreference>();
 
+  bool get material3Enabled => _isOn<Material3Preference>();
+
+  bool get manualPaginationEnabled => _isOn<ManualPaginationPreference>();
+
+  bool get trueDarkModeEnabled => _isOn<TrueDarkModePreference>();
+
+  bool get hapticFeedbackEnabled => _isOn<HapticFeedbackPreference>();
+
   double get textScaleFactor =>
       preferences.singleWhereType<TextScaleFactorPreference>().val;
 

lib/cubits/search/search_cubit.dart

@@ -102,6 +102,18 @@ class SearchCubit extends Cubit<SearchState> {
     search(state.params.query);
   }
 
+  void onExactMatchToggled() {
+    emit(
+      state.copyWith(
+        params: state.params.copyWith(
+          exactMatch: !state.params.exactMatch,
+        ),
+      ),
+    );
+
+    search(state.params.query);
+  }
+
   void onDateTimeRangeUpdated(DateTime start, DateTime end) {
     final DateTime updatedStart = start.copyWith(
       second: 0,

lib/cubits/user/user_cubit.dart

@@ -7,16 +7,16 @@ import 'package:hacki/repositories/repositories.dart';
 part 'user_state.dart';
 
 class UserCubit extends Cubit<UserState> {
-  UserCubit({StoriesRepository? storiesRepository})
-      : _storiesRepository =
-            storiesRepository ?? locator.get<StoriesRepository>(),
+  UserCubit({HackerNewsRepository? hackerNewsRepository})
+      : _hackerNewsRepository =
+            hackerNewsRepository ?? locator.get<HackerNewsRepository>(),
         super(const UserState.init());
 
-  final StoriesRepository _storiesRepository;
+  final HackerNewsRepository _hackerNewsRepository;
 
   void init({required String userId}) {
     emit(state.copyWith(status: Status.inProgress));
-    _storiesRepository.fetchUser(id: userId).then((User? user) {
+    _hackerNewsRepository.fetchUser(id: userId).then((User? user) {
       emit(
         state.copyWith(
           user: user ?? User.emptyWithId(userId),

lib/extensions/context_extension.dart

@@ -85,4 +85,8 @@ extension ContextExtension on BuildContext {
   int get storyTileMaxLines {
     return _storyTileMaxLines;
   }
+
+  double get topPadding {
+    return MediaQuery.of(this).padding.top + kToolbarHeight;
+  }
 }

lib/extensions/item_action_mixin.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hacki/blocs/auth/auth_bloc.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
@@ -103,31 +104,26 @@ mixin ItemActionMixin<T extends StatefulWidget> on State<T> {
         context: context,
         builder: (BuildContext context) {
           return SafeArea(
-            child: ColoredBox(
-              color: Theme.of(context).canvasColor,
-              child: Material(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    ListTile(
-                      onTap: () => context.pop(item.url),
-                      title: const Text('Link to article'),
-                    ),
-                    ListTile(
-                      onTap: () => context.pop(
-                        'https://news.ycombinator.com/item?id=${item.id}',
-                      ),
-                      title: const Text('Link to HN'),
-                    ),
-                  ],
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                ListTile(
+                  onTap: () => context.pop(item.url),
+                  title: const Text('Link to article'),
                 ),
-              ),
+                ListTile(
+                  onTap: () => context.pop(
+                    '${Constants.hackerNewsItemLinkPrefix}${item.id}',
+                  ),
+                  title: const Text('Link to HN'),
+                ),
+              ],
             ),
           );
         },
       );
     } else {
-      linkToShare = 'https://news.ycombinator.com/item?id=${item.id}';
+      linkToShare = '${Constants.hackerNewsItemLinkPrefix}${item.id}';
     }
 
     if (linkToShare != null) {

lib/main.dart

@@ -19,6 +19,7 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/services/fetcher.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/haptic_feedback_util.dart';
 import 'package:hacki/utils/theme_util.dart';
 import 'package:hive/hive.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
@@ -229,14 +230,23 @@ class HackiApp extends StatelessWidget {
           )..init(),
         ),
       ],
-      child: BlocBuilder<PreferenceCubit, PreferenceState>(
+      child: BlocConsumer<PreferenceCubit, PreferenceState>(
+        listenWhen: (PreferenceState previous, PreferenceState current) =>
+            previous.hapticFeedbackEnabled != current.hapticFeedbackEnabled,
+        listener: (_, PreferenceState state) {
+          HapticFeedbackUtil.enabled = state.hapticFeedbackEnabled;
+        },
         buildWhen: (PreferenceState previous, PreferenceState current) =>
             previous.appColor != current.appColor ||
             previous.font != current.font ||
-            previous.textScaleFactor != current.textScaleFactor,
+            previous.textScaleFactor != current.textScaleFactor ||
+            previous.material3Enabled != current.material3Enabled ||
+            previous.trueDarkModeEnabled != current.trueDarkModeEnabled,
         builder: (BuildContext context, PreferenceState state) {
           return AdaptiveTheme(
-            key: ValueKey<String>('${state.appColor}${state.font}'),
+            key: ValueKey<String>(
+              '''${state.appColor}${state.font}${state.material3Enabled}${state.trueDarkModeEnabled}''',
+            ),
             light: ThemeData(
               primaryColor: state.appColor,
               colorScheme: ColorScheme.fromSwatch(
@@ -251,7 +261,7 @@ class HackiApp extends StatelessWidget {
                 primarySwatch: state.appColor,
                 brightness: Brightness.dark,
               ),
-              canvasColor: Palette.black,
+              canvasColor: state.trueDarkModeEnabled ? Palette.black : null,
               fontFamily: state.font.name,
             ),
             initial: savedThemeMode ?? AdaptiveThemeMode.system,
@@ -287,7 +297,61 @@ class HackiApp extends StatelessWidget {
                         title: 'Hacki',
                         debugShowCheckedModeBanner: false,
                         theme: (isDarkModeEnabled ? darkTheme : theme).copyWith(
-                          useMaterial3: false,
+                          useMaterial3: state.material3Enabled,
+                          dividerTheme: state.material3Enabled
+                              ? DividerThemeData(
+                                  color: Palette.grey.withOpacity(0.2),
+                                )
+                              : null,
+                          switchTheme: state.material3Enabled
+                              ? SwitchThemeData(
+                                  trackColor: MaterialStateProperty.resolveWith(
+                                    (Set<MaterialState> states) {
+                                      if (states
+                                          .contains(MaterialState.selected)) {
+                                        return null;
+                                      } else {
+                                        return Palette.grey.withOpacity(0.2);
+                                      }
+                                    },
+                                  ),
+                                )
+                              : null,
+                          bottomSheetTheme: state.material3Enabled
+                              ? const BottomSheetThemeData(
+                                  modalElevation: 8,
+                                  clipBehavior: Clip.hardEdge,
+                                  shadowColor: Palette.black,
+                                )
+                              : null,
+                          inputDecorationTheme: state.material3Enabled
+                              ? InputDecorationTheme(
+                                  enabledBorder: UnderlineInputBorder(
+                                    borderSide: BorderSide(
+                                      color: isDarkModeEnabled
+                                          ? Palette.white
+                                          : Palette.black,
+                                    ),
+                                  ),
+                                )
+                              : null,
+                          sliderTheme: state.material3Enabled
+                              ? SliderThemeData(
+                                  inactiveTrackColor:
+                                      state.appColor.shade200.withOpacity(0.5),
+                                )
+                              : null,
+                          outlinedButtonTheme: state.material3Enabled
+                              ? OutlinedButtonThemeData(
+                                  style: ButtonStyle(
+                                    side: MaterialStateBorderSide.resolveWith(
+                                      (_) => const BorderSide(
+                                        color: Palette.grey,
+                                      ),
+                                    ),
+                                  ),
+                                )
+                              : null,
                         ),
                         routerConfig: router,
                       ),

lib/models/discoverable_feature.dart

@@ -25,13 +25,18 @@ enum DiscoverableFeature {
     featureId: 'jump_up_button_with_long_press',
     title: 'Shortcut',
     description:
-        '''Tapping on this button will take you to the previous off-screen root level comment.\n\nLong press on it to jump to the very beginning of this thread.''',
+        '''Tapping on this button will take you to the previous root level comment.\n\nLong press on it to jump to the very beginning of this thread.''',
   ),
   jumpDownButton(
     featureId: 'jump_down_button_with_long_press',
     title: 'Shortcut',
     description:
-        '''Tapping on this button will take you to the next off-screen root level comment.\n\nLong press on it to jump to the end of this thread.''',
+        '''Tapping on this button will take you to the next root level comment.\n\nLong press on it to jump to the end of this thread.''',
+  ),
+  searchInThread(
+    featureId: 'search_in_thread',
+    title: 'Search in Thread',
+    description: '''Search for comments in this thread.''',
   );
 
   const DiscoverableFeature({

lib/models/item/buildable_comment.dart

@@ -17,6 +17,7 @@ class BuildableComment extends Comment with Buildable {
     required super.deleted,
     required super.hidden,
     required super.level,
+    required super.isFromCache,
     required this.elements,
   });
 
@@ -33,6 +34,7 @@ class BuildableComment extends Comment with Buildable {
           deleted: comment.deleted,
           level: comment.level,
           hidden: comment.hidden,
+          isFromCache: comment.isFromCache,
         );
 
   @override
@@ -53,6 +55,7 @@ class BuildableComment extends Comment with Buildable {
       hidden: hidden ?? this.hidden,
       level: level ?? this.level,
       elements: elements,
+      isFromCache: isFromCache,
     );
   }
 

lib/models/item/comment.dart

@@ -13,6 +13,7 @@ class Comment extends Item {
     required super.deleted,
     required super.hidden,
     required this.level,
+    required this.isFromCache,
   }) : super(
           descendants: 0,
           parts: <int>[],
@@ -21,9 +22,12 @@ class Comment extends Item {
           type: '',
         );
 
-  Comment.fromJson(super.json, {this.level = 0}) : super.fromJson();
+  Comment.fromJson(super.json, {this.level = 0})
+      : isFromCache = json['fromCache'] == true,
+        super.fromJson();
 
   final int level;
+  final bool isFromCache;
 
   String get metadata => '''by $by $timeAgo''';
 
@@ -45,6 +49,7 @@ class Comment extends Item {
       deleted: deleted,
       hidden: hidden ?? this.hidden,
       level: level ?? this.level,
+      isFromCache: isFromCache,
     );
   }
 

lib/models/preference.dart

@@ -37,12 +37,16 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
       const MarkReadStoriesModePreference(),
       // Divider.
       const NotificationModePreference(),
-      const SwipeGesturePreference(),
       const AutoScrollModePreference(),
       const CollapseModePreference(),
       const ReaderModePreference(),
       const CustomTabPreference(),
+      const ManualPaginationPreference(),
+      const SwipeGesturePreference(),
+      const HapticFeedbackPreference(),
       const EyeCandyModePreference(),
+      const TrueDarkModePreference(),
+      const Material3Preference(),
     ],
   );
 
@@ -66,6 +70,8 @@ const bool _notificationModeDefaultValue = true;
 const bool _swipeGestureModeDefaultValue = false;
 const bool _displayModeDefaultValue = true;
 const bool _eyeCandyModeDefaultValue = false;
+const bool _trueDarkModeDefaultValue = false;
+const bool _hapticFeedbackModeDefaultValue = true;
 const bool _readerModeDefaultValue = true;
 const bool _markReadStoriesModeDefaultValue = true;
 const bool _metadataModeDefaultValue = true;
@@ -73,6 +79,8 @@ const bool _storyUrlModeDefaultValue = true;
 const bool _collapseModeDefaultValue = true;
 const bool _autoScrollModeDefaultValue = false;
 const bool _customTabModeDefaultValue = false;
+const bool _material3ModeDefaultValue = false;
+const bool _paginationModeDefaultValue = false;
 const double _textScaleFactorDefaultValue = 1;
 final int _fetchModeDefaultValue = FetchMode.eager.index;
 final int _commentsOrderDefaultValue = CommentsOrder.natural.index;
@@ -97,7 +105,7 @@ class SwipeGesturePreference extends BooleanPreference {
   String get key => 'swipeGestureMode';
 
   @override
-  String get title => 'Enable Swipe Gesture';
+  String get title => 'Swipe Gesture';
 
   @override
   String get subtitle =>
@@ -285,6 +293,45 @@ class EyeCandyModePreference extends BooleanPreference {
   String get subtitle => 'some sort of magic.';
 }
 
+class ManualPaginationPreference extends BooleanPreference {
+  const ManualPaginationPreference({bool? val})
+      : super(val: val ?? _paginationModeDefaultValue);
+
+  @override
+  ManualPaginationPreference copyWith({required bool? val}) {
+    return ManualPaginationPreference(val: val);
+  }
+
+  @override
+  String get key => 'paginationMode';
+
+  @override
+  String get title => 'Manual Pagination';
+
+  @override
+  String get subtitle => '''so you can get stuff done.''';
+}
+
+class Material3Preference extends BooleanPreference {
+  const Material3Preference({bool? val})
+      : super(val: val ?? _material3ModeDefaultValue);
+
+  @override
+  Material3Preference copyWith({required bool? val}) {
+    return Material3Preference(val: val);
+  }
+
+  @override
+  String get key => 'material3Mode';
+
+  @override
+  String get title => 'Material 3';
+
+  @override
+  String get subtitle =>
+      '''experimental feature. Please open an issue on GitHub if you notice anything weird.''';
+}
+
 /// Whether or not to use Custom Tabs for launching URLs.
 /// If false, default browser will be used.
 ///
@@ -312,6 +359,47 @@ class CustomTabPreference extends BooleanPreference {
   bool get isDisplayable => Platform.isAndroid;
 }
 
+class TrueDarkModePreference extends BooleanPreference {
+  const TrueDarkModePreference({bool? val})
+      : super(val: val ?? _trueDarkModeDefaultValue);
+
+  @override
+  TrueDarkModePreference copyWith({required bool? val}) {
+    return TrueDarkModePreference(val: val);
+  }
+
+  @override
+  String get key => 'trueDarkMode';
+
+  @override
+  String get title => 'True Dark Mode';
+
+  @override
+  String get subtitle => 'real dark.';
+}
+
+class HapticFeedbackPreference extends BooleanPreference {
+  const HapticFeedbackPreference({bool? val})
+      : super(val: val ?? _hapticFeedbackModeDefaultValue);
+
+  @override
+  HapticFeedbackPreference copyWith({required bool? val}) {
+    return HapticFeedbackPreference(val: val);
+  }
+
+  @override
+  String get key => 'hapticFeedbackMode';
+
+  @override
+  String get title => 'Haptic Feedback';
+
+  @override
+  String get subtitle => '';
+
+  @override
+  bool get isDisplayable => Platform.isIOS;
+}
+
 class FetchModePreference extends IntPreference {
   FetchModePreference({int? val}) : super(val: val ?? _fetchModeDefaultValue);
 
@@ -401,7 +489,7 @@ class StoryMarkingModePreference extends IntPreference {
   String get key => 'storyMarkingMode';
 
   @override
-  String get title => 'Mark a Story as Read on';
+  String get title => 'Mark as Read on';
 }
 
 class AppColorPreference extends IntPreference {

lib/models/search_params.dart

@@ -8,31 +8,36 @@ class SearchParams extends Equatable {
     required this.filters,
     required this.query,
     required this.page,
-    this.sorted = false,
+    required this.sorted,
+    required this.exactMatch,
   });
 
   SearchParams.init()
       : filters = <SearchFilter>{},
         query = '',
         page = 0,
-        sorted = false;
+        sorted = false,
+        exactMatch = false;
 
   final Set<SearchFilter> filters;
   final String query;
   final int page;
   final bool sorted;
+  final bool exactMatch;
 
   SearchParams copyWith({
     Set<SearchFilter>? filters,
     String? query,
     int? page,
     bool? sorted,
+    bool? exactMatch,
   }) {
     return SearchParams(
       filters: filters ?? this.filters,
       query: query ?? this.query,
       page: page ?? this.page,
       sorted: sorted ?? this.sorted,
+      exactMatch: exactMatch ?? this.exactMatch,
     );
   }
 
@@ -43,6 +48,7 @@ class SearchParams extends Equatable {
       query: query,
       page: page,
       sorted: sorted,
+      exactMatch: exactMatch,
     );
   }
 
@@ -54,16 +60,19 @@ class SearchParams extends Equatable {
       query: query,
       page: page,
       sorted: sorted,
+      exactMatch: exactMatch,
     );
   }
 
   String get filteredQuery {
     final StringBuffer buffer = StringBuffer();
+    final String encodedQuery =
+        Uri.encodeComponent(exactMatch ? '"$query"' : query);
 
     if (sorted) {
-      buffer.write('search_by_date?query=${Uri.encodeComponent(query)}');
+      buffer.write('search_by_date?query=$encodedQuery');
     } else {
-      buffer.write('search?query=${Uri.encodeComponent(query)}');
+      buffer.write('search?query=$encodedQuery');
     }
 
     final Iterable<NumericFilter> numericFilters =
@@ -111,5 +120,6 @@ class SearchParams extends Equatable {
         query,
         page,
         sorted,
+        exactMatch,
       ];
 }

lib/models/story_marking_mode.dart

@@ -6,7 +6,8 @@ enum StoryMarkingMode {
   tap('tapping'),
   // Mark a story as read after user scrolls past or taps on it, whichever
   // happens the first.
-  scrollPastOrTap('scrolling past or tapping');
+  scrollPastOrTap('scrolling past or tapping'),
+  swipeGestureOnly('swipe gesture only');
 
   const StoryMarkingMode(this.label);
 

lib/repositories/hacker_news_repository.dart

@@ -1,19 +1,31 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
+import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
+import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/utils/utils.dart';
+import 'package:logger/logger.dart';
 
-/// [StoriesRepository] is for fetching
+/// [HackerNewsRepository] is for fetching
 /// [Item] such as [Story], [PollOption], [Comment] or [User].
 ///
 /// You can learn more about the Hacker News API at
 /// https://github.com/HackerNews/API.
-class StoriesRepository {
-  StoriesRepository({
+class HackerNewsRepository {
+  HackerNewsRepository({
     FirebaseClient? firebaseClient,
-  }) : _firebaseClient = firebaseClient ?? FirebaseClient.anonymous();
+    SembastRepository? sembastRepository,
+    Logger? logger,
+  })  : _firebaseClient = firebaseClient ?? FirebaseClient.anonymous(),
+        _sembastRepository =
+            sembastRepository ?? locator.get<SembastRepository>(),
+        _logger = logger ?? locator.get<Logger>();
 
   final FirebaseClient _firebaseClient;
+  final SembastRepository _sembastRepository;
+  final Logger _logger;
   static const String _baseUrl = 'https://hacker-news.firebaseio.com/v0/';
 
   Future<Map<String, dynamic>?> _fetchItemJson(int id) async {
@@ -34,11 +46,10 @@ class StoriesRepository {
         await _fetchItemJson(id).then((Map<String, dynamic>? json) {
       if (json == null) return null;
 
-      final String type = json['type'] as String;
-      if (type == 'story' || type == 'job' || type == 'poll') {
+      if (json.isStory) {
         final Story story = Story.fromJson(json);
         return story;
-      } else if (type == 'comment') {
+      } else if (json.isComment) {
         final Comment comment = Comment.fromJson(json);
         return comment;
       }
@@ -57,11 +68,10 @@ class StoriesRepository {
 
       final Map<String, dynamic> json = val as Map<String, dynamic>;
 
-      final String type = json['type'] as String;
-      if (type == 'story' || type == 'job' || type == 'poll') {
+      if (json.isStory) {
         final Story story = Story.fromJson(json);
         return story;
-      } else if (type == 'comment') {
+      } else if (json.isComment) {
         final Comment comment = Comment.fromJson(json);
         return comment;
       }
@@ -226,7 +236,17 @@ class StoriesRepository {
         if (json == null) return null;
 
         final Comment comment = Comment.fromJson(json, level: level);
+
+        if (!json.isFromCache) {
+          unawaited(_sembastRepository.cacheComment(comment));
+        }
+
         return comment;
+      }).onError((Object? error, StackTrace stackTrace) {
+        _logger.e(error, stackTrace: stackTrace);
+        return _sembastRepository
+            .getCachedComment(id: id)
+            .then((Comment? value) => value?.copyWith(level: level));
       });
 
       if (comment != null) {
@@ -251,7 +271,17 @@ class StoriesRepository {
         if (json == null) return null;
 
         final Comment comment = Comment.fromJson(json, level: level);
+
+        if (!json.isFromCache) {
+          unawaited(_sembastRepository.cacheComment(comment));
+        }
+
         return comment;
+      }).onError((Object? error, StackTrace stackTrace) {
+        _logger.e(error, stackTrace: stackTrace);
+        return _sembastRepository
+            .getCachedComment(id: id)
+            .then((Comment? value) => value?.copyWith(level: level));
       });
 
       if (comment != null) {
@@ -275,11 +305,10 @@ class StoriesRepository {
           await _fetchItemJson(id).then((Map<String, dynamic>? json) async {
         if (json == null) return null;
 
-        final String type = json['type'] as String;
-        if (type == 'story' || type == 'job') {
+        if (json.isStory) {
           final Story story = Story.fromJson(json);
           return story;
-        } else if (type == 'comment') {
+        } else if (json.isComment) {
           final Comment comment = Comment.fromJson(json);
           return comment;
         }
@@ -343,12 +372,57 @@ class StoriesRepository {
     Map<String, dynamic>? json,
   ) async {
     if (json == null) return null;
-    final String text = json['text'] as String? ?? '';
-    final String parsedText = await compute<String, String>(
-      HtmlUtil.parseHtml,
-      text,
-    );
-    json['text'] = parsedText;
+    final int? itemId = json.itemId;
+
+    String? cachedText;
+    if (json.isComment && itemId != null) {
+      cachedText =
+          (await locator.get<SembastRepository>().getCachedComment(id: itemId))
+              ?.text;
+    }
+
+    bool isValid(String? text) {
+      return cachedText != null &&
+          cachedText != '[delayed]' &&
+          cachedText != '[flagged]';
+    }
+
+    if (isValid(cachedText)) {
+      json
+        ..text = cachedText
+        ..isFromCache = true;
+    } else {
+      final String? text = json.text;
+      if (text == null || text.isEmpty) return json;
+      final String parsedText = await compute<String, String>(
+        HtmlUtil.parseHtml,
+        text,
+      );
+      json.text = parsedText;
+    }
+
     return json;
   }
 }
+
+extension on Map<String, dynamic> {
+  bool get isFromCache => this['fromCache'] == true;
+
+  set isFromCache(bool value) {
+    this['fromCache'] = value;
+  }
+
+  String? get text => this['text'] as String?;
+
+  set text(String? value) {
+    this['text'] = value;
+  }
+
+  int? get itemId => this['id'] as int?;
+
+  String? get type => this['type'] as String?;
+
+  bool get isStory => type == 'story' || type == 'job' || type == 'poll';
+
+  bool get isComment => type == 'comment';
+}

lib/repositories/preference_repository.dart

@@ -384,7 +384,7 @@ class PreferenceRepository {
     );
   }
 
-  Future<void> updateHasRead(int storyId) async {
+  Future<void> addHasRead(int storyId) async {
     final String key = _getHasReadKey(storyId);
     if (Platform.isIOS) {
       await _syncedPrefs.setBool(key: key, val: true);
@@ -398,6 +398,17 @@ class PreferenceRepository {
     }
   }
 
+  Future<void> removeHasRead(int storyId) async {
+    final String key = _getHasReadKey(storyId);
+    if (Platform.isIOS) {
+      await _syncedPrefs.remove(key: key);
+    } else {
+      final SharedPreferences prefs = await _prefs;
+
+      await prefs.remove(_getHasReadKey(storyId));
+    }
+  }
+
   Future<void> clearAllReadStories() async {
     if (Platform.isIOS) {
       await _syncedPrefs.clearAll();

lib/repositories/repositories.dart

@@ -1,7 +1,7 @@
 export 'auth_repository.dart';
+export 'hacker_news_repository.dart';
 export 'offline_repository.dart';
 export 'post_repository.dart';
 export 'preference_repository.dart';
 export 'search_repository.dart';
 export 'sembast_repository.dart';
-export 'stories_repository.dart';

lib/repositories/search_repository.dart

@@ -60,6 +60,7 @@ class SearchRepository {
           deleted: false,
           hidden: false,
           level: 0,
+          isFromCache: false,
         );
         yield comment;
       } else {

lib/screens/home/home_screen.dart

@@ -49,7 +49,7 @@ class _HomeScreenState extends State<HomeScreen>
     super.didPopNext();
     if (context.read<StoriesBloc>().deviceScreenType ==
         DeviceScreenType.mobile) {
-      locator.get<Logger>().i('resetting comments in CommentCache');
+      locator.get<Logger>().i('Resetting comments in CommentCache');
       Future<void>.delayed(
         Durations.ms500,
         locator.get<CommentCache>().resetComments,
@@ -196,12 +196,13 @@ class _HomeScreenState extends State<HomeScreen>
   }
 
   void onStoryTapped(Story story) {
-    final bool useReader = context.read<PreferenceCubit>().state.readerEnabled;
+    final PreferenceState prefState = context.read<PreferenceCubit>().state;
+    final bool useReader = prefState.readerEnabled;
+    final StoryMarkingMode storyMarkingMode = prefState.storyMarkingMode;
     final bool offlineReading =
         context.read<StoriesBloc>().state.isOfflineReading;
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
-    final StoryMarkingMode storyMarkingMode =
-        context.read<PreferenceCubit>().state.storyMarkingMode;
+    final bool markReadStoriesEnabled = prefState.markReadStoriesEnabled;
 
     // If a story is a job story and it has a link to the job posting,
     // it would be better to just navigate to the web page.
@@ -210,7 +211,12 @@ class _HomeScreenState extends State<HomeScreen>
     if (isJobWithLink) {
       context.read<ReminderCubit>().removeLastReadStoryId();
     } else {
-      final ItemScreenArgs args = ItemScreenArgs(item: story);
+      final bool shouldMarkNewComment = markReadStoriesEnabled &&
+          context.read<StoriesBloc>().state.readStoriesIds.contains(story.id);
+      final ItemScreenArgs args = ItemScreenArgs(
+        item: story,
+        shouldMarkNewComment: shouldMarkNewComment,
+      );
 
       context.read<ReminderCubit>().updateLastReadStoryId(story.id);
 
@@ -230,7 +236,7 @@ class _HomeScreenState extends State<HomeScreen>
       );
     }
 
-    if (storyMarkingMode.shouldDetectTapping) {
+    if (markReadStoriesEnabled && storyMarkingMode.shouldDetectTapping) {
       context.read<StoriesBloc>().add(StoryRead(story: story));
     }
 
@@ -253,7 +259,7 @@ class _HomeScreenState extends State<HomeScreen>
     final int? id = event.itemId;
 
     if (id != null) {
-      locator.get<StoriesRepository>().fetchItem(id: id).then((Item? item) {
+      locator.get<HackerNewsRepository>().fetchItem(id: id).then((Item? item) {
         if (mounted) {
           if (item != null) {
             goToItemScreen(
@@ -272,7 +278,7 @@ class _HomeScreenState extends State<HomeScreen>
     if (storyId == null) return;
 
     await locator
-        .get<StoriesRepository>()
+        .get<HackerNewsRepository>()
         .fetchStory(id: storyId)
         .then((Story? story) {
       if (story == null) {
@@ -297,7 +303,7 @@ class _HomeScreenState extends State<HomeScreen>
       context.read<NotificationCubit>().markAsRead(commentId);
 
       await locator
-          .get<StoriesRepository>()
+          .get<HackerNewsRepository>()
           .fetchStory(id: storyId)
           .then((Story? story) {
         if (story == null) {

lib/screens/item/item_screen.dart

@@ -24,23 +24,26 @@ class ItemScreenArgs extends Equatable {
   const ItemScreenArgs({
     required this.item,
     this.onlyShowTargetComment = false,
+    this.shouldMarkNewComment = false,
     this.useCommentCache = false,
     this.targetComments,
   });
 
   final Item item;
   final bool onlyShowTargetComment;
+  final bool shouldMarkNewComment;
   final List<Comment>? targetComments;
 
   /// when the user is trying to view a sub-thread from a main thread, we don't
-  /// need to fetch comments from [StoriesRepository] since we have some, if not
-  /// all, comments cached in [CommentCache].
+  /// need to fetch comments from [HackerNewsRepository] since we have some,
+  /// if not all, comments cached in [CommentCache].
   final bool useCommentCache;
 
   @override
   List<Object?> get props => <Object?>[
         item,
         onlyShowTargetComment,
+        shouldMarkNewComment,
         targetComments,
         useCommentCache,
       ];
@@ -52,6 +55,7 @@ class ItemScreen extends StatefulWidget {
     required this.parentComments,
     super.key,
     this.splitViewEnabled = false,
+    this.shouldMarkNewComment = false,
   });
 
   static const String routeName = 'item';
@@ -81,6 +85,7 @@ class ItemScreen extends StatefulWidget {
         child: ItemScreen(
           item: args.item,
           parentComments: args.targetComments ?? <Comment>[],
+          shouldMarkNewComment: args.shouldMarkNewComment,
         ),
       ),
     );
@@ -123,6 +128,7 @@ class ItemScreen extends StatefulWidget {
             item: args.item,
             parentComments: args.targetComments ?? <Comment>[],
             splitViewEnabled: true,
+            shouldMarkNewComment: args.shouldMarkNewComment,
           ),
         ),
       ),
@@ -130,6 +136,7 @@ class ItemScreen extends StatefulWidget {
   }
 
   final bool splitViewEnabled;
+  final bool shouldMarkNewComment;
   final Item item;
   final List<Comment> parentComments;
 
@@ -142,9 +149,6 @@ class _ItemScreenState extends State<ItemScreen>
   final TextEditingController commentEditingController =
       TextEditingController();
   final FocusNode focusNode = FocusNode();
-  final ItemScrollController itemScrollController = ItemScrollController();
-  final ItemPositionsListener itemPositionsListener =
-      ItemPositionsListener.create();
   final ScrollOffsetListener scrollOffsetListener =
       ScrollOffsetListener.create();
   final Throttle storyLinkTapThrottle = Throttle(
@@ -182,6 +186,7 @@ class _ItemScreenState extends State<ItemScreen>
         FeatureDiscovery.discoverFeatures(
           context,
           <String>{
+            DiscoverableFeature.searchInThread.featureId,
             DiscoverableFeature.pinToTop.featureId,
             DiscoverableFeature.addStoryToFavList.featureId,
             DiscoverableFeature.openStoryInWebView.featureId,
@@ -218,8 +223,6 @@ class _ItemScreenState extends State<ItemScreen>
 
   @override
   Widget build(BuildContext context) {
-    final double topPadding =
-        MediaQuery.of(context).padding.top + kToolbarHeight;
     return BlocBuilder<AuthBloc, AuthState>(
       builder: (BuildContext context, AuthState authState) {
         return MultiBlocListener(
@@ -272,15 +275,14 @@ class _ItemScreenState extends State<ItemScreen>
                       children: <Widget>[
                         Positioned.fill(
                           child: MainView(
-                            itemScrollController: itemScrollController,
-                            itemPositionsListener: itemPositionsListener,
                             scrollOffsetListener: scrollOffsetListener,
                             commentEditingController: commentEditingController,
                             authState: authState,
-                            topPadding: topPadding,
+                            topPadding: context.topPadding,
                             splitViewEnabled: widget.splitViewEnabled,
                             onMoreTapped: onMoreTapped,
                             onRightMoreTapped: onRightMoreTapped,
+                            shouldMarkNewComment: widget.shouldMarkNewComment,
                           ),
                         ),
                         BlocBuilder<SplitViewCubit, SplitViewState>(
@@ -313,24 +315,24 @@ class _ItemScreenState extends State<ItemScreen>
                             );
                           },
                         ),
-                        Positioned(
+                        const Positioned(
                           right: Dimens.pt12,
                           bottom: Dimens.pt36,
-                          child: CustomFloatingActionButton(
-                            itemScrollController: itemScrollController,
-                            itemPositionsListener: itemPositionsListener,
-                          ),
+                          child: CustomFloatingActionButton(),
                         ),
                         Positioned(
                           bottom: Dimens.zero,
                           left: Dimens.zero,
                           right: Dimens.zero,
-                          child: ReplyBox(
-                            splitViewEnabled: true,
-                            focusNode: focusNode,
-                            textEditingController: commentEditingController,
-                            onSendTapped: onSendTapped,
-                            onChanged: context.read<EditCubit>().onTextChanged,
+                          child: Material(
+                            child: ReplyBox(
+                              splitViewEnabled: true,
+                              focusNode: focusNode,
+                              textEditingController: commentEditingController,
+                              onSendTapped: onSendTapped,
+                              onChanged:
+                                  context.read<EditCubit>().onTextChanged,
+                            ),
                           ),
                         ),
                       ],
@@ -348,20 +350,16 @@ class _ItemScreenState extends State<ItemScreen>
                       fontSizeIconButtonKey: fontSizeIconButtonKey,
                     ),
                     body: MainView(
-                      itemScrollController: itemScrollController,
-                      itemPositionsListener: itemPositionsListener,
                       scrollOffsetListener: scrollOffsetListener,
                       commentEditingController: commentEditingController,
                       authState: authState,
-                      topPadding: topPadding,
+                      topPadding: context.topPadding,
                       splitViewEnabled: widget.splitViewEnabled,
                       onMoreTapped: onMoreTapped,
                       onRightMoreTapped: onRightMoreTapped,
+                      shouldMarkNewComment: widget.shouldMarkNewComment,
                     ),
-                    floatingActionButton: CustomFloatingActionButton(
-                      itemScrollController: itemScrollController,
-                      itemPositionsListener: itemPositionsListener,
-                    ),
+                    floatingActionButton: const CustomFloatingActionButton(),
                     bottomSheet: ReplyBox(
                       textEditingController: commentEditingController,
                       focusNode: focusNode,
@@ -437,42 +435,36 @@ class _ItemScreenState extends State<ItemScreen>
       context: context,
       builder: (BuildContext context) {
         return SafeArea(
-          child: ColoredBox(
-            color: Theme.of(context).canvasColor,
-            child: Material(
-              color: Palette.transparent,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
-                  ListTile(
-                    leading: const Icon(Icons.av_timer),
-                    title: const Text('View ancestors'),
-                    onTap: () {
-                      context.pop();
-                      onTimeMachineActivated(comment);
-                    },
-                    enabled:
-                        comment.level > 0 && !(comment.dead || comment.deleted),
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.list),
-                    title: const Text('View in separate thread'),
-                    onTap: () {
-                      locator.get<AppReviewService>().requestReview();
-                      context.pop();
-                      goToItemScreen(
-                        args: ItemScreenArgs(
-                          item: comment,
-                          useCommentCache: true,
-                        ),
-                        forceNewScreen: true,
-                      );
-                    },
-                    enabled: !(comment.dead || comment.deleted),
-                  ),
-                ],
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              ListTile(
+                leading: const Icon(Icons.av_timer),
+                title: const Text('View ancestors'),
+                onTap: () {
+                  context.pop();
+                  onTimeMachineActivated(comment);
+                },
+                enabled:
+                    comment.level > 0 && !(comment.dead || comment.deleted),
               ),
-            ),
+              ListTile(
+                leading: const Icon(Icons.list),
+                title: const Text('View in separate thread'),
+                onTap: () {
+                  locator.get<AppReviewService>().requestReview();
+                  context.pop();
+                  goToItemScreen(
+                    args: ItemScreenArgs(
+                      item: comment,
+                      useCommentCache: true,
+                    ),
+                    forceNewScreen: true,
+                  );
+                },
+                enabled: !(comment.dead || comment.deleted),
+              ),
+            ],
           ),
         );
       },

lib/screens/item/widgets/custom_app_bar.dart

@@ -34,6 +34,7 @@ class CustomAppBar extends AppBar {
               ),
               const Spacer(),
             ],
+            const InThreadSearchIconButton(),
             IconButton(
               key: fontSizeIconButtonKey,
               icon: Text(

lib/screens/item/widgets/custom_floating_action_button.dart

@@ -3,108 +3,93 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/context_extension.dart';
 import 'package:hacki/models/discoverable_feature.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class CustomFloatingActionButton extends StatelessWidget {
   const CustomFloatingActionButton({
-    required this.itemScrollController,
-    required this.itemPositionsListener,
     super.key,
   });
 
-  final ItemScrollController itemScrollController;
-  final ItemPositionsListener itemPositionsListener;
-
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<CommentsCubit, CommentsState>(
-      builder: (BuildContext context, CommentsState state) {
-        return BlocBuilder<EditCubit, EditState>(
-          buildWhen: (EditState previous, EditState current) =>
-              previous.showReplyBox != current.showReplyBox,
-          builder: (BuildContext context, EditState editState) {
-            return AnimatedPadding(
-              padding: editState.showReplyBox
-                  ? const EdgeInsets.only(
-                      bottom: Dimens.replyBoxCollapsedHeight,
-                    )
-                  : EdgeInsets.zero,
-              duration: Durations.ms200,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
-                  CustomDescribedFeatureOverlay(
-                    feature: DiscoverableFeature.jumpUpButton,
-                    contentLocation: ContentLocation.above,
-                    tapTarget: const Icon(
+    return BlocBuilder<EditCubit, EditState>(
+      buildWhen: (EditState previous, EditState current) =>
+          previous.showReplyBox != current.showReplyBox,
+      builder: (BuildContext context, EditState editState) {
+        return AnimatedPadding(
+          padding: editState.showReplyBox
+              ? const EdgeInsets.only(
+                  bottom: Dimens.replyBoxCollapsedHeight,
+                )
+              : EdgeInsets.zero,
+          duration: Durations.ms200,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              CustomDescribedFeatureOverlay(
+                feature: DiscoverableFeature.jumpUpButton,
+                contentLocation: ContentLocation.above,
+                tapTarget: const Icon(
+                  Icons.keyboard_arrow_up,
+                  color: Palette.white,
+                ),
+                child: InkWell(
+                  onLongPress: () =>
+                      context.read<CommentsCubit>().scrollTo(index: 0),
+                  child: FloatingActionButton.small(
+                    backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+
+                    /// Randomly generated string as heroTag to prevent
+                    /// default [FloatingActionButton] animation.
+                    heroTag: UniqueKey().hashCode,
+                    onPressed: () {
+                      HapticFeedbackUtil.selection();
+                      context.read<CommentsCubit>().scrollToPreviousRoot();
+                    },
+                    child: Icon(
                       Icons.keyboard_arrow_up,
-                      color: Palette.white,
-                    ),
-                    child: InkWell(
-                      onLongPress: () => itemScrollController.scrollTo(
-                        index: 0,
-                        duration: Durations.ms400,
-                      ),
-                      child: FloatingActionButton.small(
-                        backgroundColor:
-                            Theme.of(context).scaffoldBackgroundColor,
-
-                        /// Randomly generated string as heroTag to prevent
-                        /// default [FloatingActionButton] animation.
-                        heroTag: UniqueKey().hashCode,
-                        onPressed: () {
-                          HapticFeedbackUtil.selection();
-                          context.read<CommentsCubit>().scrollToPreviousRoot(
-                                itemScrollController,
-                                itemPositionsListener,
-                              );
-                        },
-                        child: Icon(
-                          Icons.keyboard_arrow_up,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                      ),
+                      color: Theme.of(context).colorScheme.primary,
                     ),
                   ),
-                  CustomDescribedFeatureOverlay(
-                    feature: DiscoverableFeature.jumpDownButton,
-                    tapTarget: const Icon(
-                      Icons.keyboard_arrow_down,
-                      color: Palette.white,
-                    ),
-                    child: InkWell(
-                      onLongPress: () => itemScrollController.scrollTo(
-                        index: state.comments.length,
-                        duration: Durations.ms400,
-                      ),
-                      child: FloatingActionButton.small(
-                        backgroundColor:
-                            Theme.of(context).scaffoldBackgroundColor,
-
-                        /// Same as above.
-                        heroTag: UniqueKey().hashCode,
-                        onPressed: () {
-                          HapticFeedbackUtil.selection();
-                          context.read<CommentsCubit>().scrollToNextRoot(
-                                itemScrollController,
-                                itemPositionsListener,
-                              );
-                        },
-                        child: Icon(
-                          Icons.keyboard_arrow_down,
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
+                ),
               ),
-            );
-          },
+              CustomDescribedFeatureOverlay(
+                feature: DiscoverableFeature.jumpDownButton,
+                tapTarget: const Icon(
+                  Icons.keyboard_arrow_down,
+                  color: Palette.white,
+                ),
+                child: InkWell(
+                  onLongPress: () {
+                    final CommentsCubit cubit = context.read<CommentsCubit>();
+                    cubit.scrollTo(index: cubit.state.comments.length);
+                  },
+                  child: FloatingActionButton.small(
+                    backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+
+                    /// Same as above.
+                    heroTag: UniqueKey().hashCode,
+                    onPressed: () {
+                      HapticFeedbackUtil.selection();
+                      context.read<CommentsCubit>().scrollToNextRoot(
+                            onError: () => context.showSnackBar(
+                              content: '''No more root level comment below.''',
+                            ),
+                          );
+                    },
+                    child: Icon(
+                      Icons.keyboard_arrow_down,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
         );
       },
     );

lib/screens/item/widgets/in_thread_search_icon_button.dart

@@ -0,0 +1,211 @@
+import 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/blocs/auth/auth_bloc.dart';
+import 'package:hacki/cubits/comments/comments_cubit.dart';
+import 'package:hacki/models/models.dart';
+import 'package:hacki/screens/widgets/widgets.dart';
+import 'package:hacki/styles/styles.dart';
+
+class InThreadSearchIconButton extends StatelessWidget {
+  const InThreadSearchIconButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return OpenContainer(
+      closedColor: Palette.transparent,
+      openColor: Theme.of(context).canvasColor,
+      closedShape: const CircleBorder(),
+      closedElevation: 0,
+      openElevation: 0,
+      transitionType: ContainerTransitionType.fadeThrough,
+      closedBuilder: (BuildContext context, void Function() action) {
+        return CustomDescribedFeatureOverlay(
+          tapTarget: const Icon(
+            Icons.search,
+            color: Palette.white,
+          ),
+          feature: DiscoverableFeature.searchInThread,
+          child: IconButton(
+            tooltip: 'Search in thread',
+            icon: const Icon(Icons.search),
+            onPressed: action,
+          ),
+        );
+      },
+      openBuilder: (_, void Function({Object? returnValue}) action) =>
+          _InThreadSearchView(
+        commentsCubit: context.read<CommentsCubit>(),
+        action: action,
+      ),
+    );
+  }
+}
+
+class _InThreadSearchView extends StatefulWidget {
+  const _InThreadSearchView({
+    required this.commentsCubit,
+    required this.action,
+  });
+
+  final CommentsCubit commentsCubit;
+  final void Function({Object? returnValue}) action;
+
+  @override
+  State<_InThreadSearchView> createState() => _InThreadSearchViewState();
+}
+
+class _InThreadSearchViewState extends State<_InThreadSearchView> {
+  final ScrollController scrollController = ScrollController();
+  final FocusNode focusNode = FocusNode();
+  final TextEditingController textEditingController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    scrollController.addListener(onScroll);
+    textEditingController.text = widget.commentsCubit.state.inThreadSearchQuery;
+    if (textEditingController.text.isEmpty) {
+      focusNode.requestFocus();
+    }
+  }
+
+  @override
+  void dispose() {
+    scrollController
+      ..removeListener(onScroll)
+      ..dispose();
+    focusNode.dispose();
+    textEditingController.dispose();
+    super.dispose();
+  }
+
+  void onScroll() => focusNode.unfocus();
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider<CommentsCubit>.value(
+      value: widget.commentsCubit,
+      child: BlocBuilder<CommentsCubit, CommentsState>(
+        buildWhen: (CommentsState previous, CommentsState current) =>
+            previous.matchedComments != current.matchedComments ||
+            previous.inThreadSearchAuthor != current.inThreadSearchAuthor,
+        builder: (BuildContext context, CommentsState state) {
+          final AuthState authState = context.read<AuthBloc>().state;
+          return Scaffold(
+            resizeToAvoidBottomInset: true,
+            appBar: AppBar(
+              backgroundColor: Theme.of(context).canvasColor,
+              elevation: 0,
+              leadingWidth: 0,
+              leading: const SizedBox.shrink(),
+              title: Padding(
+                padding: const EdgeInsets.only(bottom: Dimens.pt8),
+                child: Flex(
+                  direction: Axis.horizontal,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    Expanded(
+                      child: TextField(
+                        controller: textEditingController,
+                        focusNode: focusNode,
+                        cursorColor: Theme.of(context).primaryColor,
+                        autocorrect: false,
+                        decoration: InputDecoration(
+                          hintText: 'Search in this thread',
+                          suffixText: '${state.matchedComments.length} results',
+                          focusedBorder: UnderlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Theme.of(context).primaryColor,
+                            ),
+                          ),
+                        ),
+                        onChanged: (String text) => widget.commentsCubit.search(
+                          text,
+                          author: state.inThreadSearchAuthor,
+                        ),
+                      ),
+                    ),
+                    IconButton(
+                      icon: Icon(
+                        Icons.close,
+                        color: Theme.of(context).colorScheme.onSurface,
+                      ),
+                      onPressed: widget.action,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            body: ListView(
+              controller: scrollController,
+              shrinkWrap: true,
+              children: <Widget>[
+                Row(
+                  children: <Widget>[
+                    const SizedBox(
+                      width: Dimens.pt12,
+                    ),
+                    CustomChip(
+                      selected: state.inThreadSearchAuthor == state.item.by,
+                      label: 'by OP',
+                      onSelected: (bool value) {
+                        if (value) {
+                          widget.commentsCubit.search(
+                            state.inThreadSearchQuery,
+                            author: state.item.by,
+                          );
+                        } else {
+                          widget.commentsCubit.search(
+                            state.inThreadSearchQuery,
+                          );
+                        }
+                      },
+                    ),
+                    const SizedBox(
+                      width: Dimens.pt12,
+                    ),
+                    if (authState.isLoggedIn)
+                      CustomChip(
+                        selected:
+                            state.inThreadSearchAuthor == authState.username,
+                        label: 'by me',
+                        onSelected: (bool value) {
+                          if (value) {
+                            widget.commentsCubit.search(
+                              state.inThreadSearchQuery,
+                              author: authState.username,
+                            );
+                          } else {
+                            widget.commentsCubit.search(
+                              state.inThreadSearchQuery,
+                            );
+                          }
+                        },
+                      ),
+                  ],
+                ),
+                for (final int i in state.matchedComments)
+                  CommentTile(
+                    index: i,
+                    comment: state.comments.elementAt(i),
+                    fetchMode: FetchMode.lazy,
+                    actionable: false,
+                    collapsable: false,
+                    onTap: () {
+                      widget.action();
+                      widget.commentsCubit.scrollTo(
+                        index: i + 1,
+                        alignment: 0.2,
+                      );
+                    },
+                  ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/screens/item/widgets/link_icon_button.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/discoverable_feature.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
@@ -27,7 +28,7 @@ class LinkIconButton extends StatelessWidget {
         ),
       ),
       onPressed: () => LinkUtil.launch(
-        'https://news.ycombinator.com/item?id=$storyId',
+        '${Constants.hackerNewsItemLinkPrefix}$storyId',
         context,
         useHackiForHnLink: false,
       ),

lib/screens/item/widgets/main_view.dart

@@ -18,8 +18,6 @@ import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class MainView extends StatelessWidget {
   const MainView({
-    required this.itemScrollController,
-    required this.itemPositionsListener,
     required this.scrollOffsetListener,
     required this.commentEditingController,
     required this.authState,
@@ -27,16 +25,16 @@ class MainView extends StatelessWidget {
     required this.splitViewEnabled,
     required this.onMoreTapped,
     required this.onRightMoreTapped,
+    required this.shouldMarkNewComment,
     super.key,
   });
 
-  final ItemScrollController itemScrollController;
-  final ItemPositionsListener itemPositionsListener;
   final ScrollOffsetListener scrollOffsetListener;
   final TextEditingController commentEditingController;
   final AuthState authState;
   final double topPadding;
   final bool splitViewEnabled;
+  final bool shouldMarkNewComment;
   final void Function(Item item, Rect? rect) onMoreTapped;
   final ValueChanged<Comment> onRightMoreTapped;
 
@@ -49,6 +47,9 @@ class MainView extends StatelessWidget {
       children: <Widget>[
         Positioned.fill(
           child: BlocBuilder<CommentsCubit, CommentsState>(
+            buildWhen: (CommentsState previous, CommentsState current) =>
+                previous.comments.length != current.comments.length ||
+                previous.status != current.status,
             builder: (BuildContext context, CommentsState state) {
               return RefreshIndicator(
                 displacement: 100,
@@ -67,8 +68,10 @@ class MainView extends StatelessWidget {
                 },
                 child: ScrollablePositionedList.builder(
                   physics: const AlwaysScrollableScrollPhysics(),
-                  itemScrollController: itemScrollController,
-                  itemPositionsListener: itemPositionsListener,
+                  itemScrollController:
+                      context.read<CommentsCubit>().itemScrollController,
+                  itemPositionsListener:
+                      context.read<CommentsCubit>().itemPositionsListener,
                   itemCount: state.comments.length + 2,
                   padding: EdgeInsets.only(top: topPadding),
                   scrollOffsetListener: scrollOffsetListener,
@@ -100,13 +103,17 @@ class MainView extends StatelessWidget {
 
                     index = index - 1;
                     final Comment comment = state.comments.elementAt(index);
+
                     return FadeIn(
                       key: ValueKey<String>('${comment.id}-FadeIn'),
                       child: CommentTile(
                         comment: comment,
+                        index: index,
                         level: comment.level,
                         opUsername: state.item.by,
                         fetchMode: state.fetchMode,
+                        isResponse: state.isResponse(comment),
+                        isNew: shouldMarkNewComment && !comment.isFromCache,
                         onReplyTapped: (Comment cmt) {
                           HapticFeedbackUtil.light();
                           if (cmt.deleted || cmt.dead) {
@@ -130,7 +137,6 @@ class MainView extends StatelessWidget {
                         },
                         onMoreTapped: onMoreTapped,
                         onRightMoreTapped: onRightMoreTapped,
-                        itemScrollController: itemScrollController,
                       ),
                     );
                   },
@@ -185,7 +191,7 @@ class _ParentItemSection extends StatelessWidget {
   final ValueChanged<Comment> onRightMoreTapped;
 
   static const double _viewParentButtonWidth = 100;
-  static const double _viewRootButtonWidth = 80;
+  static const double _viewRootButtonWidth = 85;
 
   @override
   Widget build(BuildContext context) {

lib/screens/item/widgets/more_popup_menu.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hacki/blocs/blocs.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
@@ -66,175 +67,191 @@ class MorePopupMenu extends StatelessWidget {
         builder: (BuildContext context, VoteState voteState) {
           final bool upvoted = voteState.vote == Vote.up;
           final bool downvoted = voteState.vote == Vote.down;
-          return ColoredBox(
-            color: Theme.of(context).canvasColor,
-            child: Material(
-              color: Palette.transparent,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: <Widget>[
-                  BlocProvider<UserCubit>(
-                    create: (BuildContext context) =>
-                        UserCubit()..init(userId: item.by),
-                    child: BlocBuilder<UserCubit, UserState>(
-                      builder: (BuildContext context, UserState state) {
-                        return Semantics(
-                          excludeSemantics: state.status == Status.inProgress,
-                          child: ListTile(
-                            leading: const Icon(
-                              Icons.account_circle,
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              BlocProvider<UserCubit>(
+                create: (BuildContext context) =>
+                    UserCubit()..init(userId: item.by),
+                child: BlocBuilder<UserCubit, UserState>(
+                  builder: (BuildContext context, UserState state) {
+                    return Semantics(
+                      excludeSemantics: state.status == Status.inProgress,
+                      child: ListTile(
+                        leading: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: <Widget>[
+                            AnimatedCrossFade(
+                              alignment: Alignment.center,
+                              duration: Durations.ms300,
+                              crossFadeState: state.status.isLoading
+                                  ? CrossFadeState.showFirst
+                                  : CrossFadeState.showSecond,
+                              firstChild: const Icon(
+                                Icons.account_circle_outlined,
+                              ),
+                              secondChild: const Icon(
+                                Icons.account_circle,
+                              ),
                             ),
-                            title: Text(item.by),
-                            subtitle: Text(
-                              state.user.description,
-                            ),
-                            onTap: () {
-                              context.pop();
-                              showDialog<void>(
-                                context: context,
-                                builder: (BuildContext context) => AlertDialog(
-                                  semanticLabel:
-                                      '''About ${state.user.id}. ${state.user.about}''',
-                                  title: Text(
-                                    'About ${state.user.id}',
-                                  ),
-                                  content: state.user.about.isEmpty
-                                      ? const Row(
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.center,
-                                          children: <Widget>[
-                                            Text(
-                                              'empty',
-                                              style: TextStyle(
-                                                color: Palette.grey,
-                                              ),
-                                            ),
-                                          ],
-                                        )
-                                      : SelectableLinkify(
-                                          text: HtmlUtil.parseHtml(
-                                            state.user.about,
+                          ],
+                        ),
+                        title: Text(item.by),
+                        subtitle: Text(
+                          state.user.description,
+                        ),
+                        onTap: () {
+                          context.pop();
+                          final double fontSize = context
+                              .read<PreferenceCubit>()
+                              .state
+                              .fontSize
+                              .fontSize;
+                          showDialog<void>(
+                            context: context,
+                            builder: (BuildContext context) => AlertDialog(
+                              semanticLabel:
+                                  '''About ${state.user.id}. ${state.user.about}''',
+                              title: Text(
+                                'About ${state.user.id}',
+                              ),
+                              content: state.user.about.isEmpty
+                                  ? const Row(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Text(
+                                          'empty',
+                                          style: TextStyle(
+                                            color: Palette.grey,
                                           ),
-                                          linkStyle: TextStyle(
-                                            color:
-                                                Theme.of(context).primaryColor,
-                                          ),
-                                          onOpen: (LinkableElement link) =>
-                                              LinkUtil.launch(
-                                            link.url,
-                                            context,
-                                          ),
-                                          semanticsLabel: state.user.about,
                                         ),
-                                  actions: <Widget>[
-                                    TextButton(
-                                      onPressed: () {
-                                        locator
-                                            .get<AppReviewService>()
-                                            .requestReview();
-                                        context.pop();
-                                        onSearchUserTapped(context);
-                                      },
-                                      child: const Text(
-                                        'Search',
+                                      ],
+                                    )
+                                  : SelectableLinkify(
+                                      text: HtmlUtil.parseHtml(
+                                        state.user.about,
                                       ),
-                                    ),
-                                    TextButton(
-                                      onPressed: () {
-                                        locator
-                                            .get<AppReviewService>()
-                                            .requestReview();
-                                        context.pop();
-                                      },
-                                      child: const Text(
-                                        'Okay',
+                                      style: TextStyle(
+                                        fontSize: fontSize,
                                       ),
+                                      linkStyle: TextStyle(
+                                        fontSize: fontSize,
+                                        color: Theme.of(context).primaryColor,
+                                      ),
+                                      onOpen: (LinkableElement link) =>
+                                          LinkUtil.launch(
+                                        link.url,
+                                        context,
+                                      ),
+                                      semanticsLabel: state.user.about,
                                     ),
-                                  ],
+                              actions: <Widget>[
+                                TextButton(
+                                  onPressed: () {
+                                    locator
+                                        .get<AppReviewService>()
+                                        .requestReview();
+                                    context.pop();
+                                    onSearchUserTapped(context);
+                                  },
+                                  child: const Text(
+                                    'Search',
+                                  ),
                                 ),
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                  ),
-                  ListTile(
-                    leading: Icon(
-                      FeatherIcons.chevronUp,
-                      color: upvoted ? Theme.of(context).primaryColor : null,
-                    ),
-                    title: Text(
-                      upvoted ? 'Upvoted' : 'Upvote',
-                      style: upvoted
-                          ? TextStyle(color: Theme.of(context).primaryColor)
-                          : null,
-                    ),
-                    subtitle:
-                        item is Story ? Text(item.score.toString()) : null,
-                    onTap: context.read<VoteCubit>().upvote,
-                  ),
-                  ListTile(
-                    leading: Icon(
-                      FeatherIcons.chevronDown,
-                      color: downvoted ? Theme.of(context).primaryColor : null,
-                    ),
-                    title: Text(
-                      downvoted ? 'Downvoted' : 'Downvote',
-                      style: downvoted
-                          ? TextStyle(color: Theme.of(context).primaryColor)
-                          : null,
-                    ),
-                    onTap: context.read<VoteCubit>().downvote,
-                  ),
-                  BlocBuilder<FavCubit, FavState>(
-                    builder: (BuildContext context, FavState state) {
-                      final bool isFav = state.favIds.contains(item.id);
-                      return ListTile(
-                        leading: Icon(
-                          isFav ? Icons.favorite : Icons.favorite_border,
-                          color: isFav ? Theme.of(context).primaryColor : null,
-                        ),
-                        title: Text(
-                          isFav ? 'Unfavorite' : 'Favorite',
-                        ),
-                        onTap: () => context.pop(MenuAction.fav),
-                      );
-                    },
-                  ),
-                  ListTile(
-                    leading: const Icon(FeatherIcons.share),
-                    title: const Text(
-                      'Share',
-                    ),
-                    onTap: () => context.pop(MenuAction.share),
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.local_police),
-                    title: const Text(
-                      'Flag',
-                    ),
-                    onTap: () => context.pop(MenuAction.flag),
-                  ),
-                  ListTile(
-                    leading: Icon(
-                      isBlocked ? Icons.visibility : Icons.visibility_off,
-                    ),
-                    title: Text(
-                      isBlocked ? 'Unblock' : 'Block',
-                    ),
-                    onTap: () => context.pop(MenuAction.block),
-                  ),
-                  ListTile(
-                    leading: const Icon(Icons.close),
-                    title: const Text(
-                      'Cancel',
-                    ),
-                    onTap: () => context.pop(MenuAction.cancel),
-                  ),
-                ],
+                                TextButton(
+                                  onPressed: () {
+                                    locator
+                                        .get<AppReviewService>()
+                                        .requestReview();
+                                    context.pop();
+                                  },
+                                  child: const Text(
+                                    'Okay',
+                                  ),
+                                ),
+                              ],
+                            ),
+                          );
+                        },
+                      ),
+                    );
+                  },
+                ),
               ),
-            ),
+              ListTile(
+                leading: Icon(
+                  FeatherIcons.chevronUp,
+                  color: upvoted ? Theme.of(context).primaryColor : null,
+                ),
+                title: Text(
+                  upvoted ? 'Upvoted' : 'Upvote',
+                  style: upvoted
+                      ? TextStyle(color: Theme.of(context).primaryColor)
+                      : null,
+                ),
+                subtitle: item is Story ? Text(item.score.toString()) : null,
+                onTap: context.read<VoteCubit>().upvote,
+              ),
+              ListTile(
+                leading: Icon(
+                  FeatherIcons.chevronDown,
+                  color: downvoted ? Theme.of(context).primaryColor : null,
+                ),
+                title: Text(
+                  downvoted ? 'Downvoted' : 'Downvote',
+                  style: downvoted
+                      ? TextStyle(color: Theme.of(context).primaryColor)
+                      : null,
+                ),
+                onTap: context.read<VoteCubit>().downvote,
+              ),
+              BlocBuilder<FavCubit, FavState>(
+                builder: (BuildContext context, FavState state) {
+                  final bool isFav = state.favIds.contains(item.id);
+                  return ListTile(
+                    leading: Icon(
+                      isFav ? Icons.favorite : Icons.favorite_border,
+                      color: isFav ? Theme.of(context).primaryColor : null,
+                    ),
+                    title: Text(
+                      isFav ? 'Unfavorite' : 'Favorite',
+                    ),
+                    onTap: () => context.pop(MenuAction.fav),
+                  );
+                },
+              ),
+              ListTile(
+                leading: const Icon(FeatherIcons.share),
+                title: const Text(
+                  'Share',
+                ),
+                onTap: () => context.pop(MenuAction.share),
+              ),
+              ListTile(
+                leading: const Icon(Icons.local_police),
+                title: const Text(
+                  'Flag',
+                ),
+                onTap: () => context.pop(MenuAction.flag),
+              ),
+              ListTile(
+                leading: Icon(
+                  isBlocked ? Icons.visibility : Icons.visibility_off,
+                ),
+                title: Text(
+                  isBlocked ? 'Unblock' : 'Block',
+                ),
+                onTap: () => context.pop(MenuAction.block),
+              ),
+              ListTile(
+                leading: const Icon(Icons.close),
+                title: const Text(
+                  'Cancel',
+                ),
+                onTap: () => context.pop(MenuAction.cancel),
+              ),
+            ],
           );
         },
       ),
@@ -245,6 +262,7 @@ class MorePopupMenu extends StatelessWidget {
     showModalBottomSheet<void>(
       context: context,
       isScrollControlled: true,
+      showDragHandle: true,
       builder: (BuildContext context) {
         return BlocProvider<SearchCubit>(
           create: (_) => SearchCubit()
@@ -253,28 +271,16 @@ class MorePopupMenu extends StatelessWidget {
                 author: item.by,
               ),
             ),
-          child: Container(
+          child: SizedBox(
             height: MediaQuery.of(context).size.height - Dimens.pt120,
-            color: Theme.of(context).canvasColor,
-            margin: const EdgeInsets.only(top: Dimens.pt12),
-            child: Material(
-              child: Column(
-                children: <Widget>[
-                  Container(
-                    height: Dimens.pt4,
-                    width: Dimens.pt24,
-                    decoration: BoxDecoration(
-                      color: Palette.grey,
-                      borderRadius: BorderRadius.circular(Dimens.pt16),
-                    ),
+            child: const Column(
+              children: <Widget>[
+                Expanded(
+                  child: SearchScreen(
+                    fromUserDialog: true,
                   ),
-                  const Expanded(
-                    child: SearchScreen(
-                      fromUserDialog: true,
-                    ),
-                  ),
-                ],
-              ),
+                ),
+              ],
             ),
           ),
         );

lib/screens/item/widgets/pin_icon_button.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/context_extension.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
@@ -45,7 +46,12 @@ class PinIconButton extends StatelessWidget {
                 if (pinned) {
                   context.read<PinCubit>().unpinStory(story);
                 } else {
-                  context.read<PinCubit>().pinStory(story);
+                  context.read<PinCubit>().pinStory(
+                        story,
+                        onDone: () => context.showSnackBar(
+                          content: 'Pinned to home page.',
+                        ),
+                      );
                 }
               },
             ),

lib/screens/item/widgets/reply_box.dart

@@ -76,7 +76,8 @@ class _ReplyBoxState extends State<ReplyBox> with ItemActionMixin {
                 duration: Durations.ms200,
                 decoration: BoxDecoration(
                   boxShadow: <BoxShadow>[
-                    if (!context.read<SplitViewCubit>().state.enabled)
+                    if (!context.read<SplitViewCubit>().state.enabled &&
+                        !Theme.of(context).useMaterial3)
                       BoxShadow(
                         color: expanded ? Palette.transparent : Palette.black26,
                         blurRadius: Dimens.pt40,
@@ -84,6 +85,9 @@ class _ReplyBoxState extends State<ReplyBox> with ItemActionMixin {
                   ],
                 ),
                 child: Material(
+                  color: Theme.of(context).useMaterial3
+                      ? Palette.transparent
+                      : null,
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[

lib/screens/item/widgets/widgets.dart

@@ -1,6 +1,7 @@
 export 'custom_app_bar.dart';
 export 'custom_floating_action_button.dart';
 export 'fav_icon_button.dart';
+export 'in_thread_search_icon_button.dart';
 export 'link_icon_button.dart';
 export 'login_dialog.dart';
 export 'main_view.dart';

lib/screens/profile/profile_screen.dart

@@ -378,7 +378,7 @@ class _ProfileScreenState extends State<ProfileScreen>
   void onCommentTapped(Comment comment, {VoidCallback? then}) {
     throttle.run(() {
       locator
-          .get<StoriesRepository>()
+          .get<HackerNewsRepository>()
           .fetchParentStoryWithComments(id: comment.parent)
           .then(((Story, List<Comment>)? res) {
         if (res != null && mounted) {

lib/screens/profile/qr_code_view_screen.dart

@@ -12,14 +12,13 @@ class QrCodeViewScreen extends StatelessWidget {
 
   static const String routeName = 'qr-code-view';
 
-  static const int qrCodeVersion = 4;
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
         backgroundColor: Palette.transparent,
+        foregroundColor: Theme.of(context).colorScheme.onSurface,
       ),
       body: Column(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -35,7 +34,6 @@ class QrCodeViewScreen extends StatelessWidget {
                 eyeShape: QrEyeShape.square,
                 color: Theme.of(context).colorScheme.onSurface,
               ),
-              version: qrCodeVersion,
               size: 300,
             ),
           ),

lib/screens/search/search_screen.dart

@@ -30,17 +30,29 @@ class SearchScreen extends StatefulWidget {
 class _SearchScreenState extends State<SearchScreen> with ItemActionMixin {
   final RefreshController refreshController = RefreshController();
   final ScrollController scrollController = ScrollController();
+  final TextEditingController textEditingController = TextEditingController();
+  final FocusNode focusNode = FocusNode();
   final Debouncer debouncer = Debouncer(delay: Durations.oneSecond);
 
   static const Duration chipsAnimationDuration = Durations.ms300;
 
+  @override
+  void initState() {
+    super.initState();
+    scrollController.addListener(onScroll);
+  }
+
   @override
   void dispose() {
     refreshController.dispose();
     scrollController.dispose();
+    focusNode.dispose();
+    textEditingController.dispose();
     super.dispose();
   }
 
+  void onScroll() => focusNode.unfocus();
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<PreferenceCubit, PreferenceState>(
@@ -53,226 +65,12 @@ class _SearchScreenState extends State<SearchScreen> with ItemActionMixin {
           },
           builder: (BuildContext context, SearchState state) {
             return Scaffold(
+              backgroundColor: Palette.transparent,
               resizeToAvoidBottomInset: false,
               body: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  ColoredBox(
-                    color: Theme.of(context).canvasColor,
-                    child: Column(
-                      children: <Widget>[
-                        Padding(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: Dimens.pt12,
-                          ),
-                          child: TextField(
-                            cursorColor: Theme.of(context).primaryColor,
-                            autocorrect: false,
-                            decoration: InputDecoration(
-                              hintText: 'Search Hacker News',
-                              focusedBorder: UnderlineInputBorder(
-                                borderSide: BorderSide(
-                                  color: Theme.of(context).primaryColor,
-                                ),
-                              ),
-                            ),
-                            onChanged: (String val) {
-                              if (val.isNotEmpty) {
-                                debouncer.run(() {
-                                  context.read<SearchCubit>().search(val);
-                                });
-                              }
-                            },
-                          ),
-                        ),
-                        const SizedBox(
-                          height: Dimens.pt6,
-                        ),
-                        AnimatedCrossFade(
-                          duration: chipsAnimationDuration,
-                          crossFadeState: state.showDateRangeShortcutChips
-                              ? CrossFadeState.showSecond
-                              : CrossFadeState.showFirst,
-                          firstChild: SizedBox.fromSize(),
-                          secondChild: Column(
-                            mainAxisSize: MainAxisSize.min,
-                            children: <Widget>[
-                              SingleChildScrollView(
-                                scrollDirection: Axis.horizontal,
-                                child: Row(
-                                  children: <Widget>[
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.dayBefore(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.dayAfter(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.weekBefore(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.weekAfter(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.monthBefore(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                    const SizedBox(
-                                      width: Dimens.pt8,
-                                    ),
-                                    DateTimeShortcutChip.monthAfter(
-                                      onDateTimeRangeUpdated: context
-                                          .read<SearchCubit>()
-                                          .onDateTimeRangeUpdated,
-                                      startDate: state.dateFilter?.startTime,
-                                      endDate: state.dateFilter?.endTime,
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        SingleChildScrollView(
-                          scrollDirection: Axis.horizontal,
-                          child: Row(
-                            children: <Widget>[
-                              const SizedBox(
-                                width: Dimens.pt8,
-                              ),
-                              DateTimeRangeFilterChip(
-                                filter: state.dateFilter,
-                                initialStartDate: state.dateFilter?.startTime,
-                                initialEndDate: state.dateFilter?.endTime,
-                                onDateTimeRangeUpdated: context
-                                    .read<SearchCubit>()
-                                    .onDateTimeRangeUpdated,
-                                onDateTimeRangeRemoved: context
-                                    .read<SearchCubit>()
-                                    .removeFilter<DateTimeRangeFilter>,
-                              ),
-                              const SizedBox(
-                                width: Dimens.pt8,
-                              ),
-                              PostedByFilterChip(
-                                filter: state.params.get<PostedByFilter>(),
-                                onChanged: context
-                                    .read<SearchCubit>()
-                                    .onPostedByChanged,
-                              ),
-                              const SizedBox(
-                                width: Dimens.pt8,
-                              ),
-                              CustomChip(
-                                onSelected: (_) =>
-                                    context.read<SearchCubit>().onSortToggled(),
-                                selected: state.params.sorted,
-                                label: '''newest first''',
-                              ),
-                              const SizedBox(
-                                width: Dimens.pt8,
-                              ),
-                              for (final CustomDateTimeRange range
-                                  in CustomDateTimeRange.values) ...<Widget>[
-                                CustomRangeFilterChip(
-                                  range: range,
-                                  onTap: context
-                                      .read<SearchCubit>()
-                                      .onDateTimeRangeUpdated,
-                                ),
-                                const SizedBox(
-                                  width: Dimens.pt8,
-                                ),
-                              ],
-                            ],
-                          ),
-                        ),
-                        SingleChildScrollView(
-                          scrollDirection: Axis.horizontal,
-                          child: Row(
-                            children: <Widget>[
-                              for (final TypeTagFilter filter
-                                  in TypeTagFilter.all) ...<Widget>[
-                                const SizedBox(
-                                  width: Dimens.pt8,
-                                ),
-                                CustomChip(
-                                  onSelected: (_) => context
-                                      .read<SearchCubit>()
-                                      .onToggled(filter),
-                                  selected: context
-                                          .read<SearchCubit>()
-                                          .state
-                                          .params
-                                          .get<TypeTagFilter>() ==
-                                      filter,
-                                  label: filter.query,
-                                ),
-                              ],
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  if (state.status == SearchStatus.loading &&
-                      state.results.isEmpty) ...<Widget>[
-                    const SizedBox(
-                      height: Dimens.pt100,
-                    ),
-                    const Center(
-                      child: CustomCircularProgressIndicator(),
-                    ),
-                  ],
-                  if (state.status == SearchStatus.loaded &&
-                      state.results.isEmpty) ...<Widget>[
-                    const SizedBox(
-                      height: Dimens.pt100,
-                    ),
-                    const Center(
-                      child: Text(
-                        'Nothing found...',
-                        style: TextStyle(
-                          color: Palette.grey,
-                        ),
-                      ),
-                    ),
-                  ],
                   Expanded(
                     child: SmartRefresher(
                       enablePullDown: false,
@@ -313,6 +111,243 @@ class _SearchScreenState extends State<SearchScreen> with ItemActionMixin {
                             ? const NeverScrollableScrollPhysics()
                             : null,
                         children: <Widget>[
+                          Column(
+                            children: <Widget>[
+                              Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: Dimens.pt12,
+                                ),
+                                child: TextField(
+                                  controller: textEditingController,
+                                  focusNode: focusNode,
+                                  cursorColor: Theme.of(context).primaryColor,
+                                  autocorrect: false,
+                                  decoration: InputDecoration(
+                                    hintText: 'Search Hacker News',
+                                    focusedBorder: UnderlineInputBorder(
+                                      borderSide: BorderSide(
+                                        color: Theme.of(context).primaryColor,
+                                      ),
+                                    ),
+                                  ),
+                                  onChanged: (String val) {
+                                    if (val.isNotEmpty) {
+                                      debouncer.run(() {
+                                        context.read<SearchCubit>().search(val);
+                                      });
+                                    }
+                                  },
+                                ),
+                              ),
+                              const SizedBox(
+                                height: Dimens.pt6,
+                              ),
+                              AnimatedCrossFade(
+                                duration: chipsAnimationDuration,
+                                crossFadeState: state.showDateRangeShortcutChips
+                                    ? CrossFadeState.showSecond
+                                    : CrossFadeState.showFirst,
+                                firstChild: SizedBox.fromSize(),
+                                secondChild: Column(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: <Widget>[
+                                    SingleChildScrollView(
+                                      scrollDirection: Axis.horizontal,
+                                      child: Row(
+                                        children: <Widget>[
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.dayBefore(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.dayAfter(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.weekBefore(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.weekAfter(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.monthBefore(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                          const SizedBox(
+                                            width: Dimens.pt8,
+                                          ),
+                                          DateTimeShortcutChip.monthAfter(
+                                            onDateTimeRangeUpdated: context
+                                                .read<SearchCubit>()
+                                                .onDateTimeRangeUpdated,
+                                            startDate:
+                                                state.dateFilter?.startTime,
+                                            endDate: state.dateFilter?.endTime,
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              SingleChildScrollView(
+                                scrollDirection: Axis.horizontal,
+                                child: Row(
+                                  children: <Widget>[
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                    DateTimeRangeFilterChip(
+                                      filter: state.dateFilter,
+                                      initialStartDate:
+                                          state.dateFilter?.startTime,
+                                      initialEndDate: state.dateFilter?.endTime,
+                                      onDateTimeRangeUpdated: context
+                                          .read<SearchCubit>()
+                                          .onDateTimeRangeUpdated,
+                                      onDateTimeRangeRemoved: context
+                                          .read<SearchCubit>()
+                                          .removeFilter<DateTimeRangeFilter>,
+                                    ),
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                    PostedByFilterChip(
+                                      filter:
+                                          state.params.get<PostedByFilter>(),
+                                      onChanged: context
+                                          .read<SearchCubit>()
+                                          .onPostedByChanged,
+                                    ),
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                    CustomChip(
+                                      onSelected: (_) => context
+                                          .read<SearchCubit>()
+                                          .onSortToggled(),
+                                      selected: state.params.sorted,
+                                      label: '''newest first''',
+                                    ),
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                    CustomChip(
+                                      onSelected: (_) => context
+                                          .read<SearchCubit>()
+                                          .onExactMatchToggled(),
+                                      selected: state.params.exactMatch,
+                                      label: '''exact match''',
+                                    ),
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                    for (final CustomDateTimeRange range
+                                        in CustomDateTimeRange
+                                            .values) ...<Widget>[
+                                      CustomRangeFilterChip(
+                                        range: range,
+                                        onTap: context
+                                            .read<SearchCubit>()
+                                            .onDateTimeRangeUpdated,
+                                      ),
+                                      const SizedBox(
+                                        width: Dimens.pt8,
+                                      ),
+                                    ],
+                                  ],
+                                ),
+                              ),
+                              SingleChildScrollView(
+                                scrollDirection: Axis.horizontal,
+                                child: Row(
+                                  children: <Widget>[
+                                    for (final TypeTagFilter filter
+                                        in TypeTagFilter.all) ...<Widget>[
+                                      const SizedBox(
+                                        width: Dimens.pt8,
+                                      ),
+                                      CustomChip(
+                                        onSelected: (_) => context
+                                            .read<SearchCubit>()
+                                            .onToggled(filter),
+                                        selected: context
+                                                .read<SearchCubit>()
+                                                .state
+                                                .params
+                                                .get<TypeTagFilter>() ==
+                                            filter,
+                                        label: filter.query,
+                                      ),
+                                    ],
+                                    const SizedBox(
+                                      width: Dimens.pt8,
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              if (state.status == SearchStatus.loading &&
+                                  state.results.isEmpty) ...<Widget>[
+                                const SizedBox(
+                                  height: Dimens.pt100,
+                                ),
+                                const Center(
+                                  child: CustomCircularProgressIndicator(),
+                                ),
+                              ],
+                              if (state.status == SearchStatus.loaded &&
+                                  state.results.isEmpty) ...<Widget>[
+                                const SizedBox(
+                                  height: Dimens.pt100,
+                                ),
+                                const Center(
+                                  child: Text(
+                                    'Nothing found...',
+                                    style: TextStyle(
+                                      color: Palette.grey,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ],
+                          ),
                           ...state.results
                               .map(
                                 (Item e) => <Widget>[

lib/screens/search/widgets/date_time_range_filter_chip.dart

@@ -49,7 +49,7 @@ class DateTimeRangeFilterChip extends StatelessWidget {
     final DateTime? start = filter?.startTime;
     final DateTime? end = filter?.endTime;
     if (start == null && end == null) {
-      return '''from X to Y''';
+      return '''date range''';
     } else if (start == end) {
       return '''from ${_formatDateTime(start)}''';
     } else {

lib/screens/web_view/web_view_screen.dart

@@ -20,6 +20,7 @@ class WebViewScreen extends StatefulWidget {
 
 class _WebViewScreenState extends State<WebViewScreen> {
   final WebViewController controller = WebViewController();
+  bool showFullUrl = false;
 
   @override
   void initState() {
@@ -43,15 +44,26 @@ class _WebViewScreenState extends State<WebViewScreen> {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Theme.of(context).canvasColor,
-        title: Text(
-          humanize(widget.url),
-          style: const TextStyle(
-            fontSize: TextDimens.pt12,
+        foregroundColor: Theme.of(context).colorScheme.onSurface,
+        title: GestureDetector(
+          onTap: () {
+            setState(() {
+              showFullUrl = !showFullUrl;
+            });
+          },
+          child: Text(
+            showFullUrl
+                ? humanize(widget.url)
+                : Uri.parse(widget.url).authority,
+            style: const TextStyle(
+              fontSize: TextDimens.pt14,
+            ),
+            overflow: TextOverflow.ellipsis,
+            textAlign: TextAlign.center,
           ),
-          overflow: TextOverflow.ellipsis,
-          textAlign: TextAlign.center,
         ),
         centerTitle: true,
+        elevation: 0,
       ),
       body: WebViewWidget(
         controller: controller,

lib/screens/widgets/centered_text.dart

@@ -32,6 +32,12 @@ class CenteredText extends StatelessWidget {
           text: 'blocked',
         );
 
+  const CenteredText.empty({Key? key})
+      : this(
+          key: key,
+          text: 'empty',
+        );
+
   final String text;
   final Color color;
 

lib/screens/widgets/comment_tile.dart

@@ -10,7 +10,6 @@ import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class CommentTile extends StatelessWidget {
   const CommentTile({
@@ -25,19 +24,23 @@ class CommentTile extends StatelessWidget {
     this.actionable = true,
     this.collapsable = true,
     this.selectable = true,
+    this.isResponse = false,
+    this.isNew = false,
     this.level = 0,
+    this.index,
     this.onTap,
-    this.itemScrollController,
   });
 
   final String? opUsername;
   final Comment comment;
   final int level;
+  final int? index;
   final bool actionable;
   final bool collapsable;
   final bool selectable;
+  final bool isResponse;
+  final bool isNew;
   final FetchMode fetchMode;
-  final ItemScrollController? itemScrollController;
 
   final void Function(Comment)? onReplyTapped;
   final void Function(Comment, Rect?)? onMoreTapped;
@@ -163,6 +166,33 @@ class CommentTile extends StatelessWidget {
                                     color: primaryColor,
                                   ),
                                 ),
+                              if (index != null)
+                                Text(
+                                  ' #${index! + 1}',
+                                  style: const TextStyle(
+                                    color: Palette.grey,
+                                  ),
+                                  textScaleFactor:
+                                      MediaQuery.of(context).textScaleFactor,
+                                ),
+                              if (isResponse)
+                                const Padding(
+                                  padding: EdgeInsets.only(left: 4),
+                                  child: Icon(
+                                    Icons.reply,
+                                    size: 16,
+                                    color: Palette.grey,
+                                  ),
+                                ),
+                              if (isNew)
+                                const Padding(
+                                  padding: EdgeInsets.only(left: 4),
+                                  child: Icon(
+                                    Icons.sunny_snowing,
+                                    size: 16,
+                                    color: Palette.grey,
+                                  ),
+                                ),
                               const Spacer(),
                               Text(
                                 comment.timeAgo,
@@ -270,7 +300,7 @@ class CommentTile extends StatelessWidget {
           );
 
           final double commentBackgroundColorOpacity =
-              Theme.of(context).brightness == Brightness.dark ? 0.03 : 0.15;
+              Theme.of(context).canvasColor != Palette.white ? 0.03 : 0.15;
 
           final Color commentColor = prefState.eyeCandyEnabled
               ? color.withOpacity(commentBackgroundColorOpacity)
@@ -351,7 +381,8 @@ class CommentTile extends StatelessWidget {
     final CollapseState collapseState = context.read<CollapseCubit>().state;
     final CommentsState? commentsState =
         context.tryRead<CommentsCubit>()?.state;
-    return fetchMode == FetchMode.lazy &&
+    return actionable &&
+        fetchMode == FetchMode.lazy &&
         comment.kids.isNotEmpty &&
         collapseState.collapsed == false &&
         commentsState?.commentIds.contains(comment.kids.first) == false &&
@@ -370,14 +401,14 @@ class CommentTile extends StatelessWidget {
       ..collapse(onStateChanged: HapticFeedbackUtil.selection);
     if (collapseCubit.state.collapsed &&
         preferenceCubit.state.autoScrollEnabled) {
-      final List<Comment> comments =
-          context.read<CommentsCubit>().state.comments;
+      final CommentsCubit commentsCubit = context.read<CommentsCubit>();
+      final List<Comment> comments = commentsCubit.state.comments;
       final int indexOfNextComment = comments.indexOf(comment) + 1;
       if (indexOfNextComment < comments.length) {
         Future<void>.delayed(
           Durations.ms300,
           () {
-            itemScrollController?.scrollTo(
+            commentsCubit.itemScrollController.scrollTo(
               index: indexOfNextComment,
               alignment: 0.1,
               duration: Durations.ms300,

lib/screens/widgets/countdown_reminder.dart

@@ -107,7 +107,7 @@ class _CountDownReminderState extends State<CountdownReminder>
                   onTap: () {
                     if (state.storyId != null) {
                       locator
-                          .get<StoriesRepository>()
+                          .get<HackerNewsRepository>()
                           .fetchStory(id: state.storyId!)
                           .then((Story? story) {
                         if (story == null) {

lib/screens/widgets/custom_chip.dart

@@ -15,13 +15,19 @@ class CustomChip extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final bool useMaterial3 = Theme.of(context).useMaterial3;
     return FilterChip(
       shadowColor: Palette.transparent,
       selectedShadowColor: Palette.transparent,
       backgroundColor: Palette.transparent,
-      shape: StadiumBorder(
-        side: BorderSide(color: Theme.of(context).primaryColor),
-      ),
+      side: useMaterial3 && !selected
+          ? BorderSide(color: Theme.of(context).colorScheme.onSurface)
+          : null,
+      shape: Theme.of(context).useMaterial3
+          ? null
+          : StadiumBorder(
+              side: BorderSide(color: Theme.of(context).primaryColor),
+            ),
       label: Text(label),
       labelStyle: TextStyle(
         color: selected ? Theme.of(context).colorScheme.onPrimary : null,

lib/screens/widgets/custom_linkify/linkifiers/code_linkifier.dart

@@ -27,25 +27,34 @@ class CodeLinkifier extends Linkifier {
           list.add(element);
         } else {
           final String matchedText = match.group(0)!;
-          final num pos = element.text.indexOf(matchedText);
           final List<String> splitTexts = element.text.split(matchedText);
 
-          int curPos = 0;
-          bool added = false;
+          final String preceding = splitTexts[0];
 
-          for (final String text in splitTexts) {
-            list.addAll(parse(<LinkifyElement>[TextElement(text)], options));
+          list.addAll(
+            parse(
+              <LinkifyElement>[
+                TextElement(preceding == '\n\n' ? '' : preceding),
+              ],
+              options,
+            ),
+          );
 
-            curPos += text.length;
+          String trimmedText = matchedText
+              .replaceFirst(_openTag, '')
+              .replaceFirst(_closeTag, '');
+          trimmedText = '$trimmedText\n';
 
-            if (!added && curPos >= pos) {
-              added = true;
-              final String trimmedText = matchedText
-                  .replaceFirst(_openTag, '')
-                  .replaceFirst(_closeTag, '');
-              list.add(CodeElement(trimmedText));
-            }
-          }
+          list
+            ..add(CodeElement(trimmedText))
+            ..addAll(
+              parse(
+                <LinkifyElement>[
+                  TextElement(splitTexts[1]),
+                ],
+                options,
+              ),
+            );
         }
       } else {
         list.add(element);

lib/screens/widgets/custom_linkify/linkifiers/url_linkifier.dart

@@ -4,7 +4,7 @@ import 'package:flutter/widgets.dart' show StringCharacters, immutable;
 import 'package:linkify/linkify.dart';
 
 final RegExp _urlRegex = RegExp(
-  r'^(.*?)((?:https?:\/\/|www\.)[^\s/$.?#].[\/\\\%:\?=&#@;A-Za-z0-9()+_.,~-]*)',
+  r'''^(.*?)((?:https?:\/\/|www\.)[^\s/$.?#].[\/\\\%:\?=&#@;A-Za-z0-9()+\*_.,'~-]*)''',
   caseSensitive: false,
   dotAll: true,
 );
@@ -84,7 +84,7 @@ class UrlLinkifier extends Linkifier {
 
             if (url.endsWith(',')) {
               url = url.substring(0, max(0, url.length - 1));
-              end = '$end,';
+              end = '${end ?? ''},';
             }
 
             if ((options.humanize) || (options.removeWww)) {

lib/screens/widgets/items_list_view.dart

@@ -25,10 +25,12 @@ class ItemsListView<T extends Item> extends StatelessWidget {
     this.enablePullDown = true,
     this.markReadStories = false,
     this.showOfflineBanner = false,
+    this.loadStyle = LoadStyle.ShowWhenLoading,
     this.onRefresh,
     this.onLoadMore,
     this.onPinned,
     this.header,
+    this.footer,
     this.onMoreTapped,
     this.scrollController,
     this.itemBuilder,
@@ -43,8 +45,10 @@ class ItemsListView<T extends Item> extends StatelessWidget {
   final bool markReadStories;
   final bool showOfflineBanner;
 
+  final LoadStyle loadStyle;
   final List<T> items;
   final Widget? header;
+  final Widget? footer;
   final RefreshController refreshController;
   final ScrollController? scrollController;
   final VoidCallback? onRefresh;
@@ -224,6 +228,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
               ? Column(children: e)
               : itemBuilder!(Column(children: e), items.elementAt(index)),
         ),
+        if (footer != null) footer!,
         const SizedBox(
           height: Dimens.pt40,
         ),
@@ -237,7 +242,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
         backgroundColor: Theme.of(context).primaryColor,
       ),
       footer: CustomFooter(
-        loadStyle: LoadStyle.ShowWhenLoading,
+        loadStyle: loadStyle,
         builder: (BuildContext context, LoadStatus? mode) {
           const double height = 55;
           late final Widget body;

lib/screens/widgets/offline_banner.dart

@@ -22,6 +22,7 @@ class OfflineBanner extends StatelessWidget {
       builder: (BuildContext context, StoriesState state) {
         if (state.isOfflineReading) {
           return MaterialBanner(
+            dividerColor: Palette.transparent,
             content: Text(
               'You are currently in offline mode. '
               '${showExitButton ? 'Exit to fetch latest stories.' : ''}',

lib/screens/widgets/stories_list_view.dart

@@ -3,10 +3,12 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:hacki/blocs/blocs.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
+import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:visibility_detector/visibility_detector.dart';
@@ -48,7 +50,8 @@ class _StoriesListViewState extends State<StoriesListView>
     return BlocBuilder<PreferenceCubit, PreferenceState>(
       buildWhen: (PreferenceState previous, PreferenceState current) =>
           previous.complexStoryTileEnabled != current.complexStoryTileEnabled ||
-          previous.metadataEnabled != current.metadataEnabled,
+          previous.metadataEnabled != current.metadataEnabled ||
+          previous.manualPaginationEnabled != current.manualPaginationEnabled,
       builder: (BuildContext context, PreferenceState preferenceState) {
         return BlocConsumer<StoriesBloc, StoriesState>(
           listenWhen: (StoriesState previous, StoriesState current) =>
@@ -66,12 +69,21 @@ class _StoriesListViewState extends State<StoriesListView>
                   previous.currentPageByType[storyType] == 0) ||
               (previous.storiesByType[storyType]!.length !=
                   current.storiesByType[storyType]!.length) ||
-              (previous.readStoriesIds.length != current.readStoriesIds.length),
+              (previous.readStoriesIds.length !=
+                  current.readStoriesIds.length) ||
+              (previous.statusByType[widget.storyType] !=
+                  current.statusByType[widget.storyType]),
           builder: (BuildContext context, StoriesState state) {
+            bool shouldShowLoadButton() {
+              return preferenceState.manualPaginationEnabled &&
+                  state.statusByType[widget.storyType] == Status.success &&
+                  (state.storiesByType[widget.storyType]?.length ?? 0) <
+                      (state.storyIdsByType[widget.storyType]?.length ?? 0);
+            }
+
             return ItemsListView<Story>(
               showOfflineBanner: true,
-              markReadStories:
-                  context.read<PreferenceCubit>().state.markReadStoriesEnabled,
+              markReadStories: preferenceState.markReadStoriesEnabled,
               showWebPreviewOnStoryTile:
                   preferenceState.complexStoryTileEnabled,
               showMetadataOnStoryTile: preferenceState.metadataEnabled,
@@ -87,16 +99,54 @@ class _StoriesListViewState extends State<StoriesListView>
                 context.read<PinCubit>().refresh();
               },
               onLoadMore: () {
-                context
-                    .read<StoriesBloc>()
-                    .add(StoriesLoadMore(type: storyType));
+                if (preferenceState.manualPaginationEnabled) {
+                  refreshController
+                    ..refreshCompleted(resetFooterState: true)
+                    ..loadComplete();
+                } else {
+                  loadMoreStories();
+                }
               },
               onTap: onStoryTapped,
               onPinned: context.read<PinCubit>().pinStory,
               header: state.isOfflineReading ? null : header,
+              loadStyle: LoadStyle.HideAlways,
+              footer: Center(
+                child: AnimatedCrossFade(
+                  alignment: Alignment.center,
+                  crossFadeState: shouldShowLoadButton()
+                      ? CrossFadeState.showFirst
+                      : CrossFadeState.showSecond,
+                  duration: Durations.ms300,
+                  firstChild: Padding(
+                    padding: const EdgeInsets.only(
+                      left: Dimens.pt48,
+                      right: Dimens.pt48,
+                      top: Dimens.pt36,
+                      bottom: Dimens.pt12,
+                    ),
+                    child: OutlinedButton(
+                      onPressed: loadMoreStories,
+                      style: ButtonStyle(
+                        minimumSize: MaterialStateProperty.all(
+                          const Size(double.infinity, Dimens.pt48),
+                        ),
+                        foregroundColor: MaterialStateColor.resolveWith(
+                          (_) => Theme.of(context).colorScheme.onSurface,
+                        ),
+                      ),
+                      child: Text(
+                        '''Load Page ${(state.currentPageByType[widget.storyType] ?? 0) + 2}''',
+                      ),
+                    ),
+                  ),
+                  secondChild: const SizedBox.shrink(),
+                ),
+              ),
               onMoreTapped: onMoreTapped,
               itemBuilder: (Widget child, Story story) {
                 return Slidable(
+                  key: ValueKey<Story>(story),
                   enabled: !preferenceState.swipeGestureEnabled,
                   startActionPane: ActionPane(
                     motion: const BehindMotion(),
@@ -130,6 +180,30 @@ class _StoriesListViewState extends State<StoriesListView>
                       ),
                     ],
                   ),
+                  endActionPane: ActionPane(
+                    motion: const BehindMotion(),
+                    dismissible: DismissiblePane(
+                      closeOnCancel: true,
+                      confirmDismiss: () async {
+                        mark(story);
+                        return false;
+                      },
+                      onDismissed: () {},
+                    ),
+                    children: <Widget>[
+                      SlidableAction(
+                        onPressed: (_) => mark(story),
+                        backgroundColor: preferenceState.markReadStoriesEnabled
+                            ? Theme.of(context).primaryColor
+                            : Palette.grey,
+                        foregroundColor:
+                            Theme.of(context).colorScheme.onPrimary,
+                        icon: state.readStoriesIds.contains(story.id)
+                            ? Icons.visibility_off
+                            : Icons.visibility,
+                      ),
+                    ],
+                  ),
                   child: OptionalWrapper(
                     enabled: context
                             .read<PreferenceCubit>()
@@ -162,4 +236,23 @@ class _StoriesListViewState extends State<StoriesListView>
       },
     );
   }
+
+  void mark(Story story) {
+    HapticFeedbackUtil.light();
+    final StoriesBloc storiesBloc = context.read<StoriesBloc>();
+    final bool markReadStoriesEnabled =
+        context.read<PreferenceCubit>().state.markReadStoriesEnabled;
+    if (markReadStoriesEnabled) {
+      if (storiesBloc.state.readStoriesIds.contains(story.id)) {
+        storiesBloc.add(StoryUnread(story: story));
+      } else {
+        storiesBloc.add(StoryRead(story: story));
+      }
+    } else {
+      context.showSnackBar(content: 'Read story marking is disabled.');
+    }
+  }
+
+  void loadMoreStories() =>
+      context.read<StoriesBloc>().add(StoriesLoadMore(type: widget.storyType));
 }

lib/screens/widgets/tap_down_wrapper.dart

@@ -37,6 +37,7 @@ class _TapDownWrapperState extends State<TapDownWrapper>
       onTapDown: onTapDown,
       onTapUp: onTapUp,
       onTapCancel: onTapCancel,
+      behavior: HitTestBehavior.opaque,
       child: AnimatedBuilder(
         animation:
             CurvedAnimation(parent: controller, curve: Curves.decelerate),

lib/services/fetcher.dart

@@ -44,7 +44,7 @@ abstract class Fetcher {
       logger: logger,
     );
 
-    final StoriesRepository storiesRepository = StoriesRepository();
+    final HackerNewsRepository hackerNewsRepository = HackerNewsRepository();
     final SembastRepository sembastRepository = SembastRepository();
 
     final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
@@ -57,7 +57,7 @@ abstract class Fetcher {
 
     Comment? newReply;
 
-    await storiesRepository
+    await hackerNewsRepository
         .fetchSubmitted(userId: username)
         .then((List<int>? submittedItems) async {
       if (submittedItems != null) {
@@ -67,7 +67,9 @@ abstract class Fetcher {
         );
 
         for (final int id in subscribedItems) {
-          await storiesRepository.fetchRawItem(id: id).then((Item? item) async {
+          await hackerNewsRepository
+              .fetchRawItem(id: id)
+              .then((Item? item) async {
             final List<int> kids = item?.kids ?? <int>[];
             final List<int> previousKids =
                 (await sembastRepository.kids(of: id)) ?? <int>[];
@@ -81,7 +83,7 @@ abstract class Fetcher {
               for (final int newCommentId in diff) {
                 if (unreadIds.contains(newCommentId)) continue;
 
-                await storiesRepository
+                await hackerNewsRepository
                     .fetchRawComment(id: newCommentId)
                     .then((Comment? comment) async {
                   final bool hasPushedBefore =
@@ -113,7 +115,7 @@ abstract class Fetcher {
     // pushed before.
     if (newReply != null) {
       final Story? story =
-          await storiesRepository.fetchRawParentStory(id: newReply!.id);
+          await hackerNewsRepository.fetchRawParentStory(id: newReply!.id);
       final String text = HtmlUtil.parseHtml(newReply!.text);
 
       if (story != null) {

lib/services/web_analyzer.dart

@@ -288,14 +288,14 @@ class WebAnalyzer {
   }
 
   static Future<String?> _fetchInfoFromStory(List<int> meta) async {
-    final StoriesRepository storiesRepository = StoriesRepository();
+    final HackerNewsRepository hackerNewsRepository = HackerNewsRepository();
     final int storyId = meta.first;
     List<int> kids = meta.sublist(1, meta.length);
 
     // Kids of stories from search results are always empty, so here we try
     // to fetch the story itself first and see if the kids are still empty.
     if (kids.isEmpty) {
-      final Story? story = await storiesRepository.fetchStory(id: storyId);
+      final Story? story = await hackerNewsRepository.fetchStory(id: storyId);
 
       if (story == null) return null;
 
@@ -305,7 +305,7 @@ class WebAnalyzer {
     }
 
     final Comment? comment =
-        await storiesRepository.fetchComment(id: kids.first);
+        await hackerNewsRepository.fetchComment(id: kids.first);
 
     return comment != null ? '${comment.by}: ${comment.text}' : null;
   }

lib/utils/haptic_feedback_util.dart

@@ -1,7 +1,17 @@
 import 'package:flutter/services.dart';
 
 abstract class HapticFeedbackUtil {
-  static void selection() => HapticFeedback.selectionClick();
+  static bool enabled = true;
 
-  static void light() => HapticFeedback.lightImpact();
+  static void selection() {
+    if (enabled) {
+      HapticFeedback.selectionClick();
+    }
+  }
+
+  static void light() {
+    if (enabled) {
+      HapticFeedback.lightImpact();
+    }
+  }
 }

lib/utils/html_util.dart

@@ -34,7 +34,16 @@ abstract class HtmlUtil {
   static String parseHtml(String text) {
     return HtmlUnescape()
         .convert(text)
-        .replaceAll('<p>', '\n')
+        .replaceAllMapped(
+          RegExp(r'\<pre\>\<code\>(.*?)\<\/code\>\<\/pre\>', dotAll: true),
+          (Match match) =>
+              '<pre><code>${match[1]?.replaceAll('\n', '[break]')}</code></pre>',
+        )
+        .replaceAll('\n', '')
+        .replaceAllMapped(
+          RegExp(r'\<p\>(.*?)\<p\>', dotAll: true),
+          (Match match) => '\n${match[1]?.replaceAll('\n', ' ')}\n',
+        )
         .replaceAllMapped(
           RegExp(r'\<i\>(.*?)\<\/i\>'),
           (Match match) => '*${match[1]}*',
@@ -43,6 +52,8 @@ abstract class HtmlUtil {
           RegExp(r'\<a href=\"(.*?)\".*?\>.*?\<\/a\>'),
           (Match match) => match[1] ?? '',
         )
-        .replaceAll('\n', '\n\n');
+        .replaceAll('\n', '\n\n')
+        .replaceAll('<p>', '\n\n')
+        .replaceAll('[break]', '\n');
   }
 }

lib/utils/link_util.dart

@@ -52,7 +52,10 @@ abstract class LinkUtil {
     if (useHackiForHnLink && link.isStoryLink) {
       final int? id = link.itemId;
       if (id != null) {
-        locator.get<StoriesRepository>().fetchItem(id: id).then((Item? item) {
+        locator
+            .get<HackerNewsRepository>()
+            .fetchItem(id: id)
+            .then((Item? item) {
           if (item != null) {
             router.push(
               '/${ItemScreen.routeName}',

pubspec.lock

@@ -25,6 +25,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.13.0"
+  animations:
+    dependency: "direct main"
+    description:
+      name: animations
+      sha256: ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.8"
   args:
     dependency: transitive
     description:
@@ -459,14 +467,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  gbk_codec:
-    dependency: "direct main"
-    description:
-      name: gbk_codec
-      sha256: "3af5311fc9393115e3650ae6023862adf998051a804a08fb804f042724999f61"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.0"
   get_it:
     dependency: "direct main"
     description:
@@ -487,10 +487,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: a206cc4621a644531a2e05e7774616ab4d9d85eab1f3b0e255f3102937fccab1
+      sha256: c247a4f76071c3b97bb5ae8912968870d5565644801c5e09f3bc961b4d874895
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.0"
+    version: "12.1.1"
   hive:
     dependency: "direct main"
     description:
@@ -1168,66 +1168,66 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
+      sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.14"
+    version: "6.2.1"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330
+      sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.2.0"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f"
+      sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.2.0"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e
+      sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88
+      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "3.1.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618"
+      sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5"
+      sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.20"
+    version: "2.2.0"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069"
+      sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.1.0"
   uuid:
     dependency: transitive
     description:
@@ -1430,4 +1430,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.1.0 <4.0.0"
-  flutter: ">=3.13.8"
+  flutter: ">=3.13.9"

pubspec.yaml

@@ -1,14 +1,15 @@
 name: hacki
 description: A Hacker News reader.
-version: 2.0.1+126
+version: 2.4.0+131
 publish_to: none
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: "3.13.8"
+  flutter: "3.13.9"
 
 dependencies:
   adaptive_theme: ^3.2.0
+  animations: ^2.0.8
   badges: ^3.0.2
   bloc: ^8.1.1
   cached_network_image: ^3.2.3
@@ -37,9 +38,8 @@ dependencies:
   flutter_siri_suggestions: ^2.1.0
   flutter_slidable: ^3.0.0
   font_awesome_flutter: ^10.3.0
-  gbk_codec: ^0.4.0
   get_it: ^7.2.0
-  go_router: ^12.0.0
+  go_router: ^12.1.1
   hive: ^2.2.3
   html: ^0.15.1
   html_unescape: ^2.0.0
@@ -66,7 +66,7 @@ dependencies:
   responsive_builder: ^0.7.0
   rxdart: ^0.27.7
   scrollable_positioned_list: ^0.3.5
-  sembast: ^3.4.0+6
+  sembast: ^3.5.0+1
   share_plus: ^7.2.1
   shared_preferences: ^2.2.2
   shared_preferences_android: ^2.2.1
@@ -75,7 +75,7 @@ dependencies:
   synced_shared_preferences:
     path: components/synced_shared_preferences
   universal_platform: ^1.0.0+1
-  url_launcher: ^6.1.9
+  url_launcher: ^6.2.1
   visibility_detector: ^0.4.0+2
   wakelock: ^0.6.2
   webview_flutter: ^4.4.1

test/blocs/auth/auth_bloc_test.dart

@@ -9,7 +9,7 @@ class MockAuthRepository extends Mock implements AuthRepository {}
 
 class MockPreferenceRepository extends Mock implements PreferenceRepository {}
 
-class MockStoriesRepository extends Mock implements StoriesRepository {}
+class MockHackerNewsRepository extends Mock implements HackerNewsRepository {}
 
 class MockSembastRepository extends Mock implements SembastRepository {}
 
@@ -17,7 +17,8 @@ void main() {
   final MockAuthRepository mockAuthRepository = MockAuthRepository();
   final MockPreferenceRepository mockPreferenceRepository =
       MockPreferenceRepository();
-  final MockStoriesRepository mockStoriesRepository = MockStoriesRepository();
+  final MockHackerNewsRepository mockHackerNewsRepository =
+      MockHackerNewsRepository();
   final MockSembastRepository mockSembastRepository = MockSembastRepository();
 
   const int created = 0;
@@ -49,7 +50,7 @@ void main() {
             AuthBloc(
               authRepository: mockAuthRepository,
               preferenceRepository: mockPreferenceRepository,
-              storiesRepository: mockStoriesRepository,
+              hackerNewsRepository: mockHackerNewsRepository,
               sembastRepository: mockSembastRepository,
             ).state,
             equals(const AuthState.init()),
@@ -67,7 +68,7 @@ void main() {
           .thenAnswer((_) => Future<String?>.value(username));
       when(() => mockAuthRepository.password)
           .thenAnswer((_) => Future<String>.value(password));
-      when(() => mockStoriesRepository.fetchUser(id: username))
+      when(() => mockHackerNewsRepository.fetchUser(id: username))
           .thenAnswer((_) => Future<User>.value(tUser));
       when(() => mockAuthRepository.loggedIn)
           .thenAnswer((_) => Future<bool>.value(false));
@@ -79,7 +80,7 @@ void main() {
         return AuthBloc(
           authRepository: mockAuthRepository,
           preferenceRepository: mockPreferenceRepository,
-          storiesRepository: mockStoriesRepository,
+          hackerNewsRepository: mockHackerNewsRepository,
           sembastRepository: mockSembastRepository,
         );
       },
@@ -91,7 +92,7 @@ void main() {
       verify: (_) {
         verify(() => mockAuthRepository.loggedIn).called(2);
         verifyNever(() => mockAuthRepository.username);
-        verifyNever(() => mockStoriesRepository.fetchUser(id: username));
+        verifyNever(() => mockHackerNewsRepository.fetchUser(id: username));
       },
     );
 
@@ -107,7 +108,7 @@ void main() {
         return AuthBloc(
           authRepository: mockAuthRepository,
           preferenceRepository: mockPreferenceRepository,
-          storiesRepository: mockStoriesRepository,
+          hackerNewsRepository: mockHackerNewsRepository,
           sembastRepository: mockSembastRepository,
         );
       },
@@ -154,7 +155,8 @@ void main() {
             password: password,
           ),
         ).called(1);
-        verify(() => mockStoriesRepository.fetchUser(id: username)).called(1);
+        verify(() => mockHackerNewsRepository.fetchUser(id: username))
+            .called(1);
       },
     );
   });