v0.2.30 (#68)

* bumped version.

* cache  in case app gets killed in the background.

* bumped flutter version.

* updated

* improved 'ReplyBox'.

* fixed lint.

* fixed EditCubit.

* updated EditCubit.

* fixed navigation in tablet mode.

* clear cache after submission.

.github/workflows/github-actions.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_VERSION: "11.0"
-      FLUTTER_VERSION: "3.0.3"
+      FLUTTER_VERSION: "3.0.5"
     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.3'
+          flutter-version: '3.0.5'
           channel: 'stable'
       - run: flutter pub get
       - run: flutter analyze

README.md

@@ -1,14 +1,13 @@
 
 # <img width="64" src="https://user-images.githubusercontent.com/7277662/167775086-0b234f28-dee4-44f6-aae4-14a28ed4bbb6.png"> Hacki for Hacker News
 
-A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
+A [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
 
 [![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/)
 [![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest)
-[![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev)
-[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
 [![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://pub.dev/packages/effective_dart)
+[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
 
 [<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
 

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

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

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

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

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

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

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

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

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 = 5;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -577,7 +577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.27;
+				MARKETING_VERSION = 0.2.30;
 				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 = 5;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.27;
+				MARKETING_VERSION = 0.2.30;
 				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 = 5;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -745,7 +745,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.27;
+				MARKETING_VERSION = 0.2.30;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/cubits/comments/comments_cubit.dart

@@ -11,6 +11,7 @@ import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
+import 'package:logger/logger.dart';
 
 part 'comments_state.dart';
 
@@ -21,6 +22,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     SembastRepository? sembastRepository,
+    Logger? logger,
     required bool offlineReading,
     required Item item,
     required FetchMode defaultFetchMode,
@@ -33,6 +35,7 @@ class CommentsCubit extends Cubit<CommentsState> {
             storiesRepository ?? locator.get<StoriesRepository>(),
         _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
+        _logger = logger ?? locator.get<Logger>(),
         super(
           CommentsState.init(
             offlineReading: offlineReading,
@@ -47,8 +50,17 @@ class CommentsCubit extends Cubit<CommentsState> {
   final OfflineRepository _offlineRepository;
   final StoriesRepository _storiesRepository;
   final SembastRepository _sembastRepository;
+  final Logger _logger;
+
+  /// The [StreamSubscription] for stream (both lazy or eager)
+  /// fetching comments posted directly to the story.
   StreamSubscription<Comment>? _streamSubscription;
 
+  /// The map of [StreamSubscription] for streams
+  /// fetching comments lazily. [int] is the id of parent comment.
+  final Map<int, StreamSubscription<Comment>> _streamSubscriptions =
+      <int, StreamSubscription<Comment>>{};
+
   static const int _pageSize = 20;
 
   @override
@@ -73,7 +85,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       );
 
       _streamSubscription = _storiesRepository
-          .fetchAllCommentsStream(
+          .fetchAllCommentsRecursivelyStream(
             ids: targetParents!.last.kids,
             level: targetParents.last.level + 1,
           )
@@ -105,7 +117,8 @@ class CommentsCubit extends Cubit<CommentsState> {
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     } else {
-      if (state.fetchMode == FetchMode.lazy) {
+      switch (state.fetchMode) {
+        case FetchMode.lazy:
           _streamSubscription = _storiesRepository
               .fetchCommentsStream(
                 ids: kids,
@@ -113,14 +126,16 @@ class CommentsCubit extends Cubit<CommentsState> {
               )
               .listen(_onCommentFetched)
             ..onDone(_onDone);
-      } else {
+          break;
+        case FetchMode.eager:
           _streamSubscription = _storiesRepository
-            .fetchAllCommentsStream(
+              .fetchAllCommentsRecursivelyStream(
                 ids: kids,
                 getFromCache: useCommentCache ? _commentCache.getComment : null,
               )
               .listen(_onCommentFetched)
             ..onDone(_onDone);
+          break;
       }
     }
   }
@@ -135,18 +150,27 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
-    _collapseCache.resetCollapsedComments();
-
     emit(
       state.copyWith(
         status: CommentsStatus.loading,
+      ),
+    );
+
+    _collapseCache.resetCollapsedComments();
+
+    await _streamSubscription?.cancel();
+    for (final int id in _streamSubscriptions.keys) {
+      await _streamSubscriptions[id]?.cancel();
+    }
+    _streamSubscriptions.clear();
+
+    emit(
+      state.copyWith(
         comments: <Comment>[],
         currentPage: 0,
       ),
     );
 
-    await _streamSubscription?.cancel();
-
     final Item item = state.item;
     final Item updatedItem =
         await _storiesRepository.fetchItemBy(id: item.id) ?? item;
@@ -161,7 +185,7 @@ class CommentsCubit extends Cubit<CommentsState> {
         ..onDone(_onDone);
     } else {
       _streamSubscription = _storiesRepository
-          .fetchAllCommentsStream(
+          .fetchAllCommentsRecursivelyStream(
             ids: kids,
           )
           .listen(_onCommentFetched)
@@ -189,20 +213,20 @@ class CommentsCubit extends Cubit<CommentsState> {
 
   /// [comment] is only used for lazy fetching.
   void loadMore({Comment? comment}) {
-    if (state.fetchMode == FetchMode.eager) {
+    switch (state.fetchMode) {
-      if (_streamSubscription != null) {
+      case FetchMode.lazy:
-        emit(state.copyWith(status: CommentsStatus.loading));
-        _streamSubscription?.resume();
-      }
-    } else {
         if (comment == null) return;
+        if (_streamSubscriptions.containsKey(comment.id)) return;
 
         final int level = comment.level + 1;
         int offset = 0;
 
-      _streamSubscription = _streamSubscription =
+        /// Ignoring because the subscription will be cancelled in close()
-          _storiesRepository.fetchCommentsStream(ids: comment.kids).listen(
+        // ignore: cancel_subscriptions
-        (Comment cmt) {
+        final StreamSubscription<Comment> streamSubscription =
+            _storiesRepository
+                .fetchCommentsStream(ids: comment.kids)
+                .listen((Comment cmt) {
           _collapseCache.addKid(cmt.id, to: cmt.parent);
           _commentCache.cacheComment(cmt);
           _sembastRepository.cacheComment(cmt);
@@ -223,8 +247,25 @@ class CommentsCubit extends Cubit<CommentsState> {
             ),
           );
           offset++;
-        },
+        })
-      );
+              ..onDone(() {
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              })
+              ..onError((dynamic error) {
+                _logger.e(error);
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              });
+
+        _streamSubscriptions[comment.id] = streamSubscription;
+        break;
+      case FetchMode.eager:
+        if (_streamSubscription != null) {
+          emit(state.copyWith(status: CommentsStatus.loading));
+          _streamSubscription?.resume();
+        }
+        break;
     }
   }
 
@@ -255,6 +296,10 @@ class CommentsCubit extends Cubit<CommentsState> {
     if (state.order == order) return;
     HapticFeedback.selectionClick();
     _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      s.cancel();
+    }
+    _streamSubscriptions.clear();
     emit(state.copyWith(order: order));
     init(useCommentCache: true);
   }
@@ -265,6 +310,10 @@ class CommentsCubit extends Cubit<CommentsState> {
     _collapseCache.resetCollapsedComments();
     HapticFeedback.selectionClick();
     _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      s.cancel();
+    }
+    _streamSubscriptions.clear();
     emit(state.copyWith(fetchMode: fetchMode));
     init(useCommentCache: true);
   }
@@ -360,6 +409,9 @@ class CommentsCubit extends Cubit<CommentsState> {
   @override
   Future<void> close() async {
     await _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      await s.cancel();
+    }
     await super.close();
   }
 }

lib/cubits/comments/comments_state.dart

@@ -78,6 +78,8 @@ class CommentsState extends Equatable {
     );
   }
 
+  Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
+
   @override
   List<Object?> get props => <Object?>[
         item,

lib/cubits/edit/edit_cubit.dart

@@ -1,13 +1,14 @@
-import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/utils/debouncer.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
 
 part 'edit_state.dart';
 
-class EditCubit extends Cubit<EditState> {
+class EditCubit extends HydratedCubit<EditState> {
   EditCubit({DraftCache? draftCache})
       : _draftCache = draftCache ?? locator.get<DraftCache>(),
         _debouncer = Debouncer(delay: const Duration(seconds: 1)),
@@ -47,6 +48,7 @@ class EditCubit extends Cubit<EditState> {
       _draftCache.removeDraft(replyingTo: state.replyingTo!.id);
     }
     emit(const EditState.init());
+    clear();
   }
 
   void onTextChanged(String text) {
@@ -61,4 +63,47 @@ class EditCubit extends Cubit<EditState> {
       });
     }
   }
+
+  void deleteDraft() => clear();
+
+  @override
+  EditState? fromJson(Map<String, dynamic> json) {
+    final String text = json['text'] as String? ?? '';
+    final Map<String, dynamic>? itemJson =
+        json['item'] as Map<String, dynamic>?;
+    final Item? replyingTo = itemJson == null ? null : Item.fromJson(itemJson);
+
+    if (replyingTo != null && text.isNotEmpty) {
+      _draftCache.cacheDraft(text: text, replyingTo: replyingTo.id);
+
+      final EditState state = EditState(
+        text: text,
+        replyingTo: replyingTo,
+      );
+
+      cachedState = state;
+
+      return state;
+    }
+
+    return state;
+  }
+
+  @override
+  Map<String, dynamic>? toJson(EditState state) {
+    EditState selected = state;
+
+    if (state.replyingTo == null ||
+        (state.replyingTo?.id != cachedState.replyingTo?.id &&
+            state.text.isNullOrEmpty)) {
+      selected = cachedState;
+    }
+
+    return <String, dynamic>{
+      'text': selected.text,
+      'item': selected.replyingTo?.toJson(),
+    };
+  }
+
+  static EditState cachedState = const EditState.init();
 }

lib/cubits/notification/notification_cubit.dart

@@ -33,7 +33,8 @@ class NotificationCubit extends Cubit<NotificationState> {
         _preferenceRepository.shouldShowNotification
             .then((bool showNotification) {
           if (showNotification) {
-            init();
+            // Delaying the initialization to prevent janks in home screen.
+            Future<void>.delayed(const Duration(seconds: 2), init);
           }
         });
 

lib/cubits/preference/preference_cubit.dart

@@ -1,5 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/services.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/comments/comments_cubit.dart';
 import 'package:hacki/repositories/repositories.dart';
@@ -82,12 +83,14 @@ class PreferenceCubit extends Cubit<PreferenceState> {
 
   void selectFetchMode(FetchMode? fetchMode) {
     if (fetchMode == null || state.fetchMode == fetchMode) return;
+    HapticFeedback.lightImpact();
     emit(state.copyWith(fetchMode: fetchMode));
     _preferenceRepository.selectFetchMode(fetchMode);
   }
 
   void selectCommentsOrder(CommentsOrder? order) {
     if (order == null || state.order == order) return;
+    HapticFeedback.lightImpact();
     emit(state.copyWith(order: order));
     _preferenceRepository.selectCommentsOrder(order);
   }

lib/extensions/context_extension.dart

@@ -1,7 +1,9 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-extension TryReadContext on BuildContext {
+extension ContextExtension on BuildContext {
   T? tryRead<T>() {
     try {
       return read<T>();
@@ -16,4 +18,41 @@ extension TryReadContext on BuildContext {
         box == null ? null : box.localToGlobal(Offset.zero) & box.size;
     return rect;
   }
+
+  static double _screenWidth = 0;
+  static double _storyTileHeight = 0;
+  static int _storyTileMaxLines = 4;
+  static const double _screenWidthLowerBound = 428,
+      _screenWidthUpperBound = 850,
+      _picHeightLowerBound = 110,
+      _picHeightUpperBound = 128,
+      _smallPicHeight = 100,
+      _picHeightFactor = 0.3;
+
+  double get storyTileHeight {
+    final double screenWidth =
+        min(MediaQuery.of(this).size.height, MediaQuery.of(this).size.width);
+
+    if (screenWidth == _screenWidth) {
+      return _storyTileHeight;
+    } else {
+      _screenWidth = screenWidth;
+    }
+
+    final bool showSmallerPreviewPic = screenWidth > _screenWidthLowerBound &&
+        screenWidth < _screenWidthUpperBound;
+    final double height = showSmallerPreviewPic
+        ? _smallPicHeight
+        : (screenWidth * _picHeightFactor)
+            .clamp(_picHeightLowerBound, _picHeightUpperBound);
+    final int maxLines = height == _smallPicHeight ? 3 : 4;
+    _storyTileMaxLines = maxLines;
+
+    _storyTileHeight = height;
+    return height;
+  }
+
+  int get storyTileMaxLines {
+    return _storyTileMaxLines;
+  }
 }

lib/extensions/date_time_extension.dart

@@ -7,10 +7,8 @@ extension DateTimeExtension on DateTime {
       return '$gap year${gap == 1 ? '' : 's'} ago';
     } else if (diff.inDays > 30) {
       int gap = now.month - month;
-      if (gap == 0) {
+      if (gap <= 0) {
-        gap = 1;
+        gap = now.month + 12 - month;
-      } else if (gap < 0) {
-        gap = now.month + (12 - month);
       }
       return '$gap month${gap == 1 ? '' : 's'} ago';
     } else if (diff.inDays >= 1) {

lib/extensions/string_extension.dart

@@ -13,3 +13,12 @@ extension StringExtension on String {
     return replaceAllMapped(regex, (_) => '');
   }
 }
+
+extension OptionalStringExtension on String? {
+  bool get isNullOrEmpty {
+    if (this == null) return true;
+    return this!.trim().isEmpty;
+  }
+
+  bool get isNotNullOrEmpty => !isNullOrEmpty;
+}

lib/main.dart

@@ -19,6 +19,7 @@ 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';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:rxdart/rxdart.dart' show BehaviorSubject;
 import 'package:shared_preferences/shared_preferences.dart';
@@ -39,6 +40,12 @@ Future<void> main({bool testing = false}) async {
 
   isTesting = testing;
 
+  final HydratedStorage storage = await HydratedStorage.build(
+    storageDirectory: kIsWeb
+        ? HydratedStorage.webStorageDirectory
+        : await getTemporaryDirectory(),
+  );
+
   if (Platform.isIOS) {
     unawaited(
       Workmanager().initialize(
@@ -93,20 +100,26 @@ Future<void> main({bool testing = false}) async {
       prefs.getBool(PreferenceRepository.trueDarkModeKey) ?? false;
 
   if (kReleaseMode) {
-    runApp(
+    HydratedBlocOverrides.runZoned(
+      () => runApp(
         HackiApp(
           savedThemeMode: savedThemeMode,
           trueDarkMode: trueDarkMode,
         ),
+      ),
+      storage: storage,
     );
   } else {
     BlocOverrides.runZoned(
       () {
-        runApp(
+        HydratedBlocOverrides.runZoned(
+          () => runApp(
             HackiApp(
               savedThemeMode: savedThemeMode,
               trueDarkMode: trueDarkMode,
             ),
+          ),
+          storage: storage,
         );
       },
       blocObserver: CustomBlocObserver(),
@@ -187,6 +200,10 @@ class HackiApp extends StatelessWidget {
           lazy: false,
           create: (BuildContext context) => PostCubit(),
         ),
+        BlocProvider<EditCubit>(
+          lazy: false,
+          create: (BuildContext context) => EditCubit(),
+        ),
       ],
       child: AdaptiveTheme(
         light: ThemeData(

lib/models/comment.dart

@@ -59,6 +59,7 @@ class Comment extends Item {
     );
   }
 
+  @override
   Map<String, dynamic> toJson() => <String, dynamic>{
         'id': id,
         'time': time,

lib/models/item.dart

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:hacki/extensions/date_time_extension.dart';
 
-abstract class Item extends Equatable {
+class Item extends Equatable {
   const Item({
     required this.id,
     required this.deleted,
@@ -35,6 +35,22 @@ abstract class Item extends Equatable {
         text = '',
         type = '';
 
+  Item.fromJson(Map<String, dynamic> json)
+      : id = json['id'] as int? ?? 0,
+        score = json['score'] as int? ?? 0,
+        descendants = json['descendants'] as int? ?? 0,
+        time = json['time'] as int? ?? 0,
+        by = json['by'] as String? ?? '',
+        title = json['title'] as String? ?? '',
+        text = json['text'] as String? ?? '',
+        url = json['url'] as String? ?? '',
+        kids = <int>[],
+        dead = json['dead'] as bool? ?? false,
+        deleted = json['deleted'] as bool? ?? false,
+        parent = json['parent'] as int? ?? 0,
+        parts = <int>[],
+        type = json['type'] as String? ?? '';
+
   final int id;
   final int time;
   final int score;
@@ -65,4 +81,40 @@ abstract class Item extends Equatable {
   bool get isJob => type == 'job';
 
   bool get isComment => type == 'comment';
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'descendants': descendants,
+      'id': id,
+      'score': score,
+      'time': time,
+      'by': by,
+      'title': title,
+      'url': url,
+      'kids': kids,
+      'text': text,
+      'dead': dead,
+      'deleted': deleted,
+      'type': type,
+      'parts': parts,
+    };
+  }
+
+  @override
+  List<Object?> get props => <Object?>[
+        id,
+        deleted,
+        by,
+        time,
+        text,
+        dead,
+        parent,
+        kids,
+        url,
+        score,
+        title,
+        type,
+        parts,
+        descendants,
+      ];
 }

lib/models/poll_option.dart

@@ -79,6 +79,7 @@ class PollOption extends Item {
     );
   }
 
+  @override
   Map<String, dynamic> toJson() {
     return <String, dynamic>{
       'descendants': descendants,

lib/models/story.dart

@@ -91,6 +91,7 @@ class Story extends Item {
   String get simpleMetadata =>
       '''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
 
+  @override
   Map<String, dynamic> toJson() {
     return <String, dynamic>{
       'descendants': descendants,

lib/models/user.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:intl/intl.dart';
 
 class User {
@@ -39,8 +37,6 @@ class User {
 
   @override
   String toString() {
-    final String prettyString =
+    return 'User $about, $created, $delay, $id, $karma';
-        const JsonEncoder.withIndent('  ').convert(this);
-    return 'User $prettyString';
   }
 }

lib/repositories/stories_repository.dart

@@ -73,7 +73,7 @@ class StoriesRepository {
     return;
   }
 
-  Stream<Comment> fetchAllCommentsStream({
+  Stream<Comment> fetchAllCommentsRecursivelyStream({
     required List<int> ids,
     int level = 0,
     Comment? Function(int)? getFromCache,
@@ -94,7 +94,7 @@ class StoriesRepository {
       if (comment != null) {
         yield comment;
 
-        yield* fetchAllCommentsStream(
+        yield* fetchAllCommentsRecursivelyStream(
           ids: comment.kids,
           level: level + 1,
           getFromCache: getFromCache,

lib/screens/item/item_screen.dart

@@ -96,10 +96,6 @@ class ItemScreen extends StatefulWidget {
                   useCommentCache: args.useCommentCache,
                 ),
             ),
-            BlocProvider<EditCubit>(
-              lazy: false,
-              create: (BuildContext context) => EditCubit(),
-            ),
           ],
           child: ItemScreen(
             item: args.item,
@@ -141,10 +137,6 @@ class ItemScreen extends StatefulWidget {
                   targetParents: args.targetComments,
                 ),
             ),
-            BlocProvider<EditCubit>(
-              lazy: false,
-              create: (BuildContext context) => EditCubit(),
-            ),
           ],
           child: ItemScreen(
             item: args.item,
@@ -164,7 +156,7 @@ class ItemScreen extends StatefulWidget {
   _ItemScreenState createState() => _ItemScreenState();
 }
 
-class _ItemScreenState extends State<ItemScreen> {
+class _ItemScreenState extends State<ItemScreen> with RouteAware {
   final TextEditingController commentEditingController =
       TextEditingController();
   final ScrollController scrollController = ScrollController();
@@ -185,11 +177,20 @@ class _ItemScreenState extends State<ItemScreen> {
   static const Duration _featureDiscoveryDismissThrottleDelay =
       Duration(seconds: 1);
 
+  @override
+  void didPop() {
+    super.didPop();
+    if (context.read<EditCubit>().state.text.isNullOrEmpty) {
+      context.read<EditCubit>().onReplyBoxClosed();
+    }
+  }
+
   @override
   void initState() {
     super.initState();
 
-    SchedulerBinding.instance.addPostFrameCallback((_) {
+    SchedulerBinding.instance
+      ..addPostFrameCallback((_) {
         if (!isTesting) {
           FeatureDiscovery.discoverFeatures(
             context,
@@ -200,6 +201,15 @@ class _ItemScreenState extends State<ItemScreen> {
             },
           );
         }
+      })
+      ..addPostFrameCallback((_) {
+        final ModalRoute<dynamic>? route = ModalRoute.of(context);
+
+        if (route == null) return;
+
+        locator
+            .get<RouteObserver<ModalRoute<dynamic>>>()
+            .subscribe(this, route);
       });
 
     scrollController.addListener(() {
@@ -208,6 +218,8 @@ class _ItemScreenState extends State<ItemScreen> {
         context.read<EditCubit>().onScrolled();
       }
     });
+
+    commentEditingController.text = context.read<EditCubit>().state.text ?? '';
   }
 
   @override
@@ -502,7 +514,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                   Text(
                                     '''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
                                     style: const TextStyle(
-                                      fontSize: TextDimens.pt12,
+                                      fontSize: TextDimens.pt13,
                                     ),
                                   ),
                                 ] else ...<Widget>[
@@ -523,7 +535,12 @@ class _ItemScreenState extends State<ItemScreen> {
                                               strokeWidth: Dimens.pt2,
                                             ),
                                           )
-                                        : const Text('View parent thread'),
+                                        : const Text(
+                                            'View parent thread',
+                                            style: TextStyle(
+                                              fontSize: TextDimens.pt13,
+                                            ),
+                                          ),
                                   ),
                                 ],
                                 const Spacer(),
@@ -537,7 +554,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                         child: Text(
                                           'Lazy',
                                           style: TextStyle(
-                                            fontSize: TextDimens.pt12,
+                                            fontSize: TextDimens.pt13,
                                           ),
                                         ),
                                       ),
@@ -546,7 +563,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                         child: Text(
                                           'Eager',
                                           style: TextStyle(
-                                            fontSize: TextDimens.pt12,
+                                            fontSize: TextDimens.pt13,
                                           ),
                                         ),
                                       ),
@@ -568,7 +585,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                       child: Text(
                                         'Natural',
                                         style: TextStyle(
-                                          fontSize: TextDimens.pt12,
+                                          fontSize: TextDimens.pt13,
                                         ),
                                       ),
                                     ),
@@ -577,7 +594,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                       child: Text(
                                         'Newest first',
                                         style: TextStyle(
-                                          fontSize: TextDimens.pt12,
+                                          fontSize: TextDimens.pt13,
                                         ),
                                       ),
                                     ),
@@ -586,7 +603,7 @@ class _ItemScreenState extends State<ItemScreen> {
                                       child: Text(
                                         'Oldest first',
                                         style: TextStyle(
-                                          fontSize: TextDimens.pt12,
+                                          fontSize: TextDimens.pt13,
                                         ),
                                       ),
                                     ),
@@ -680,7 +697,8 @@ class _ItemScreenState extends State<ItemScreen> {
               return BlocListener<EditCubit, EditState>(
                 listenWhen: (EditState previous, EditState current) {
                   return previous.replyingTo != current.replyingTo ||
-                      previous.itemBeingEdited != current.itemBeingEdited;
+                      previous.itemBeingEdited != current.itemBeingEdited ||
+                      commentEditingController.text != current.text;
                 },
                 listener: (BuildContext context, EditState editState) {
                   if (editState.replyingTo != null ||

lib/screens/item/widgets/reply_box.dart

@@ -5,7 +5,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/item.dart';
+import 'package:hacki/screens/screens.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/link_util.dart';
 
@@ -145,6 +147,39 @@ class _ReplyBoxState extends State<ReplyBox> {
                                   color: Palette.orange,
                                 ),
                                 onPressed: () {
+                                  final EditState state =
+                                      context.read<EditCubit>().state;
+                                  if (state.replyingTo != null &&
+                                      state.text.isNotNullOrEmpty) {
+                                    showDialog<void>(
+                                      context: context,
+                                      builder: (BuildContext context) =>
+                                          AlertDialog(
+                                        title: const Text('Save draft?'),
+                                        actions: <Widget>[
+                                          TextButton(
+                                            onPressed: () {
+                                              context
+                                                  .read<EditCubit>()
+                                                  .deleteDraft();
+                                              Navigator.pop(context);
+                                            },
+                                            child: const Text(
+                                              'No',
+                                              style: TextStyle(
+                                                color: Palette.red,
+                                              ),
+                                            ),
+                                          ),
+                                          TextButton(
+                                            onPressed: () =>
+                                                Navigator.pop(context),
+                                            child: const Text('Yes'),
+                                          ),
+                                        ],
+                                      ),
+                                    );
+                                  }
                                   widget.onCloseTapped();
                                   expanded = false;
                                 },
@@ -249,8 +284,31 @@ class _ReplyBoxState extends State<ReplyBox> {
                         style: const TextStyle(color: Palette.grey),
                       ),
                       const Spacer(),
+                      if (replyingTo != null)
                         TextButton(
-                        child: const Text('Copy All'),
+                          child: const Text('View thread'),
+                          onPressed: () {
+                            HapticFeedback.lightImpact();
+                            setState(() {
+                              expanded = false;
+                            });
+                            Navigator.popUntil(
+                              context,
+                              (Route<dynamic> route) =>
+                                  route.settings.name == ItemScreen.routeName ||
+                                  route.isFirst,
+                            );
+                            goToItemScreen(
+                              args: ItemScreenArgs(
+                                item: replyingTo,
+                                useCommentCache: true,
+                              ),
+                              forceNewScreen: true,
+                            );
+                          },
+                        ),
+                      TextButton(
+                        child: const Text('Copy all'),
                         onPressed: () => FlutterClipboard.copy(
                           replyingTo?.text ?? '',
                         ).then((_) => HapticFeedback.selectionClick()),

lib/screens/item/widgets/scroll_up_icon_button.dart

@@ -20,7 +20,7 @@ class _ScrollUpIconButtonState extends State<ScrollUpIconButton> {
     super.initState();
 
     widget.scrollController.addListener(() {
-      if (widget.scrollController.offset <= 1000) {
+      if (widget.scrollController.offset <= 1000 && mounted) {
         setState(() {});
       }
     });

lib/screens/profile/profile_screen.dart

@@ -526,7 +526,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                   showAboutDialog(
                                     context: context,
                                     applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.27',
+                                    applicationVersion: 'v0.2.30',
                                     applicationIcon: ClipRRect(
                                       borderRadius: const BorderRadius.all(
                                         Radius.circular(

lib/screens/widgets/comment_tile.dart

@@ -288,11 +288,22 @@ class CommentTile extends StatelessWidget {
                                     !context
                                         .read<CommentsCubit>()
                                         .state
-                                        .comments
+                                        .commentIds
-                                        .map((Comment e) => e.id)
+                                        .contains(comment.kids.first) &&
-                                        .toSet()
+                                    !context
-                                        .contains(comment.kids.first))
+                                        .read<CommentsCubit>()
+                                        .state
+                                        .onlyShowTargetComment)
                                   Center(
+                                    child: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                        horizontal: Dimens.pt12,
+                                      ),
+                                      child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.center,
+                                        children: <Widget>[
+                                          Expanded(
                                             child: TextButton(
                                               onPressed: () {
                                                 HapticFeedback.selectionClick();
@@ -308,6 +319,10 @@ class CommentTile extends StatelessWidget {
                                               ),
                                             ),
                                           ),
+                                        ],
+                                      ),
+                                    ),
+                                  ),
                                 const Divider(
                                   height: Dimens.zero,
                                 ),

lib/screens/widgets/countdown_reminder.dart

@@ -33,7 +33,7 @@ class _CountDownReminderState extends State<CountdownReminder>
   bool isVisible = false;
 
   static const Duration countdownDuration = Duration(seconds: 8);
-  static const Duration visibilityCountdownDuration = Duration(seconds: 3);
+  static const Duration visibilityCountdownDuration = Duration.zero;
 
   @override
   void initState() {

lib/screens/widgets/link_preview/link_preview.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:hacki/config/constants.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/link_preview/link_view.dart';
 import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
@@ -199,23 +200,9 @@ class _LinkPreviewState extends State<LinkPreview> {
 
   @override
   Widget build(BuildContext context) {
-    const double screenWidthLowerBound = 428,
-        screenWidthUpperBound = 850,
-        picHeightLowerBound = 118,
-        picHeightUpperBound = 140,
-        smallPicHeight = 100,
-        picHeightFactor = 0.14;
-    final double screenWidth = MediaQuery.of(context).size.width;
-    final bool showSmallerPreviewPic = screenWidth > screenWidthLowerBound &&
-        screenWidth < screenWidthUpperBound;
-    final double height = showSmallerPreviewPic
-        ? smallPicHeight
-        : (MediaQuery.of(context).size.height * picHeightFactor)
-            .clamp(picHeightLowerBound, picHeightUpperBound);
-
     final Widget loadingWidget = widget.placeholderWidget ??
         Container(
-          height: height,
+          height: context.storyTileHeight,
           width: MediaQuery.of(context).size.width,
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(
@@ -232,13 +219,13 @@ class _LinkPreviewState extends State<LinkPreview> {
     final WebInfo? info = _info as WebInfo?;
     loadedWidget = _info == null
         ? _buildLinkContainer(
-            height,
+            context.storyTileHeight,
             title: _errorTitle,
             desc: _errorBody,
             imageUri: null,
           )
         : _buildLinkContainer(
-            height,
+            context.storyTileHeight,
             title: _errorTitle,
             desc: WebAnalyzer.isNotEmpty(info!.description)
                 ? info.description

lib/screens/widgets/link_preview/link_view.dart

@@ -147,7 +147,7 @@ class LinkView extends StatelessWidget {
 
   Widget _buildTitleContainer(TextStyle _titleTS, int _maxLines) {
     return Padding(
-      padding: const EdgeInsets.fromLTRB(4, 2, 3, 1),
+      padding: const EdgeInsets.fromLTRB(4, 2, 3, 0),
       child: Column(
         children: <Widget>[
           Container(
@@ -168,7 +168,7 @@ class LinkView extends StatelessWidget {
     return Expanded(
       flex: 2,
       child: Padding(
-        padding: const EdgeInsets.fromLTRB(5, 3, 5, 0),
+        padding: const EdgeInsets.fromLTRB(5, 2, 5, 0),
         child: Column(
           children: <Widget>[
             if (showMetadata)

lib/screens/widgets/story_tile.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.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';
@@ -29,20 +30,7 @@ class StoryTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (showWebPreview) {
-      const double screenWidthLowerBound = 428,
+      final double height = context.storyTileHeight;
-          screenWidthUpperBound = 850,
-          picHeightLowerBound = 118,
-          picHeightUpperBound = 140,
-          smallPicHeight = 100,
-          picHeightFactor = 0.14;
-      final double screenWidth = MediaQuery.of(context).size.width;
-      final bool showSmallerPreviewPic = screenWidth > screenWidthLowerBound &&
-          screenWidth < screenWidthUpperBound;
-      final double height = showSmallerPreviewPic
-          ? smallPicHeight
-          : (MediaQuery.of(context).size.height * picHeightFactor)
-              .clamp(picHeightLowerBound, picHeightUpperBound);
-
       return TapDownWrapper(
         onTap: onTap,
         child: Padding(
@@ -143,7 +131,7 @@ class StoryTile extends StatelessWidget {
               backgroundColor: Palette.transparent,
               borderRadius: Dimens.zero,
               removeElevation: true,
-              bodyMaxLines: height == smallPicHeight ? 3 : 4,
+              bodyMaxLines: context.storyTileMaxLines,
               errorTitle: story.title,
               titleStyle: TextStyle(
                 color: hasRead

lib/styles/dimens.dart

@@ -27,6 +27,7 @@ abstract class TextDimens {
   static const double pt8 = 8;
   static const double pt10 = 10;
   static const double pt12 = 12;
+  static const double pt13 = 13;
   static const double pt14 = 14;
   static const double pt15 = 15;
   static const double pt16 = 16;

pubspec.lock

@@ -490,6 +490,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.1"
+  hydrated_bloc:
+    dependency: "direct main"
+    description:
+      name: hydrated_bloc
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "8.1.0"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -1246,4 +1253,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.3"
+  flutter: ">=3.0.5"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.27+69
+version: 0.2.30+73
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
-  flutter: "3.0.3"
+  flutter: "3.0.5"
 
 dependencies:
   adaptive_theme: ^3.0.0
@@ -42,6 +42,7 @@ dependencies:
   html: ^0.15.0
   html_unescape: ^2.0.0
   http: ^0.13.3
+  hydrated_bloc: ^8.1.0
   intl: ^0.17.0
   logger: ^1.1.0
   path: ^1.8.0