v0.2.21 (#57)

* replaced StoryScreen with ItemScreen.

* use ItemScreen for share extension.

* fixed getItemId()

* bumped version.

* force new screen on viewing comments in separate thread.

* disable comment thread if comment is deleted or dead.

* navigate to new screen on viewing parent thread.

* bumped version.

* fixed inconsistent fontsize.

* bumped version.

README.md

@@ -10,8 +10,6 @@ A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with
 [![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)
 
-<noscript><a href="https://liberapay.com/jfeng_for_open_source/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
-
 [<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/61.txt

@@ -0,0 +1 @@
+- Offline mode now includes web pages.

fastlane/metadata/android/en-US/changelogs/62.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/63.txt

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

lib/config/custom_router.dart

@@ -10,8 +10,8 @@ class CustomRouter {
     switch (settings.name) {
       case HomeScreen.routeName:
         return HomeScreen.route();
-      case StoryScreen.routeName:
+      case ItemScreen.routeName:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
       case SubmitScreen.routeName:
         return SubmitScreen.route();
       default:
@@ -22,8 +22,8 @@ class CustomRouter {
   /// Nested routing for bottom navigation bar.
   static Route<dynamic> onGenerateNestedRoute(RouteSettings settings) {
     switch (settings.name) {
-      case StoryScreen.routeName:
+      case ItemScreen.routeName:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
       case SubmitScreen.routeName:
         return SubmitScreen.route();
       default:

lib/cubits/comments/comments_cubit.dart

@@ -1,11 +1,15 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:hacki/config/locator.dart';
+import 'package:hacki/main.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
+import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
 
 part 'comments_state.dart';
@@ -17,14 +21,14 @@ class CommentsCubit extends Cubit<CommentsState> {
     StoriesRepository? storiesRepository,
     SembastRepository? sembastRepository,
     required bool offlineReading,
-    required Story story,
+    required Item item,
   })  : _cacheService = cacheService ?? locator.get<CacheService>(),
         _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
         _storiesRepository =
             storiesRepository ?? locator.get<StoriesRepository>(),
         _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
-        super(CommentsState.init(offlineReading: offlineReading, story: story));
+        super(CommentsState.init(offlineReading: offlineReading, item: item));
 
   final CacheService _cacheService;
   final CacheRepository _cacheRepository;
@@ -67,32 +71,38 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     emit(state.copyWith(status: CommentsStatus.loading));
 
-    final Story story = state.story;
+    final Item item = state.item;
-    final Story updatedStory = state.offlineReading
+    final Item updatedItem = state.offlineReading
-        ? story
+        ? item
-        : await _storiesRepository.fetchStoryBy(story.id) ?? story;
+        : await _storiesRepository.fetchItemBy(id: item.id) ?? item;
+    final List<int> kids = () {
+      switch (state.order) {
+        case CommentsOrder.natural:
+          return updatedItem.kids;
+        case CommentsOrder.newestFirst:
+          return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
+        case CommentsOrder.oldestFirst:
+          return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
+      }
+    }();
 
-    emit(state.copyWith(story: updatedStory));
+    emit(state.copyWith(item: updatedItem));
 
     if (state.offlineReading) {
       _streamSubscription = _cacheRepository
-          .getCachedCommentsStream(ids: updatedStory.kids)
+          .getCachedCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     } else {
       _streamSubscription = _storiesRepository
-          .fetchCommentsStream(ids: updatedStory.kids)
+          .fetchCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     }
   }
 
   Future<void> refresh() async {
-    final bool offlineReading = await _cacheRepository.hasCachedStories;
+    if (state.offlineReading) {
-
-    _cacheService.resetCollapsedComments();
-
-    if (offlineReading) {
       emit(
         state.copyWith(
           status: CommentsStatus.loaded,
@@ -101,6 +111,10 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
+    _cacheService
+      ..resetComments()
+      ..resetCollapsedComments();
+
     emit(
       state.copyWith(
         status: CommentsStatus.loading,
@@ -110,28 +124,40 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     await _streamSubscription?.cancel();
 
-    final Story story = state.story;
+    final Item item = state.item;
-    final Story updatedStory =
+    final Item updatedItem =
-        await _storiesRepository.fetchStoryBy(story.id) ?? story;
+        await _storiesRepository.fetchItemBy(id: item.id) ?? item;
+    final List<int> kids = () {
+      switch (state.order) {
+        case CommentsOrder.natural:
+          return updatedItem.kids;
+        case CommentsOrder.newestFirst:
+          return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
+        case CommentsOrder.oldestFirst:
+          return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
+      }
+    }();
+
     _streamSubscription = _storiesRepository
-        .fetchCommentsStream(ids: updatedStory.kids)
+        .fetchCommentsStream(ids: kids)
         .listen(_onCommentFetched)
       ..onDone(_onDone);
 
     emit(
       state.copyWith(
-        story: updatedStory,
+        item: updatedItem,
         status: CommentsStatus.loaded,
       ),
     );
   }
 
   void loadAll(Story story) {
+    HapticFeedback.lightImpact();
     emit(
       state.copyWith(
         onlyShowTargetComment: false,
         comments: <Comment>[],
-        story: story,
+        item: story,
       ),
     );
     init();
@@ -144,6 +170,36 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
+  Future<void> loadParentThread() async {
+    unawaited(HapticFeedback.lightImpact());
+    emit(state.copyWith(fetchParentStatus: CommentsStatus.loading));
+    final Story? parent =
+        await _storiesRepository.fetchParentStory(id: state.item.id);
+
+    if (parent == null) {
+      return;
+    } else {
+      await HackiApp.navigatorKey.currentState?.pushNamed(
+        ItemScreen.routeName,
+        arguments: ItemScreenArgs(item: parent),
+      );
+
+      emit(
+        state.copyWith(
+          fetchParentStatus: CommentsStatus.loaded,
+        ),
+      );
+    }
+  }
+
+  void onOrderChanged(CommentsOrder? order) {
+    HapticFeedback.selectionClick();
+    if (order == null) return;
+    _streamSubscription?.cancel();
+    emit(state.copyWith(order: order, comments: <Comment>[]));
+    init();
+  }
+
   void _onDone() {
     _streamSubscription?.cancel();
     _streamSubscription = null;
@@ -161,7 +217,7 @@ class CommentsCubit extends Cubit<CommentsState> {
         ..cacheComment(comment);
       _sembastRepository.cacheComment(comment);
 
-      final List<LinkifyElement> elements = linkify(
+      final List<LinkifyElement> elements = _linkify(
         comment.text,
       );
 
@@ -194,7 +250,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
-  List<LinkifyElement> linkify(
+  static List<LinkifyElement> _linkify(
     String text, {
     LinkifyOptions options = const LinkifyOptions(),
     List<Linkifier> linkifiers = const <Linkifier>[

lib/cubits/comments/comments_state.dart

@@ -8,12 +8,19 @@ enum CommentsStatus {
   failure,
 }
 
+enum CommentsOrder {
+  natural,
+  newestFirst,
+  oldestFirst,
+}
+
 class CommentsState extends Equatable {
   const CommentsState({
-    required this.story,
+    required this.item,
     required this.comments,
     required this.status,
-    required this.collapsed,
+    required this.fetchParentStatus,
+    required this.order,
     required this.onlyShowTargetComment,
     required this.offlineReading,
     required this.currentPage,
@@ -21,35 +28,39 @@ class CommentsState extends Equatable {
 
   CommentsState.init({
     required this.offlineReading,
-    required this.story,
+    required this.item,
   })  : comments = <Comment>[],
         status = CommentsStatus.init,
-        collapsed = false,
+        fetchParentStatus = CommentsStatus.init,
+        order = CommentsOrder.natural,
         onlyShowTargetComment = false,
         currentPage = 0;
 
-  final Story story;
+  final Item item;
   final List<Comment> comments;
   final CommentsStatus status;
-  final bool collapsed;
+  final CommentsStatus fetchParentStatus;
+  final CommentsOrder order;
   final bool onlyShowTargetComment;
   final bool offlineReading;
   final int currentPage;
 
   CommentsState copyWith({
-    Story? story,
+    Item? item,
     List<Comment>? comments,
     CommentsStatus? status,
-    bool? collapsed,
+    CommentsStatus? fetchParentStatus,
+    CommentsOrder? order,
     bool? onlyShowTargetComment,
     bool? offlineReading,
     int? currentPage,
   }) {
     return CommentsState(
-      story: story ?? this.story,
+      item: item ?? this.item,
       comments: comments ?? this.comments,
+      fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
       status: status ?? this.status,
-      collapsed: collapsed ?? this.collapsed,
+      order: order ?? this.order,
       onlyShowTargetComment:
           onlyShowTargetComment ?? this.onlyShowTargetComment,
       offlineReading: offlineReading ?? this.offlineReading,
@@ -59,10 +70,11 @@ class CommentsState extends Equatable {
 
   @override
   List<Object?> get props => <Object?>[
-        story,
+        item,
         comments,
         status,
-        collapsed,
+        fetchParentStatus,
+        order,
         onlyShowTargetComment,
         offlineReading,
         currentPage,

lib/cubits/fav/fav_cubit.dart

@@ -39,15 +39,15 @@ class FavCubit extends Cubit<FavState> {
           emit(
             state.copyWith(
               favIds: favIds,
-              favStories: <Story>[],
+              favItems: <Item>[],
               currentPage: 0,
             ),
           );
           _storiesRepository
-              .fetchStoriesStream(
+              .fetchItemsStream(
                 ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
               )
-              .listen(_onStoryLoaded)
+              .listen(_onItemLoaded)
               .onDone(() {
             emit(
               state.copyWith(
@@ -73,13 +73,13 @@ class FavCubit extends Cubit<FavState> {
       ),
     );
 
-    final Story? story = await _storiesRepository.fetchStoryBy(id);
+    final Item? item = await _storiesRepository.fetchItemBy(id: id);
 
-    if (story == null) return;
+    if (item == null) return;
 
     emit(
       state.copyWith(
-        favStories: List<Story>.from(state.favStories)..insert(0, story),
+        favItems: List<Item>.from(state.favItems)..insert(0, item),
       ),
     );
 
@@ -96,8 +96,8 @@ class FavCubit extends Cubit<FavState> {
     emit(
       state.copyWith(
         favIds: List<int>.from(state.favIds)..remove(id),
-        favStories: List<Story>.from(state.favStories)
+        favItems: List<Item>.from(state.favItems)
-          ..removeWhere((Story e) => e.id == id),
+          ..removeWhere((Item e) => e.id == id),
       ),
     );
 
@@ -120,13 +120,13 @@ class FavCubit extends Cubit<FavState> {
       }
 
       _storiesRepository
-          .fetchStoriesStream(
+          .fetchItemsStream(
             ids: state.favIds.sublist(
               lower,
               upper,
             ),
           )
-          .listen(_onStoryLoaded)
+          .listen(_onItemLoaded)
           .onDone(() {
         emit(state.copyWith(status: FavStatus.loaded));
       });
@@ -142,7 +142,7 @@ class FavCubit extends Cubit<FavState> {
       state.copyWith(
         status: FavStatus.loading,
         currentPage: 0,
-        favStories: <Story>[],
+        favItems: <Item>[],
         favIds: <int>[],
       ),
     );
@@ -150,20 +150,20 @@ class FavCubit extends Cubit<FavState> {
     _preferenceRepository.favList(of: username).then((List<int> favIds) {
       emit(state.copyWith(favIds: favIds));
       _storiesRepository
-          .fetchStoriesStream(
+          .fetchItemsStream(
             ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
           )
-          .listen(_onStoryLoaded)
+          .listen(_onItemLoaded)
           .onDone(() {
         emit(state.copyWith(status: FavStatus.loaded));
       });
     });
   }
 
-  void _onStoryLoaded(Story story) {
+  void _onItemLoaded(Item item) {
     emit(
       state.copyWith(
-        favStories: List<Story>.from(state.favStories)..add(story),
+        favItems: List<Item>.from(state.favItems)..add(item),
       ),
     );
   }

lib/cubits/fav/fav_state.dart

@@ -10,31 +10,31 @@ enum FavStatus {
 class FavState extends Equatable {
   const FavState({
     required this.favIds,
-    required this.favStories,
+    required this.favItems,
     required this.status,
     required this.currentPage,
   });
 
   FavState.init()
       : favIds = <int>[],
-        favStories = <Story>[],
+        favItems = <Item>[],
         status = FavStatus.init,
         currentPage = 0;
 
   final List<int> favIds;
-  final List<Story> favStories;
+  final List<Item> favItems;
   final FavStatus status;
   final int currentPage;
 
   FavState copyWith({
     List<int>? favIds,
-    List<Story>? favStories,
+    List<Item>? favItems,
     FavStatus? status,
     int? currentPage,
   }) {
     return FavState(
       favIds: favIds ?? this.favIds,
-      favStories: favStories ?? this.favStories,
+      favItems: favItems ?? this.favItems,
       status: status ?? this.status,
       currentPage: currentPage ?? this.currentPage,
     );
@@ -43,7 +43,7 @@ class FavState extends Equatable {
   @override
   List<Object?> get props => <Object?>[
         favIds,
-        favStories,
+        favItems,
         status,
         currentPage,
       ];

lib/cubits/split_view/split_view_cubit.dart

@@ -13,9 +13,9 @@ class SplitViewCubit extends Cubit<SplitViewState> {
 
   final CacheService _cacheService;
 
-  void updateStoryScreenArgs(StoryScreenArgs args) {
+  void updateItemScreenArgs(ItemScreenArgs args) {
     _cacheService.resetCollapsedComments();
-    emit(state.copyWith(storyScreenArgs: args));
+    emit(state.copyWith(itemScreenArgs: args));
   }
 
   void enableSplitView() => emit(state.copyWith(enabled: true));

lib/cubits/split_view/split_view_state.dart

@@ -2,7 +2,7 @@ part of 'split_view_cubit.dart';
 
 class SplitViewState extends Equatable {
   const SplitViewState({
-    required this.storyScreenArgs,
+    required this.itemScreenArgs,
     required this.expanded,
     required this.enabled,
   });
@@ -10,21 +10,21 @@ class SplitViewState extends Equatable {
   const SplitViewState.init()
       : enabled = false,
         expanded = false,
-        storyScreenArgs = null;
+        itemScreenArgs = null;
 
   final bool enabled;
   final bool expanded;
-  final StoryScreenArgs? storyScreenArgs;
+  final ItemScreenArgs? itemScreenArgs;
 
   SplitViewState copyWith({
     bool? enabled,
     bool? expanded,
-    StoryScreenArgs? storyScreenArgs,
+    ItemScreenArgs? itemScreenArgs,
   }) {
     return SplitViewState(
       enabled: enabled ?? this.enabled,
       expanded: expanded ?? this.expanded,
-      storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
+      itemScreenArgs: itemScreenArgs ?? this.itemScreenArgs,
     );
   }
 
@@ -32,6 +32,6 @@ class SplitViewState extends Equatable {
   List<Object?> get props => <Object?>[
         enabled,
         expanded,
-        storyScreenArgs,
+        itemScreenArgs,
       ];
 }

lib/extensions/state_extension.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/main.dart';
-import 'package:hacki/screens/screens.dart' show StoryScreen, StoryScreenArgs;
+import 'package:hacki/screens/screens.dart' show ItemScreen, ItemScreenArgs;
 
 extension StateExtension on State {
   void showSnackBar({
@@ -26,14 +26,17 @@ extension StateExtension on State {
     );
   }
 
-  Future<void>? goToStoryScreen({required StoryScreenArgs args}) {
+  Future<void>? goToItemScreen({
+    required ItemScreenArgs args,
+    bool forceNewScreen = false,
+  }) {
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
 
-    if (splitViewEnabled) {
+    if (splitViewEnabled && !forceNewScreen) {
-      context.read<SplitViewCubit>().updateStoryScreenArgs(args);
+      context.read<SplitViewCubit>().updateItemScreenArgs(args);
     } else {
       return HackiApp.navigatorKey.currentState?.pushNamed(
-        StoryScreen.routeName,
+        ItemScreen.routeName,
         arguments: args,
       );
     }

lib/extensions/string_extension.dart

@@ -1,7 +1,8 @@
 extension StringExtension on String {
   int? getItemId() {
     final RegExp regex = RegExp(r'\d+$');
-    final String match = regex.stringMatch(this) ?? '';
+    final RegExp exception = RegExp(r'\)|].*$');
+    final String match = regex.stringMatch(replaceAll(exception, '')) ?? '';
     return int.tryParse(match);
   }
 

lib/main.dart

@@ -179,10 +179,6 @@ class HackiApp extends StatelessWidget {
           lazy: false,
           create: (BuildContext context) => PostCubit(),
         ),
-        BlocProvider<EditCubit>(
-          lazy: false,
-          create: (BuildContext context) => EditCubit(),
-        ),
       ],
       child: AdaptiveTheme(
         light: ThemeData(

lib/models/buildable_comment.dart

@@ -11,6 +11,7 @@ class BuildableComment extends Comment {
     required super.by,
     required super.text,
     required super.kids,
+    required super.dead,
     required super.deleted,
     required super.level,
     required this.elements,
@@ -25,6 +26,7 @@ class BuildableComment extends Comment {
           by: comment.by,
           text: comment.text,
           kids: comment.kids,
+          dead: comment.dead,
           deleted: comment.deleted,
           level: comment.level,
         );

lib/models/comment.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/item.dart';
 
 class Comment extends Item {
@@ -12,11 +11,11 @@ class Comment extends Item {
     required super.by,
     required super.text,
     required super.kids,
+    required super.dead,
     required super.deleted,
     required this.level,
   }) : super(
           descendants: 0,
-          dead: false,
           parts: <int>[],
           title: '',
           url: '',
@@ -43,8 +42,7 @@ class Comment extends Item {
 
   final int level;
 
-  String get postedDate =>
+  String get metadata => '''by $by $postedDate''';
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
 
   Comment copyWith({int? level}) {
     return Comment(
@@ -55,6 +53,7 @@ class Comment extends Item {
       by: by,
       text: text,
       kids: kids,
+      dead: dead,
       deleted: deleted,
       level: level ?? this.level,
     );

lib/models/item.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:hacki/extensions/date_time_extension.dart';
 
 abstract class Item extends Equatable {
   const Item({
@@ -54,6 +55,9 @@ abstract class Item extends Equatable {
   final List<int> kids;
   final List<int> parts;
 
+  String get postedDate =>
+      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
+
   bool get isPoll => type == 'poll';
 
   bool get isStory => type == 'story';

lib/models/poll_option.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/item.dart';
 
 class PollOption extends Item {
@@ -63,9 +62,6 @@ class PollOption extends Item {
 
   final double ratio;
 
-  String get postedDate =>
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
-
   PollOption copyWith({double? ratio}) {
     return PollOption(
       id: id,

lib/models/story.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/item.dart';
 
 enum StoryType {
@@ -94,9 +93,6 @@ class Story extends Item {
   String get simpleMetadata =>
       '''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
 
-  String get postedDate =>
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
-
   Map<String, dynamic> toJson() {
     return <String, dynamic>{
       'descendants': descendants,

lib/repositories/stories_repository.dart

@@ -170,7 +170,7 @@ class StoriesRepository {
       if (json == null) return null;
 
       final String type = json['type'] as String;
-      if (type == 'story' || type == 'job') {
+      if (type == 'story' || type == 'job' || type == 'poll') {
         final Story story = Story.fromJson(json);
         return story;
       } else if (json['type'] == 'comment') {
@@ -192,7 +192,7 @@ class StoriesRepository {
       final Map<String, dynamic> json = val as Map<String, dynamic>;
 
       final String type = json['type'] as String;
-      if (type == 'story' || type == 'job') {
+      if (type == 'story' || type == 'job' || type == 'poll') {
         final Story story = Story.fromJson(json);
         return story;
       } else if (json['type'] == 'comment') {

lib/screens/home_screen.dart

@@ -375,16 +375,16 @@ class _HomeScreenState extends State<HomeScreen>
     if (isJobWithLink) {
       context.read<ReminderCubit>().removeLastReadStoryId();
     } else {
-      final StoryScreenArgs args = StoryScreenArgs(story: story);
+      final ItemScreenArgs args = ItemScreenArgs(item: story);
 
       context.read<ReminderCubit>().updateLastReadStoryId(story.id);
 
       if (splitViewEnabled) {
-        context.read<SplitViewCubit>().updateStoryScreenArgs(args);
+        context.read<SplitViewCubit>().updateItemScreenArgs(args);
       } else {
         HackiApp.navigatorKey.currentState
             ?.pushNamed(
-          StoryScreen.routeName,
+          ItemScreen.routeName,
           arguments: args,
         )
             .whenComplete(() {
@@ -436,13 +436,10 @@ class _HomeScreenState extends State<HomeScreen>
     final int? id = event.getItemId();
 
     if (id != null) {
-      locator
+      locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
-          .get<StoriesRepository>()
-          .fetchParentStory(id: id)
-          .then((Story? story) {
         if (mounted) {
-          if (story != null) {
+          if (item != null) {
-            goToStoryScreen(args: StoryScreenArgs(story: story));
+            goToItemScreen(args: ItemScreenArgs(item: item));
           }
         }
       });
@@ -462,8 +459,8 @@ class _HomeScreenState extends State<HomeScreen>
         showSnackBar(content: 'Something went wrong...');
         return;
       }
-      final StoryScreenArgs args = StoryScreenArgs(story: story);
+      final ItemScreenArgs args = ItemScreenArgs(item: story);
-      goToStoryScreen(args: args);
+      goToItemScreen(args: args);
     });
   }
 
@@ -487,8 +484,8 @@ class _HomeScreenState extends State<HomeScreen>
           showSnackBar(content: 'Something went wrong...');
           return;
         }
-        final StoryScreenArgs args = StoryScreenArgs(story: story);
+        final ItemScreenArgs args = ItemScreenArgs(item: story);
-        goToStoryScreen(args: args);
+        goToItemScreen(args: args);
       });
     }
   }
@@ -586,10 +583,10 @@ class _TabletStoryView extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<SplitViewCubit, SplitViewState>(
       buildWhen: (SplitViewState previous, SplitViewState current) =>
-          previous.storyScreenArgs != current.storyScreenArgs,
+          previous.itemScreenArgs != current.itemScreenArgs,
       builder: (BuildContext context, SplitViewState state) {
-        if (state.storyScreenArgs != null) {
+        if (state.itemScreenArgs != null) {
-          return StoryScreen.build(context, state.storyScreenArgs!);
+          return ItemScreen.build(context, state.itemScreenArgs!);
         }
 
         return Material(

lib/screens/item/item_screen.dart

@@ -16,7 +16,7 @@ import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/main.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
-import 'package:hacki/screens/story/widgets/widgets.dart';
+import 'package:hacki/screens/item/widgets/widgets.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/utils/utils.dart';
@@ -33,64 +33,63 @@ enum _MenuAction {
   cancel,
 }
 
-class StoryScreenArgs extends Equatable {
+class ItemScreenArgs extends Equatable {
-  const StoryScreenArgs({
+  const ItemScreenArgs({
-    required this.story,
+    required this.item,
     this.onlyShowTargetComment = false,
     this.targetComments,
   });
 
-  final Story story;
+  final Item item;
   final bool onlyShowTargetComment;
   final List<Comment>? targetComments;
 
   @override
   List<Object?> get props => <Object?>[
-        story,
+        item,
         onlyShowTargetComment,
         targetComments,
       ];
 }
 
-class StoryScreen extends StatefulWidget {
+class ItemScreen extends StatefulWidget {
-  const StoryScreen({
+  const ItemScreen({
     super.key,
     this.splitViewEnabled = false,
-    required this.story,
+    required this.item,
     required this.parentComments,
   });
 
-  static const String routeName = '/story';
+  static const String routeName = '/item';
 
-  static Route<dynamic> route(StoryScreenArgs args) {
+  static Route<dynamic> route(ItemScreenArgs args) {
-    return MaterialPageRoute<StoryScreen>(
+    return MaterialPageRoute<ItemScreen>(
       settings: const RouteSettings(name: routeName),
       builder: (BuildContext context) => MultiBlocProvider(
         providers: <BlocProvider<dynamic>>[
           BlocProvider<CommentsCubit>(
             create: (_) => CommentsCubit(
               offlineReading: context.read<StoriesBloc>().state.offlineReading,
-              story: args.story,
+              item: args.item,
             )..init(
                 onlyShowTargetComment: args.onlyShowTargetComment,
                 targetParents: args.targetComments,
               ),
           ),
-          if (args.story.isPoll)
+          BlocProvider<EditCubit>(
-            BlocProvider<PollCubit>(
+            lazy: false,
-              create: (BuildContext context) =>
+            create: (BuildContext context) => EditCubit(),
-                  PollCubit(story: args.story)..init(),
           ),
         ],
-        child: StoryScreen(
+        child: ItemScreen(
-          story: args.story,
+          item: args.item,
           parentComments: args.targetComments ?? <Comment>[],
         ),
       ),
     );
   }
 
-  static Widget build(BuildContext context, StoryScreenArgs args) {
+  static Widget build(BuildContext context, ItemScreenArgs args) {
     return WillPopScope(
       onWillPop: () async {
         if (context.read<SplitViewCubit>().state.expanded) {
@@ -101,25 +100,24 @@ class StoryScreen extends StatefulWidget {
         }
       },
       child: MultiBlocProvider(
-        key: ValueKey<StoryScreenArgs>(args),
+        key: ValueKey<ItemScreenArgs>(args),
         providers: <BlocProvider<dynamic>>[
           BlocProvider<CommentsCubit>(
             create: (BuildContext context) => CommentsCubit(
               offlineReading: context.read<StoriesBloc>().state.offlineReading,
-              story: args.story,
+              item: args.item,
             )..init(
                 onlyShowTargetComment: args.onlyShowTargetComment,
                 targetParents: args.targetComments,
               ),
           ),
-          if (args.story.isPoll)
+          BlocProvider<EditCubit>(
-            BlocProvider<PollCubit>(
+            lazy: false,
-              create: (BuildContext context) =>
+            create: (BuildContext context) => EditCubit(),
-                  PollCubit(story: args.story)..init(),
           ),
         ],
-        child: StoryScreen(
+        child: ItemScreen(
-          story: args.story,
+          item: args.item,
           parentComments: args.targetComments ?? <Comment>[],
           splitViewEnabled: true,
         ),
@@ -128,14 +126,14 @@ class StoryScreen extends StatefulWidget {
   }
 
   final bool splitViewEnabled;
-  final Story story;
+  final Item item;
   final List<Comment> parentComments;
 
   @override
-  _StoryScreenState createState() => _StoryScreenState();
+  _ItemScreenState createState() => _ItemScreenState();
 }
 
-class _StoryScreenState extends State<StoryScreen> {
+class _ItemScreenState extends State<ItemScreen> {
   final TextEditingController commentEditingController =
       TextEditingController();
   final ScrollController scrollController = ScrollController();
@@ -187,6 +185,7 @@ class _StoryScreenState extends State<StoryScreen> {
     scrollController.dispose();
     storyLinkTapThrottle.dispose();
     featureDiscoveryDismissThrottle.dispose();
+    focusNode.dispose();
     super.dispose();
   }
 
@@ -271,16 +270,18 @@ class _StoryScreenState extends State<StoryScreen> {
                 controller: refreshController,
                 onRefresh: () {
                   HapticFeedback.lightImpact();
-                  locator.get<CacheService>().resetComments();
+
+                  if (context.read<StoriesBloc>().state.offlineReading) {
+                    refreshController.refreshCompleted();
+                  } else {
                     context.read<CommentsCubit>().refresh();
 
-                  if (widget.story.isPoll) {
+                    if (widget.item.isPoll) {
                       context.read<PollCubit>().refresh();
                     }
+                  }
                 },
-                onLoading: () {
+                onLoading: context.read<CommentsCubit>().loadMore,
-                  context.read<CommentsCubit>().loadMore();
-                },
                 child: ListView(
                   primary: false,
                   children: <Widget>[
@@ -300,13 +301,13 @@ class _StoryScreenState extends State<StoryScreen> {
                             onPressed: (_) {
                               HapticFeedback.lightImpact();
 
-                              if (widget.story !=
+                              if (widget.item !=
                                   context.read<EditCubit>().state.replyingTo) {
                                 commentEditingController.clear();
                               }
                               context
                                   .read<EditCubit>()
-                                  .onReplyTapped(widget.story);
+                                  .onReplyTapped(widget.item);
                               focusNode.requestFocus();
                             },
                             backgroundColor: Colors.orange,
@@ -314,7 +315,7 @@ class _StoryScreenState extends State<StoryScreen> {
                             icon: Icons.message,
                           ),
                           SlidableAction(
-                            onPressed: (_) => onMorePressed(widget.story),
+                            onPressed: (_) => onMoreTapped(widget.item),
                             backgroundColor: Colors.orange,
                             foregroundColor: Colors.white,
                             icon: Icons.more_horiz,
@@ -331,14 +332,14 @@ class _StoryScreenState extends State<StoryScreen> {
                             child: Row(
                               children: <Widget>[
                                 Text(
-                                  widget.story.by,
+                                  state.item.by,
                                   style: const TextStyle(
                                     color: Colors.orange,
                                   ),
                                 ),
                                 const Spacer(),
                                 Text(
-                                  widget.story.postedDate,
+                                  state.item.postedDate,
                                   style: const TextStyle(
                                     color: Colors.grey,
                                   ),
@@ -346,9 +347,10 @@ class _StoryScreenState extends State<StoryScreen> {
                               ],
                             ),
                           ),
+                          if (state.item is Story)
                             InkWell(
                               onTap: () => LinkUtil.launch(
-                              widget.story.url,
+                                state.item.url,
                                 useReader: context
                                     .read<PreferenceCubit>()
                                     .state
@@ -366,24 +368,28 @@ class _StoryScreenState extends State<StoryScreen> {
                                   top: 12,
                                 ),
                                 child: Text(
-                                widget.story.title,
+                                  state.item.title,
                                   textAlign: TextAlign.center,
                                   style: TextStyle(
                                     fontWeight: FontWeight.bold,
-                                  color: widget.story.url.isNotEmpty
+                                    color: state.item.url.isNotEmpty
                                         ? Colors.orange
                                         : null,
                                   ),
                                 ),
                               ),
+                            )
+                          else
+                            const SizedBox(
+                              height: 6,
                             ),
-                          if (widget.story.text.isNotEmpty)
+                          if (state.item.text.isNotEmpty)
                             Padding(
                               padding: const EdgeInsets.symmetric(
                                 horizontal: 10,
                               ),
                               child: SelectableLinkify(
-                                text: widget.story.text,
+                                text: widget.item.text,
                                 style: TextStyle(
                                   fontSize:
                                       MediaQuery.of(context).textScaleFactor *
@@ -406,14 +412,18 @@ class _StoryScreenState extends State<StoryScreen> {
                                 },
                               ),
                             ),
-                          if (widget.story.isPoll)
+                          if (state.item.isPoll)
-                            PollView(
+                            BlocProvider<PollCubit>(
+                              create: (BuildContext context) =>
+                                  PollCubit(story: state.item as Story)..init(),
+                              child: PollView(
                                 onLoginTapped: onLoginTapped,
                               ),
+                            ),
                         ],
                       ),
                     ),
-                    if (widget.story.text.isNotEmpty)
+                    if (state.item.text.isNotEmpty)
                       const SizedBox(
                         height: 8,
                       ),
@@ -425,13 +435,87 @@ class _StoryScreenState extends State<StoryScreen> {
                         child: TextButton(
                           onPressed: () => context
                               .read<CommentsCubit>()
-                              .loadAll(widget.story),
+                              .loadAll(state.item as Story),
                           child: const Text('View all comments'),
                         ),
                       ),
                       const Divider(
                         height: 0,
                       ),
+                    ] else ...<Widget>[
+                      Row(
+                        children: <Widget>[
+                          if (state.item is Story) ...<Widget>[
+                            const SizedBox(
+                              width: 12,
+                            ),
+                            Text(
+                              '''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
+                            ),
+                          ] else ...<Widget>[
+                            const SizedBox(
+                              width: 4,
+                            ),
+                            TextButton(
+                              onPressed: context
+                                  .read<CommentsCubit>()
+                                  .loadParentThread,
+                              child: state.fetchParentStatus ==
+                                      CommentsStatus.loading
+                                  ? const SizedBox(
+                                      height: 12,
+                                      width: 12,
+                                      child: CustomCircularProgressIndicator(
+                                        strokeWidth: 2,
+                                      ),
+                                    )
+                                  : const Text('View parent thread'),
+                            ),
+                          ],
+                          const Spacer(),
+                          DropdownButton<CommentsOrder>(
+                            value: state.order,
+                            underline: const SizedBox.shrink(),
+                            items: const <DropdownMenuItem<CommentsOrder>>[
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.natural,
+                                child: Text(
+                                  'Natural',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.newestFirst,
+                                child: Text(
+                                  'Newest first',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.oldestFirst,
+                                child: Text(
+                                  'Oldest first',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                            ],
+                            onChanged:
+                                context.read<CommentsCubit>().onOrderChanged,
+                          ),
+                          const SizedBox(
+                            width: 4,
+                          ),
+                        ],
+                      ),
+                      const Divider(
+                        height: 0,
+                      ),
                     ],
                     if (state.comments.isEmpty &&
                         state.status == CommentsStatus.allLoaded) ...<Widget>[
@@ -453,7 +537,7 @@ class _StoryScreenState extends State<StoryScreen> {
                           level: comment.level,
                           myUsername:
                               authState.isLoggedIn ? authState.username : null,
-                          opUsername: widget.story.by,
+                          opUsername: widget.item.by,
                           onReplyTapped: (Comment cmt) {
                             HapticFeedback.lightImpact();
                             if (cmt.deleted || cmt.dead) {
@@ -477,9 +561,9 @@ class _StoryScreenState extends State<StoryScreen> {
                             context.read<EditCubit>().onEditTapped(cmt);
                             focusNode.requestFocus();
                           },
-                          onMoreTapped: onMorePressed,
+                          onMoreTapped: onMoreTapped,
                           onStoryLinkTapped: onStoryLinkTapped,
-                          onTimeMachineActivated: onTimeMachineActivated,
+                          onRightMoreTapped: onRightMoreTapped,
                         ),
                       ),
                     if ((state.status == CommentsStatus.allLoaded &&
@@ -530,8 +614,10 @@ class _StoryScreenState extends State<StoryScreen> {
                                 SplitViewState current,
                               ) =>
                                   previous.expanded != current.expanded,
-                              builder:
+                              builder: (
-                                  (BuildContext context, SplitViewState state) {
+                                BuildContext context,
+                                SplitViewState state,
+                              ) {
                                 return Positioned(
                                   top: 0,
                                   left: 0,
@@ -540,7 +626,7 @@ class _StoryScreenState extends State<StoryScreen> {
                                     backgroundColor: Theme.of(context)
                                         .canvasColor
                                         .withOpacity(0.6),
-                                    story: widget.story,
+                                    item: widget.item,
                                     scrollController: scrollController,
                                     onBackgroundTap:
                                         onFeatureDiscoveryDismissed,
@@ -580,7 +666,7 @@ class _StoryScreenState extends State<StoryScreen> {
                         appBar: CustomAppBar(
                           backgroundColor:
                               Theme.of(context).canvasColor.withOpacity(0.6),
-                          story: widget.story,
+                          item: widget.item,
                           scrollController: scrollController,
                           onBackgroundTap: onFeatureDiscoveryDismissed,
                           onDismiss: onFeatureDiscoveryDismissed,
@@ -615,12 +701,53 @@ class _StoryScreenState extends State<StoryScreen> {
     return Future<bool>.value(false);
   }
 
+  void onRightMoreTapped(Comment comment) {
+    HapticFeedback.lightImpact();
+    showModalBottomSheet<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return Container(
+          height: 140,
+          color: Theme.of(context).canvasColor,
+          child: Material(
+            color: Colors.transparent,
+            child: Column(
+              children: <Widget>[
+                ListTile(
+                  leading: const Icon(Icons.av_timer),
+                  title: const Text('View parents'),
+                  onTap: () {
+                    Navigator.pop(context);
+                    onTimeMachineActivated(comment);
+                  },
+                  enabled:
+                      comment.level > 0 && !(comment.dead || comment.deleted),
+                ),
+                ListTile(
+                  leading: const Icon(Icons.list),
+                  title: const Text('View in separate thread'),
+                  onTap: () {
+                    Navigator.pop(context);
+                    goToItemScreen(
+                      args: ItemScreenArgs(item: comment),
+                      forceNewScreen: true,
+                    );
+                  },
+                  enabled: !(comment.dead || comment.deleted),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
   void onTimeMachineActivated(Comment comment) {
     final Size size = MediaQuery.of(context).size;
     final DeviceScreenType deviceType = getDeviceType(size);
     final double widthFactor =
         deviceType != DeviceScreenType.mobile ? 0.6 : 0.9;
-    HapticFeedback.lightImpact();
     showDialog<void>(
       context: context,
       builder: (BuildContext context) {
@@ -695,15 +822,12 @@ class _StoryScreenState extends State<StoryScreen> {
     final int? id = link.getItemId();
     if (id != null) {
       storyLinkTapThrottle.run(() {
-        locator
+        locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
-            .get<StoriesRepository>()
-            .fetchParentStory(id: id)
-            .then((Story? story) {
           if (mounted) {
-            if (story != null) {
+            if (item != null) {
               HackiApp.navigatorKey.currentState!.pushNamed(
-                StoryScreen.routeName,
+                ItemScreen.routeName,
-                arguments: StoryScreenArgs(story: story),
+                arguments: ItemScreenArgs(item: item),
               );
             }
           }
@@ -714,7 +838,7 @@ class _StoryScreenState extends State<StoryScreen> {
     }
   }
 
-  void onMorePressed(Item item) {
+  void onMoreTapped(Item item) {
     HapticFeedback.lightImpact();
 
     if (item.dead || item.deleted) {

lib/screens/item/widgets/custom_app_bar.dart

@@ -2,16 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:hacki/models/models.dart';
-import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
+import 'package:hacki/screens/item/widgets/widgets.dart';
-import 'package:hacki/screens/story/widgets/link_icon_button.dart';
-import 'package:hacki/screens/story/widgets/pin_icon_button.dart';
-import 'package:hacki/screens/story/widgets/scroll_up_icon_button.dart';
 
 class CustomAppBar extends AppBar {
   CustomAppBar({
     Key? key,
     required ScrollController scrollController,
-    required Story story,
+    required Item item,
     required Color backgroundColor,
     required Future<bool> Function() onBackgroundTap,
     required Future<bool> Function() onDismiss,
@@ -41,18 +38,19 @@ class CustomAppBar extends AppBar {
             ScrollUpIconButton(
               scrollController: scrollController,
             ),
+            if (item is Story)
               PinIconButton(
-              story: story,
+                story: item,
                 onBackgroundTap: onBackgroundTap,
                 onDismiss: onDismiss,
               ),
             FavIconButton(
-              storyId: story.id,
+              storyId: item.id,
               onBackgroundTap: onBackgroundTap,
               onDismiss: onDismiss,
             ),
             LinkIconButton(
-              storyId: story.id,
+              storyId: item.id,
               onBackgroundTap: onBackgroundTap,
               onDismiss: onDismiss,
             ),

lib/screens/item/widgets/reply_box.dart

@@ -83,10 +83,12 @@ class _ReplyBoxState extends State<ReplyBox> {
                         ),
                         Row(
                           children: <Widget>[
-                            Padding(
+                            Expanded(
-                              padding: const EdgeInsets.symmetric(
+                              child: Padding(
-                                horizontal: 12,
+                                padding: const EdgeInsets.only(
-                                vertical: 8,
+                                  left: 12,
+                                  top: 8,
+                                  bottom: 8,
                                 ),
                                 child: Text(
                                   replyingTo == null
@@ -94,9 +96,11 @@ class _ReplyBoxState extends State<ReplyBox> {
                                       : 'Replying '
                                           '${replyingTo.by}',
                                   style: const TextStyle(color: Colors.grey),
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                ),
                               ),
                             ),
-                            const Spacer(),
                             if (!isLoading) ...<Widget>[
                               ...<Widget>[
                                 if (replyingTo != null)

lib/screens/profile/profile_screen.dart

@@ -135,8 +135,8 @@ class _ProfileScreenState extends State<ProfileScreen>
                               },
                               onTap: (Item item) {
                                 if (item is Story) {
-                                  goToStoryScreen(
+                                  goToItemScreen(
-                                    args: StoryScreenArgs(story: item),
+                                    args: ItemScreenArgs(item: item),
                                   );
                                 } else if (item is Comment) {
                                   onCommentTapped(item);
@@ -160,7 +160,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                             }
                           },
                           builder: (BuildContext context, FavState favState) {
-                            if (favState.favStories.isEmpty &&
+                            if (favState.favItems.isEmpty &&
                                 favState.status != FavStatus.loading) {
                               return const CenteredMessageView(
                                 content:
@@ -169,12 +169,13 @@ class _ProfileScreenState extends State<ProfileScreen>
                                     'News account if you are logged in.',
                               );
                             }
-                            return ItemsListView<Story>(
+                            return ItemsListView<Item>(
                               showWebPreview:
                                   preferenceState.showComplexStoryTile,
                               showMetadata: preferenceState.showMetadata,
+                              useCommentTile: true,
                               refreshController: refreshControllerFav,
-                              items: favState.favStories,
+                              items: favState.favItems,
                               onRefresh: () {
                                 HapticFeedback.lightImpact();
                                 context.read<FavCubit>().refresh();
@@ -182,8 +183,8 @@ class _ProfileScreenState extends State<ProfileScreen>
                               onLoadMore: () {
                                 context.read<FavCubit>().loadMore();
                               },
-                              onTap: (Story story) => goToStoryScreen(
+                              onTap: (Item item) => goToItemScreen(
-                                args: StoryScreenArgs(story: story),
+                                args: ItemScreenArgs(item: item),
                               ),
                             );
                           },
@@ -408,7 +409,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                   showAboutDialog(
                                     context: context,
                                     applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.19',
+                                    applicationVersion: 'v0.2.21',
                                     applicationIcon: ClipRRect(
                                       borderRadius: const BorderRadius.all(
                                         Radius.circular(12),
@@ -676,7 +677,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                     .get<SembastRepository>()
                     .deleteAllCachedComments()
                     .whenComplete(
-                      locator.get<SembastRepository>().deleteAllCachedComments,
+                      locator.get<CacheRepository>().deleteAll,
                     )
                     .whenComplete(
                       locator.get<PreferenceRepository>().clearAllReadStories,
@@ -705,9 +706,9 @@ class _ProfileScreenState extends State<ProfileScreen>
           .fetchParentStoryWithComments(id: comment.parent)
           .then((Tuple2<Story, List<Comment>>? tuple) {
         if (tuple != null && mounted) {
-          goToStoryScreen(
+          goToItemScreen(
-            args: StoryScreenArgs(
+            args: ItemScreenArgs(
-              story: tuple.item1,
+              item: tuple.item1,
               targetComments: tuple.item2.isEmpty
                   ? <Comment>[comment]
                   : <Comment>[

lib/screens/screens.dart

@@ -1,6 +1,6 @@
 export 'home_screen.dart';
+export 'item/item_screen.dart';
 export 'profile/profile_screen.dart';
 export 'search/search_screen.dart';
-export 'story/story_screen.dart';
 export 'submit/submit_screen.dart';
 export 'web_view/web_view_screen.dart';

lib/screens/search/search_screen.dart

@@ -162,8 +162,8 @@ class _SearchScreenState extends State<SearchScreen> {
                                           prefState.showComplexStoryTile,
                                       showMetadata: prefState.showMetadata,
                                       story: e,
-                                      onTap: () => goToStoryScreen(
+                                      onTap: () => goToItemScreen(
-                                        args: StoryScreenArgs(story: e),
+                                        args: ItemScreenArgs(item: e),
                                       ),
                                     ),
                                   ),

lib/screens/widgets/comment_tile.dart

@@ -18,7 +18,7 @@ class CommentTile extends StatelessWidget {
     this.onReplyTapped,
     this.onMoreTapped,
     this.onEditTapped,
-    this.onTimeMachineActivated,
+    this.onRightMoreTapped,
     this.opUsername,
     this.actionable = true,
     this.level = 0,
@@ -32,7 +32,7 @@ class CommentTile extends StatelessWidget {
   final Function(Comment)? onReplyTapped;
   final Function(Comment)? onMoreTapped;
   final Function(Comment)? onEditTapped;
-  final Function(Comment)? onTimeMachineActivated;
+  final Function(Comment)? onRightMoreTapped;
   final Function(String) onStoryLinkTapped;
 
   @override
@@ -94,13 +94,13 @@ class CommentTile extends StatelessWidget {
                                   ],
                                 )
                               : null,
-                          endActionPane: actionable && level != 0
+                          endActionPane: actionable
                               ? ActionPane(
                                   motion: const StretchMotion(),
                                   children: <Widget>[
                                     SlidableAction(
                                       onPressed: (_) =>
-                                          onTimeMachineActivated?.call(comment),
+                                          onRightMoreTapped?.call(comment),
                                       backgroundColor: Colors.orange,
                                       foregroundColor: Colors.white,
                                       icon: Icons.av_timer,

lib/screens/widgets/countdown_reminder.dart

@@ -109,9 +109,8 @@ class _CountDownReminderState extends State<CountdownReminder>
                           showSnackBar(content: 'Something went wrong...');
                           return;
                         }
-                        final StoryScreenArgs args =
+                        final ItemScreenArgs args = ItemScreenArgs(item: story);
-                            StoryScreenArgs(story: story);
+                        goToItemScreen(args: args);
-                        goToStoryScreen(args: args);
 
                         context.read<ReminderCubit>().removeLastReadStoryId();
                       });

lib/screens/widgets/items_list_view.dart

@@ -18,6 +18,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
     required this.items,
     required this.onTap,
     required this.refreshController,
+    this.useCommentTile = false,
+    this.showCommentBy = false,
     this.enablePullDown = true,
     this.pinnable = false,
     this.markReadStories = false,
@@ -32,6 +34,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
           'onPinned cannot be null when pinnable is true',
         );
 
+  final bool useCommentTile;
+  final bool showCommentBy;
   final bool showWebPreview;
   final bool showMetadata;
   final bool enablePullDown;
@@ -103,6 +107,22 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                 ),
             ];
           } else if (e is Comment) {
+            if (useCommentTile) {
+              return <Widget>[
+                if (showWebPreview)
+                  const Divider(
+                    height: 0,
+                  ),
+                _CommentTile(
+                  comment: e,
+                  onTap: () => onTap(e),
+                  fontSize: showWebPreview ? 14 : 16,
+                ),
+                const Divider(
+                  height: 0,
+                ),
+              ];
+            }
             return <Widget>[
               FadeIn(
                 child: Padding(
@@ -135,7 +155,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                                     horizontal: 6,
                                   ),
                                   child: Linkify(
-                                    text: e.text,
+                                    text:
+                                        '''${showCommentBy ? '${e.by}: ' : ''}${e.text}''',
                                     maxLines: 4,
                                     linkStyle: const TextStyle(
                                       color: Colors.orange,
@@ -215,3 +236,65 @@ class ItemsListView<T extends Item> extends StatelessWidget {
     );
   }
 }
+
+class _CommentTile extends StatelessWidget {
+  const _CommentTile({
+    Key? key,
+    required this.comment,
+    required this.onTap,
+    this.fontSize = 16,
+  }) : super(key: key);
+
+  final Comment comment;
+  final VoidCallback onTap;
+  final double fontSize;
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Padding(
+        padding: const EdgeInsets.only(left: 12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            const SizedBox(
+              height: 8,
+            ),
+            Row(
+              children: <Widget>[
+                Expanded(
+                  child: Text(
+                    comment.text,
+                    style: TextStyle(
+                      fontSize: fontSize,
+                    ),
+                    overflow: TextOverflow.ellipsis,
+                    maxLines: 2,
+                  ),
+                ),
+              ],
+            ),
+            Row(
+              children: <Widget>[
+                Expanded(
+                  child: Text(
+                    comment.metadata,
+                    style: TextStyle(
+                      color: Colors.grey,
+                      fontSize: fontSize - 2,
+                    ),
+                    maxLines: 1,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(
+              height: 8,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/screens/widgets/link_preview/link_preview.dart

@@ -109,7 +109,7 @@ class LinkPreview extends StatefulWidget {
 
 class _LinkPreviewState extends State<LinkPreview> {
   InfoBase? _info;
-  String? _errorTitle, _errorBody, _url;
+  String? _errorTitle, _errorBody;
   bool _loading = false;
 
   @override
@@ -119,37 +119,19 @@ class _LinkPreviewState extends State<LinkPreview> {
         'Oops! Unable to parse the url. We have '
             'sent feedback to our developers & '
             'we will try to fix this in our next release. Thanks!';
-    _url = widget.link.trim();
 
-    if (_url?.isNotEmpty ?? false) {
-      _info = WebAnalyzer.getInfoFromCache(_url);
-    } else {
-      _info = WebAnalyzer.getInfoFromCache(widget.story.id.toString());
-    }
-
-    if (_info == null) {
     _loading = true;
     _getInfo();
-    }
+
     super.initState();
   }
 
   Future<void> _getInfo() async {
-    if (_url!.startsWith('http') || _url!.startsWith('https')) {
     _info = await WebAnalyzer.getInfo(
-        _url,
       story: widget.story,
       cache: widget.cache,
       offlineReading: widget.offlineReading,
     );
-    } else {
-      _info = await WebAnalyzer.getInfo(
-        null,
-        story: widget.story,
-        cache: widget.cache,
-        offlineReading: widget.offlineReading,
-      );
-    }
 
     if (mounted) {
       setState(() {
@@ -193,7 +175,7 @@ class _LinkPreviewState extends State<LinkPreview> {
         metadata: widget.story.simpleMetadata,
         url: widget.link,
         title: widget.story.title,
-        description: desc ?? title ?? 'no comments yet.',
+        description: desc ?? title ?? 'no comment yet.',
         imageUri: imageUri,
         imagePath: Constants.hackerNewsLogoPath,
         onTap: _launchURL,

lib/screens/widgets/link_preview/web_analyzer.dart

@@ -95,12 +95,12 @@ class WebAnalyzer {
 
   /// Get web information
   /// return [InfoBase]
-  static InfoBase? getInfoFromCache(String? url) {
+  static InfoBase? getInfoFromCache(String? cacheKey) {
-    final InfoBase? info = cacheMap[url];
+    final InfoBase? info = cacheMap[cacheKey];
 
     if (info != null) {
       if (!info._timeout.isAfter(DateTime.now())) {
-        cacheMap.remove(url);
+        cacheMap.remove(cacheKey);
       }
     }
     return info;
@@ -108,14 +108,16 @@ class WebAnalyzer {
 
   /// Get web information
   /// return [InfoBase]
-  static Future<InfoBase?> getInfo(
+  static Future<InfoBase?> getInfo({
-    String? url, {
     required Story story,
     Duration cache = const Duration(hours: 24),
     bool multimedia = true,
     required bool offlineReading,
   }) async {
-    InfoBase? info = getInfoFromCache(url);
+    final String key = getKey(story);
+    final String url = story.url;
+
+    InfoBase? info = getInfoFromCache(key);
 
     if (info != null) return info;
 
@@ -126,7 +128,8 @@ class WebAnalyzer {
       )
         .._timeout = DateTime.now().add(cache)
         .._shouldRetry = false;
-      cacheMap[story.id.toString()] = info;
+
+      cacheMap[key] = info;
 
       return info;
     }
@@ -148,7 +151,9 @@ class WebAnalyzer {
       )
         .._shouldRetry = false
         .._timeout = DateTime.now();
-      cacheMap[url] = info;
+
+      cacheMap[key] = info;
+
       return info;
     }
 
@@ -161,7 +166,7 @@ class WebAnalyzer {
 
       if (info != null && !info._shouldRetry) {
         info._timeout = DateTime.now().add(cache);
-        cacheMap[url] = info;
+        cacheMap[key] = info;
       }
 
       return info;
@@ -214,12 +219,12 @@ class WebAnalyzer {
 
     if (res == null || isEmpty(res[2] as String?)) {
       final String? commentText = await compute(
-        _fetchInfoFromStoryId,
+        _fetchInfoFromStory,
-        story.kids,
+        <int>[story.id, ...story.kids],
       );
 
       shouldRetry = commentText == null;
-      fallbackDescription = commentText ?? 'no comments yet';
+      fallbackDescription = commentText ?? 'no comment yet';
     } else {
       shouldRetry = false;
     }
@@ -281,11 +286,25 @@ class WebAnalyzer {
     }
   }
 
-  static Future<String?> _fetchInfoFromStoryId(List<int> kids) async {
+  static Future<String?> _fetchInfoFromStory(List<int> meta) async {
+    final StoriesRepository storiesRepository = StoriesRepository();
+    final int storyId = meta.first;
+    List<int> kids = meta.sublist(1, meta.length);
+
+    // Kids of stories from search results are always empty, so here we try
+    // to fetch the story itself first and see if the kids are still empty.
+    if (kids.isEmpty) {
+      final Story? story = await storiesRepository.fetchStoryBy(storyId);
+
+      if (story == null) return null;
+
+      kids = story.kids;
+
       if (kids.isEmpty) return null;
+    }
 
     final Comment? comment =
-        await StoriesRepository().fetchCommentBy(id: kids.first);
+        await storiesRepository.fetchCommentBy(id: kids.first);
 
     return comment != null ? '${comment.by}: ${comment.text}' : null;
   }
@@ -540,4 +559,7 @@ class WebAnalyzer {
     }
     return source;
   }
+
+  static String getKey(Story story) =>
+      story.url.isNotEmpty ? story.url : story.id.toString();
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.19+60
+version: 0.2.21+63
 publish_to: none
 
 environment: