v0.2.26 (#63)

* added integration test.

* replace listview with listview.builder

* added cache.

* bumped version.

* bumped version.

* updated github action.

* bumped version.

* fixed time machine cubit.

* fixed time machine cubit.

* reverted changes.

* removed keepAliveMixin

.github/workflows/github-actions.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_VERSION: "11.0"
-      FLUTTER_VERSION: "3.0.0"
+      FLUTTER_VERSION: "3.0.3"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
@@ -20,7 +20,7 @@ jobs:
           java-version: '17'
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.0.3'
           channel: 'stable'
       - run: flutter pub get
       - run: flutter analyze

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

@@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.

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

@@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.

integration_test/app_test.dart

@@ -0,0 +1,46 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hacki/main.dart' as app;
+import 'package:hacki/screens/widgets/story_tile.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('performance test', () {
+    testWidgets('scrolling performance on ItemScreen',
+        (WidgetTester tester) async {
+      await app.main(testing: true);
+      await tester.pump();
+
+      final Finder bestStoryTabFinder = find.text('BEST');
+
+      await tester.tap(bestStoryTabFinder);
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+
+      final Finder storyTileFinder = find.byType(StoryTile);
+
+      await tester.tap(storyTileFinder.first);
+      await tester.pumpAndSettle(const Duration(seconds: 3));
+
+      TestGesture gesture = await tester.startGesture(const Offset(0, 300));
+      await gesture.moveBy(const Offset(0, -300));
+      await tester.pump();
+
+      gesture = await tester.startGesture(const Offset(0, 300));
+      await gesture.moveBy(const Offset(0, -300));
+      await tester.pump();
+
+      gesture = await tester.startGesture(const Offset(0, 300));
+      await gesture.moveBy(const Offset(0, -300));
+      await tester.pump();
+
+      gesture = await tester.startGesture(const Offset(0, 300));
+      await gesture.moveBy(const Offset(0, 900));
+      await tester.pump();
+
+      gesture = await tester.startGesture(const Offset(0, 300));
+      await gesture.moveBy(const Offset(0, -900));
+      await tester.pump();
+    });
+  });
+}

ios/Podfile.lock

@@ -19,6 +19,8 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
+  - integration_test (0.0.1):
+    - Flutter
   - OrderedSet (5.0.0)
   - path_provider_ios (0.0.1):
     - Flutter
@@ -50,6 +52,7 @@ DEPENDENCIES:
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_siri_suggestions (from `.symlinks/plugins/flutter_siri_suggestions/ios`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -80,6 +83,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   flutter_siri_suggestions:
     :path: ".symlinks/plugins/flutter_siri_suggestions/ios"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
   path_provider_ios:
     :path: ".symlinks/plugins/path_provider_ios/ios"
   receive_sharing_intent:
@@ -109,6 +114,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825

ios/Runner.xcodeproj/project.pbxproj

@@ -568,7 +568,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -577,7 +577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.24;
+				MARKETING_VERSION = 0.2.26;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -705,7 +705,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.24;
+				MARKETING_VERSION = 0.2.26;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -736,7 +736,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -745,7 +745,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.24;
+				MARKETING_VERSION = 0.2.26;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/blocs/stories/stories_bloc.dart

@@ -17,15 +17,18 @@ part 'stories_state.dart';
 class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   StoriesBloc({
     required PreferenceCubit preferenceCubit,
-    CacheRepository? cacheRepository,
+    OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     PreferenceRepository? preferenceRepository,
+    Logger? logger,
   })  : _preferenceCubit = preferenceCubit,
-        _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
+        _offlineRepository =
+            offlineRepository ?? locator.get<OfflineRepository>(),
         _storiesRepository =
             storiesRepository ?? locator.get<StoriesRepository>(),
         _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
+        _logger = logger ?? locator.get<Logger>(),
         super(const StoriesState.init()) {
     on<StoriesInitialize>(onInitialize);
     on<StoriesRefresh>(onRefresh);
@@ -41,9 +44,10 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   }
 
   final PreferenceCubit _preferenceCubit;
-  final CacheRepository _cacheRepository;
+  final OfflineRepository _offlineRepository;
   final StoriesRepository _storiesRepository;
   final PreferenceRepository _preferenceRepository;
+  final Logger _logger;
   DeviceScreenType? deviceScreenType;
   StreamSubscription<PreferenceState>? _streamSubscription;
   static const int _smallPageSize = 10;
@@ -73,7 +77,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         add(StoriesPageSizeChanged(pageSize: pageSize));
       }
     });
-    final bool hasCachedStories = await _cacheRepository.hasCachedStories;
+    final bool hasCachedStories = await _offlineRepository.hasCachedStories;
     final bool isComplexTile = _preferenceCubit.state.showComplexStoryTile;
     final int pageSize = _getPageSize(isComplexTile: isComplexTile);
     emit(
@@ -92,13 +96,13 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     required Emitter<StoriesState> emit,
   }) async {
     if (state.offlineReading) {
-      final List<int> ids = await _cacheRepository.getCachedStoryIds(of: of);
+      final List<int> ids = await _offlineRepository.getCachedStoryIds(of: of);
       emit(
         state
             .copyWithStoryIdsUpdated(of: of, to: ids)
             .copyWithCurrentPageUpdated(of: of, to: 0),
       );
-      _cacheRepository
+      _offlineRepository
           .getCachedStoriesStream(
         ids: ids.sublist(0, min(ids.length, state.currentPageSize)),
       )
@@ -169,7 +173,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       }
 
       if (state.offlineReading) {
-        _cacheRepository
+        _offlineRepository
             .getCachedStoriesStream(
           ids: state.storyIdsByType[event.type]!.sublist(
             lower,
@@ -243,9 +247,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       ),
     );
 
-    await _cacheRepository.deleteAllStoryIds();
+    await _offlineRepository.deleteAllStoryIds();
-    await _cacheRepository.deleteAllStories();
+    await _offlineRepository.deleteAllStories();
-    await _cacheRepository.deleteAllComments();
+    await _offlineRepository.deleteAllComments();
 
     final Set<int> prioritizedIds = <int>{};
     final List<StoryType> prioritizedTypes = <StoryType>[...types]
@@ -253,7 +257,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
 
     for (final StoryType type in prioritizedTypes) {
       final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
-      await _cacheRepository.cacheStoryIds(of: type, ids: ids);
+      await _offlineRepository.cacheStoryIds(of: type, ids: ids);
       prioritizedIds.addAll(ids);
     }
 
@@ -275,7 +279,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       final List<int> ids = await _storiesRepository.fetchStoryIds(
         of: StoryType.latest,
       );
-      await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
+      await _offlineRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
       latestIds.addAll(ids);
 
       await fetchAndCacheStories(
@@ -314,11 +318,11 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         continue;
       }
 
-      await _cacheRepository.cacheStory(story: story);
+      await _offlineRepository.cacheStory(story: story);
 
       if (story.url.isNotEmpty && includingWebPage) {
-        locator.get<Logger>().i('downloading ${story.url}');
+        _logger.i('downloading ${story.url}');
-        await _cacheRepository.cacheUrl(url: story.url);
+        await _offlineRepository.cacheUrl(url: story.url);
       }
 
       _storiesRepository
@@ -326,7 +330,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
           .whereType<Comment>()
           .listen(
             (Comment comment) => unawaited(
-              _cacheRepository.cacheComment(comment: comment),
+              _offlineRepository.cacheComment(comment: comment),
             ),
           )
           .onDone(() => add(StoryDownloaded(skipped: false)));
@@ -378,10 +382,10 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     StoriesExitOffline event,
     Emitter<StoriesState> emit,
   ) async {
-    await _cacheRepository.deleteAllStoryIds();
+    await _offlineRepository.deleteAllStoryIds();
-    await _cacheRepository.deleteAllStories();
+    await _offlineRepository.deleteAllStories();
-    await _cacheRepository.deleteAllComments();
+    await _offlineRepository.deleteAllComments();
-    await _cacheRepository.deleteAllWebPages();
+    await _offlineRepository.deleteAllWebPages();
     emit(state.copyWith(offlineReading: false));
     add(StoriesInitialize());
   }

lib/config/locator.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hacki/config/custom_log_filter.dart';
 import 'package:hacki/repositories/repositories.dart';
@@ -10,14 +11,18 @@ final GetIt locator = GetIt.instance;
 /// Set up [GetIt] locator.
 Future<void> setUpLocator() async {
   locator
+    ..registerSingleton<Logger>(Logger(filter: CustomLogFilter()))
     ..registerSingleton<StoriesRepository>(StoriesRepository())
     ..registerSingleton<PreferenceRepository>(PreferenceRepository())
     ..registerSingleton<SearchRepository>(SearchRepository())
     ..registerSingleton<AuthRepository>(AuthRepository())
     ..registerSingleton<PostRepository>(PostRepository())
     ..registerSingleton<SembastRepository>(SembastRepository())
-    ..registerSingleton<CacheRepository>(CacheRepository())
+    ..registerSingleton<OfflineRepository>(OfflineRepository())
-    ..registerSingleton<CacheService>(CacheService())
+    ..registerSingleton<DraftCache>(DraftCache())
+    ..registerSingleton<CommentCache>(CommentCache())
     ..registerSingleton<LocalNotification>(LocalNotification())
-    ..registerSingleton<Logger>(Logger(filter: CustomLogFilter()));
+    ..registerSingleton<RouteObserver<ModalRoute<dynamic>>>(
+      RouteObserver<ModalRoute<dynamic>>(),
+    );
 }

lib/cubits/collapse/collapse_cubit.dart

@@ -10,31 +10,31 @@ part 'collapse_state.dart';
 class CollapseCubit extends Cubit<CollapseState> {
   CollapseCubit({
     required int commentId,
-    CacheService? cacheService,
+    CollapseCache? collapseCache,
   })  : _commentId = commentId,
-        _cacheService = cacheService ?? locator.get<CacheService>(),
+        _collapseCache = collapseCache ?? locator.get<CollapseCache>(),
         super(const CollapseState.init());
 
   final int _commentId;
-  final CacheService _cacheService;
+  final CollapseCache _collapseCache;
   late final StreamSubscription<Map<int, Set<int>>> _streamSubscription;
 
   void init() {
     _streamSubscription =
-        _cacheService.hiddenComments.listen(hiddenCommentsStreamListener);
+        _collapseCache.hiddenComments.listen(hiddenCommentsStreamListener);
 
     emit(
       state.copyWith(
-        collapsedCount: _cacheService.totalHidden(_commentId),
+        collapsedCount: _collapseCache.totalHidden(_commentId),
-        collapsed: _cacheService.isCollapsed(_commentId),
+        collapsed: _collapseCache.isCollapsed(_commentId),
-        hidden: _cacheService.isHidden(_commentId),
+        hidden: _collapseCache.isHidden(_commentId),
       ),
     );
   }
 
   void collapse() {
     if (state.collapsed) {
-      _cacheService.uncollapse(_commentId);
+      _collapseCache.uncollapse(_commentId);
 
       emit(
         state.copyWith(
@@ -43,7 +43,7 @@ class CollapseCubit extends Cubit<CollapseState> {
         ),
       );
     } else {
-      final int count = _cacheService.collapse(_commentId);
+      final int count = _collapseCache.collapse(_commentId);
 
       emit(
         state.copyWith(

lib/cubits/comments/comments_cubit.dart

@@ -16,22 +16,26 @@ part 'comments_state.dart';
 
 class CommentsCubit extends Cubit<CommentsState> {
   CommentsCubit({
-    CacheService? cacheService,
+    required CollapseCache collapseCache,
-    CacheRepository? cacheRepository,
+    CommentCache? commentCache,
+    OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     SembastRepository? sembastRepository,
     required bool offlineReading,
     required Item item,
-  })  : _cacheService = cacheService ?? locator.get<CacheService>(),
+  })  : _collapseCache = collapseCache,
-        _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
+        _commentCache = commentCache ?? locator.get<CommentCache>(),
+        _offlineRepository =
+            offlineRepository ?? locator.get<OfflineRepository>(),
         _storiesRepository =
             storiesRepository ?? locator.get<StoriesRepository>(),
         _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
         super(CommentsState.init(offlineReading: offlineReading, item: item));
 
-  final CacheService _cacheService;
+  final CollapseCache _collapseCache;
-  final CacheRepository _cacheRepository;
+  final CommentCache _commentCache;
+  final OfflineRepository _offlineRepository;
   final StoriesRepository _storiesRepository;
   final SembastRepository _sembastRepository;
   StreamSubscription<Comment>? _streamSubscription;
@@ -47,6 +51,7 @@ class CommentsCubit extends Cubit<CommentsState> {
 
   Future<void> init({
     bool onlyShowTargetComment = false,
+    bool useCommentCache = false,
     List<Comment>? targetParents,
   }) async {
     if (onlyShowTargetComment && (targetParents?.isNotEmpty ?? false)) {
@@ -80,13 +85,16 @@ class CommentsCubit extends Cubit<CommentsState> {
     emit(state.copyWith(item: updatedItem));
 
     if (state.offlineReading) {
-      _streamSubscription = _cacheRepository
+      _streamSubscription = _offlineRepository
           .getCachedCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     } else {
       _streamSubscription = _storiesRepository
-          .fetchCommentsStream(ids: kids)
+          .fetchCommentsStream(
+            ids: kids,
+            getFromCache: useCommentCache ? _commentCache.getComment : null,
+          )
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     }
@@ -102,9 +110,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
-    _cacheService
+    _collapseCache.resetCollapsedComments();
-      ..resetComments()
-      ..resetCollapsedComments();
 
     emit(
       state.copyWith(
@@ -179,7 +185,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     if (order == null) return;
     _streamSubscription?.cancel();
     emit(state.copyWith(order: order, comments: <Comment>[]));
-    init();
+    init(useCommentCache: true);
   }
 
   List<int> sortKids(List<int> kids) {
@@ -205,9 +211,8 @@ class CommentsCubit extends Cubit<CommentsState> {
 
   void _onCommentFetched(Comment? comment) {
     if (comment != null) {
-      _cacheService
+      _collapseCache.addKid(comment.id, to: comment.parent);
-        ..addKid(comment.id, to: comment.parent)
+      _commentCache.cacheComment(comment);
-        ..cacheComment(comment);
       _sembastRepository.cacheComment(comment);
 
       final List<LinkifyElement> elements = _linkify(
@@ -227,7 +232,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
           updatedComments.length <=
               _pageSize * 2 + _pageSize * state.currentPage) {
-        final bool isHidden = _cacheService.isHidden(comment.id);
+        final bool isHidden = _collapseCache.isHidden(comment.id);
 
         if (!isHidden) {
           _streamSubscription?.pause();

lib/cubits/edit/edit_cubit.dart

@@ -8,19 +8,19 @@ import 'package:hacki/utils/debouncer.dart';
 part 'edit_state.dart';
 
 class EditCubit extends Cubit<EditState> {
-  EditCubit({CacheService? cacheService})
+  EditCubit({DraftCache? draftCache})
-      : _cacheService = cacheService ?? locator.get<CacheService>(),
+      : _draftCache = draftCache ?? locator.get<DraftCache>(),
         _debouncer = Debouncer(delay: const Duration(seconds: 1)),
         super(const EditState.init());
 
-  final CacheService _cacheService;
+  final DraftCache _draftCache;
   final Debouncer _debouncer;
 
   void onReplyTapped(Item item) {
     emit(
       EditState(
         replyingTo: item,
-        text: _cacheService.getDraft(replyingTo: item.id),
+        text: _draftCache.getDraft(replyingTo: item.id),
       ),
     );
   }
@@ -44,7 +44,7 @@ class EditCubit extends Cubit<EditState> {
 
   void onReplySubmittedSuccessfully() {
     if (state.replyingTo != null) {
-      _cacheService.removeDraft(replyingTo: state.replyingTo!.id);
+      _draftCache.removeDraft(replyingTo: state.replyingTo!.id);
     }
     emit(const EditState.init());
   }
@@ -54,7 +54,7 @@ class EditCubit extends Cubit<EditState> {
     if (state.replyingTo != null) {
       final int? id = state.replyingTo?.id;
       _debouncer.run(() {
-        _cacheService.cacheDraft(
+        _draftCache.cacheDraft(
           text: text,
           replyingTo: id!,
         );

lib/cubits/split_view/split_view_cubit.dart

@@ -3,18 +3,24 @@ import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
+import 'package:logger/logger.dart';
 
 part 'split_view_state.dart';
 
 class SplitViewCubit extends Cubit<SplitViewState> {
-  SplitViewCubit({CacheService? cacheService})
+  SplitViewCubit({
-      : _cacheService = cacheService ?? locator.get<CacheService>(),
+    CommentCache? commentCache,
+    Logger? logger,
+  })  : _commentCache = commentCache ?? locator.get<CommentCache>(),
+        _logger = logger ?? locator.get<Logger>(),
         super(const SplitViewState.init());
 
-  final CacheService _cacheService;
+  final Logger _logger;
+  final CommentCache _commentCache;
 
   void updateItemScreenArgs(ItemScreenArgs args) {
-    _cacheService.resetCollapsedComments();
+    _logger.i('resetting comments in CommentCache');
+    _commentCache.resetComments();
     emit(state.copyWith(itemScreenArgs: args));
   }
 

lib/cubits/time_machine/time_machine_cubit.dart

@@ -3,34 +3,34 @@ import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart' show Comment;
 import 'package:hacki/repositories/repositories.dart';
-import 'package:hacki/services/cache_service.dart';
+import 'package:hacki/services/services.dart';
 
 part 'time_machine_state.dart';
 
 class TimeMachineCubit extends Cubit<TimeMachineState> {
   TimeMachineCubit({
     SembastRepository? sembastRepository,
-    CacheService? cacheService,
+    CommentCache? commentCache,
   })  : _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
-        _cacheService = cacheService ?? locator.get<CacheService>(),
+        _commentCache = commentCache ?? locator.get<CommentCache>(),
         super(TimeMachineState.init());
 
   final SembastRepository _sembastRepository;
-  final CacheService _cacheService;
+  final CommentCache _commentCache;
 
   Future<void> activateTimeMachine(Comment comment) async {
     emit(state.copyWith(parents: <Comment>[]));
 
     final List<Comment> parents = <Comment>[];
-    Comment? parent = _cacheService.getComment(comment.parent);
+    Comment? parent = _commentCache.getComment(comment.parent);
     parent ??= await _sembastRepository.getCachedComment(id: comment.parent);
 
     while (parent != null) {
       parents.insert(0, parent);
 
       final int parentId = parent.parent;
-      parent = _cacheService.getComment(parentId);
+      parent = _commentCache.getComment(parentId);
       parent ??= await _sembastRepository.getCachedComment(id: parentId);
     }
 

lib/extensions/context_extension.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+extension TryReadContext on BuildContext {
+  T? tryRead<T>() {
+    try {
+      return read<T>();
+    } catch (_) {
+      return null;
+    }
+  }
+}

lib/extensions/extensions.dart

@@ -1,3 +1,4 @@
+export 'context_extension.dart';
 export 'date_time_extension.dart';
 export 'int_extension.dart';
 export 'list_extension.dart';

lib/extensions/widget_extension.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 extension WidgetModifier on Widget {
-  Widget padding([EdgeInsetsGeometry value = const EdgeInsets.all(12)]) {
+  Widget padded([EdgeInsetsGeometry value = const EdgeInsets.all(12)]) {
     return Padding(
       padding: value,
       child: this,

lib/main.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:feature_discovery/feature_discovery.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -14,6 +15,7 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/repositories/repositories.dart' show PreferenceRepository;
 import 'package:hacki/screens/screens.dart';
+import 'package:hacki/services/custom_bloc_observer.dart';
 import 'package:hacki/services/fetcher.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hive/hive.dart';
@@ -30,9 +32,13 @@ final BehaviorSubject<String?> selectNotificationSubject =
 final BehaviorSubject<String?> siriSuggestionSubject =
     BehaviorSubject<String?>();
 
-Future<void> main() async {
+late final bool isTesting;
+
+Future<void> main({bool testing = false}) async {
   WidgetsFlutterBinding.ensureInitialized();
 
+  isTesting = testing;
+
   if (Platform.isIOS) {
     unawaited(
       Workmanager().initialize(
@@ -86,25 +92,26 @@ Future<void> main() async {
   final bool trueDarkMode =
       prefs.getBool(PreferenceRepository.trueDarkModeKey) ?? false;
 
-  // Uncomment code below for running with logging.
+  if (kReleaseMode) {
-  // BlocOverrides.runZoned(
-  //   () {
-  //     runApp(
-  //       HackiApp(
-  //         savedThemeMode: savedThemeMode,
-  //         trueDarkMode: trueDarkMode,
-  //       ),
-  //     );
-  //   },
-  //   blocObserver: CustomBlocObserver(),
-  // );
-
     runApp(
       HackiApp(
         savedThemeMode: savedThemeMode,
         trueDarkMode: trueDarkMode,
       ),
     );
+  } else {
+    BlocOverrides.runZoned(
+      () {
+        runApp(
+          HackiApp(
+            savedThemeMode: savedThemeMode,
+            trueDarkMode: trueDarkMode,
+          ),
+        );
+      },
+      blocObserver: CustomBlocObserver(),
+    );
+  }
 }
 
 class HackiApp extends StatelessWidget {
@@ -221,6 +228,9 @@ class HackiApp extends StatelessWidget {
                       debugShowCheckedModeBanner: false,
                       theme: useTrueDark ? trueDarkTheme : theme,
                       navigatorKey: navigatorKey,
+                      navigatorObservers: <NavigatorObserver>[
+                        locator.get<RouteObserver<ModalRoute<dynamic>>>(),
+                      ],
                       onGenerateRoute: CustomRouter.onGenerateRoute,
                       initialRoute: HomeScreen.routeName,
                     ),

lib/repositories/auth_repository.dart

@@ -11,11 +11,14 @@ class AuthRepository extends PostableRepository {
   AuthRepository({
     Dio? dio,
     PreferenceRepository? preferenceRepository,
+    Logger? logger,
   })  : _preferenceRepository =
             preferenceRepository ?? locator.get<PreferenceRepository>(),
+        _logger = logger ?? locator.get<Logger>(),
         super(dio: dio);
 
   final PreferenceRepository _preferenceRepository;
+  final Logger _logger;
 
   static const String _authority = 'news.ycombinator.com';
 
@@ -45,7 +48,7 @@ class AuthRepository extends PostableRepository {
           password: password,
         );
       } catch (_) {
-        locator.get<Logger>().e(_);
+        _logger.e(_);
         return false;
       }
     }

lib/repositories/offline_repository.dart

@@ -5,20 +5,22 @@ import 'package:hive/hive.dart';
 import 'package:http/http.dart';
 import 'package:logger/logger.dart';
 
-/// [CacheRepository] is for storing stories and comments for offline reading.
+/// [OfflineRepository] is for storing stories and comments for offline reading.
 /// It's using [Hive] as its database which is being stored in temp directory.
-class CacheRepository {
+class OfflineRepository {
-  CacheRepository({
+  OfflineRepository({
     Future<Box<List<int>>>? storyIdBox,
     Future<Box<Map<dynamic, dynamic>>>? storyBox,
     Future<LazyBox<String>>? webPageBox,
     Future<LazyBox<Map<dynamic, dynamic>>>? commentBox,
+    Logger? logger,
   })  : _storyIdBox = storyIdBox ?? Hive.openBox<List<int>>(_storyIdBoxName),
         _storyBox =
             storyBox ?? Hive.openBox<Map<dynamic, dynamic>>(_storyBoxName),
         _webPageBox = webPageBox ?? Hive.openLazyBox<String>(_webPageBoxName),
         _commentBox = commentBox ??
-            Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName);
+            Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName),
+        _logger = logger ?? locator.get<Logger>();
 
   static const String _storyIdBoxName = 'storyIdBox';
   static const String _storyBoxName = 'storyBox';
@@ -28,6 +30,7 @@ class CacheRepository {
   final Future<Box<Map<dynamic, dynamic>>> _storyBox;
   final Future<LazyBox<Map<dynamic, dynamic>>> _commentBox;
   final Future<LazyBox<String>> _webPageBox;
+  final Logger _logger;
 
   Future<bool> get hasCachedStories =>
       _storyBox.then((Box<Map<dynamic, dynamic>> box) => box.isNotEmpty);
@@ -41,7 +44,7 @@ class CacheRepository {
     try {
       box = await _storyIdBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyIdBoxName);
       box = await _storyIdBox;
     }
@@ -55,7 +58,7 @@ class CacheRepository {
     try {
       box = await _storyBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyBoxName);
       box = await _storyBox;
     }
@@ -69,7 +72,7 @@ class CacheRepository {
     try {
       box = await _webPageBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_webPageBoxName);
       box = await _webPageBox;
     }
@@ -83,7 +86,7 @@ class CacheRepository {
       final LazyBox<String> box = await _webPageBox;
       return box.get(url);
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_webPageBoxName);
       return null;
     }
@@ -94,7 +97,7 @@ class CacheRepository {
       final LazyBox<String> box = await _webPageBox;
       return box.containsKey(url);
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_webPageBoxName);
       return false;
     }
@@ -106,7 +109,7 @@ class CacheRepository {
       final List<int>? ids = box.get(of.name);
       return ids ?? <int>[];
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyIdBoxName);
       return <int>[];
     }
@@ -118,7 +121,7 @@ class CacheRepository {
     try {
       box = await _storyBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyBoxName);
       return;
     }
@@ -143,7 +146,7 @@ class CacheRepository {
     try {
       box = await _storyBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyBoxName);
       return null;
     }
@@ -162,7 +165,7 @@ class CacheRepository {
     try {
       box = await _commentBox;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_commentBoxName);
       box = await _commentBox;
     }
@@ -180,7 +183,7 @@ class CacheRepository {
       final Comment comment = Comment.fromJson(json.cast<String, dynamic>());
       return comment;
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_commentBoxName);
       return null;
     }
@@ -210,7 +213,7 @@ class CacheRepository {
       final Box<List<int>> box = await _storyIdBox;
       return box.clear();
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyIdBoxName);
       return 0;
     }
@@ -221,7 +224,7 @@ class CacheRepository {
       final Box<Map<dynamic, dynamic>> box = await _storyBox;
       return box.clear();
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_storyBoxName);
       return 0;
     }
@@ -232,7 +235,7 @@ class CacheRepository {
       final LazyBox<Map<dynamic, dynamic>> box = await _commentBox;
       return box.clear();
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_commentBoxName);
       return 0;
     }
@@ -243,7 +246,7 @@ class CacheRepository {
       final LazyBox<String> box = await _webPageBox;
       return box.clear();
     } catch (_) {
-      locator.get<Logger>().e(_);
+      _logger.e(_);
       await Hive.deleteBoxFromDisk(_webPageBoxName);
       return 0;
     }

lib/repositories/preference_repository.dart

@@ -12,9 +12,11 @@ class PreferenceRepository {
     SyncedSharedPreferences? syncedPrefs,
     Future<SharedPreferences>? prefs,
     FlutterSecureStorage? secureStorage,
+    Logger? logger,
   })  : _syncedPrefs = syncedPrefs ?? SyncedSharedPreferences.instance,
         _prefs = prefs ?? SharedPreferences.getInstance(),
-        _secureStorage = secureStorage ?? const FlutterSecureStorage();
+        _secureStorage = secureStorage ?? const FlutterSecureStorage(),
+        _logger = logger ?? locator.get<Logger>();
 
   static const String _usernameKey = 'username';
   static const String _passwordKey = 'password';
@@ -43,7 +45,8 @@ class PreferenceRepository {
 
   static const bool _notificationModeDefaultValue = true;
   static const bool _displayModeDefaultValue = true;
-  static const bool _navigationModeDefaultValue = true;
+  static const bool _navigationModeDefaultValueIOS = true;
+  static const bool _navigationModeDefaultValueAndroid = false;
   static const bool _eyeCandyModeDefaultValue = false;
   static const bool _trueDarkModeDefaultValue = false;
   static const bool _readerModeDefaultValue = true;
@@ -54,6 +57,7 @@ class PreferenceRepository {
   final SyncedSharedPreferences _syncedPrefs;
   final Future<SharedPreferences> _prefs;
   final FlutterSecureStorage _secureStorage;
+  final Logger _logger;
 
   Future<bool> get loggedIn async => await username != null;
 
@@ -84,7 +88,10 @@ class PreferenceRepository {
 
   Future<bool> get shouldShowWebFirst async => _prefs.then(
         (SharedPreferences prefs) =>
-            prefs.getBool(_navigationModeKey) ?? _navigationModeDefaultValue,
+            prefs.getBool(_navigationModeKey) ??
+            (Platform.isAndroid
+                ? _navigationModeDefaultValueAndroid
+                : _navigationModeDefaultValueIOS),
       );
 
   Future<bool> get shouldShowEyeCandy async => _prefs.then(
@@ -160,7 +167,7 @@ class PreferenceRepository {
           aOptions: androidOptions,
         );
       } catch (_) {
-        locator.get<Logger>().e(_);
+        _logger.e(_);
       }
 
       rethrow;
@@ -188,8 +195,10 @@ class PreferenceRepository {
 
   Future<void> toggleNavigationMode() async {
     final SharedPreferences prefs = await _prefs;
-    final bool currentMode =
+    final bool currentMode = prefs.getBool(_navigationModeKey) ??
-        prefs.getBool(_navigationModeKey) ?? _navigationModeDefaultValue;
+        (Platform.isAndroid
+            ? _navigationModeDefaultValueAndroid
+            : _navigationModeDefaultValueIOS);
     await prefs.setBool(_navigationModeKey, !currentMode);
   }
 

lib/repositories/repositories.dart

@@ -1,5 +1,5 @@
 export 'auth_repository.dart';
-export 'cache_repository.dart';
+export 'offline_repository.dart';
 export 'post_repository.dart';
 export 'preference_repository.dart';
 export 'search_repository.dart';

lib/repositories/stories_repository.dart

@@ -51,9 +51,12 @@ class StoriesRepository {
   Stream<Comment> fetchCommentsStream({
     required List<int> ids,
     int level = 0,
+    Comment? Function(int)? getFromCache,
   }) async* {
     for (final int id in ids) {
-      final Comment? comment = await _firebaseClient
+      Comment? comment = getFromCache?.call(id)?.copyWith(level: level);
+
+      comment ??= await _firebaseClient
           .get('${_baseUrl}item/$id.json')
           .then((dynamic json) => _parseJson(json as Map<String, dynamic>?))
           .then((Map<String, dynamic>? json) async {
@@ -69,6 +72,7 @@ class StoriesRepository {
         yield* fetchCommentsStream(
           ids: comment.kids,
           level: level + 1,
+          getFromCache: getFromCache,
         );
       }
     }

lib/screens/home_screen.dart

@@ -26,6 +26,7 @@ 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:logger/logger.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 
@@ -46,8 +47,7 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen>
-    with SingleTickerProviderStateMixin {
+    with SingleTickerProviderStateMixin, RouteAware {
-  final CacheService cacheService = locator.get<CacheService>();
   final Throttle featureDiscoveryDismissThrottle = Throttle(
     delay: _throttleDelay,
   );
@@ -61,6 +61,19 @@ class _HomeScreenState extends State<HomeScreen>
 
   static const Duration _throttleDelay = Duration(seconds: 1);
 
+  @override
+  void didPopNext() {
+    super.didPopNext();
+    if (context.read<StoriesBloc>().deviceScreenType ==
+        DeviceScreenType.mobile) {
+      locator.get<Logger>().i('resetting comments in CommentCache');
+      Future<void>.delayed(
+        const Duration(milliseconds: 500),
+        locator.get<CommentCache>().resetComments,
+      );
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -88,13 +101,25 @@ class _HomeScreenState extends State<HomeScreen>
           siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
     }
 
-    SchedulerBinding.instance.addPostFrameCallback((_) {
+    SchedulerBinding.instance
+      ..addPostFrameCallback((_) {
+        if (!isTesting) {
           FeatureDiscovery.discoverFeatures(
             context,
             const <String>{
               Constants.featureLogIn,
             },
           );
+        }
+      })
+      ..addPostFrameCallback((_) {
+        final ModalRoute<dynamic>? route = ModalRoute.of(context);
+
+        if (route == null) return;
+
+        locator
+            .get<RouteObserver<ModalRoute<dynamic>>>()
+            .subscribe(this, route);
       });
 
     tabController = TabController(vsync: this, length: 6)

lib/screens/item/item_screen.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: comment_references
+
 import 'package:equatable/equatable.dart';
 import 'package:feature_discovery/feature_discovery.dart';
 import 'package:flutter/material.dart';
@@ -38,6 +40,7 @@ class ItemScreenArgs extends Equatable {
   const ItemScreenArgs({
     required this.item,
     this.onlyShowTargetComment = false,
+    this.useCommentCache = false,
     this.targetComments,
   });
 
@@ -45,11 +48,17 @@ class ItemScreenArgs extends Equatable {
   final bool onlyShowTargetComment;
   final List<Comment>? targetComments;
 
+  /// when a user is trying to view a sub-thread from a main thread, we don't
+  /// need to fetch comments from [StoryRepository] since we have some, if not
+  /// all, comments cached in [CommentCache].
+  final bool useCommentCache;
+
   @override
   List<Object?> get props => <Object?>[
         item,
         onlyShowTargetComment,
         targetComments,
+        useCommentCache,
       ];
 }
 
@@ -66,8 +75,8 @@ class ItemScreen extends StatefulWidget {
   static Route<dynamic> route(ItemScreenArgs args) {
     return MaterialPageRoute<ItemScreen>(
       settings: const RouteSettings(name: routeName),
-      builder: (BuildContext context) => RepositoryProvider<CacheService>(
+      builder: (BuildContext context) => RepositoryProvider<CollapseCache>(
-        create: (BuildContext context) => CacheService(),
+        create: (BuildContext context) => CollapseCache(),
         lazy: false,
         child: MultiBlocProvider(
           providers: <BlocProvider<dynamic>>[
@@ -76,10 +85,11 @@ class ItemScreen extends StatefulWidget {
                 offlineReading:
                     context.read<StoriesBloc>().state.offlineReading,
                 item: args.item,
-                cacheService: context.read<CacheService>(),
+                collapseCache: context.read<CollapseCache>(),
               )..init(
                   onlyShowTargetComment: args.onlyShowTargetComment,
                   targetParents: args.targetComments,
+                  useCommentCache: args.useCommentCache,
                 ),
             ),
             BlocProvider<EditCubit>(
@@ -106,8 +116,9 @@ class ItemScreen extends StatefulWidget {
           return true;
         }
       },
-      child: RepositoryProvider<CacheService>(
+      child: RepositoryProvider<CollapseCache>(
-        create: (BuildContext context) => CacheService(),
+        create: (BuildContext context) => CollapseCache(),
+        lazy: false,
         child: MultiBlocProvider(
           key: ValueKey<ItemScreenArgs>(args),
           providers: <BlocProvider<dynamic>>[
@@ -116,7 +127,7 @@ class ItemScreen extends StatefulWidget {
                 offlineReading:
                     context.read<StoriesBloc>().state.offlineReading,
                 item: args.item,
-                cacheService: context.read<CacheService>(),
+                collapseCache: context.read<CollapseCache>(),
               )..init(
                   onlyShowTargetComment: args.onlyShowTargetComment,
                   targetParents: args.targetComments,
@@ -171,6 +182,7 @@ class _ItemScreenState extends State<ItemScreen> {
     super.initState();
 
     SchedulerBinding.instance.addPostFrameCallback((_) {
+      if (!isTesting) {
         FeatureDiscovery.discoverFeatures(
           context,
           const <String>{
@@ -179,6 +191,7 @@ class _ItemScreenState extends State<ItemScreen> {
             Constants.featureOpenStoryInWebView,
           },
         );
+      }
     });
 
     scrollController.addListener(() {
@@ -191,7 +204,6 @@ class _ItemScreenState extends State<ItemScreen> {
 
   @override
   void dispose() {
-    locator.get<CacheService>().resetComments();
     refreshController.dispose();
     commentEditingController.dispose();
     scrollController.dispose();
@@ -296,8 +308,12 @@ class _ItemScreenState extends State<ItemScreen> {
                   }
                 },
                 onLoading: context.read<CommentsCubit>().loadMore,
-                child: ListView(
+                child: ListView.builder(
                   primary: false,
+                  itemCount: state.comments.length + 2,
+                  itemBuilder: (BuildContext context, int index) {
+                    if (index == 0) {
+                      return Column(
                         children: <Widget>[
                           SizedBox(
                             height: topPadding,
@@ -409,13 +425,13 @@ class _ItemScreenState extends State<ItemScreen> {
                                     child: SelectableLinkify(
                                       text: state.item.text,
                                       style: TextStyle(
-                                  fontSize:
+                                        fontSize: MediaQuery.of(context)
-                                      MediaQuery.of(context).textScaleFactor *
+                                                .textScaleFactor *
                                             TextDimens.pt15,
                                       ),
                                       linkStyle: TextStyle(
-                                  fontSize:
+                                        fontSize: MediaQuery.of(context)
-                                      MediaQuery.of(context).textScaleFactor *
+                                                .textScaleFactor *
                                             TextDimens.pt15,
                                         color: Palette.orange,
                                       ),
@@ -433,7 +449,8 @@ class _ItemScreenState extends State<ItemScreen> {
                                 if (state.item.isPoll)
                                   BlocProvider<PollCubit>(
                                     create: (BuildContext context) =>
-                                  PollCubit(story: state.item as Story)..init(),
+                                        PollCubit(story: state.item as Story)
+                                          ..init(),
                                     child: PollView(
                                       onLoginTapped: onLoginTapped,
                                     ),
@@ -483,7 +500,8 @@ class _ItemScreenState extends State<ItemScreen> {
                                         ? const SizedBox(
                                             height: Dimens.pt12,
                                             width: Dimens.pt12,
-                                      child: CustomCircularProgressIndicator(
+                                            child:
+                                                CustomCircularProgressIndicator(
                                               strokeWidth: Dimens.pt2,
                                             ),
                                           )
@@ -494,7 +512,8 @@ class _ItemScreenState extends State<ItemScreen> {
                                 DropdownButton<CommentsOrder>(
                                   value: state.order,
                                   underline: const SizedBox.shrink(),
-                            items: const <DropdownMenuItem<CommentsOrder>>[
+                                  items: const <
+                                      DropdownMenuItem<CommentsOrder>>[
                                     DropdownMenuItem<CommentsOrder>(
                                       value: CommentsOrder.natural,
                                       child: Text(
@@ -523,8 +542,9 @@ class _ItemScreenState extends State<ItemScreen> {
                                       ),
                                     ),
                                   ],
-                            onChanged:
+                                  onChanged: context
-                                context.read<CommentsCubit>().onOrderChanged,
+                                      .read<CommentsCubit>()
+                                      .onOrderChanged,
                                 ),
                                 const SizedBox(
                                   width: Dimens.pt4,
@@ -536,7 +556,8 @@ class _ItemScreenState extends State<ItemScreen> {
                             ),
                           ],
                           if (state.comments.isEmpty &&
-                        state.status == CommentsStatus.allLoaded) ...<Widget>[
+                              state.status ==
+                                  CommentsStatus.allLoaded) ...<Widget>[
                             const SizedBox(
                               height: 240,
                             ),
@@ -547,8 +568,26 @@ class _ItemScreenState extends State<ItemScreen> {
                               ),
                             ),
                           ],
-                    for (final Comment comment in state.comments)
+                        ],
-                      FadeIn(
+                      );
+                    } else if (index == state.comments.length + 1) {
+                      if ((state.status == CommentsStatus.allLoaded &&
+                              state.comments.isNotEmpty) ||
+                          state.onlyShowTargetComment) {
+                        return SizedBox(
+                          height: 240,
+                          child: Center(
+                            child: Text(happyFace),
+                          ),
+                        );
+                      } else {
+                        return const SizedBox.shrink();
+                      }
+                    }
+
+                    index = index - 1;
+                    final Comment comment = state.comments.elementAt(index);
+                    return FadeIn(
                       key: ValueKey<String>('${comment.id}-FadeIn'),
                       child: CommentTile(
                         comment: comment,
@@ -563,11 +602,7 @@ class _ItemScreenState extends State<ItemScreen> {
                           }
 
                           if (cmt.id !=
-                                context
+                              context.read<EditCubit>().state.replyingTo?.id) {
-                                    .read<EditCubit>()
-                                    .state
-                                    .replyingTo
-                                    ?.id) {
                             commentEditingController.clear();
                           }
 
@@ -587,17 +622,8 @@ class _ItemScreenState extends State<ItemScreen> {
                         onStoryLinkTapped: onStoryLinkTapped,
                         onRightMoreTapped: onRightMoreTapped,
                       ),
-                      ),
+                    );
-                    if ((state.status == CommentsStatus.allLoaded &&
+                  },
-                            state.comments.isNotEmpty) ||
-                        state.onlyShowTargetComment)
-                      SizedBox(
-                        height: 240,
-                        child: Center(
-                          child: Text(happyFace),
-                        ),
-                      )
-                  ],
                 ),
               );
 
@@ -753,7 +779,10 @@ class _ItemScreenState extends State<ItemScreen> {
                   onTap: () {
                     Navigator.pop(context);
                     goToItemScreen(
-                      args: ItemScreenArgs(item: comment),
+                      args: ItemScreenArgs(
+                        item: comment,
+                        useCommentCache: true,
+                      ),
                       forceNewScreen: true,
                     );
                   },

lib/screens/profile/profile_screen.dart

@@ -410,7 +410,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                   showAboutDialog(
                                     context: context,
                                     applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.24',
+                                    applicationVersion: 'v0.2.26',
                                     applicationIcon: ClipRRect(
                                       borderRadius: const BorderRadius.all(
                                         Radius.circular(
@@ -680,7 +680,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                     .get<SembastRepository>()
                     .deleteAllCachedComments()
                     .whenComplete(
-                      locator.get<CacheRepository>().deleteAll,
+                      locator.get<OfflineRepository>().deleteAll,
                     )
                     .whenComplete(
                       locator.get<PreferenceRepository>().clearAllReadStories,

lib/screens/web_view/web_view_screen.dart

@@ -34,7 +34,7 @@ class _WebViewScreenState extends State<WebViewScreen> {
       ),
       body: WebView(
         onWebViewCreated: (WebViewController controller) async {
-          final String? html = await locator.get<CacheRepository>().getHtml(
+          final String? html = await locator.get<OfflineRepository>().getHtml(
                 url: widget.url,
               );
 

lib/screens/widgets/comment_tile.dart

@@ -44,7 +44,7 @@ class CommentTile extends StatelessWidget {
       lazy: false,
       create: (_) => CollapseCubit(
         commentId: comment.id,
-        cacheService: context.read<CacheService>(),
+        collapseCache: context.tryRead<CollapseCache>() ?? CollapseCache(),
       )..init(),
       child: BlocBuilder<CollapseCubit, CollapseState>(
         builder: (BuildContext context, CollapseState state) {
@@ -340,7 +340,12 @@ class CommentTile extends StatelessWidget {
     );
   }
 
+  static final Map<int, Color> _colors = <int, Color>{};
+
   Color _getColor(int level) {
+    final int initialLevel = level;
+    if (_colors[initialLevel] != null) return _colors[initialLevel]!;
+
     while (level >= 10) {
       level = level - 10;
     }
@@ -361,6 +366,7 @@ class CommentTile extends StatelessWidget {
       1,
     );
 
+    _colors[initialLevel] = color;
     return color;
   }
 }

lib/screens/widgets/link_preview/web_analyzer.dart

@@ -140,7 +140,7 @@ class WebAnalyzer {
 
       while (comment == null && index < story.kids.length) {
         comment = await locator
-            .get<CacheRepository>()
+            .get<OfflineRepository>()
             .getCachedComment(id: story.kids.elementAt(index));
         index++;
       }

lib/services/caches/caches.dart

@@ -0,0 +1,3 @@
+export 'collapse_cache.dart';
+export 'comment_cache.dart';
+export 'draft_cache.dart';

lib/services/caches/collapse_cache.dart

@@ -1,9 +1,6 @@
-import 'package:hacki/models/models.dart' show Comment;
 import 'package:rxdart/rxdart.dart';
 
-class CacheService {
+class CollapseCache {
-  final Map<int, Comment> _comments = <int, Comment>{};
-  final Map<int, String> _drafts = <int, String>{};
   final Map<int, Set<int>> _kids = <int, Set<int>>{};
   final Set<int> _collapsed = <int>{};
   final Map<int, Set<int>> _hidden = <int, Set<int>>{};
@@ -76,19 +73,4 @@ class CacheService {
   bool isCollapsed(int commentId) => _collapsed.contains(commentId);
 
   int totalHidden(int commentId) => _hidden[commentId]?.length ?? 0;
-
-  void cacheComment(Comment comment) => _comments[comment.id] = comment;
-
-  Comment? getComment(int id) => _comments[id];
-
-  void resetComments() {
-    _comments.clear();
-  }
-
-  void removeDraft({required int replyingTo}) => _drafts.remove(replyingTo);
-
-  void cacheDraft({required String text, required int replyingTo}) =>
-      _drafts[replyingTo] = text;
-
-  String? getDraft({required int replyingTo}) => _drafts[replyingTo];
 }

lib/services/caches/comment_cache.dart

@@ -0,0 +1,13 @@
+import 'package:hacki/models/models.dart' show Comment;
+
+class CommentCache {
+  static final Map<int, Comment> _comments = <int, Comment>{};
+
+  void cacheComment(Comment comment) => _comments[comment.id] = comment;
+
+  Comment? getComment(int id) => _comments[id];
+
+  void resetComments() {
+    _comments.clear();
+  }
+}

lib/services/caches/draft_cache.dart

@@ -0,0 +1,10 @@
+class DraftCache {
+  static final Map<int, String> _drafts = <int, String>{};
+
+  void removeDraft({required int replyingTo}) => _drafts.remove(replyingTo);
+
+  void cacheDraft({required String text, required int replyingTo}) =>
+      _drafts[replyingTo] = text;
+
+  String? getDraft({required int replyingTo}) => _drafts[replyingTo];
+}

lib/services/custom_bloc_observer.dart

@@ -3,15 +3,30 @@ import 'package:hacki/config/locator.dart';
 import 'package:logger/logger.dart';
 
 class CustomBlocObserver extends BlocObserver {
+  @override
+  void onCreate(BlocBase<dynamic> bloc) {
+    locator.get<Logger>().v('$bloc created');
+    super.onCreate(bloc);
+  }
+
   @override
   void onEvent(
     Bloc<dynamic, dynamic> bloc,
     Object? event,
   ) {
-    locator.get<Logger>().d(event);
+    locator.get<Logger>().v(event);
     super.onEvent(bloc, event);
   }
 
+  @override
+  void onTransition(
+    Bloc<dynamic, dynamic> bloc,
+    Transition<dynamic, dynamic> transition,
+  ) {
+    locator.get<Logger>().v(transition);
+    super.onTransition(bloc, transition);
+  }
+
   @override
   void onError(
     BlocBase<dynamic> bloc,

lib/services/services.dart

@@ -1,4 +1,4 @@
-export 'cache_service.dart';
+export 'caches/caches.dart';
 export 'custom_bloc_observer.dart';
 export 'fetcher.dart';
 export 'firebase_client.dart';

lib/utils/link_util.dart

@@ -19,7 +19,7 @@ abstract class LinkUtil {
   }) {
     if (offlineReading) {
       locator
-          .get<CacheRepository>()
+          .get<OfflineRepository>()
           .hasCachedWebPage(url: link)
           .then((bool cached) {
         if (cached) {

pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: adaptive_theme
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
   analyzer:
     dependency: transitive
     description:
@@ -22,6 +22,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.1.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.11"
   args:
     dependency: transitive
     description:
@@ -175,14 +182,14 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2"
+    version: "1.2.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.1"
   csslib:
     dependency: transitive
     description:
@@ -196,7 +203,7 @@ packages:
       name: dbus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5"
+    version: "0.7.6"
   diff_match_patch:
     dependency: transitive
     description:
@@ -281,6 +288,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.3.0"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_fadein:
     dependency: "direct main"
     description:
@@ -410,6 +422,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   gbk_codec:
     dependency: "direct main"
     description:
@@ -473,6 +490,11 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.1"
+  integration_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   intl:
     dependency: "direct main"
     description:
@@ -605,7 +627,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.16"
   path_provider_ios:
     dependency: "direct main"
     description:
@@ -747,7 +769,7 @@ packages:
       name: share_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.9"
+    version: "4.0.10"
   share_plus_linux:
     dependency: transitive
     description:
@@ -935,6 +957,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   synced_shared_preferences:
     dependency: "direct main"
     description:
@@ -997,7 +1026,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   universal_platform:
     dependency: "direct main"
     description:
@@ -1088,7 +1117,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.3.0"
+    version: "8.2.2"
   wakelock:
     dependency: "direct main"
     description:
@@ -1138,6 +1167,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -1210,4 +1246,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.0.3"

pubspec.yaml

@@ -1,10 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.24+66
+version: 0.2.26+68
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
+  flutter: "3.0.3"
 
 dependencies:
   adaptive_theme: ^3.0.0
@@ -74,8 +75,10 @@ dev_dependencies:
   bloc_test: ^9.0.3
   flutter_test:
     sdk: flutter
+  integration_test:
+    sdk: flutter
   mocktail: ^0.3.0
-  very_good_analysis: ^2.3.0
+  very_good_analysis: ^2.4.0
 
 flutter:
   uses-material-design: true