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.

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: livinglist
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: jfeng_for_open_source
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -3,15 +3,14 @@
 
 A simple noiseless [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)
-[![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
+[![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)
 
-<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) [<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/)
+[<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/)
 
 
 Features:
@@ -36,24 +35,22 @@ Features:
 
 
 <p align="center">
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799288-6e98352a-fe89-4a2e-8a74-c5782463a1e1.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799297-75b52eac-2066-4df9-bdfc-7c82bf7b81c8.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799302-860c61b8-abba-486a-9592-bc84a6af3232.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799305-308743d3-1c89-45de-9645-3b6ec789c282.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798176-5212e9bf-296d-4d9b-ab48-19b741684c8a.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798185-d7c81348-956e-483c-a1bc-5cd872bdad62.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798187-4404adea-b2bc-472e-8568-2379e6db01a4.png"> 
+   <img width="200" alt="01" src="assets/screenshots/01.png"> 
+   <img width="200" alt="02" src="assets/screenshots/02.png"> 
+   <img width="200" alt="03" src="assets/screenshots/03.png"> 
+   <img width="200" alt="04" src="assets/screenshots/04.png"> 
+   <img width="200" alt="05" src="assets/screenshots/05.png"> 
+   <img width="200" alt="06" src="assets/screenshots/06.png"> 
+   <img width="200" alt="07" src="assets/screenshots/07.png"> 
+   <img width="200" alt="08" src="assets/screenshots/08.png"> 
+   <img width="200" alt="09" src="assets/screenshots/09.png"> 
+   <img width="200" alt="10" src="assets/screenshots/10.png"> 
+   <img width="200" alt="11" src="assets/screenshots/11.png"> 
+   <img width="200" alt="12" src="assets/screenshots/12.png"> 
    
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162733-906c4afd-39a8-48ae-946a-8019b327eaa0.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162735-f2b25119-4702-4308-b2f5-281a2a2c5901.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163024-6dcd65b6-bada-4c1c-95af-387fd4f42fb2.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163033-7bcf7038-b9aa-4ce4-8b58-64578eae8531.png"> 
+   <img width="400" alt="ipad-01" src="assets/screenshots/ipad-01.png"> 
+   <img width="400" alt="ipad-02" src="assets/screenshots/ipad-02.png"> 
+   <img width="400" alt="ipad-03" src="assets/screenshots/ipad-03.png"> 
+   <img width="400" alt="ipad-04" src="assets/screenshots/ipad-04.png"> 
 </p>
 

analysis_options.yaml

@@ -5,4 +5,5 @@ linter:
     public_member_api_docs: false
     library_private_types_in_public_api: false
     omit_local_variable_types: false
+    one_member_abstracts: false
     always_specify_types: true

android/app/src/main/AndroidManifest.xml

@@ -9,11 +9,16 @@
             <action android:name="android.intent.action.VIEW" />
             <data android:scheme="https" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="*/*" />
+        </intent>
     </queries>
 
    <application
         android:label="hacki"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -48,6 +53,21 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="*/*" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="http"
+                    android:host="news.ycombinator.com"
+                    android:pathPrefix="/item" />
+                <data
+                    android:scheme="https"
+                    android:host="news.ycombinator.com"
+                    android:pathPrefix="/item" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,4 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.

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

@@ -0,0 +1,5 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

@@ -0,0 +1,6 @@
+- You can now add filters for searching.
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

@@ -0,0 +1,6 @@
+- You can now add filters for searching.
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

@@ -0,0 +1,6 @@
+- You can now add filters for searching.
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

@@ -0,0 +1,6 @@
+- You can now add filters for searching.
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

@@ -0,0 +1,7 @@
+- You can share links.
+- You can now add filters for searching.
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.

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

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

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

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

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

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

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/Podfile.lock

@@ -14,6 +14,8 @@ PODS:
     - Flutter
   - flutter_secure_storage (3.3.1):
     - Flutter
+  - flutter_siri_suggestions (0.0.1):
+    - Flutter
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
@@ -23,6 +25,8 @@ PODS:
   - ReachabilitySwift (5.0.0)
   - receive_sharing_intent (0.0.1):
     - Flutter
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_ios (0.0.1):
     - Flutter
   - sqflite (0.0.2):
@@ -32,8 +36,6 @@ PODS:
     - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
-  - video_player_avfoundation (0.0.1):
-    - Flutter
   - wakelock (0.0.1):
     - Flutter
   - webview_flutter_wkwebview (0.0.1):
@@ -47,13 +49,14 @@ DEPENDENCIES:
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - flutter_siri_suggestions (from `.symlinks/plugins/flutter_siri_suggestions/ios`)
   - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
   - workmanager (from `.symlinks/plugins/workmanager/ios`)
@@ -75,10 +78,14 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  flutter_siri_suggestions:
+    :path: ".symlinks/plugins/flutter_siri_suggestions/ios"
   path_provider_ios:
     :path: ".symlinks/plugins/path_provider_ios/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_ios:
     :path: ".symlinks/plugins/shared_preferences_ios/ios"
   sqflite:
@@ -87,8 +94,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/synced_shared_preferences/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
   wakelock:
     :path: ".symlinks/plugins/wakelock/ios"
   webview_flutter_wkwebview:
@@ -102,16 +107,17 @@ SPEC CHECKSUMS:
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
+  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
   shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
   url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
-  video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
   workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6

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 = 2;
+				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.8;
+				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 = 2;
+				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.8;
+				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 = 2;
+				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.8;
+				MARKETING_VERSION = 0.2.21;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ios/Runner/Info.plist

@@ -39,6 +39,12 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>https</string>
+		<string>http</string>
+		<string>mailto</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

lib/blocs/stories/stories_bloc.dart

@@ -32,6 +32,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     on<StoryRead>(onStoryRead);
     on<StoriesLoaded>(onStoriesLoaded);
     on<StoriesDownload>(onDownload);
+    on<StoryDownloaded>(onStoryDownloaded);
     on<StoriesExitOffline>(onExitOffline);
     on<StoriesPageSizeChanged>(onPageSizeChanged);
     on<ClearAllReadStories>(onClearAllReadStories);
@@ -48,6 +49,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   static const int _tabletSmallPageSize = 15;
   static const int _tabletLargePageSize = 25;
 
+  /// Types of story to be shown in the tab bar.
+  static const Set<StoryType> types = <StoryType>{
+    StoryType.top,
+    StoryType.best,
+    StoryType.latest,
+    StoryType.ask,
+    StoryType.show,
+  };
+
   Future<void> onInitialize(
     StoriesInitialize event,
     Emitter<StoriesState> emit,
@@ -70,11 +80,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         currentPageSize: pageSize,
       ),
     );
-    await loadStories(of: StoryType.top, emit: emit);
-    await loadStories(of: StoryType.latest, emit: emit);
-    await loadStories(of: StoryType.ask, emit: emit);
-    await loadStories(of: StoryType.show, emit: emit);
-    await loadStories(of: StoryType.jobs, emit: emit);
+    for (final StoryType type in types) {
+      await loadStories(of: type, emit: emit);
+    }
   }
 
   Future<void> loadStories({
@@ -237,52 +245,48 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     await _cacheRepository.deleteAllStories();
     await _cacheRepository.deleteAllComments();
 
-    final List<int> topIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.top);
-    final List<int> newIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.latest);
-    final List<int> askIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.ask);
-    final List<int> showIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.show);
-    final List<int> jobIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.jobs);
+    final Set<int> prioritizedIds = <int>{};
+    final List<StoryType> prioritizedTypes = <StoryType>[...types]
+      ..remove(StoryType.latest);
 
-    await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
+    for (final StoryType type in prioritizedTypes) {
+      final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
+      await _cacheRepository.cacheStoryIds(of: type, ids: ids);
+      prioritizedIds.addAll(ids);
+    }
 
-    final List<int> allIds = <int>[
-      ...topIds,
-      ...newIds,
-      ...askIds,
-      ...showIds,
-      ...jobIds
-    ];
+    emit(
+      state.copyWith(
+        storiesDownloaded: 0,
+        storiesToBeDownloaded: prioritizedIds.length,
+      ),
+    );
 
     try {
-      _storiesRepository
-          .fetchStoriesStream(ids: allIds)
-          .listen((Story story) async {
-        if (story.kids.isNotEmpty) {
-          await _cacheRepository.cacheStory(story: story);
-          _storiesRepository
-              .fetchAllChildrenComments(ids: story.kids)
-              .listen((Comment? comment) async {
-            if (comment != null) {
-              await _cacheRepository.cacheComment(comment: comment);
-            }
-          });
-        }
-      }).onDone(() {
-        emit(
-          state.copyWith(
-            downloadStatus: StoriesDownloadStatus.finished,
-          ),
-        );
-      });
+      await fetchAndCacheStories(
+        prioritizedIds,
+        includingWebPage: event.includingWebPage,
+        isPrioritized: true,
+      );
+
+      final Set<int> latestIds = <int>{};
+      final List<int> ids = await _storiesRepository.fetchStoryIds(
+        of: StoryType.latest,
+      );
+      await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
+      latestIds.addAll(ids);
+
+      await fetchAndCacheStories(
+        latestIds,
+        includingWebPage: event.includingWebPage,
+        isPrioritized: false,
+      );
+
+      emit(
+        state.copyWith(
+          downloadStatus: StoriesDownloadStatus.finished,
+        ),
+      );
     } catch (_) {
       emit(
         state.copyWith(
@@ -292,6 +296,71 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     }
   }
 
+  Future<void> fetchAndCacheStories(
+    Iterable<int> ids, {
+    required bool includingWebPage,
+    required bool isPrioritized,
+  }) async {
+    for (final int id in ids) {
+      final Story? story = await _storiesRepository.fetchStoryBy(id);
+
+      if (story == null) {
+        if (isPrioritized) {
+          add(StoryDownloaded(skipped: true));
+        }
+        continue;
+      }
+
+      if (story.kids.isEmpty) {
+        if (isPrioritized) {
+          add(StoryDownloaded(skipped: true));
+        }
+        continue;
+      }
+
+      await _cacheRepository.cacheStory(story: story);
+
+      if (story.url.isNotEmpty && includingWebPage) {
+        await _cacheRepository.cacheUrl(url: story.url);
+      }
+
+      final Completer<void> completer = Completer<void>();
+      _storiesRepository
+          .fetchAllChildrenComments(ids: story.kids)
+          .listen((Comment? comment) async {
+        if (comment != null) {
+          await _cacheRepository.cacheComment(comment: comment);
+        }
+      }).onDone(() {
+        completer.complete();
+        add(StoryDownloaded(skipped: false));
+      });
+
+      await completer.future;
+    }
+  }
+
+  void onStoryDownloaded(StoryDownloaded event, Emitter<StoriesState> emit) {
+    if (event.skipped) {
+      emit(
+        state.copyWith(
+          storiesToBeDownloaded: state.storiesToBeDownloaded - 1,
+        ),
+      );
+    } else {
+      final int updatedStoriesDownloaded = state.storiesDownloaded + 1;
+      emit(
+        state.copyWith(
+          storiesDownloaded: updatedStoriesDownloaded,
+          storiesToBeDownloaded:
+              updatedStoriesDownloaded > state.storiesToBeDownloaded
+                  ? state.storiesToBeDownloaded + 1
+                  : state.storiesToBeDownloaded,
+        ),
+      );
+    }
+  }
+
   Future<void> onPageSizeChanged(
     StoriesPageSizeChanged event,
     Emitter<StoriesState> emit,
@@ -307,6 +376,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     await _cacheRepository.deleteAllStoryIds();
     await _cacheRepository.deleteAllStories();
     await _cacheRepository.deleteAllComments();
+    await _cacheRepository.deleteAllWebPages();
     emit(state.copyWith(offlineReading: false));
     add(StoriesInitialize());
   }

lib/blocs/stories/stories_event.dart

@@ -38,8 +38,21 @@ class StoriesLoadMore extends StoriesEvent {
 }
 
 class StoriesDownload extends StoriesEvent {
+  StoriesDownload({required this.includingWebPage});
+
+  final bool includingWebPage;
+
   @override
-  List<Object?> get props => <Object?>[];
+  List<Object?> get props => <Object?>[includingWebPage];
+}
+
+class StoryDownloaded extends StoriesEvent {
+  StoryDownloaded({required this.skipped});
+
+  final bool skipped;
+
+  @override
+  List<Object?> get props => <Object?>[skipped];
 }
 
 class StoriesExitOffline extends StoriesEvent {

lib/blocs/stories/stories_state.dart

@@ -23,11 +23,14 @@ class StoriesState extends Equatable {
     required this.offlineReading,
     required this.downloadStatus,
     required this.currentPageSize,
+    required this.storiesDownloaded,
+    required this.storiesToBeDownloaded,
   });
 
   const StoriesState.init({
     this.storiesByType = const <StoryType, List<Story>>{
       StoryType.top: <Story>[],
+      StoryType.best: <Story>[],
       StoryType.latest: <Story>[],
       StoryType.ask: <Story>[],
       StoryType.show: <Story>[],
@@ -35,6 +38,7 @@ class StoriesState extends Equatable {
     },
     this.storyIdsByType = const <StoryType, List<int>>{
       StoryType.top: <int>[],
+      StoryType.best: <int>[],
       StoryType.latest: <int>[],
       StoryType.ask: <int>[],
       StoryType.show: <int>[],
@@ -42,6 +46,7 @@ class StoriesState extends Equatable {
     },
     this.statusByType = const <StoryType, StoriesStatus>{
       StoryType.top: StoriesStatus.initial,
+      StoryType.best: StoriesStatus.initial,
       StoryType.latest: StoriesStatus.initial,
       StoryType.ask: StoriesStatus.initial,
       StoryType.show: StoriesStatus.initial,
@@ -49,6 +54,7 @@ class StoriesState extends Equatable {
     },
     this.currentPageByType = const <StoryType, int>{
       StoryType.top: 0,
+      StoryType.best: 0,
       StoryType.latest: 0,
       StoryType.ask: 0,
       StoryType.show: 0,
@@ -57,7 +63,9 @@ class StoriesState extends Equatable {
   })  : offlineReading = false,
         downloadStatus = StoriesDownloadStatus.initial,
         currentPageSize = 0,
-        readStoriesIds = const <int>{};
+        readStoriesIds = const <int>{},
+        storiesDownloaded = 0,
+        storiesToBeDownloaded = 0;
 
   final Map<StoryType, List<Story>> storiesByType;
   final Map<StoryType, List<int>> storyIdsByType;
@@ -67,6 +75,8 @@ class StoriesState extends Equatable {
   final StoriesDownloadStatus downloadStatus;
   final bool offlineReading;
   final int currentPageSize;
+  final int storiesDownloaded;
+  final int storiesToBeDownloaded;
 
   StoriesState copyWith({
     Map<StoryType, List<Story>>? storiesByType,
@@ -77,6 +87,8 @@ class StoriesState extends Equatable {
     StoriesDownloadStatus? downloadStatus,
     bool? offlineReading,
     int? currentPageSize,
+    int? storiesDownloaded,
+    int? storiesToBeDownloaded,
   }) {
     return StoriesState(
       storiesByType: storiesByType ?? this.storiesByType,
@@ -87,6 +99,9 @@ class StoriesState extends Equatable {
       offlineReading: offlineReading ?? this.offlineReading,
       downloadStatus: downloadStatus ?? this.downloadStatus,
       currentPageSize: currentPageSize ?? this.currentPageSize,
+      storiesDownloaded: storiesDownloaded ?? this.storiesDownloaded,
+      storiesToBeDownloaded:
+          storiesToBeDownloaded ?? this.storiesToBeDownloaded,
     );
   }
 
@@ -98,18 +113,12 @@ class StoriesState extends Equatable {
     final Map<StoryType, List<Story>> newMap =
         Map<StoryType, List<Story>>.from(storiesByType);
     newMap[of] = List<Story>.from(newMap[of]!)..add(story);
-    return StoriesState(
+    return copyWith(
       storiesByType: newMap,
-      storyIdsByType: storyIdsByType,
-      statusByType: statusByType,
-      currentPageByType: currentPageByType,
       readStoriesIds: <int>{
         ...readStoriesIds,
         if (hasRead) story.id,
       },
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
     );
   }
 
@@ -120,15 +129,8 @@ class StoriesState extends Equatable {
     final Map<StoryType, List<int>> newMap =
         Map<StoryType, List<int>>.from(storyIdsByType);
     newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
+    return copyWith(
       storyIdsByType: newMap,
-      statusByType: statusByType,
-      currentPageByType: currentPageByType,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
     );
   }
 
@@ -139,15 +141,8 @@ class StoriesState extends Equatable {
     final Map<StoryType, StoriesStatus> newMap =
         Map<StoryType, StoriesStatus>.from(statusByType);
     newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
+    return copyWith(
       statusByType: newMap,
-      currentPageByType: currentPageByType,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
     );
   }
 
@@ -158,15 +153,8 @@ class StoriesState extends Equatable {
     final Map<StoryType, int> newMap =
         Map<StoryType, int>.from(currentPageByType);
     newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
-      statusByType: statusByType,
+    return copyWith(
       currentPageByType: newMap,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
     );
   }
 
@@ -183,15 +171,11 @@ class StoriesState extends Equatable {
     final Map<StoryType, int> newCurrentPageMap =
         Map<StoryType, int>.from(currentPageByType);
     newCurrentPageMap[of] = 0;
-    return StoriesState(
+    return copyWith(
       storiesByType: newStoriesMap,
       storyIdsByType: newStoryIdsMap,
       statusByType: newStatusMap,
       currentPageByType: newCurrentPageMap,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
     );
   }
 
@@ -205,5 +189,7 @@ class StoriesState extends Equatable {
         offlineReading,
         downloadStatus,
         currentPageSize,
+        storiesDownloaded,
+        storiesToBeDownloaded,
       ];
 }

lib/config/constants.dart

@@ -9,6 +9,7 @@ abstract class Constants {
       'https://apps.apple.com/us/app/hacki/id1602043763?action=write-review';
   static const String googlePlayLink =
       'https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US';
+  static const String sponsorLink = 'https://github.com/sponsors/Livinglist';
 
   static const String _imagePath = 'assets/images';
   static const String hackerNewsLogoPath = '$_imagePath/hacker_news_logo.png';

lib/config/custom_router.dart

@@ -10,8 +10,8 @@ class CustomRouter {
     switch (settings.name) {
       case HomeScreen.routeName:
         return HomeScreen.route();
-      case StoryScreen.routeName:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+      case ItemScreen.routeName:
+        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:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+      case ItemScreen.routeName:
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
       case SubmitScreen.routeName:
         return SubmitScreen.route();
       default:

lib/cubits/collapse/collapse_cubit.dart

@@ -55,21 +55,21 @@ class CollapseCubit extends Cubit<CollapseState> {
   }
 
   void hiddenCommentsStreamListener(Map<int, Set<int>> event) {
+    int collapsedCount = 0;
     for (final int key in event.keys) {
       if (key == _commentId && !isClosed) {
-        emit(
-          state.copyWith(
-            collapsedCount: event[key]?.length ?? 0,
-          ),
-        );
-        return;
+        collapsedCount = event[key]?.length ?? 0;
+        break;
       }
     }
 
     for (final Set<int> val in event.values) {
       if (val.contains(_commentId) && !isClosed) {
         emit(
-          state.copyWith(hidden: true),
+          state.copyWith(
+            hidden: true,
+            collapsedCount: collapsedCount,
+          ),
         );
         return;
       }
@@ -77,7 +77,10 @@ class CollapseCubit extends Cubit<CollapseState> {
 
     if (!isClosed) {
       emit(
-        state.copyWith(hidden: false),
+        state.copyWith(
+          hidden: false,
+          collapsedCount: collapsedCount,
+        ),
       );
     }
   }

lib/cubits/comments/comments_cubit.dart

@@ -1,10 +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';
@@ -16,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;
@@ -66,30 +71,38 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     emit(state.copyWith(status: CommentsStatus.loading));
 
-    final Story story = state.story;
-    final Story updatedStory = state.offlineReading
-        ? story
-        : await _storiesRepository.fetchStoryBy(story.id) ?? story;
+    final Item item = state.item;
+    final Item updatedItem = state.offlineReading
+        ? item
+        : 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 (offlineReading) {
+    if (state.offlineReading) {
       emit(
         state.copyWith(
           status: CommentsStatus.loaded,
@@ -98,6 +111,10 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
+    _cacheService
+      ..resetComments()
+      ..resetCollapsedComments();
+
     emit(
       state.copyWith(
         status: CommentsStatus.loading,
@@ -107,28 +124,40 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     await _streamSubscription?.cancel();
 
-    final Story story = state.story;
-    final Story updatedStory =
-        await _storiesRepository.fetchStoryBy(story.id) ?? story;
+    final Item item = state.item;
+    final Item updatedItem =
+        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();
@@ -141,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;
@@ -157,16 +216,29 @@ class CommentsCubit extends Cubit<CommentsState> {
         ..addKid(comment.id, to: comment.parent)
         ..cacheComment(comment);
       _sembastRepository.cacheComment(comment);
+
+      final List<LinkifyElement> elements = _linkify(
+        comment.text,
+      );
+
+      final BuildableComment buildableComment =
+          BuildableComment.fromComment(comment, elements: elements);
+
       final List<Comment> updatedComments = <Comment>[
         ...state.comments,
-        comment
+        buildableComment
       ];
+
       emit(state.copyWith(comments: updatedComments));
 
       if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
           updatedComments.length <=
               _pageSize * 2 + _pageSize * state.currentPage) {
-        _streamSubscription?.pause();
+        final bool isHidden = _cacheService.isHidden(comment.id);
+
+        if (!isHidden) {
+          _streamSubscription?.pause();
+        }
 
         emit(
           state.copyWith(
@@ -178,6 +250,31 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
+  static List<LinkifyElement> _linkify(
+    String text, {
+    LinkifyOptions options = const LinkifyOptions(),
+    List<Linkifier> linkifiers = const <Linkifier>[
+      UrlLinkifier(),
+      EmailLinkifier(),
+    ],
+  }) {
+    List<LinkifyElement> list = <LinkifyElement>[TextElement(text)];
+
+    if (text.isEmpty) {
+      return <LinkifyElement>[];
+    }
+
+    if (linkifiers.isEmpty) {
+      return list;
+    }
+
+    for (final Linkifier linkifier in linkifiers) {
+      list = linkifier.parse(list, options);
+    }
+
+    return list;
+  }
+
   @override
   Future<void> close() async {
     await _streamSubscription?.cancel();

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/cubits.dart

@@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
 export 'split_view/split_view_cubit.dart';
 export 'submit/submit_cubit.dart';
 export 'time_machine/time_machine_cubit.dart';
+export 'user/user_cubit.dart';
 export 'vote/vote_cubit.dart';

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)
-          ..removeWhere((Story e) => e.id == id),
+        favItems: List<Item>.from(state.favItems)
+          ..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/pin/pin_cubit.dart

@@ -52,6 +52,8 @@ class PinCubit extends Cubit<PinState> {
     _preferenceRepository.updatePinnedStoriesIds(state.pinnedStoriesIds);
   }
 
+  void refresh() => init();
+
   void _onStoryFetched(Story story) {
     emit(state.copyWith(pinnedStories: <Story>[...state.pinnedStories, story]));
   }

lib/cubits/poll/poll_cubit.dart

@@ -23,6 +23,10 @@ class PollCubit extends Cubit<PollState> {
   Future<void> init({
     bool refresh = false,
   }) async {
+    if (refresh) {
+      emit(PollState.init());
+    }
+
     emit(state.copyWith(status: PollStatus.loading));
 
     List<int> pollOptionsIds = _story.parts;

lib/cubits/preference/preference_cubit.dart

@@ -31,6 +31,8 @@ class PreferenceCubit extends Cubit<PreferenceState> {
         .then((bool value) => emit(state.copyWith(useReader: value)));
     _preferenceRepository.markReadStories
         .then((bool value) => emit(state.copyWith(markReadStories: value)));
+    _preferenceRepository.shouldShowMetadata
+        .then((bool value) => emit(state.copyWith(showMetadata: value)));
   }
 
   void toggleNotificationMode() {
@@ -67,4 +69,9 @@ class PreferenceCubit extends Cubit<PreferenceState> {
     emit(state.copyWith(markReadStories: !state.markReadStories));
     _preferenceRepository.toggleMarkReadStoriesMode();
   }
+
+  void toggleMetadataMode() {
+    emit(state.copyWith(showMetadata: !state.showMetadata));
+    _preferenceRepository.toggleMetadataMode();
+  }
 }

lib/cubits/preference/preference_state.dart

@@ -9,6 +9,7 @@ class PreferenceState extends Equatable {
     required this.useTrueDark,
     required this.useReader,
     required this.markReadStories,
+    required this.showMetadata,
   });
 
   const PreferenceState.init()
@@ -18,7 +19,8 @@ class PreferenceState extends Equatable {
         showEyeCandy = false,
         useTrueDark = false,
         useReader = false,
-        markReadStories = false;
+        markReadStories = false,
+        showMetadata = false;
 
   final bool showNotification;
   final bool showComplexStoryTile;
@@ -27,6 +29,7 @@ class PreferenceState extends Equatable {
   final bool useTrueDark;
   final bool useReader;
   final bool markReadStories;
+  final bool showMetadata;
 
   PreferenceState copyWith({
     bool? showNotification,
@@ -36,6 +39,7 @@ class PreferenceState extends Equatable {
     bool? useTrueDark,
     bool? useReader,
     bool? markReadStories,
+    bool? showMetadata,
   }) {
     return PreferenceState(
       showNotification: showNotification ?? this.showNotification,
@@ -45,6 +49,7 @@ class PreferenceState extends Equatable {
       useTrueDark: useTrueDark ?? this.useTrueDark,
       useReader: useReader ?? this.useReader,
       markReadStories: markReadStories ?? this.markReadStories,
+      showMetadata: showMetadata ?? this.showMetadata,
     );
   }
 
@@ -57,5 +62,6 @@ class PreferenceState extends Equatable {
         useTrueDark,
         useReader,
         markReadStories,
+        showMetadata,
       ];
 }

lib/cubits/search/search_cubit.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
@@ -13,42 +15,94 @@ class SearchCubit extends Cubit<SearchState> {
 
   final SearchRepository _searchRepository;
 
+  StreamSubscription<Story>? streamSubscription;
+
   void search(String query) {
+    streamSubscription?.cancel();
     emit(
       state.copyWith(
         results: <Story>[],
-        currentPage: 0,
         status: SearchStatus.loading,
-        query: query,
+        searchFilters: state.searchFilters.copyWith(query: query, page: 0),
       ),
     );
-    _searchRepository.search(query).listen(_onStoryFetched).onDone(() {
-      emit(state.copyWith(status: SearchStatus.loaded));
-    });
+    streamSubscription = _searchRepository
+        .search(filters: state.searchFilters)
+        .listen(_onStoryFetched)
+      ..onDone(() {
+        emit(state.copyWith(status: SearchStatus.loaded));
+      });
   }
 
   void loadMore() {
-    final int updatedPage = state.currentPage + 1;
+    if (state.status != SearchStatus.loading) {
+      final int updatedPage = state.searchFilters.page + 1;
+      emit(
+        state.copyWith(
+          status: SearchStatus.loadingMore,
+          searchFilters: state.searchFilters.copyWith(page: updatedPage),
+        ),
+      );
+      streamSubscription = _searchRepository
+          .search(filters: state.searchFilters)
+          .listen(_onStoryFetched)
+        ..onDone(() {
+          emit(state.copyWith(status: SearchStatus.loaded));
+        });
+    }
+  }
+
+  void addFilter<T extends SearchFilter>(T filter) {
+    if (state.searchFilters.contains<T>()) {
+      emit(
+        state.copyWith(
+          searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
+        ),
+      );
+    }
+
     emit(
       state.copyWith(
-        status: SearchStatus.loadingMore,
-        currentPage: updatedPage,
+        searchFilters: state.searchFilters.copyWithFilterAdded(filter),
       ),
     );
-    _searchRepository
-        .search(state.query, page: updatedPage)
-        .listen(_onStoryFetched)
-        .onDone(() {
-      emit(state.copyWith(status: SearchStatus.loaded));
-    });
+
+    search(state.searchFilters.query);
+  }
+
+  void removeFilter<T extends SearchFilter>() {
+    emit(
+      state.copyWith(
+        searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
+      ),
+    );
+
+    search(state.searchFilters.query);
+  }
+
+  void onSortToggled() {
+    emit(
+      state.copyWith(
+        searchFilters: state.searchFilters.copyWith(
+          sorted: !state.searchFilters.sorted,
+        ),
+      ),
+    );
+
+    search(state.searchFilters.query);
   }
 
   void _onStoryFetched(Story story) {
     emit(
       state.copyWith(
         results: List<Story>.from(state.results)..add(story),
-        status: SearchStatus.loaded,
       ),
     );
   }
+
+  @override
+  Future<void> close() async {
+    await streamSubscription?.cancel();
+    await super.close();
+  }
 }

lib/cubits/search/search_state.dart

@@ -9,42 +9,36 @@ enum SearchStatus {
 
 class SearchState extends Equatable {
   const SearchState({
-    required this.query,
     required this.status,
     required this.results,
-    required this.currentPage,
+    required this.searchFilters,
   });
 
   SearchState.init()
-      : query = '',
-        status = SearchStatus.initial,
+      : status = SearchStatus.initial,
         results = <Story>[],
-        currentPage = 0;
+        searchFilters = SearchFilters.init();
 
-  final String query;
   final List<Story> results;
   final SearchStatus status;
-  final int currentPage;
+  final SearchFilters searchFilters;
 
   SearchState copyWith({
-    String? query,
     List<Story>? results,
     SearchStatus? status,
-    int? currentPage,
+    SearchFilters? searchFilters,
   }) {
     return SearchState(
-      query: query ?? this.query,
       results: results ?? this.results,
       status: status ?? this.status,
-      currentPage: currentPage ?? this.currentPage,
+      searchFilters: searchFilters ?? this.searchFilters,
     );
   }
 
   @override
   List<Object?> get props => <Object?>[
-        query,
         status,
         results,
-        currentPage,
+        searchFilters,
       ];
 }

lib/cubits/split_view/split_view_cubit.dart

@@ -13,12 +13,14 @@ 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));
 
   void disableSplitView() => emit(state.copyWith(enabled: false));
+
+  void zoom() => emit(state.copyWith(expanded: !state.expanded));
 }

lib/cubits/split_view/split_view_state.dart

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

lib/cubits/user/user_cubit.dart

@@ -0,0 +1,26 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/config/locator.dart';
+import 'package:hacki/models/models.dart';
+import 'package:hacki/repositories/repositories.dart';
+
+part 'user_state.dart';
+
+class UserCubit extends Cubit<UserState> {
+  UserCubit({StoriesRepository? storiesRepository})
+      : _storiesRepository =
+            storiesRepository ?? locator.get<StoriesRepository>(),
+        super(UserState.init());
+
+  final StoriesRepository _storiesRepository;
+
+  void init({required String userId}) {
+    emit(state.copyWith(status: UserStatus.loading));
+    _storiesRepository.fetchUserBy(userId: userId).then((User user) {
+      emit(state.copyWith(user: user, status: UserStatus.loaded));
+    }).onError((_, __) {
+      emit(state.copyWith(status: UserStatus.failure));
+      return;
+    });
+  }
+}

lib/cubits/user/user_state.dart

@@ -0,0 +1,38 @@
+part of 'user_cubit.dart';
+
+enum UserStatus {
+  initial,
+  loading,
+  loaded,
+  failure,
+}
+
+class UserState extends Equatable {
+  const UserState({
+    required this.user,
+    required this.status,
+  });
+
+  UserState.init()
+      : user = User.empty(),
+        status = UserStatus.initial;
+
+  final User user;
+  final UserStatus status;
+
+  UserState copyWith({
+    User? user,
+    UserStatus? status,
+  }) {
+    return UserState(
+      user: user ?? this.user,
+      status: status ?? this.status,
+    );
+  }
+
+  @override
+  List<Object?> get props => <Object?>[
+        user,
+        status,
+      ];
+}

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) {
-      context.read<SplitViewCubit>().updateStoryScreenArgs(args);
+    if (splitViewEnabled && !forceNewScreen) {
+      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,15 @@
 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);
   }
+
+  String removeAllEmojis() {
+    final RegExp regex = RegExp(
+      r'(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])',
+    );
+    return replaceAllMapped(regex, (_) => '');
+  }
 }

lib/main.dart

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/custom_router.dart';
 import 'package:hacki/config/locator.dart';
@@ -24,6 +25,10 @@ import 'package:workmanager/workmanager.dart';
 final BehaviorSubject<String?> selectNotificationSubject =
     BehaviorSubject<String?>();
 
+// For receiving payload event from siri suggestions.
+final BehaviorSubject<String?> siriSuggestionSubject =
+    BehaviorSubject<String?>();
+
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
@@ -57,6 +62,16 @@ Future<void> main() async {
           badge: true,
           sound: true,
         );
+
+    FlutterSiriSuggestions.instance.configure(
+      onLaunch: (Map<String, dynamic> message) async {
+        final String? storyId = message['key'] as String?;
+
+        if (storyId == null) return;
+
+        siriSuggestionSubject.add(storyId);
+      },
+    );
   }
 
   final Directory tempDir = await getTemporaryDirectory();
@@ -76,6 +91,7 @@ Future<void> main() async {
   //     runApp(
   //       HackiApp(
   //         savedThemeMode: savedThemeMode,
+  //         trueDarkMode: trueDarkMode,
   //       ),
   //     );
   //   },
@@ -163,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

@@ -0,0 +1,35 @@
+import 'package:flutter_linkify/flutter_linkify.dart';
+import 'package:hacki/models/comment.dart';
+import 'package:hacki/models/models.dart';
+
+class BuildableComment extends Comment {
+  BuildableComment({
+    required super.id,
+    required super.time,
+    required super.parent,
+    required super.score,
+    required super.by,
+    required super.text,
+    required super.kids,
+    required super.dead,
+    required super.deleted,
+    required super.level,
+    required this.elements,
+  });
+
+  BuildableComment.fromComment(Comment comment, {required this.elements})
+      : super(
+          id: comment.id,
+          time: comment.time,
+          parent: comment.parent,
+          score: comment.score,
+          by: comment.by,
+          text: comment.text,
+          kids: comment.kids,
+          dead: comment.dead,
+          deleted: comment.deleted,
+          level: comment.level,
+        );
+
+  final List<LinkifyElement> elements;
+}

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 =>
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
+  String get metadata => '''by $by $postedDate''';
 
   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/models.dart

@@ -1,6 +1,8 @@
+export 'buildable_comment.dart';
 export 'comment.dart';
 export 'item.dart';
 export 'poll_option.dart';
 export 'post_data.dart';
+export 'search_filters.dart';
 export 'story.dart';
 export 'user.dart';

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/search_filter.dart

@@ -0,0 +1,104 @@
+part of 'search_filters.dart';
+
+abstract class SearchFilter {
+  String get query;
+}
+
+abstract class NumericFilter extends SearchFilter {}
+
+abstract class TagFilter extends SearchFilter {}
+
+class DateTimeRangeFilter implements NumericFilter {
+  DateTimeRangeFilter({
+    this.startTime,
+    this.endTime,
+  });
+
+  final DateTime? startTime;
+  final DateTime? endTime;
+
+  @override
+  String get query {
+    final int? startTimestamp = startTime == null
+        ? null
+        : startTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
+    final int? endTimestamp = endTime == null
+        ? null
+        : endTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
+    final String query =
+        '''${startTimestamp == null ? '' : 'created_at_i>$startTimestamp'},${endTimestamp == null ? '' : 'created_at_i<$endTimestamp'}''';
+
+    if (query.endsWith(',')) {
+      return query.replaceFirst(',', '');
+    }
+
+    return query;
+  }
+}
+
+class PostedByFilter implements TagFilter {
+  PostedByFilter({required this.author});
+
+  final String author;
+
+  @override
+  String get query {
+    return 'author_$author';
+  }
+}
+
+class FrontPageFilter implements TagFilter {
+  FrontPageFilter();
+
+  @override
+  String get query {
+    return 'front_page';
+  }
+}
+
+class ShowHnFilter implements TagFilter {
+  ShowHnFilter();
+
+  @override
+  String get query {
+    return 'show_hn';
+  }
+}
+
+class AskHnFilter implements TagFilter {
+  AskHnFilter();
+
+  @override
+  String get query {
+    return 'ask_hn';
+  }
+}
+
+class PollFilter implements TagFilter {
+  PollFilter();
+
+  @override
+  String get query {
+    return 'poll';
+  }
+}
+
+class StoryFilter implements TagFilter {
+  StoryFilter();
+
+  @override
+  String get query {
+    return 'story';
+  }
+}
+
+class CombinedFilter implements TagFilter {
+  CombinedFilter({required this.filters});
+
+  final List<TagFilter> filters;
+
+  @override
+  String get query {
+    return '''(${filters.map((TagFilter e) => e.query).reduce((String value, String element) => '$value, $element')})''';
+  }
+}

lib/models/search_filters.dart

@@ -0,0 +1,116 @@
+import 'package:collection/collection.dart';
+import 'package:equatable/equatable.dart';
+
+part 'search_filter.dart';
+
+class SearchFilters extends Equatable {
+  const SearchFilters({
+    required this.filters,
+    required this.query,
+    required this.page,
+    this.sorted = false,
+  });
+
+  SearchFilters.init()
+      : filters = <SearchFilter>{},
+        query = '',
+        page = 0,
+        sorted = false;
+
+  final Set<SearchFilter> filters;
+  final String query;
+  final int page;
+  final bool sorted;
+
+  SearchFilters copyWith({
+    Set<SearchFilter>? filters,
+    String? query,
+    int? page,
+    bool? sorted,
+  }) {
+    return SearchFilters(
+      filters: filters ?? this.filters,
+      query: query ?? this.query,
+      page: page ?? this.page,
+      sorted: sorted ?? this.sorted,
+    );
+  }
+
+  SearchFilters copyWithFilterRemoved<T extends SearchFilter>() {
+    return SearchFilters(
+      filters: <SearchFilter>{...filters}
+        ..removeWhere((SearchFilter e) => e is T),
+      query: query,
+      page: page,
+      sorted: sorted,
+    );
+  }
+
+  SearchFilters copyWithFilterAdded(
+    SearchFilter filter,
+  ) {
+    return SearchFilters(
+      filters: <SearchFilter>{...filters, filter},
+      query: query,
+      page: page,
+      sorted: sorted,
+    );
+  }
+
+  String get filteredQuery {
+    final StringBuffer buffer = StringBuffer();
+
+    if (sorted) {
+      buffer.write('search_by_date?query=${Uri.encodeComponent(query)}');
+    } else {
+      buffer.write('search?query=${Uri.encodeComponent(query)}');
+    }
+
+    final Iterable<NumericFilter> numericFilters =
+        filters.whereType<NumericFilter>();
+    final List<TagFilter> tagFilters = <TagFilter>[
+      ...filters.whereType<TagFilter>(),
+      CombinedFilter(filters: <TagFilter>[StoryFilter(), PollFilter()]),
+    ];
+
+    if (numericFilters.isNotEmpty) {
+      buffer
+        ..write('&numericFilters=')
+        ..writeAll(
+          numericFilters.map<String>((NumericFilter e) => e.query),
+          ',',
+        );
+    }
+
+    if (tagFilters.isNotEmpty) {
+      buffer
+        ..write('&tags=')
+        ..writeAll(
+          tagFilters.map<String>((TagFilter e) => e.query),
+          ',',
+        );
+    }
+
+    buffer.write('&page=$page');
+
+    return buffer.toString();
+  }
+
+  bool contains<T extends SearchFilter>() {
+    return filters.whereType<T>().isNotEmpty;
+  }
+
+  T? get<T extends SearchFilter>() {
+    return filters.singleWhereOrNull(
+      (SearchFilter e) => e is T,
+    ) as T?;
+  }
+
+  @override
+  List<Object?> get props => <Object?>[
+        filters,
+        query,
+        page,
+        sorted,
+      ];
+}

lib/models/story.dart

@@ -1,14 +1,35 @@
 import 'dart:convert';
 
-import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/item.dart';
 
 enum StoryType {
-  top,
-  latest,
-  ask,
-  show,
-  jobs,
+  top('topstories'),
+  best('beststories'),
+  latest('newstories'),
+  ask('askstories'),
+  show('showstories'),
+  jobs('jobstories');
+
+  const StoryType(this.path);
+
+  final String path;
+
+  String get label {
+    switch (this) {
+      case StoryType.top:
+        return 'TOP';
+      case StoryType.best:
+        return 'BEST';
+      case StoryType.latest:
+        return 'NEW';
+      case StoryType.ask:
+        return 'ASK';
+      case StoryType.show:
+        return 'SHOW';
+      case StoryType.jobs:
+        return 'JOBS';
+    }
+  }
 }
 
 class Story extends Item {
@@ -66,8 +87,11 @@ class Story extends Item {
           parent: 0,
         );
 
-  String get postedDate =>
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
+  String get metadata =>
+      '''$score point${score > 1 ? 's' : ''} by $by $postedDate | $descendants comment${descendants > 1 ? 's' : ''}''';
+
+  String get simpleMetadata =>
+      '''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
 
   Map<String, dynamic> toJson() {
     return <String, dynamic>{

lib/models/user.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:intl/intl.dart';
+
 class User {
   User({
     required this.about,
@@ -29,6 +31,12 @@ class User {
   final String id;
   final int karma;
 
+  static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
+
+  String get description {
+    return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
+  }
+
   @override
   String toString() {
     final String prettyString =

lib/repositories/auth_repository.dart

@@ -1,25 +1,23 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
+import 'package:hacki/repositories/postable_repository.dart';
 import 'package:hacki/repositories/repositories.dart';
-import 'package:hacki/utils/service_exception.dart';
 
-class AuthRepository {
+class AuthRepository extends PostableRepository {
   AuthRepository({
     Dio? dio,
     PreferenceRepository? preferenceRepository,
-  })  : _dio = dio ?? Dio(),
-        _preferenceRepository =
-            preferenceRepository ?? locator.get<PreferenceRepository>();
+  })  : _preferenceRepository =
+            preferenceRepository ?? locator.get<PreferenceRepository>(),
+        super(dio: dio);
+
+  final PreferenceRepository _preferenceRepository;
 
   static const String _authority = 'news.ycombinator.com';
 
-  final Dio _dio;
-  final PreferenceRepository _preferenceRepository;
-
   Future<bool> get loggedIn async => _preferenceRepository.loggedIn;
 
   Future<String?> get username async => _preferenceRepository.username;
@@ -37,7 +35,7 @@ class AuthRepository {
       goto: 'news',
     );
 
-    final bool success = await _performDefaultPost(uri, data);
+    final bool success = await performDefaultPost(uri, data);
 
     if (success) {
       await _preferenceRepository.setAuth(
@@ -69,7 +67,7 @@ class AuthRepository {
       un: flag ? null : 't',
     );
 
-    return _performDefaultPost(uri, data);
+    return performDefaultPost(uri, data);
   }
 
   Future<bool> favorite({
@@ -86,7 +84,7 @@ class AuthRepository {
       un: favorite ? null : 't',
     );
 
-    return _performDefaultPost(uri, data);
+    return performDefaultPost(uri, data);
   }
 
   Future<bool> upvote({
@@ -103,7 +101,7 @@ class AuthRepository {
       how: upvote ? 'up' : 'un',
     );
 
-    return _performDefaultPost(uri, data);
+    return performDefaultPost(uri, data);
   }
 
   Future<bool> downvote({
@@ -120,53 +118,6 @@ class AuthRepository {
       how: downvote ? 'down' : 'un',
     );
 
-    return _performDefaultPost(uri, data);
-  }
-
-  Future<bool> _performDefaultPost(
-    Uri uri,
-    PostDataMixin data, {
-    String? cookie,
-    bool Function(String?)? validateLocation,
-  }) async {
-    try {
-      final Response<void> response = await _performPost<void>(
-        uri,
-        data,
-        cookie: cookie,
-        validateStatus: (int? status) => status == HttpStatus.found,
-      );
-
-      if (validateLocation != null) {
-        return validateLocation(response.headers.value('location'));
-      }
-
-      return true;
-    } on ServiceException {
-      return false;
-    }
-  }
-
-  Future<Response<T>> _performPost<T>(
-    Uri uri,
-    PostDataMixin data, {
-    String? cookie,
-    ResponseType? responseType,
-    bool Function(int?)? validateStatus,
-  }) async {
-    try {
-      return await _dio.postUri<T>(
-        uri,
-        data: data.toJson(),
-        options: Options(
-          headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
-          responseType: responseType,
-          contentType: 'application/x-www-form-urlencoded',
-          validateStatus: validateStatus,
-        ),
-      );
-    } on DioError catch (e) {
-      throw ServiceException(e.message);
-    }
+    return performDefaultPost(uri, data);
   }
 }

lib/repositories/cache_repository.dart

@@ -1,5 +1,7 @@
+import 'package:flutter/foundation.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hive/hive.dart';
+import 'package:http/http.dart';
 
 /// [CacheRepository] is for storing stories and comments for offline reading.
 /// It's using [Hive] as its database which is being stored in temp directory.
@@ -7,19 +9,23 @@ class CacheRepository {
   CacheRepository({
     Future<Box<List<int>>>? storyIdBox,
     Future<Box<Map<dynamic, dynamic>>>? storyBox,
+    Future<Box<String>>? webPageBox,
     Future<LazyBox<Map<dynamic, dynamic>>>? commentBox,
   })  : _storyIdBox = storyIdBox ?? Hive.openBox<List<int>>(_storyIdBoxName),
         _storyBox =
             storyBox ?? Hive.openBox<Map<dynamic, dynamic>>(_storyBoxName),
+        _webPageBox = webPageBox ?? Hive.openBox<String>(_webPageBoxName),
         _commentBox = commentBox ??
             Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName);
 
   static const String _storyIdBoxName = 'storyIdBox';
   static const String _storyBoxName = 'storyBox';
   static const String _commentBoxName = 'commentBox';
+  static const String _webPageBoxName = 'webPageBox';
   final Future<Box<List<int>>> _storyIdBox;
   final Future<Box<Map<dynamic, dynamic>>> _storyBox;
   final Future<LazyBox<Map<dynamic, dynamic>>> _commentBox;
+  final Future<Box<String>> _webPageBox;
 
   Future<bool> get hasCachedStories =>
       _storyBox.then((Box<Map<dynamic, dynamic>> box) => box.isNotEmpty);
@@ -37,6 +43,22 @@ class CacheRepository {
     return box.put(story.id.toString(), story.toJson());
   }
 
+  Future<void> cacheUrl({required String url}) async {
+    final Box<String> box = await _webPageBox;
+    final String html = await compute(downloadWebPage, url);
+    return box.put(url, html);
+  }
+
+  Future<String?> getHtml({required String url}) async {
+    final Box<String> box = await _webPageBox;
+    return box.get(url);
+  }
+
+  Future<bool> hasCachedWebPage({required String url}) async {
+    final Box<String> box = await _webPageBox;
+    return box.containsKey(url);
+  }
+
   Future<List<int>> getCachedStoryIds({required StoryType of}) async {
     final Box<List<int>> box = await _storyIdBox;
     final List<int>? ids = box.get(of.name);
@@ -119,9 +141,27 @@ class CacheRepository {
     return box.clear();
   }
 
+  Future<int> deleteAllWebPages() async {
+    final Box<String> box = await _webPageBox;
+    return box.clear();
+  }
+
   Future<int> deleteAll() async {
     return deleteAllStoryIds()
         .whenComplete(deleteAllStories)
-        .whenComplete(deleteAllComments);
+        .whenComplete(deleteAllComments)
+        .whenComplete(deleteAllWebPages);
+  }
+
+  static Future<String> downloadWebPage(String link) async {
+    try {
+      final Client client = Client();
+      final Uri url = Uri.parse(link);
+      final Response response = await client.get(url);
+      final String body = response.body;
+      return body;
+    } catch (_) {
+      return '''Web page not available.''';
+    }
   }
 }

lib/repositories/post_repository.dart

@@ -3,20 +3,20 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/post_data.dart';
-import 'package:hacki/repositories/repositories.dart';
+import 'package:hacki/repositories/postable_repository.dart';
+import 'package:hacki/repositories/preference_repository.dart';
 import 'package:hacki/utils/utils.dart';
 
-class PostRepository {
+class PostRepository extends PostableRepository {
   PostRepository({Dio? dio, PreferenceRepository? storageRepository})
-      : _dio = dio ?? Dio(),
-        _preferenceRepository =
-            storageRepository ?? locator.get<PreferenceRepository>();
+      : _preferenceRepository =
+            storageRepository ?? locator.get<PreferenceRepository>(),
+        super(dio: dio);
+
+  final PreferenceRepository _preferenceRepository;
 
   static const String _authority = 'news.ycombinator.com';
 
-  final Dio _dio;
-  final PreferenceRepository _preferenceRepository;
-
   Future<bool> comment({
     required int parentId,
     required String text,
@@ -36,7 +36,7 @@ class PostRepository {
       text: text,
     );
 
-    return _performDefaultPost(
+    return performDefaultPost(
       uri,
       data,
       validateLocation: (String? location) => location == '/',
@@ -79,7 +79,7 @@ class PostRepository {
       text: text,
     );
 
-    return _performDefaultPost(
+    return performDefaultPost(
       uri,
       data,
       cookie: cookie,
@@ -121,7 +121,7 @@ class PostRepository {
       text: text,
     );
 
-    return _performDefaultPost(
+    return performDefaultPost(
       uri,
       data,
       cookie: cookie,
@@ -144,58 +144,11 @@ class PostRepository {
       pw: password,
       id: id,
     );
-    return _performPost(
+    return performPost(
       uri,
       data,
       responseType: ResponseType.bytes,
       validateStatus: (int? status) => status == HttpStatus.ok,
     );
   }
-
-  Future<bool> _performDefaultPost(
-    Uri uri,
-    PostDataMixin data, {
-    String? cookie,
-    bool Function(String?)? validateLocation,
-  }) async {
-    try {
-      final Response<void> response = await _performPost<void>(
-        uri,
-        data,
-        cookie: cookie,
-        validateStatus: (int? status) => status == HttpStatus.found,
-      );
-
-      if (validateLocation != null) {
-        return validateLocation(response.headers.value('location'));
-      }
-
-      return true;
-    } on ServiceException {
-      return false;
-    }
-  }
-
-  Future<Response<T>> _performPost<T>(
-    Uri uri,
-    PostDataMixin data, {
-    String? cookie,
-    ResponseType? responseType,
-    bool Function(int?)? validateStatus,
-  }) async {
-    try {
-      return await _dio.postUri<T>(
-        uri,
-        data: data.toJson(),
-        options: Options(
-          headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
-          responseType: responseType,
-          contentType: 'application/x-www-form-urlencoded',
-          validateStatus: validateStatus,
-        ),
-      );
-    } on DioError catch (e) {
-      throw ServiceException(e.message);
-    }
-  }
 }

lib/repositories/postable_repository.dart

@@ -0,0 +1,63 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:hacki/models/models.dart';
+import 'package:hacki/utils/service_exception.dart';
+
+class PostableRepository {
+  PostableRepository({
+    Dio? dio,
+  }) : _dio = dio ?? Dio();
+
+  final Dio _dio;
+
+  @protected
+  Future<bool> performDefaultPost(
+    Uri uri,
+    PostDataMixin data, {
+    String? cookie,
+    bool Function(String?)? validateLocation,
+  }) async {
+    try {
+      final Response<void> response = await performPost<void>(
+        uri,
+        data,
+        cookie: cookie,
+        validateStatus: (int? status) => status == HttpStatus.found,
+      );
+
+      if (validateLocation != null) {
+        return validateLocation(response.headers.value('location'));
+      }
+
+      return true;
+    } on ServiceException {
+      return false;
+    }
+  }
+
+  @protected
+  Future<Response<T>> performPost<T>(
+    Uri uri,
+    PostDataMixin data, {
+    String? cookie,
+    ResponseType? responseType,
+    bool Function(int?)? validateStatus,
+  }) async {
+    try {
+      return await _dio.postUri<T>(
+        uri,
+        data: data.toJson(),
+        options: Options(
+          headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
+          responseType: responseType,
+          contentType: 'application/x-www-form-urlencoded',
+          validateStatus: validateStatus,
+        ),
+      );
+    } on DioError catch (e) {
+      throw ServiceException(e.message);
+    }
+  }
+}

lib/repositories/preference_repository.dart

@@ -21,6 +21,7 @@ class PreferenceRepository {
   static const String _unreadCommentsIdsKey = 'unreadCommentsIds';
   static const String _lastReadStoryIdKey = 'lastReadStoryId';
   static const String _isFirstLaunchKey = 'isFirstLaunch';
+  static const String _metadataModeKey = 'metadataMode';
 
   static const String _notificationModeKey = 'notificationMode';
   static const String _readerModeKey = 'readerMode';
@@ -46,6 +47,7 @@ class PreferenceRepository {
   static const bool _readerModeDefaultValue = true;
   static const bool _markReadStoriesModeDefaultValue = true;
   static const bool _isFirstLaunchKeyDefaultValue = true;
+  static const bool _metadataModeDefaultValue = true;
 
   final SyncedSharedPreferences _syncedPrefs;
   final Future<SharedPreferences> _prefs;
@@ -67,29 +69,6 @@ class PreferenceRepository {
     return val;
   }
 
-  Future<List<String>> get blocklist async => _prefs.then(
-        (SharedPreferences prefs) =>
-            prefs.getStringList(_blocklistKey) ?? <String>[],
-      );
-
-  Future<List<int>> get pinnedStoriesIds async {
-    if (Platform.isIOS) {
-      final List<String>? favList = await _syncedPrefs.getStringList(
-        key: _pinnedStoriesIdsKey,
-      );
-      return favList?.map(int.parse).toList() ?? <int>[];
-    } else {
-      return _prefs.then(
-        (SharedPreferences prefs) =>
-            prefs
-                .getStringList(_pinnedStoriesIdsKey)
-                ?.map(int.parse)
-                .toList() ??
-            <int>[],
-      );
-    }
-  }
-
   Future<bool> get shouldShowNotification async => _prefs.then(
         (SharedPreferences prefs) =>
             prefs.getBool(_notificationModeKey) ??
@@ -111,6 +90,11 @@ class PreferenceRepository {
             prefs.getBool(_eyeCandyModeKey) ?? _eyeCandyModeDefaultValue,
       );
 
+  Future<bool> get shouldShowMetadata async => _prefs.then(
+        (SharedPreferences prefs) =>
+            prefs.getBool(_metadataModeKey) ?? _metadataModeDefaultValue,
+      );
+
   Future<bool> get trueDarkMode async => _prefs.then(
         (SharedPreferences prefs) =>
             prefs.getBool(trueDarkModeKey) ?? _trueDarkModeDefaultValue,
@@ -127,24 +111,6 @@ class PreferenceRepository {
             _markReadStoriesModeDefaultValue,
       );
 
-  Future<List<int>> get unreadCommentsIds async => _prefs.then(
-        (SharedPreferences prefs) =>
-            prefs
-                .getStringList(_unreadCommentsIdsKey)
-                ?.map(int.parse)
-                .toList() ??
-            <int>[],
-      );
-
-  Future<int?> get lastReadStoryId async =>
-      _prefs.then((SharedPreferences prefs) {
-        final String? val = prefs.getString(_lastReadStoryIdKey);
-
-        if (val == null) return null;
-
-        return int.tryParse(val);
-      });
-
   Future<bool> hasPushed(int commentId) async =>
       _prefs.then((SharedPreferences prefs) {
         final bool? val = prefs.getBool(_getPushNotificationKey(commentId));
@@ -170,53 +136,6 @@ class PreferenceRepository {
     }
   }
 
-  Future<List<int>> favList({required String of}) async {
-    final SharedPreferences prefs = await _prefs;
-    if (Platform.isIOS) {
-      final List<String> previousList =
-          ((prefs.getStringList(_getFavKey('')) ?? <String>[])
-                ..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
-              .toList();
-
-      /// Since v0.2.5, fav list will be stored in [NSUbiquitousKeyValueStore]
-      /// instead of [UserDefaults] on iOS.
-      if (previousList.isNotEmpty) {
-        for (final String fav in previousList) {
-          await addFav(username: of, id: int.parse(fav));
-        }
-
-        await prefs.remove(_getFavKey(''));
-        await prefs.remove(_getFavKey(of));
-      }
-
-      final List<String>? initialList =
-          await _syncedPrefs.getStringList(key: _getFavKey(''));
-      final List<String>? userList =
-          await _syncedPrefs.getStringList(key: _getFavKey(of));
-
-      return <String>{
-        ...?initialList,
-        ...?userList,
-      }.map(int.parse).toList();
-    } else {
-      final List<int> favList =
-          ((prefs.getStringList(_getFavKey('')) ?? <String>[])
-                ..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
-              .map(int.parse)
-              .toSet()
-              .toList();
-
-      return favList;
-    }
-  }
-
-  Future<bool?> vote({required int submittedTo, required String from}) async {
-    final SharedPreferences prefs = await _prefs;
-    final String key = _getVoteKey(from, submittedTo);
-    final bool? vote = prefs.getBool(key);
-    return vote;
-  }
-
   Future<void> setAuth({
     required String username,
     required String password,
@@ -279,6 +198,55 @@ class PreferenceRepository {
     await prefs.setBool(_markReadStoriesModeKey, !currentMode);
   }
 
+  Future<void> toggleMetadataMode() async {
+    final SharedPreferences prefs = await _prefs;
+    final bool currentMode =
+        prefs.getBool(_metadataModeKey) ?? _metadataModeDefaultValue;
+    await prefs.setBool(_metadataModeKey, !currentMode);
+  }
+
+  //#region fav
+
+  Future<List<int>> favList({required String of}) async {
+    final SharedPreferences prefs = await _prefs;
+    if (Platform.isIOS) {
+      final List<String> previousList =
+          ((prefs.getStringList(_getFavKey('')) ?? <String>[])
+                ..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
+              .toList();
+
+      /// Since v0.2.5, fav list will be stored in [NSUbiquitousKeyValueStore]
+      /// instead of [UserDefaults] on iOS.
+      if (previousList.isNotEmpty) {
+        for (final String fav in previousList) {
+          await addFav(username: of, id: int.parse(fav));
+        }
+
+        await prefs.remove(_getFavKey(''));
+        await prefs.remove(_getFavKey(of));
+      }
+
+      final List<String>? initialList =
+          await _syncedPrefs.getStringList(key: _getFavKey(''));
+      final List<String>? userList =
+          await _syncedPrefs.getStringList(key: _getFavKey(of));
+
+      return <String>{
+        ...?initialList,
+        ...?userList,
+      }.map(int.parse).toList();
+    } else {
+      final List<int> favList =
+          ((prefs.getStringList(_getFavKey('')) ?? <String>[])
+                ..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
+              .map(int.parse)
+              .toSet()
+              .toList();
+
+      return favList;
+    }
+  }
+
   Future<void> addFav({required String username, required int id}) async {
     final String key = _getFavKey(username);
 
@@ -331,6 +299,19 @@ class PreferenceRepository {
     }
   }
 
+  static String _getFavKey(String username) => 'fav_$username';
+
+  //#endregion
+
+  //#region vote
+
+  Future<bool?> vote({required int submittedTo, required String from}) async {
+    final SharedPreferences prefs = await _prefs;
+    final String key = _getVoteKey(from, submittedTo);
+    final bool? vote = prefs.getBool(key);
+    return vote;
+  }
+
   Future<void> addVote({
     required String username,
     required int id,
@@ -350,11 +331,44 @@ class PreferenceRepository {
     await prefs.remove(key);
   }
 
+  String _getVoteKey(String username, int id) => 'vote_$username-$id';
+
+  //#endregion
+
+  //#region blocklist
+
+  Future<List<String>> get blocklist async => _prefs.then(
+        (SharedPreferences prefs) =>
+            prefs.getStringList(_blocklistKey) ?? <String>[],
+      );
+
   Future<void> updateBlocklist(List<String> usernames) async {
     final SharedPreferences prefs = await _prefs;
     await prefs.setStringList(_blocklistKey, usernames);
   }
 
+  //#endregion
+
+  //#region pins
+
+  Future<List<int>> get pinnedStoriesIds async {
+    if (Platform.isIOS) {
+      final List<String>? favList = await _syncedPrefs.getStringList(
+        key: _pinnedStoriesIdsKey,
+      );
+      return favList?.map(int.parse).toList() ?? <int>[];
+    } else {
+      return _prefs.then(
+        (SharedPreferences prefs) =>
+            prefs
+                .getStringList(_pinnedStoriesIdsKey)
+                ?.map(int.parse)
+                .toList() ??
+            <int>[],
+      );
+    }
+  }
+
   Future<void> updatePinnedStoriesIds(List<int> ids) async {
     if (Platform.isIOS) {
       await _syncedPrefs.setStringList(
@@ -370,6 +384,19 @@ class PreferenceRepository {
     }
   }
 
+  //#endregion
+
+  //#region unread comment ids
+
+  Future<List<int>> get unreadCommentsIds async => _prefs.then(
+        (SharedPreferences prefs) =>
+            prefs
+                .getStringList(_unreadCommentsIdsKey)
+                ?.map(int.parse)
+                .toList() ??
+            <int>[],
+      );
+
   Future<void> updateUnreadCommentsIds(List<int> ids) async {
     final SharedPreferences prefs = await _prefs;
     await prefs.setStringList(
@@ -378,6 +405,19 @@ class PreferenceRepository {
     );
   }
 
+  //#endregion
+
+  //#region reminder
+
+  Future<int?> get lastReadStoryId async =>
+      _prefs.then((SharedPreferences prefs) {
+        final String? val = prefs.getString(_lastReadStoryIdKey);
+
+        if (val == null) return null;
+
+        return int.tryParse(val);
+      });
+
   Future<void> updateLastReadStoryId(int? id) async {
     final SharedPreferences prefs = await _prefs;
     await prefs.setString(
@@ -386,6 +426,8 @@ class PreferenceRepository {
     );
   }
 
+  //#endregion
+
   Future<void> updateHasPushed(int commentId) async {
     final SharedPreferences prefs = await _prefs;
     await prefs.setBool(
@@ -422,11 +464,7 @@ class PreferenceRepository {
     }
   }
 
-  String _getPushNotificationKey(int commentId) => 'pushed_$commentId';
+  static String _getPushNotificationKey(int commentId) => 'pushed_$commentId';
 
-  String _getFavKey(String username) => 'fav_$username';
-
-  String _getVoteKey(String username, int id) => 'vote_$username-$id';
-
-  String _getHasReadKey(int storyId) => 'hasRead_$storyId';
+  static String _getHasReadKey(int storyId) => 'hasRead_$storyId';
 }

lib/repositories/search_repository.dart

@@ -6,12 +6,14 @@ import 'package:hacki/utils/utils.dart';
 class SearchRepository {
   SearchRepository({Dio? dio}) : _dio = dio ?? Dio();
 
-  static const String _baseUrl = 'http://hn.algolia.com/api/v1/search?query=';
+  static const String _baseUrl = 'http://hn.algolia.com/api/v1/';
 
   final Dio _dio;
 
-  Stream<Story> search(String query, {int page = 0}) async* {
-    final String url = '$_baseUrl${Uri.encodeComponent(query)}&page=$page';
+  Stream<Story> search({
+    required SearchFilters filters,
+  }) async* {
+    final String url = '$_baseUrl${filters.filteredQuery}';
     final Response<Map<String, dynamic>> response =
         await _dio.get<Map<String, dynamic>>(url);
     final Map<String, dynamic>? data = response.data;
@@ -28,6 +30,8 @@ class SearchRepository {
       final String by = hit['author'] as String? ?? '';
       final String title = hit['title'] as String? ?? '';
       final int createdAt = hit['created_at_i'] as int? ?? 0;
+      final int score = hit['points'] as int? ?? 0;
+      final int descendants = hit['num_comments'] as int? ?? 0;
 
       // Getting rid of comments, only keeping stories for convenience.
       // Don't judge me.
@@ -46,9 +50,9 @@ class SearchRepository {
       final int id = int.parse(hit['objectID'] as String? ?? '0');
 
       final Story story = Story(
-        descendants: 0,
+        descendants: descendants,
         id: id,
-        score: 0,
+        score: score,
         time: createdAt,
         by: by,
         title: title,

lib/repositories/stories_repository.dart

@@ -25,22 +25,9 @@ class StoriesRepository {
   }
 
   Future<List<int>> fetchStoryIds({required StoryType of}) async {
-    final String suffix = () {
-      switch (of) {
-        case StoryType.top:
-          return 'topstories.json';
-        case StoryType.latest:
-          return 'newstories.json';
-        case StoryType.ask:
-          return 'askstories.json';
-        case StoryType.show:
-          return 'showstories.json';
-        case StoryType.jobs:
-          return 'jobstories.json';
-      }
-    }();
-    final List<int> ids =
-        await _firebaseClient.get('$_baseUrl$suffix').then((dynamic val) {
+    final List<int> ids = await _firebaseClient
+        .get('$_baseUrl${of.path}.json')
+        .then((dynamic val) {
       final List<int> ids = (val as List<dynamic>).cast<int>();
       return ids;
     });
@@ -183,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') {
@@ -205,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

@@ -2,6 +2,7 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:badges/badges.dart';
 import 'package:feature_discovery/feature_discovery.dart';
@@ -10,6 +11,7 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
+import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
@@ -52,6 +54,7 @@ class _HomeScreenState extends State<HomeScreen>
   late final TabController tabController;
   late final StreamSubscription<String> intentDataStreamSubscription;
   late final StreamSubscription<String?> notificationStreamSubscription;
+  late final StreamSubscription<String?> siriSuggestionStreamSubscription;
 
   int currentIndex = 0;
 
@@ -59,11 +62,14 @@ class _HomeScreenState extends State<HomeScreen>
 
   @override
   void didPopNext() {
+    super.didPopNext();
     if (context.read<StoriesBloc>().deviceScreenType ==
         DeviceScreenType.mobile) {
-      cacheService.resetCollapsedComments();
+      Future<void>.delayed(
+        const Duration(milliseconds: 500),
+        cacheService.resetCollapsedComments,
+      );
     }
-    super.didPopNext();
   }
 
   @override
@@ -88,6 +94,11 @@ class _HomeScreenState extends State<HomeScreen>
           selectNotificationSubject.stream.listen(onNotificationTapped);
     }
 
+    if (!siriSuggestionSubject.hasListener) {
+      siriSuggestionStreamSubscription =
+          siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
+    }
+
     SchedulerBinding.instance
       ..addPostFrameCallback((_) {
         FeatureDiscovery.discoverFeatures(
@@ -132,6 +143,7 @@ class _HomeScreenState extends State<HomeScreen>
     tabController.dispose();
     intentDataStreamSubscription.cancel();
     notificationStreamSubscription.cancel();
+    siriSuggestionStreamSubscription.cancel();
     super.dispose();
   }
 
@@ -140,7 +152,8 @@ class _HomeScreenState extends State<HomeScreen>
     final BlocBuilder<PreferenceCubit, PreferenceState> homeScreen =
         BlocBuilder<PreferenceCubit, PreferenceState>(
       buildWhen: (PreferenceState previous, PreferenceState current) =>
-          previous.showComplexStoryTile != current.showComplexStoryTile,
+          previous.showComplexStoryTile != current.showComplexStoryTile ||
+          previous.showMetadata != current.showMetadata,
       builder: (BuildContext context, PreferenceState preferenceState) {
         final BlocBuilder<PinCubit, PinState> pinnedStories =
             BlocBuilder<PinCubit, PinState>(
@@ -170,10 +183,11 @@ class _HomeScreenState extends State<HomeScreen>
                       child: Container(
                         color: Colors.orangeAccent.withOpacity(0.2),
                         child: StoryTile(
-                          key: ObjectKey(story),
+                          key: ValueKey<String>('${story.id}-PinnedStoryTile'),
                           story: story,
-                          onTap: () => onStoryTapped(story),
+                          onTap: () => onStoryTapped(story, isPin: true),
                           showWebPreview: preferenceState.showComplexStoryTile,
+                          showMetadata: preferenceState.showMetadata,
                         ),
                       ),
                     ),
@@ -220,61 +234,21 @@ class _HomeScreenState extends State<HomeScreen>
                         HapticFeedback.selectionClick();
                       },
                       tabs: <Widget>[
-                        Tab(
-                          child: Text(
-                            'TOP',
-                            style: TextStyle(
-                              fontSize: currentIndex == 0 ? 14 : 10,
-                              color: currentIndex == 0
-                                  ? Colors.orange
-                                  : Colors.grey,
+                        for (int i = 0; i < StoriesBloc.types.length; i++)
+                          Tab(
+                            key: ValueKey<StoryType>(
+                              StoriesBloc.types.elementAt(i),
+                            ),
+                            child: Text(
+                              StoriesBloc.types.elementAt(i).label,
+                              style: TextStyle(
+                                fontSize: currentIndex == i ? 14 : 10,
+                                color: currentIndex == i
+                                    ? Colors.orange
+                                    : Colors.grey,
+                              ),
                             ),
                           ),
-                        ),
-                        Tab(
-                          child: Text(
-                            'NEW',
-                            style: TextStyle(
-                              fontSize: currentIndex == 1 ? 14 : 10,
-                              color: currentIndex == 1
-                                  ? Colors.orange
-                                  : Colors.grey,
-                            ),
-                          ),
-                        ),
-                        Tab(
-                          child: Text(
-                            'ASK',
-                            style: TextStyle(
-                              fontSize: currentIndex == 2 ? 14 : 10,
-                              color: currentIndex == 2
-                                  ? Colors.orange
-                                  : Colors.grey,
-                            ),
-                          ),
-                        ),
-                        Tab(
-                          child: Text(
-                            'SHOW',
-                            style: TextStyle(
-                              fontSize: currentIndex == 3 ? 14 : 10,
-                              color: currentIndex == 3
-                                  ? Colors.orange
-                                  : Colors.grey,
-                            ),
-                          ),
-                        ),
-                        Tab(
-                          child: Text(
-                            'JOBS',
-                            style: TextStyle(
-                              fontSize: currentIndex == 4 ? 14 : 10,
-                              color: currentIndex == 4
-                                  ? Colors.orange
-                                  : Colors.grey,
-                            ),
-                          ),
-                        ),
                         Tab(
                           child: DescribedFeatureOverlay(
                             onBackgroundTap: onFeatureDiscoveryDismissed,
@@ -347,36 +321,13 @@ class _HomeScreenState extends State<HomeScreen>
               physics: const NeverScrollableScrollPhysics(),
               controller: tabController,
               children: <Widget>[
-                StoriesListView(
-                  key: const ValueKey<StoryType>(StoryType.top),
-                  storyType: StoryType.top,
-                  header: pinnedStories,
-                  onStoryTapped: onStoryTapped,
-                ),
-                StoriesListView(
-                  key: const ValueKey<StoryType>(StoryType.latest),
-                  storyType: StoryType.latest,
-                  header: pinnedStories,
-                  onStoryTapped: onStoryTapped,
-                ),
-                StoriesListView(
-                  key: const ValueKey<StoryType>(StoryType.ask),
-                  storyType: StoryType.ask,
-                  header: pinnedStories,
-                  onStoryTapped: onStoryTapped,
-                ),
-                StoriesListView(
-                  key: const ValueKey<StoryType>(StoryType.show),
-                  storyType: StoryType.show,
-                  header: pinnedStories,
-                  onStoryTapped: onStoryTapped,
-                ),
-                StoriesListView(
-                  key: const ValueKey<StoryType>(StoryType.jobs),
-                  storyType: StoryType.jobs,
-                  header: pinnedStories,
-                  onStoryTapped: onStoryTapped,
-                ),
+                for (final StoryType type in StoriesBloc.types)
+                  StoriesListView(
+                    key: ValueKey<StoryType>(type),
+                    storyType: type,
+                    header: pinnedStories,
+                    onStoryTapped: onStoryTapped,
+                  ),
                 const ProfileScreen(),
               ],
             ),
@@ -388,11 +339,11 @@ class _HomeScreenState extends State<HomeScreen>
     return ScreenTypeLayout.builder(
       mobile: (BuildContext context) {
         context.read<SplitViewCubit>().disableSplitView();
-        return _MobileHomeScreenBuilder(
+        return _MobileHomeScreen(
           homeScreen: homeScreen,
         );
       },
-      tablet: (BuildContext context) => _TabletHomeScreenBuilder(
+      tablet: (BuildContext context) => _TabletHomeScreen(
         homeScreen: homeScreen,
       ),
     );
@@ -408,13 +359,13 @@ class _HomeScreenState extends State<HomeScreen>
     return Future<bool>.value(false);
   }
 
-  void onStoryTapped(Story story) {
+  void onStoryTapped(Story story, {bool isPin = false}) {
     final bool showWebFirst =
         context.read<PreferenceCubit>().state.showWebFirst;
     final bool useReader = context.read<PreferenceCubit>().state.useReader;
     final bool offlineReading =
         context.read<StoriesBloc>().state.offlineReading;
-    final bool hasRead = context.read<StoriesBloc>().hasRead(story);
+    final bool hasRead = isPin || context.read<StoriesBloc>().hasRead(story);
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
 
     // If a story is a job story and it has a link to the job posting,
@@ -424,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(() {
@@ -442,8 +393,12 @@ class _HomeScreenState extends State<HomeScreen>
       }
     }
 
-    if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
-      LinkUtil.launchUrl(story.url, useReader: useReader);
+    if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
+      LinkUtil.launch(
+        story.url,
+        useReader: useReader,
+        offlineReading: offlineReading,
+      );
     }
 
     context.read<StoriesBloc>().add(
@@ -451,6 +406,18 @@ class _HomeScreenState extends State<HomeScreen>
             story: story,
           ),
         );
+
+    if (Platform.isIOS) {
+      FlutterSiriSuggestions.instance.registerActivity(
+        FlutterSiriActivity(
+          story.title,
+          story.id.toString(),
+          suggestedInvocationPhrase: '',
+          contentDescription: story.text,
+          persistentIdentifier: story.id.toString(),
+        ),
+      );
+    }
   }
 
   void showOnboarding() {
@@ -469,19 +436,34 @@ class _HomeScreenState extends State<HomeScreen>
     final int? id = event.getItemId();
 
     if (id != null) {
-      locator
-          .get<StoriesRepository>()
-          .fetchParentStory(id: id)
-          .then((Story? story) {
+      locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
         if (mounted) {
-          if (story != null) {
-            goToStoryScreen(args: StoryScreenArgs(story: story));
+          if (item != null) {
+            goToItemScreen(args: ItemScreenArgs(item: item));
           }
         }
       });
     }
   }
 
+  Future<void> onSiriSuggestionTapped(String? id) async {
+    if (id == null) return;
+    final int? storyId = int.tryParse(id);
+    if (storyId == null) return;
+
+    await locator
+        .get<StoriesRepository>()
+        .fetchStoryBy(storyId)
+        .then((Story? story) {
+      if (story == null) {
+        showSnackBar(content: 'Something went wrong...');
+        return;
+      }
+      final ItemScreenArgs args = ItemScreenArgs(item: story);
+      goToItemScreen(args: args);
+    });
+  }
+
   Future<void> onNotificationTapped(String? payload) async {
     if (payload == null) return;
 
@@ -502,15 +484,15 @@ class _HomeScreenState extends State<HomeScreen>
           showSnackBar(content: 'Something went wrong...');
           return;
         }
-        final StoryScreenArgs args = StoryScreenArgs(story: story);
-        goToStoryScreen(args: args);
+        final ItemScreenArgs args = ItemScreenArgs(item: story);
+        goToItemScreen(args: args);
       });
     }
   }
 }
 
-class _MobileHomeScreenBuilder extends StatelessWidget {
-  const _MobileHomeScreenBuilder({
+class _MobileHomeScreen extends StatelessWidget {
+  const _MobileHomeScreen({
     Key? key,
     required this.homeScreen,
   }) : super(key: key);
@@ -535,8 +517,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
   }
 }
 
-class _TabletHomeScreenBuilder extends StatelessWidget {
-  const _TabletHomeScreenBuilder({
+class _TabletHomeScreen extends StatelessWidget {
+  const _TabletHomeScreen({
     Key? key,
     required this.homeScreen,
   }) : super(key: key);
@@ -554,30 +536,40 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
           homeScreenWidth = 345.0;
         }
 
-        return Stack(
-          children: <Widget>[
-            Positioned(
-              left: 0,
-              top: 0,
-              bottom: 0,
-              width: homeScreenWidth,
-              child: homeScreen,
-            ),
-            Positioned(
-              left: 24,
-              bottom: 36,
-              height: 40,
-              width: homeScreenWidth - 24,
-              child: const CountdownReminder(),
-            ),
-            Positioned(
-              right: 0,
-              top: 0,
-              bottom: 0,
-              left: homeScreenWidth,
-              child: const _TabletStoryView(),
-            ),
-          ],
+        return BlocBuilder<SplitViewCubit, SplitViewState>(
+          buildWhen: (SplitViewState previous, SplitViewState current) =>
+              previous.expanded != current.expanded,
+          builder: (BuildContext context, SplitViewState state) {
+            return Stack(
+              children: <Widget>[
+                AnimatedPositioned(
+                  left: 0,
+                  top: 0,
+                  bottom: 0,
+                  width: state.expanded ? 0 : homeScreenWidth,
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.elasticOut,
+                  child: homeScreen,
+                ),
+                Positioned(
+                  left: 24,
+                  bottom: 36,
+                  height: 40,
+                  width: homeScreenWidth - 24,
+                  child: const CountdownReminder(),
+                ),
+                AnimatedPositioned(
+                  right: 0,
+                  top: 0,
+                  bottom: 0,
+                  left: state.expanded ? 0 : homeScreenWidth,
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.elasticOut,
+                  child: const _TabletStoryView(),
+                ),
+              ],
+            );
+          },
         );
       },
     );
@@ -591,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) {
-          return StoryScreen.build(state.storyScreenArgs!);
+        if (state.itemScreenArgs != null) {
+          return ItemScreen.build(context, state.itemScreenArgs!);
         }
 
         return Material(

lib/screens/item/item_screen.dart

@@ -16,114 +16,124 @@ 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';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:responsive_builder/responsive_builder.dart';
+import 'package:share_plus/share_plus.dart';
 
 enum _MenuAction {
   upvote,
   downvote,
+  share,
   block,
   flag,
   cancel,
 }
 
-class StoryScreenArgs extends Equatable {
-  const StoryScreenArgs({
-    required this.story,
+class ItemScreenArgs extends Equatable {
+  const ItemScreenArgs({
+    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 {
-  const StoryScreen({
+class ItemScreen extends StatefulWidget {
+  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) {
-    return MaterialPageRoute<StoryScreen>(
+  static Route<dynamic> route(ItemScreenArgs args) {
+    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<PollCubit>(
-              create: (BuildContext context) =>
-                  PollCubit(story: args.story)..init(),
-            ),
+          BlocProvider<EditCubit>(
+            lazy: false,
+            create: (BuildContext context) => EditCubit(),
+          ),
         ],
-        child: StoryScreen(
-          story: args.story,
+        child: ItemScreen(
+          item: args.item,
           parentComments: args.targetComments ?? <Comment>[],
         ),
       ),
     );
   }
 
-  static Widget build(StoryScreenArgs args) {
-    return MultiBlocProvider(
-      key: ValueKey<StoryScreenArgs>(args),
-      providers: <BlocProvider<dynamic>>[
-        BlocProvider<CommentsCubit>(
-          create: (BuildContext context) => CommentsCubit(
-            offlineReading: context.read<StoriesBloc>().state.offlineReading,
-            story: args.story,
-          )..init(
-              onlyShowTargetComment: args.onlyShowTargetComment,
-              targetParents: args.targetComments,
-            ),
-        ),
-        if (args.story.isPoll)
-          BlocProvider<PollCubit>(
-            create: (BuildContext context) =>
-                PollCubit(story: args.story)..init(),
+  static Widget build(BuildContext context, ItemScreenArgs args) {
+    return WillPopScope(
+      onWillPop: () async {
+        if (context.read<SplitViewCubit>().state.expanded) {
+          context.read<SplitViewCubit>().zoom();
+          return false;
+        } else {
+          return true;
+        }
+      },
+      child: MultiBlocProvider(
+        key: ValueKey<ItemScreenArgs>(args),
+        providers: <BlocProvider<dynamic>>[
+          BlocProvider<CommentsCubit>(
+            create: (BuildContext context) => CommentsCubit(
+              offlineReading: context.read<StoriesBloc>().state.offlineReading,
+              item: args.item,
+            )..init(
+                onlyShowTargetComment: args.onlyShowTargetComment,
+                targetParents: args.targetComments,
+              ),
           ),
-      ],
-      child: StoryScreen(
-        story: args.story,
-        parentComments: args.targetComments ?? <Comment>[],
-        splitViewEnabled: true,
+          BlocProvider<EditCubit>(
+            lazy: false,
+            create: (BuildContext context) => EditCubit(),
+          ),
+        ],
+        child: ItemScreen(
+          item: args.item,
+          parentComments: args.targetComments ?? <Comment>[],
+          splitViewEnabled: true,
+        ),
       ),
     );
   }
 
   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();
@@ -175,6 +185,7 @@ class _StoryScreenState extends State<StoryScreen> {
     scrollController.dispose();
     storyLinkTapThrottle.dispose();
     featureDiscoveryDismissThrottle.dispose();
+    focusNode.dispose();
     super.dispose();
   }
 
@@ -259,13 +270,18 @@ class _StoryScreenState extends State<StoryScreen> {
                 controller: refreshController,
                 onRefresh: () {
                   HapticFeedback.lightImpact();
-                  locator.get<CacheService>().resetComments();
-                  context.read<CommentsCubit>().refresh();
-                  context.read<PollCubit>().refresh();
-                },
-                onLoading: () {
-                  context.read<CommentsCubit>().loadMore();
+
+                  if (context.read<StoriesBloc>().state.offlineReading) {
+                    refreshController.refreshCompleted();
+                  } else {
+                    context.read<CommentsCubit>().refresh();
+
+                    if (widget.item.isPoll) {
+                      context.read<PollCubit>().refresh();
+                    }
+                  }
                 },
+                onLoading: context.read<CommentsCubit>().loadMore,
                 child: ListView(
                   primary: false,
                   children: <Widget>[
@@ -285,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,
@@ -299,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,
@@ -316,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,
                                   ),
@@ -331,40 +347,49 @@ class _StoryScreenState extends State<StoryScreen> {
                               ],
                             ),
                           ),
-                          InkWell(
-                            onTap: () => LinkUtil.launchUrl(
-                              widget.story.url,
-                              useReader: context
-                                  .read<PreferenceCubit>()
-                                  .state
-                                  .useReader,
-                            ),
-                            child: Padding(
-                              padding: const EdgeInsets.only(
-                                left: 6,
-                                right: 6,
-                                bottom: 12,
-                                top: 12,
+                          if (state.item is Story)
+                            InkWell(
+                              onTap: () => LinkUtil.launch(
+                                state.item.url,
+                                useReader: context
+                                    .read<PreferenceCubit>()
+                                    .state
+                                    .useReader,
+                                offlineReading: context
+                                    .read<StoriesBloc>()
+                                    .state
+                                    .offlineReading,
                               ),
-                              child: Text(
-                                widget.story.title,
-                                textAlign: TextAlign.center,
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                  color: widget.story.url.isNotEmpty
-                                      ? Colors.orange
-                                      : null,
+                              child: Padding(
+                                padding: const EdgeInsets.only(
+                                  left: 6,
+                                  right: 6,
+                                  bottom: 12,
+                                  top: 12,
+                                ),
+                                child: Text(
+                                  state.item.title,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    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 *
@@ -382,19 +407,23 @@ class _StoryScreenState extends State<StoryScreen> {
                                   )) {
                                     onStoryLinkTapped(link.url);
                                   } else {
-                                    LinkUtil.launchUrl(link.url);
+                                    LinkUtil.launch(link.url);
                                   }
                                 },
                               ),
                             ),
-                          if (widget.story.isPoll)
-                            PollView(
-                              onLoginTapped: onLoginTapped,
+                          if (state.item.isPoll)
+                            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,
                       ),
@@ -402,10 +431,87 @@ class _StoryScreenState extends State<StoryScreen> {
                       height: 0,
                     ),
                     if (state.onlyShowTargetComment) ...<Widget>[
-                      TextButton(
-                        onPressed: () =>
-                            context.read<CommentsCubit>().loadAll(widget.story),
-                        child: const Text('View all comments'),
+                      Center(
+                        child: TextButton(
+                          onPressed: () => context
+                              .read<CommentsCubit>()
+                              .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,
@@ -423,14 +529,15 @@ class _StoryScreenState extends State<StoryScreen> {
                         ),
                       ),
                     ],
-                    for (final Comment e in state.comments)
+                    for (final Comment comment in state.comments)
                       FadeIn(
+                        key: ValueKey<String>('${comment.id}-FadeIn'),
                         child: CommentTile(
-                          comment: e,
-                          level: e.level,
+                          comment: comment,
+                          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) {
@@ -454,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 &&
@@ -467,7 +574,7 @@ class _StoryScreenState extends State<StoryScreen> {
                         child: Center(
                           child: Text(happyFace),
                         ),
-                      ),
+                      )
                   ],
                 ),
               );
@@ -501,19 +608,36 @@ class _StoryScreenState extends State<StoryScreen> {
                             Positioned.fill(
                               child: mainView,
                             ),
-                            Positioned(
-                              top: 0,
-                              left: 0,
-                              right: 0,
-                              child: CustomAppBar(
-                                backgroundColor: Theme.of(context)
-                                    .canvasColor
-                                    .withOpacity(0.6),
-                                story: widget.story,
-                                scrollController: scrollController,
-                                onBackgroundTap: onFeatureDiscoveryDismissed,
-                                onDismiss: onFeatureDiscoveryDismissed,
-                              ),
+                            BlocBuilder<SplitViewCubit, SplitViewState>(
+                              buildWhen: (
+                                SplitViewState previous,
+                                SplitViewState current,
+                              ) =>
+                                  previous.expanded != current.expanded,
+                              builder: (
+                                BuildContext context,
+                                SplitViewState state,
+                              ) {
+                                return Positioned(
+                                  top: 0,
+                                  left: 0,
+                                  right: 0,
+                                  child: CustomAppBar(
+                                    backgroundColor: Theme.of(context)
+                                        .canvasColor
+                                        .withOpacity(0.6),
+                                    item: widget.item,
+                                    scrollController: scrollController,
+                                    onBackgroundTap:
+                                        onFeatureDiscoveryDismissed,
+                                    onDismiss: onFeatureDiscoveryDismissed,
+                                    splitViewEnabled: state.enabled,
+                                    expanded: state.expanded,
+                                    onZoomTap:
+                                        context.read<SplitViewCubit>().zoom,
+                                  ),
+                                );
+                              },
                             ),
                             Positioned(
                               bottom: 0,
@@ -542,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,
@@ -577,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) {
@@ -592,6 +757,7 @@ class _StoryScreenState extends State<StoryScreen> {
             builder: (BuildContext context, TimeMachineState state) {
               return Center(
                 child: Material(
+                  color: Theme.of(context).canvasColor,
                   borderRadius: const BorderRadius.all(Radius.circular(4)),
                   child: SizedBox(
                     height: size.height * 0.8,
@@ -656,26 +822,23 @@ class _StoryScreenState extends State<StoryScreen> {
     final int? id = link.getItemId();
     if (id != null) {
       storyLinkTapThrottle.run(() {
-        locator
-            .get<StoriesRepository>()
-            .fetchParentStory(id: id)
-            .then((Story? story) {
+        locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
           if (mounted) {
-            if (story != null) {
+            if (item != null) {
               HackiApp.navigatorKey.currentState!.pushNamed(
-                StoryScreen.routeName,
-                arguments: StoryScreenArgs(story: story),
+                ItemScreen.routeName,
+                arguments: ItemScreenArgs(item: item),
               );
             }
           }
         });
       });
     } else {
-      LinkUtil.launchUrl(link);
+      LinkUtil.launch(link);
     }
   }
 
-  void onMorePressed(Item item) {
+  void onMoreTapped(Item item) {
     HapticFeedback.lightImpact();
 
     if (item.dead || item.deleted) {
@@ -727,12 +890,77 @@ class _StoryScreenState extends State<StoryScreen> {
               final bool upvoted = voteState.vote == Vote.up;
               final bool downvoted = voteState.vote == Vote.down;
               return Container(
-                height: 300,
+                height: item is Comment ? 430 : 450,
                 color: Theme.of(context).canvasColor,
                 child: Material(
                   color: Colors.transparent,
                   child: Column(
                     children: <Widget>[
+                      BlocProvider<UserCubit>(
+                        create: (BuildContext context) =>
+                            UserCubit()..init(userId: item.by),
+                        child: BlocBuilder<UserCubit, UserState>(
+                          builder: (BuildContext context, UserState state) {
+                            return ListTile(
+                              leading: const Icon(
+                                Icons.account_circle,
+                              ),
+                              title: Text(item.by),
+                              subtitle: Text(
+                                state.user.description,
+                              ),
+                              onTap: () {
+                                showDialog<void>(
+                                  context: context,
+                                  builder: (BuildContext context) =>
+                                      AlertDialog(
+                                    title: Text('About ${state.user.id}'),
+                                    content: state.user.about.isEmpty
+                                        ? Row(
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.center,
+                                            children: const <Widget>[
+                                              Text(
+                                                'empty',
+                                                style: TextStyle(
+                                                  color: Colors.grey,
+                                                ),
+                                              ),
+                                            ],
+                                          )
+                                        : SelectableLinkify(
+                                            text: HtmlUtil.parseHtml(
+                                              state.user.about,
+                                            ),
+                                            linkStyle: const TextStyle(
+                                              color: Colors.orange,
+                                            ),
+                                            onOpen: (LinkableElement link) {
+                                              if (link.url.contains(
+                                                'news.ycombinator.com/item',
+                                              )) {
+                                                onStoryLinkTapped
+                                                    .call(link.url);
+                                              } else {
+                                                LinkUtil.launch(link.url);
+                                              }
+                                            },
+                                          ),
+                                    actions: <Widget>[
+                                      TextButton(
+                                        onPressed: () => Navigator.pop(context),
+                                        child: const Text(
+                                          'Okay',
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                );
+                              },
+                            );
+                          },
+                        ),
+                      ),
                       ListTile(
                         leading: Icon(
                           FeatherIcons.chevronUp,
@@ -761,6 +989,16 @@ class _StoryScreenState extends State<StoryScreen> {
                         ),
                         onTap: context.read<VoteCubit>().downvote,
                       ),
+                      ListTile(
+                        leading: const Icon(FeatherIcons.share),
+                        title: const Text(
+                          'Share',
+                        ),
+                        onTap: () => Navigator.pop(
+                          context,
+                          _MenuAction.share,
+                        ),
+                      ),
                       ListTile(
                         leading: const Icon(Icons.local_police),
                         title: const Text(
@@ -808,6 +1046,9 @@ class _StoryScreenState extends State<StoryScreen> {
             break;
           case _MenuAction.downvote:
             break;
+          case _MenuAction.share:
+            onShareTapped(item);
+            break;
           case _MenuAction.flag:
             onFlagTapped(item);
             break;
@@ -821,57 +1062,32 @@ class _StoryScreenState extends State<StoryScreen> {
     });
   }
 
+  void onShareTapped(Item item) =>
+      Share.share('https://news.ycombinator.com/item?id=${item.id}');
+
   void onFlagTapped(Item item) {
     showDialog<bool>(
       context: context,
       builder: (BuildContext context) {
-        return SimpleDialog(
+        return AlertDialog(
           title: const Text('Flag this comment?'),
-          children: <Widget>[
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 24,
-                right: 12,
-              ),
-              child: Text(
-                'Flag this comment posted by ${item.by}?',
-                style: const TextStyle(
-                  color: Colors.grey,
-                ),
+          content: Text(
+            'Flag this comment posted by ${item.by}?',
+            style: const TextStyle(
+              color: Colors.grey,
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: const Text(
+                'Cancel',
               ),
             ),
-            Padding(
-              padding: const EdgeInsets.only(
-                right: 12,
-              ),
-              child: ButtonBar(
-                children: <Widget>[
-                  TextButton(
-                    onPressed: () => Navigator.pop(context, false),
-                    child: const Text(
-                      'Cancel',
-                      style: TextStyle(
-                        color: Colors.red,
-                      ),
-                    ),
-                  ),
-                  ElevatedButton(
-                    onPressed: () {
-                      Navigator.pop(context, true);
-                    },
-                    style: ButtonStyle(
-                      backgroundColor:
-                          MaterialStateProperty.all(Colors.deepOrange),
-                    ),
-                    child: const Text(
-                      'Yes',
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: Colors.white,
-                      ),
-                    ),
-                  ),
-                ],
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: const Text(
+                'Yes',
               ),
             ),
           ],
@@ -889,55 +1105,27 @@ class _StoryScreenState extends State<StoryScreen> {
     showDialog<bool>(
       context: context,
       builder: (BuildContext context) {
-        return SimpleDialog(
+        return AlertDialog(
           title: Text('${isBlocked ? 'Unblock' : 'Block'} this user?'),
-          children: <Widget>[
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 24,
-                right: 12,
-              ),
-              child: Text(
-                'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
-                ' and ${isBlocked ? 'display' : 'hide'} '
-                'comments posted by this user?',
-                style: const TextStyle(
-                  color: Colors.grey,
-                ),
+          content: Text(
+            'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
+            ' and ${isBlocked ? 'display' : 'hide'} '
+            'comments posted by this user?',
+            style: const TextStyle(
+              color: Colors.grey,
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: const Text(
+                'Cancel',
               ),
             ),
-            Padding(
-              padding: const EdgeInsets.only(
-                right: 12,
-              ),
-              child: ButtonBar(
-                children: <Widget>[
-                  TextButton(
-                    onPressed: () => Navigator.pop(context, false),
-                    child: const Text(
-                      'Cancel',
-                      style: TextStyle(
-                        color: Colors.red,
-                      ),
-                    ),
-                  ),
-                  ElevatedButton(
-                    onPressed: () {
-                      Navigator.pop(context, true);
-                    },
-                    style: ButtonStyle(
-                      backgroundColor:
-                          MaterialStateProperty.all(Colors.deepOrange),
-                    ),
-                    child: const Text(
-                      'Yes',
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: Colors.white,
-                      ),
-                    ),
-                  ),
-                ],
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: const Text(
+                'Yes',
               ),
             ),
           ],
@@ -1090,7 +1278,7 @@ class _StoryScreenState extends State<StoryScreen> {
                               child: Transform.translate(
                                 offset: const Offset(0, 1),
                                 child: TapDownWrapper(
-                                  onTap: () => LinkUtil.launchUrl(
+                                  onTap: () => LinkUtil.launch(
                                     Constants.endUserAgreementLink,
                                   ),
                                   child: const Text(
@@ -1122,9 +1310,6 @@ class _StoryScreenState extends State<StoryScreen> {
                           },
                           child: const Text(
                             'Cancel',
-                            style: TextStyle(
-                              color: Colors.red,
-                            ),
                           ),
                         ),
                         ElevatedButton(

lib/screens/item/widgets/custom_app_bar.dart

@@ -0,0 +1,59 @@
+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/item/widgets/widgets.dart';
+
+class CustomAppBar extends AppBar {
+  CustomAppBar({
+    Key? key,
+    required ScrollController scrollController,
+    required Item item,
+    required Color backgroundColor,
+    required Future<bool> Function() onBackgroundTap,
+    required Future<bool> Function() onDismiss,
+    bool splitViewEnabled = false,
+    VoidCallback? onZoomTap,
+    bool? expanded,
+  }) : super(
+          key: key,
+          backgroundColor: backgroundColor,
+          elevation: 0,
+          actions: <Widget>[
+            if (splitViewEnabled) ...<Widget>[
+              IconButton(
+                icon: Icon(
+                  expanded ?? false
+                      ? FeatherIcons.minimize2
+                      : FeatherIcons.maximize2,
+                  size: 20,
+                ),
+                onPressed: () {
+                  HapticFeedback.lightImpact();
+                  onZoomTap?.call();
+                },
+              ),
+              const Spacer(),
+            ],
+            ScrollUpIconButton(
+              scrollController: scrollController,
+            ),
+            if (item is Story)
+              PinIconButton(
+                story: item,
+                onBackgroundTap: onBackgroundTap,
+                onDismiss: onDismiss,
+              ),
+            FavIconButton(
+              storyId: item.id,
+              onBackgroundTap: onBackgroundTap,
+              onDismiss: onDismiss,
+            ),
+            LinkIconButton(
+              storyId: item.id,
+              onBackgroundTap: onBackgroundTap,
+              onDismiss: onDismiss,
+            ),
+          ],
+        );
+}

lib/screens/item/widgets/fav_icon_button.dart

@@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
       builder: (BuildContext context, FavState favState) {
         final bool isFav = favState.favIds.contains(storyId);
         return IconButton(
+          tooltip: 'Add to favorites',
           icon: DescribedFeatureOverlay(
             onBackgroundTap: onBackgroundTap,
             onDismiss: onDismiss,

lib/screens/item/widgets/link_icon_button.dart

@@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return IconButton(
+      tooltip: 'Open this story in browser',
       icon: DescribedFeatureOverlay(
         onBackgroundTap: onBackgroundTap,
         onDismiss: onDismiss,
@@ -47,7 +48,7 @@ class LinkIconButton extends StatelessWidget {
         ),
       ),
       onPressed: () =>
-          LinkUtil.launchUrl('https://news.ycombinator.com/item?id=$storyId'),
+          LinkUtil.launch('https://news.ycombinator.com/item?id=$storyId'),
     );
   }
 }

lib/screens/item/widgets/pin_icon_button.dart

@@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
           child: Transform.translate(
             offset: const Offset(2, 0),
             child: IconButton(
+              tooltip: 'Pin to home screen',
               icon: DescribedFeatureOverlay(
                 onBackgroundTap: onBackgroundTap,
                 onDismiss: onDismiss,