v0.2.20 (#56)

* bumped version.

* fixed web analyzer.

* improved comments loading mechanism.

* fixed delete all button.

* improved reply box logic.

* improved web analyzer.

* allow users to sort comments.

* fixed styles.

* fixed bugs.

* bumped version.

* fixed comments cubit.

* fixed dead comments.

.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

@@ -4,13 +4,12 @@
 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?platform=iphone)
-[![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)
+[![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?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/)
 
 
@@ -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/171450528-02c561ed-0ebb-4c1b-9ee0-a935211db0f2.png"> 
+   <img width="200" alt="01" src="assets/screenshots/01.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png"> 
+   <img width="200" alt="02" src="assets/screenshots/02.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450541-a9af3417-526f-4dbd-96d7-781c95c886d3.png"> 
+   <img width="200" alt="03" src="assets/screenshots/03.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450543-fb631b02-5f46-4455-b8ff-9ef119a486f1.png"> 
+   <img width="200" alt="04" src="assets/screenshots/04.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450548-38e98b02-6201-48c9-9674-87bdfc61f456.png"> 
+   <img width="200" alt="05" src="assets/screenshots/05.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="06" src="assets/screenshots/06.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="07" src="assets/screenshots/07.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="08" src="assets/screenshots/08.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="09" src="assets/screenshots/09.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png"> 
+   <img width="200" alt="10" src="assets/screenshots/10.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="11" src="assets/screenshots/11.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.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="ipad-01" src="assets/screenshots/ipad-01.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="ipad-02" src="assets/screenshots/ipad-02.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="ipad-03" src="assets/screenshots/ipad-03.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="ipad-04" src="assets/screenshots/ipad-04.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"> 
 </p>
 

android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
 
    <application
         android:label="hacki"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -52,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/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.

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

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);
+    for (final StoryType type in types) {
-    await loadStories(of: StoryType.latest, emit: emit);
+      await loadStories(of: type, emit: emit);
-    await loadStories(of: StoryType.ask, emit: emit);
+    }
-    await loadStories(of: StoryType.show, emit: emit);
-    await loadStories(of: StoryType.jobs, 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 =
+    final Set<int> prioritizedIds = <int>{};
-        await _storiesRepository.fetchStoryIds(of: StoryType.top);
+    final List<StoryType> prioritizedTypes = <StoryType>[...types]
-    final List<int> newIds =
+      ..remove(StoryType.latest);
-        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);
 
-    await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
+    for (final StoryType type in prioritizedTypes) {
-    await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
+      final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
-    await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
+      await _cacheRepository.cacheStoryIds(of: type, ids: ids);
-    await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
+      prioritizedIds.addAll(ids);
-    await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
+    }
 
-    final List<int> allIds = <int>[
+    emit(
-      ...topIds,
+      state.copyWith(
-      ...newIds,
+        storiesDownloaded: 0,
-      ...askIds,
+        storiesToBeDownloaded: prioritizedIds.length,
-      ...showIds,
+      ),
-      ...jobIds
+    );
-    ];
 
     try {
-      _storiesRepository
+      await fetchAndCacheStories(
-          .fetchStoriesStream(ids: allIds)
+        prioritizedIds,
-          .listen((Story story) async {
+        includingWebPage: event.includingWebPage,
-        if (story.kids.isNotEmpty) {
+        isPrioritized: true,
-          await _cacheRepository.cacheStory(story: story);
+      );
-          _storiesRepository
+
-              .fetchAllChildrenComments(ids: story.kids)
+      final Set<int> latestIds = <int>{};
-              .listen((Comment? comment) async {
+      final List<int> ids = await _storiesRepository.fetchStoryIds(
-            if (comment != null) {
+        of: StoryType.latest,
-              await _cacheRepository.cacheComment(comment: comment);
+      );
-            }
+      await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
-          });
+      latestIds.addAll(ids);
-        }
+
-      }).onDone(() {
+      await fetchAndCacheStories(
-        emit(
+        latestIds,
-          state.copyWith(
+        includingWebPage: event.includingWebPage,
-            downloadStatus: StoriesDownloadStatus.finished,
+        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(
+    return copyWith(
-      storiesByType: storiesByType,
       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(
+    return copyWith(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
       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(
+    return copyWith(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
-      statusByType: statusByType,
       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/cubits/comments/comments_cubit.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
@@ -70,28 +72,34 @@ class CommentsCubit extends Cubit<CommentsState> {
     final Story updatedStory = state.offlineReading
         ? story
         : await _storiesRepository.fetchStoryBy(story.id) ?? story;
+    final List<int> kids = () {
+      switch (state.order) {
+        case CommentsOrder.natural:
+          return updatedStory.kids;
+        case CommentsOrder.newestFirst:
+          return updatedStory.kids.sorted((int a, int b) => b.compareTo(a));
+        case CommentsOrder.oldestFirst:
+          return updatedStory.kids.sorted((int a, int b) => a.compareTo(b));
+      }
+    }();
 
     emit(state.copyWith(story: updatedStory));
 
     if (state.offlineReading) {
       _streamSubscription = _cacheRepository
-          .getCachedCommentsStream(ids: updatedStory.kids)
+          .getCachedCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     } else {
       _streamSubscription = _storiesRepository
-          .fetchCommentsStream(ids: updatedStory.kids)
+          .fetchCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     }
   }
 
   Future<void> refresh() async {
-    final bool offlineReading = await _cacheRepository.hasCachedStories;
+    if (state.offlineReading) {
-
-    _cacheService.resetCollapsedComments();
-
-    if (offlineReading) {
       emit(
         state.copyWith(
           status: CommentsStatus.loaded,
@@ -100,6 +108,10 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
+    _cacheService
+      ..resetComments()
+      ..resetCollapsedComments();
+
     emit(
       state.copyWith(
         status: CommentsStatus.loading,
@@ -112,8 +124,19 @@ class CommentsCubit extends Cubit<CommentsState> {
     final Story story = state.story;
     final Story updatedStory =
         await _storiesRepository.fetchStoryBy(story.id) ?? story;
+    final List<int> kids = () {
+      switch (state.order) {
+        case CommentsOrder.natural:
+          return updatedStory.kids;
+        case CommentsOrder.newestFirst:
+          return updatedStory.kids.sorted((int a, int b) => b.compareTo(a));
+        case CommentsOrder.oldestFirst:
+          return updatedStory.kids.sorted((int a, int b) => a.compareTo(b));
+      }
+    }();
+
     _streamSubscription = _storiesRepository
-        .fetchCommentsStream(ids: updatedStory.kids)
+        .fetchCommentsStream(ids: kids)
         .listen(_onCommentFetched)
       ..onDone(_onDone);
 
@@ -159,16 +182,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(
@@ -180,6 +216,38 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
+  void onOrderChanged(CommentsOrder? order) {
+    if (order == null) return;
+    _streamSubscription?.cancel();
+    emit(state.copyWith(order: order, comments: <Comment>[]));
+    init();
+  }
+
+  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,18 @@ enum CommentsStatus {
   failure,
 }
 
+enum CommentsOrder {
+  natural,
+  newestFirst,
+  oldestFirst,
+}
+
 class CommentsState extends Equatable {
   const CommentsState({
     required this.story,
     required this.comments,
     required this.status,
-    required this.collapsed,
+    required this.order,
     required this.onlyShowTargetComment,
     required this.offlineReading,
     required this.currentPage,
@@ -24,14 +30,14 @@ class CommentsState extends Equatable {
     required this.story,
   })  : comments = <Comment>[],
         status = CommentsStatus.init,
-        collapsed = false,
+        order = CommentsOrder.natural,
         onlyShowTargetComment = false,
         currentPage = 0;
 
   final Story story;
   final List<Comment> comments;
   final CommentsStatus status;
-  final bool collapsed;
+  final CommentsOrder order;
   final bool onlyShowTargetComment;
   final bool offlineReading;
   final int currentPage;
@@ -40,7 +46,7 @@ class CommentsState extends Equatable {
     Story? story,
     List<Comment>? comments,
     CommentsStatus? status,
-    bool? collapsed,
+    CommentsOrder? order,
     bool? onlyShowTargetComment,
     bool? offlineReading,
     int? currentPage,
@@ -49,7 +55,7 @@ class CommentsState extends Equatable {
       story: story ?? this.story,
       comments: comments ?? this.comments,
       status: status ?? this.status,
-      collapsed: collapsed ?? this.collapsed,
+      order: order ?? this.order,
       onlyShowTargetComment:
           onlyShowTargetComment ?? this.onlyShowTargetComment,
       offlineReading: offlineReading ?? this.offlineReading,
@@ -62,7 +68,7 @@ class CommentsState extends Equatable {
         story,
         comments,
         status,
-        collapsed,
+        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/split_view/split_view_cubit.dart

@@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
   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

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

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/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();
@@ -164,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

@@ -12,11 +12,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: '',
@@ -55,6 +55,7 @@ class Comment extends Item {
       by: by,
       text: text,
       kids: kids,
+      dead: dead,
       deleted: deleted,
       level: level ?? this.level,
     );

lib/models/models.dart

@@ -1,3 +1,4 @@
+export 'buildable_comment.dart';
 export 'comment.dart';
 export 'item.dart';
 export 'poll_option.dart';

lib/models/story.dart

@@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
 
 enum StoryType {
   top('topstories'),
+  best('beststories'),
   latest('newstories'),
   ask('askstories'),
   show('showstories'),
@@ -13,6 +14,23 @@ enum StoryType {
   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 {

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/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/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();
   }
 
@@ -171,7 +183,7 @@ 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, isPin: true),
                           showWebPreview: preferenceState.showComplexStoryTile,
@@ -222,61 +234,21 @@ class _HomeScreenState extends State<HomeScreen>
                         HapticFeedback.selectionClick();
                       },
                       tabs: <Widget>[
-                        Tab(
+                        for (int i = 0; i < StoriesBloc.types.length; i++)
-                          child: Text(
+                          Tab(
-                            'TOP',
+                            key: ValueKey<StoryType>(
-                            style: TextStyle(
+                              StoriesBloc.types.elementAt(i),
-                              fontSize: currentIndex == 0 ? 14 : 10,
+                            ),
-                              color: currentIndex == 0
+                            child: Text(
-                                  ? Colors.orange
+                              StoriesBloc.types.elementAt(i).label,
-                                  : Colors.grey,
+                              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,
@@ -349,36 +321,13 @@ class _HomeScreenState extends State<HomeScreen>
               physics: const NeverScrollableScrollPhysics(),
               controller: tabController,
               children: <Widget>[
-                StoriesListView(
+                for (final StoryType type in StoriesBloc.types)
-                  key: const ValueKey<StoryType>(StoryType.top),
+                  StoriesListView(
-                  storyType: StoryType.top,
+                    key: ValueKey<StoryType>(type),
-                  header: pinnedStories,
+                    storyType: type,
-                  onStoryTapped: onStoryTapped,
+                    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,
-                ),
                 const ProfileScreen(),
               ],
             ),
@@ -390,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,
       ),
     );
@@ -444,8 +393,12 @@ class _HomeScreenState extends State<HomeScreen>
       }
     }
 
-    if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
+    if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
-      LinkUtil.launch(story.url, useReader: useReader);
+      LinkUtil.launch(
+        story.url,
+        useReader: useReader,
+        offlineReading: offlineReading,
+      );
     }
 
     context.read<StoriesBloc>().add(
@@ -453,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() {
@@ -484,6 +449,24 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
+  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 StoryScreenArgs args = StoryScreenArgs(story: story);
+      goToStoryScreen(args: args);
+    });
+  }
+
   Future<void> onNotificationTapped(String? payload) async {
     if (payload == null) return;
 
@@ -511,8 +494,8 @@ class _HomeScreenState extends State<HomeScreen>
   }
 }
 
-class _MobileHomeScreenBuilder extends StatelessWidget {
+class _MobileHomeScreen extends StatelessWidget {
-  const _MobileHomeScreenBuilder({
+  const _MobileHomeScreen({
     Key? key,
     required this.homeScreen,
   }) : super(key: key);
@@ -537,8 +520,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
   }
 }
 
-class _TabletHomeScreenBuilder extends StatelessWidget {
+class _TabletHomeScreen extends StatelessWidget {
-  const _TabletHomeScreenBuilder({
+  const _TabletHomeScreen({
     Key? key,
     required this.homeScreen,
   }) : super(key: key);
@@ -556,30 +539,40 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
           homeScreenWidth = 345.0;
         }
 
-        return Stack(
+        return BlocBuilder<SplitViewCubit, SplitViewState>(
-          children: <Widget>[
+          buildWhen: (SplitViewState previous, SplitViewState current) =>
-            Positioned(
+              previous.expanded != current.expanded,
-              left: 0,
+          builder: (BuildContext context, SplitViewState state) {
-              top: 0,
+            return Stack(
-              bottom: 0,
+              children: <Widget>[
-              width: homeScreenWidth,
+                AnimatedPositioned(
-              child: homeScreen,
+                  left: 0,
-            ),
+                  top: 0,
-            Positioned(
+                  bottom: 0,
-              left: 24,
+                  width: state.expanded ? 0 : homeScreenWidth,
-              bottom: 36,
+                  duration: const Duration(milliseconds: 300),
-              height: 40,
+                  curve: Curves.elasticOut,
-              width: homeScreenWidth - 24,
+                  child: homeScreen,
-              child: const CountdownReminder(),
+                ),
-            ),
+                Positioned(
-            Positioned(
+                  left: 24,
-              right: 0,
+                  bottom: 36,
-              top: 0,
+                  height: 40,
-              bottom: 0,
+                  width: homeScreenWidth - 24,
-              left: homeScreenWidth,
+                  child: const CountdownReminder(),
-              child: const _TabletStoryView(),
+                ),
-            ),
+                AnimatedPositioned(
-          ],
+                  right: 0,
+                  top: 0,
+                  bottom: 0,
+                  left: state.expanded ? 0 : homeScreenWidth,
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.elasticOut,
+                  child: const _TabletStoryView(),
+                ),
+              ],
+            );
+          },
         );
       },
     );
@@ -596,7 +589,7 @@ class _TabletStoryView extends StatelessWidget {
           previous.storyScreenArgs != current.storyScreenArgs,
       builder: (BuildContext context, SplitViewState state) {
         if (state.storyScreenArgs != null) {
-          return StoryScreen.build(state.storyScreenArgs!);
+          return StoryScreen.build(context, state.storyScreenArgs!);
         }
 
         return Material(

lib/screens/profile/profile_screen.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
@@ -407,7 +408,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                   showAboutDialog(
                                     context: context,
                                     applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.14',
+                                    applicationVersion: 'v0.2.20',
                                     applicationIcon: ClipRRect(
                                       borderRadius: const BorderRadius.all(
                                         Radius.circular(12),
@@ -447,7 +448,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                             SizedBox(
                                               width: 12,
                                             ),
-                                            Text('Source Code'),
+                                            Text('Source code'),
                                           ],
                                         ),
                                       ),
@@ -465,7 +466,23 @@ class _ProfileScreenState extends State<ProfileScreen>
                                             SizedBox(
                                               width: 12,
                                             ),
-                                            Text('Like the App?'),
+                                            Text('Like the app?'),
+                                          ],
+                                        ),
+                                      ),
+                                      ElevatedButton(
+                                        onPressed: () => LinkUtil.launch(
+                                          Constants.sponsorLink,
+                                        ),
+                                        child: Row(
+                                          children: const <Widget>[
+                                            Icon(
+                                              FeatherIcons.coffee,
+                                            ),
+                                            SizedBox(
+                                              width: 12,
+                                            ),
+                                            Text('Buy me a coffee'),
                                           ],
                                         ),
                                       ),
@@ -648,18 +665,18 @@ class _ProfileScreenState extends State<ProfileScreen>
               child: const Text(
                 'Cancel',
                 style: TextStyle(
-                  color: Colors.red,
+                  color: Colors.orange,
                 ),
               ),
             ),
-            ElevatedButton(
+            TextButton(
               onPressed: () {
                 Navigator.pop(context);
                 locator
                     .get<SembastRepository>()
                     .deleteAllCachedComments()
                     .whenComplete(
-                      locator.get<SembastRepository>().deleteAllCachedComments,
+                      locator.get<CacheRepository>().deleteAll,
                     )
                     .whenComplete(
                       locator.get<PreferenceRepository>().clearAllReadStories,
@@ -671,15 +688,8 @@ class _ProfileScreenState extends State<ProfileScreen>
                   showSnackBar(content: 'Data cleared!');
                 });
               },
-              style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.all(Colors.deepOrange),
-              ),
               child: const Text(
                 'Yes',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  color: Colors.white,
-                ),
               ),
             ),
           ],
@@ -855,9 +865,6 @@ class _ProfileScreenState extends State<ProfileScreen>
                           },
                           child: const Text(
                             'Cancel',
-                            style: TextStyle(
-                              color: Colors.red,
-                            ),
                           ),
                         ),
                         ElevatedButton(
@@ -909,63 +916,30 @@ class _ProfileScreenState extends State<ProfileScreen>
       context: context,
       barrierDismissible: false,
       builder: (BuildContext context) {
-        return SimpleDialog(
+        return AlertDialog(
-          children: <Widget>[
+          content: Text(
-            ...<Widget>[
+            'Log out as ${authBloc.state.username}?',
-              const SizedBox(
+            style: const TextStyle(
-                height: 16,
+              fontSize: 16,
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text(
+                'Cancel',
               ),
-              Padding(
+            ),
-                padding: const EdgeInsets.symmetric(
+            TextButton(
-                  horizontal: 18,
+              onPressed: () {
-                ),
+                Navigator.pop(context);
-                child: Text(
+                context.read<AuthBloc>().add(AuthLogout());
-                  'Log out as ${authBloc.state.username}?',
+                context.read<HistoryCubit>().reset();
-                  style: const TextStyle(
+              },
-                    fontSize: 16,
+              child: const Text(
-                  ),
+                'Log out',
-                ),
               ),
-              const SizedBox(
+            ),
-                height: 16,
-              ),
-              Padding(
-                padding: const EdgeInsets.only(
-                  right: 12,
-                ),
-                child: ButtonBar(
-                  children: <Widget>[
-                    TextButton(
-                      onPressed: () => Navigator.pop(context),
-                      child: const Text(
-                        'Cancel',
-                        style: TextStyle(
-                          color: Colors.red,
-                        ),
-                      ),
-                    ),
-                    ElevatedButton(
-                      onPressed: () {
-                        Navigator.pop(context);
-                        context.read<AuthBloc>().add(AuthLogout());
-                        context.read<HistoryCubit>().reset();
-                      },
-                      style: ButtonStyle(
-                        backgroundColor:
-                            MaterialStateProperty.all(Colors.deepOrange),
-                      ),
-                      child: const Text(
-                        'Log out',
-                        style: TextStyle(
-                          fontWeight: FontWeight.bold,
-                          color: Colors.white,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ],
           ],
         );
       },

lib/screens/profile/widgets/offline_list_tile.dart

@@ -14,12 +14,15 @@ class OfflineListTile extends StatelessWidget {
       listenWhen: (StoriesState previous, StoriesState current) =>
           previous.downloadStatus != current.downloadStatus,
       listener: (BuildContext context, StoriesState state) {
-        if (state.downloadStatus == StoriesDownloadStatus.failure) {
+        if (state.downloadStatus == StoriesDownloadStatus.failure ||
+            state.downloadStatus == StoriesDownloadStatus.finished) {
           Wakelock.disable();
         }
       },
       buildWhen: (StoriesState previous, StoriesState current) =>
-          previous.downloadStatus != current.downloadStatus,
+          previous.downloadStatus != current.downloadStatus ||
+          previous.storiesDownloaded != current.storiesDownloaded ||
+          previous.storiesToBeDownloaded != current.storiesToBeDownloaded,
       builder: (BuildContext context, StoriesState state) {
         final bool downloading =
             state.downloadStatus == StoriesDownloadStatus.downloading;
@@ -41,19 +44,53 @@ class OfflineListTile extends StatelessWidget {
 
         return ListTile(
           title: Text(
-            downloading ? 'Downloading All Stories...' : 'Download All Stories',
+            downloading
+                ? '''Downloading All Stories (${state.storiesDownloaded}/${state.storiesToBeDownloaded})'''
+                : 'Download All Stories',
           ),
           subtitle: const Text(
             'download all latest stories that have at least one comment '
-            "for offline reading. (web page won't be downloaded)",
+            'for offline reading. (Please keep Hacki in foreground while '
+            'downloading.)',
           ),
           trailing: trailingWidget,
           isThreeLine: true,
           onTap: () {
+            if (state.downloadStatus == StoriesDownloadStatus.downloading) {
+              return;
+            }
             Connectivity().checkConnectivity().then((ConnectivityResult res) {
               if (res != ConnectivityResult.none) {
-                Wakelock.enable();
+                showDialog<bool>(
-                context.read<StoriesBloc>().add(StoriesDownload());
+                  context: context,
+                  builder: (BuildContext context) => AlertDialog(
+                    title: const Text('Download web pages as well?'),
+                    content: const Text('It will take longer time.'),
+                    actions: <Widget>[
+                      TextButton(
+                        onPressed: () => Navigator.pop(context),
+                        child: const Text('Cancel'),
+                      ),
+                      TextButton(
+                        onPressed: () => Navigator.pop(context, false),
+                        child: const Text('No'),
+                      ),
+                      TextButton(
+                        onPressed: () => Navigator.pop(context, true),
+                        child: const Text('Yes'),
+                      ),
+                    ],
+                  ),
+                ).then((bool? includeWebPage) {
+                  if (includeWebPage != null) {
+                    Wakelock.enable();
+                    context.read<StoriesBloc>().add(
+                          StoriesDownload(
+                            includingWebPage: includeWebPage,
+                          ),
+                        );
+                  }
+                });
               }
             });
           },

lib/screens/screens.dart

@@ -3,3 +3,4 @@ export 'profile/profile_screen.dart';
 export 'search/search_screen.dart';
 export 'story/story_screen.dart';
 export 'submit/submit_screen.dart';
+export 'web_view/web_view_screen.dart';

lib/screens/story/story_screen.dart

@@ -22,10 +22,12 @@ 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,
@@ -74,6 +76,10 @@ class StoryScreen extends StatefulWidget {
                 targetParents: args.targetComments,
               ),
           ),
+          BlocProvider<EditCubit>(
+            lazy: false,
+            create: (BuildContext context) => EditCubit(),
+          ),
           if (args.story.isPoll)
             BlocProvider<PollCubit>(
               create: (BuildContext context) =>
@@ -88,29 +94,43 @@ class StoryScreen extends StatefulWidget {
     );
   }
 
-  static Widget build(StoryScreenArgs args) {
+  static Widget build(BuildContext context, StoryScreenArgs args) {
-    return MultiBlocProvider(
+    return WillPopScope(
-      key: ValueKey<StoryScreenArgs>(args),
+      onWillPop: () async {
-      providers: <BlocProvider<dynamic>>[
+        if (context.read<SplitViewCubit>().state.expanded) {
-        BlocProvider<CommentsCubit>(
+          context.read<SplitViewCubit>().zoom();
-          create: (BuildContext context) => CommentsCubit(
+          return false;
-            offlineReading: context.read<StoriesBloc>().state.offlineReading,
+        } else {
-            story: args.story,
+          return true;
-          )..init(
+        }
-              onlyShowTargetComment: args.onlyShowTargetComment,
+      },
-              targetParents: args.targetComments,
+      child: MultiBlocProvider(
-            ),
+        key: ValueKey<StoryScreenArgs>(args),
-        ),
+        providers: <BlocProvider<dynamic>>[
-        if (args.story.isPoll)
+          BlocProvider<CommentsCubit>(
-          BlocProvider<PollCubit>(
+            create: (BuildContext context) => CommentsCubit(
-            create: (BuildContext context) =>
+              offlineReading: context.read<StoriesBloc>().state.offlineReading,
-                PollCubit(story: args.story)..init(),
+              story: args.story,
+            )..init(
+                onlyShowTargetComment: args.onlyShowTargetComment,
+                targetParents: args.targetComments,
+              ),
           ),
-      ],
+          BlocProvider<EditCubit>(
-      child: StoryScreen(
+            lazy: false,
-        story: args.story,
+            create: (BuildContext context) => EditCubit(),
-        parentComments: args.targetComments ?? <Comment>[],
+          ),
-        splitViewEnabled: true,
+          if (args.story.isPoll)
+            BlocProvider<PollCubit>(
+              create: (BuildContext context) =>
+                  PollCubit(story: args.story)..init(),
+            ),
+        ],
+        child: StoryScreen(
+          story: args.story,
+          parentComments: args.targetComments ?? <Comment>[],
+          splitViewEnabled: true,
+        ),
       ),
     );
   }
@@ -140,7 +160,6 @@ class _StoryScreenState extends State<StoryScreen> {
     delay: _featureDiscoveryDismissThrottleDelay,
   );
 
-  static const int _extraItemsCount = 2;
   static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
   static const Duration _featureDiscoveryDismissThrottleDelay =
       Duration(seconds: 1);
@@ -176,6 +195,7 @@ class _StoryScreenState extends State<StoryScreen> {
     scrollController.dispose();
     storyLinkTapThrottle.dispose();
     featureDiscoveryDismissThrottle.dispose();
+    focusNode.dispose();
     super.dispose();
   }
 
@@ -260,239 +280,282 @@ class _StoryScreenState extends State<StoryScreen> {
                 controller: refreshController,
                 onRefresh: () {
                   HapticFeedback.lightImpact();
-                  locator.get<CacheService>().resetComments();
-                  context.read<CommentsCubit>().refresh();
 
-                  if (widget.story.isPoll) {
+                  if (context.read<StoriesBloc>().state.offlineReading) {
-                    context.read<PollCubit>().refresh();
+                    refreshController.refreshCompleted();
+                  } else {
+                    context.read<CommentsCubit>().refresh();
+
+                    if (widget.story.isPoll) {
+                      context.read<PollCubit>().refresh();
+                    }
                   }
                 },
-                onLoading: () {
+                onLoading: context.read<CommentsCubit>().loadMore,
-                  context.read<CommentsCubit>().loadMore();
+                child: ListView(
-                },
-                child: ListView.builder(
                   primary: false,
-                  itemCount: state.comments.length + _extraItemsCount,
+                  children: <Widget>[
-                  itemBuilder: (BuildContext context, int index) {
+                    SizedBox(
-                    if (index == 0) {
+                      height: topPadding,
-                      return Column(
+                    ),
+                    if (!widget.splitViewEnabled)
+                      const Padding(
+                        padding: EdgeInsets.only(bottom: 6),
+                        child: OfflineBanner(),
+                      ),
+                    Slidable(
+                      startActionPane: ActionPane(
+                        motion: const BehindMotion(),
                         children: <Widget>[
-                          SizedBox(
+                          SlidableAction(
-                            height: topPadding,
+                            onPressed: (_) {
-                          ),
+                              HapticFeedback.lightImpact();
-                          if (!widget.splitViewEnabled)
-                            const Padding(
-                              padding: EdgeInsets.only(bottom: 6),
-                              child: OfflineBanner(),
-                            ),
-                          Slidable(
-                            startActionPane: ActionPane(
-                              motion: const BehindMotion(),
-                              children: <Widget>[
-                                SlidableAction(
-                                  onPressed: (_) {
-                                    HapticFeedback.lightImpact();
 
-                                    if (widget.story !=
+                              if (widget.story !=
-                                        context
+                                  context.read<EditCubit>().state.replyingTo) {
-                                            .read<EditCubit>()
+                                commentEditingController.clear();
-                                            .state
+                              }
-                                            .replyingTo) {
+                              context
-                                      commentEditingController.clear();
+                                  .read<EditCubit>()
-                                    }
+                                  .onReplyTapped(widget.story);
-                                    context
+                              focusNode.requestFocus();
-                                        .read<EditCubit>()
+                            },
-                                        .onReplyTapped(widget.story);
+                            backgroundColor: Colors.orange,
-                                    focusNode.requestFocus();
+                            foregroundColor: Colors.white,
-                                  },
+                            icon: Icons.message,
-                                  backgroundColor: Colors.orange,
+                          ),
-                                  foregroundColor: Colors.white,
+                          SlidableAction(
-                                  icon: Icons.message,
+                            onPressed: (_) => onMorePressed(widget.story),
+                            backgroundColor: Colors.orange,
+                            foregroundColor: Colors.white,
+                            icon: Icons.more_horiz,
+                          ),
+                        ],
+                      ),
+                      child: Column(
+                        children: <Widget>[
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 6,
+                              right: 6,
+                            ),
+                            child: Row(
+                              children: <Widget>[
+                                Text(
+                                  widget.story.by,
+                                  style: const TextStyle(
+                                    color: Colors.orange,
+                                  ),
                                 ),
-                                SlidableAction(
+                                const Spacer(),
-                                  onPressed: (_) => onMorePressed(widget.story),
+                                Text(
-                                  backgroundColor: Colors.orange,
+                                  widget.story.postedDate,
-                                  foregroundColor: Colors.white,
+                                  style: const TextStyle(
-                                  icon: Icons.more_horiz,
+                                    color: Colors.grey,
+                                  ),
                                 ),
                               ],
                             ),
-                            child: Column(
+                          ),
-                              children: <Widget>[
+                          InkWell(
-                                Padding(
+                            onTap: () => LinkUtil.launch(
-                                  padding: const EdgeInsets.only(
+                              widget.story.url,
-                                    left: 6,
+                              useReader: context
-                                    right: 6,
+                                  .read<PreferenceCubit>()
-                                  ),
+                                  .state
-                                  child: Row(
+                                  .useReader,
-                                    children: <Widget>[
+                              offlineReading: context
-                                      Text(
+                                  .read<StoriesBloc>()
-                                        widget.story.by,
+                                  .state
-                                        style: const TextStyle(
+                                  .offlineReading,
-                                          color: Colors.orange,
+                            ),
-                                        ),
+                            child: Padding(
-                                      ),
+                              padding: const EdgeInsets.only(
-                                      const Spacer(),
+                                left: 6,
-                                      Text(
+                                right: 6,
-                                        widget.story.postedDate,
+                                bottom: 12,
-                                        style: const TextStyle(
+                                top: 12,
-                                          color: Colors.grey,
+                              ),
-                                        ),
+                              child: Text(
-                                      ),
+                                widget.story.title,
-                                    ],
+                                textAlign: TextAlign.center,
-                                  ),
+                                style: TextStyle(
+                                  fontWeight: FontWeight.bold,
+                                  color: widget.story.url.isNotEmpty
+                                      ? Colors.orange
+                                      : null,
                                 ),
-                                InkWell(
+                              ),
-                                  onTap: () => LinkUtil.launch(
-                                    widget.story.url,
-                                    useReader: context
-                                        .read<PreferenceCubit>()
-                                        .state
-                                        .useReader,
-                                  ),
-                                  child: Padding(
-                                    padding: const EdgeInsets.only(
-                                      left: 6,
-                                      right: 6,
-                                      bottom: 12,
-                                      top: 12,
-                                    ),
-                                    child: Text(
-                                      widget.story.title,
-                                      textAlign: TextAlign.center,
-                                      style: TextStyle(
-                                        fontWeight: FontWeight.bold,
-                                        color: widget.story.url.isNotEmpty
-                                            ? Colors.orange
-                                            : null,
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                                if (widget.story.text.isNotEmpty)
-                                  Padding(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 10,
-                                    ),
-                                    child: SelectableLinkify(
-                                      text: widget.story.text,
-                                      style: TextStyle(
-                                        fontSize: MediaQuery.of(context)
-                                                .textScaleFactor *
-                                            15,
-                                      ),
-                                      linkStyle: TextStyle(
-                                        fontSize: MediaQuery.of(context)
-                                                .textScaleFactor *
-                                            15,
-                                        color: Colors.orange,
-                                      ),
-                                      onOpen: (LinkableElement link) {
-                                        if (link.url.contains(
-                                          'news.ycombinator.com/item',
-                                        )) {
-                                          onStoryLinkTapped(link.url);
-                                        } else {
-                                          LinkUtil.launch(link.url);
-                                        }
-                                      },
-                                    ),
-                                  ),
-                                if (widget.story.isPoll)
-                                  PollView(
-                                    onLoginTapped: onLoginTapped,
-                                  ),
-                              ],
                             ),
                           ),
                           if (widget.story.text.isNotEmpty)
-                            const SizedBox(
+                            Padding(
-                              height: 8,
+                              padding: const EdgeInsets.symmetric(
-                            ),
+                                horizontal: 10,
-                          const Divider(
+                              ),
-                            height: 0,
+                              child: SelectableLinkify(
-                          ),
+                                text: widget.story.text,
-                          if (state.onlyShowTargetComment) ...<Widget>[
+                                style: TextStyle(
-                            TextButton(
+                                  fontSize:
-                              onPressed: () => context
+                                      MediaQuery.of(context).textScaleFactor *
-                                  .read<CommentsCubit>()
+                                          15,
-                                  .loadAll(widget.story),
+                                ),
-                              child: const Text('View all comments'),
+                                linkStyle: TextStyle(
-                            ),
+                                  fontSize:
-                            const Divider(
+                                      MediaQuery.of(context).textScaleFactor *
-                              height: 0,
+                                          15,
-                            ),
+                                  color: Colors.orange,
-                          ],
+                                ),
-                          if (state.comments.isEmpty &&
+                                onOpen: (LinkableElement link) {
-                              state.status ==
+                                  if (link.url.contains(
-                                  CommentsStatus.allLoaded) ...<Widget>[
+                                    'news.ycombinator.com/item',
-                            const SizedBox(
+                                  )) {
-                              height: 240,
+                                    onStoryLinkTapped(link.url);
-                            ),
+                                  } else {
-                            const Center(
+                                    LinkUtil.launch(link.url);
-                              child: Text(
+                                  }
-                                'Nothing yet',
+                                },
-                                style: TextStyle(color: Colors.grey),
                               ),
                             ),
-                          ],
+                          if (widget.story.isPoll)
+                            PollView(
+                              onLoginTapped: onLoginTapped,
+                            ),
                         ],
-                      );
-                    } else if (index ==
-                        state.comments.length + _extraItemsCount - 1) {
-                      if ((state.status == CommentsStatus.allLoaded &&
-                              state.comments.isNotEmpty) ||
-                          state.onlyShowTargetComment) {
-                        return SizedBox(
-                          height: 240,
-                          child: Center(
-                            child: Text(happyFace),
-                          ),
-                        );
-                      }
-
-                      return const SizedBox.shrink();
-                    }
-
-                    final Comment comment = state.comments.elementAt(index - 1);
-
-                    return FadeIn(
-                      key: ValueKey<int>(comment.id),
-                      child: CommentTile(
-                        comment: comment,
-                        level: comment.level,
-                        myUsername:
-                            authState.isLoggedIn ? authState.username : null,
-                        opUsername: widget.story.by,
-                        onReplyTapped: (Comment cmt) {
-                          HapticFeedback.lightImpact();
-                          if (cmt.deleted || cmt.dead) {
-                            return;
-                          }
-
-                          if (cmt !=
-                              context.read<EditCubit>().state.replyingTo) {
-                            commentEditingController.clear();
-                          }
-
-                          context.read<EditCubit>().onReplyTapped(cmt);
-                          focusNode.requestFocus();
-                        },
-                        onEditTapped: (Comment cmt) {
-                          HapticFeedback.lightImpact();
-                          if (cmt.deleted || cmt.dead) {
-                            return;
-                          }
-                          commentEditingController.clear();
-                          context.read<EditCubit>().onEditTapped(cmt);
-                          focusNode.requestFocus();
-                        },
-                        onMoreTapped: onMorePressed,
-                        onStoryLinkTapped: onStoryLinkTapped,
-                        onTimeMachineActivated: onTimeMachineActivated,
                       ),
-                    );
+                    ),
-                  },
+                    if (widget.story.text.isNotEmpty)
+                      const SizedBox(
+                        height: 8,
+                      ),
+                    const Divider(
+                      height: 0,
+                    ),
+                    if (state.onlyShowTargetComment) ...<Widget>[
+                      Center(
+                        child: TextButton(
+                          onPressed: () => context
+                              .read<CommentsCubit>()
+                              .loadAll(widget.story),
+                          child: const Text('View all comments'),
+                        ),
+                      ),
+                      const Divider(
+                        height: 0,
+                      ),
+                    ] else ...<Widget>[
+                      Row(
+                        children: <Widget>[
+                          const SizedBox(
+                            width: 12,
+                          ),
+                          Text(
+                            '''${state.story.score} karma, ${state.story.descendants} comment${state.story.descendants > 1 ? 's' : ''}''',
+                          ),
+                          const Spacer(),
+                          DropdownButton<CommentsOrder>(
+                            value: state.order,
+                            underline: const SizedBox.shrink(),
+                            items: const <DropdownMenuItem<CommentsOrder>>[
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.natural,
+                                child: Text(
+                                  'Natural',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.newestFirst,
+                                child: Text(
+                                  'Newest first',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                              DropdownMenuItem<CommentsOrder>(
+                                value: CommentsOrder.oldestFirst,
+                                child: Text(
+                                  'Oldest first',
+                                  style: TextStyle(
+                                    fontSize: 14,
+                                  ),
+                                ),
+                              ),
+                            ],
+                            onChanged:
+                                context.read<CommentsCubit>().onOrderChanged,
+                          ),
+                          const SizedBox(
+                            width: 4,
+                          ),
+                        ],
+                      ),
+                      const Divider(
+                        height: 0,
+                      ),
+                    ],
+                    if (state.comments.isEmpty &&
+                        state.status == CommentsStatus.allLoaded) ...<Widget>[
+                      const SizedBox(
+                        height: 240,
+                      ),
+                      const Center(
+                        child: Text(
+                          'Nothing yet',
+                          style: TextStyle(color: Colors.grey),
+                        ),
+                      ),
+                    ],
+                    for (final Comment comment in state.comments)
+                      FadeIn(
+                        key: ValueKey<String>('${comment.id}-FadeIn'),
+                        child: CommentTile(
+                          comment: comment,
+                          level: comment.level,
+                          myUsername:
+                              authState.isLoggedIn ? authState.username : null,
+                          opUsername: widget.story.by,
+                          onReplyTapped: (Comment cmt) {
+                            HapticFeedback.lightImpact();
+                            if (cmt.deleted || cmt.dead) {
+                              return;
+                            }
+
+                            if (cmt !=
+                                context.read<EditCubit>().state.replyingTo) {
+                              commentEditingController.clear();
+                            }
+
+                            context.read<EditCubit>().onReplyTapped(cmt);
+                            focusNode.requestFocus();
+                          },
+                          onEditTapped: (Comment cmt) {
+                            HapticFeedback.lightImpact();
+                            if (cmt.deleted || cmt.dead) {
+                              return;
+                            }
+                            commentEditingController.clear();
+                            context.read<EditCubit>().onEditTapped(cmt);
+                            focusNode.requestFocus();
+                          },
+                          onMoreTapped: onMorePressed,
+                          onStoryLinkTapped: onStoryLinkTapped,
+                          onTimeMachineActivated: onTimeMachineActivated,
+                        ),
+                      ),
+                    if ((state.status == CommentsStatus.allLoaded &&
+                            state.comments.isNotEmpty) ||
+                        state.onlyShowTargetComment)
+                      SizedBox(
+                        height: 240,
+                        child: Center(
+                          child: Text(happyFace),
+                        ),
+                      )
+                  ],
                 ),
               );
 
@@ -525,19 +588,36 @@ class _StoryScreenState extends State<StoryScreen> {
                             Positioned.fill(
                               child: mainView,
                             ),
-                            Positioned(
+                            BlocBuilder<SplitViewCubit, SplitViewState>(
-                              top: 0,
+                              buildWhen: (
-                              left: 0,
+                                SplitViewState previous,
-                              right: 0,
+                                SplitViewState current,
-                              child: CustomAppBar(
+                              ) =>
-                                backgroundColor: Theme.of(context)
+                                  previous.expanded != current.expanded,
-                                    .canvasColor
+                              builder: (
-                                    .withOpacity(0.6),
+                                BuildContext context,
-                                story: widget.story,
+                                SplitViewState state,
-                                scrollController: scrollController,
+                              ) {
-                                onBackgroundTap: onFeatureDiscoveryDismissed,
+                                return Positioned(
-                                onDismiss: onFeatureDiscoveryDismissed,
+                                  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,
+                                    splitViewEnabled: state.enabled,
+                                    expanded: state.expanded,
+                                    onZoomTap:
+                                        context.read<SplitViewCubit>().zoom,
+                                  ),
+                                );
+                              },
                             ),
                             Positioned(
                               bottom: 0,
@@ -616,6 +696,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,
@@ -751,12 +832,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,
@@ -785,6 +931,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(
@@ -832,6 +988,9 @@ class _StoryScreenState extends State<StoryScreen> {
             break;
           case _MenuAction.downvote:
             break;
+          case _MenuAction.share:
+            onShareTapped(item);
+            break;
           case _MenuAction.flag:
             onFlagTapped(item);
             break;
@@ -845,57 +1004,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>[
+          content: Text(
-            Padding(
+            'Flag this comment posted by ${item.by}?',
-              padding: const EdgeInsets.only(
+            style: const TextStyle(
-                left: 24,
+              color: Colors.grey,
-                right: 12,
+            ),
-              ),
+          ),
-              child: Text(
+          actions: <Widget>[
-                'Flag this comment posted by ${item.by}?',
+            TextButton(
-                style: const TextStyle(
+              onPressed: () => Navigator.pop(context, false),
-                  color: Colors.grey,
+              child: const Text(
-                ),
+                'Cancel',
               ),
             ),
-            Padding(
+            TextButton(
-              padding: const EdgeInsets.only(
+              onPressed: () => Navigator.pop(context, true),
-                right: 12,
+              child: const Text(
-              ),
+                'Yes',
-              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,
-                      ),
-                    ),
-                  ),
-                ],
               ),
             ),
           ],
@@ -913,55 +1047,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>[
+          content: Text(
-            Padding(
+            'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
-              padding: const EdgeInsets.only(
+            ' and ${isBlocked ? 'display' : 'hide'} '
-                left: 24,
+            'comments posted by this user?',
-                right: 12,
+            style: const TextStyle(
-              ),
+              color: Colors.grey,
-              child: Text(
+            ),
-                'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
+          ),
-                ' and ${isBlocked ? 'display' : 'hide'} '
+          actions: <Widget>[
-                'comments posted by this user?',
+            TextButton(
-                style: const TextStyle(
+              onPressed: () => Navigator.pop(context, false),
-                  color: Colors.grey,
+              child: const Text(
-                ),
+                'Cancel',
               ),
             ),
-            Padding(
+            TextButton(
-              padding: const EdgeInsets.only(
+              onPressed: () => Navigator.pop(context, true),
-                right: 12,
+              child: const Text(
-              ),
+                'Yes',
-              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,
-                      ),
-                    ),
-                  ),
-                ],
               ),
             ),
           ],
@@ -1146,9 +1252,6 @@ class _StoryScreenState extends State<StoryScreen> {
                           },
                           child: const Text(
                             'Cancel',
-                            style: TextStyle(
-                              color: Colors.red,
-                            ),
                           ),
                         ),
                         ElevatedButton(

lib/screens/story/widgets/custom_app_bar.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
 import 'package:hacki/screens/story/widgets/link_icon_button.dart';
@@ -13,11 +15,29 @@ class CustomAppBar extends AppBar {
     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,
             ),

lib/screens/story/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/story/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,

lib/screens/story/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,

lib/screens/story/widgets/reply_box.dart

@@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
                                 border: InputBorder.none,
                               ),
                               keyboardType: TextInputType.multiline,
+                              textCapitalization: TextCapitalization.sentences,
                               textInputAction: TextInputAction.newline,
                               onChanged: widget.onChanged,
                             ),

lib/screens/submit/submit_screen.dart

@@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
                       ),
                     ),
                     onChanged: context.read<SubmitCubit>().onTextChanged,
+                    textCapitalization: TextCapitalization.sentences,
                   ),
                 ),
               ),

lib/screens/web_view/web_view_screen.dart

@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import 'package:hacki/config/locator.dart';
+import 'package:hacki/repositories/repositories.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class WebViewScreen extends StatefulWidget {
+  const WebViewScreen({
+    super.key,
+    required this.url,
+  });
+
+  final String url;
+
+  @override
+  State<WebViewScreen> createState() => _WebViewScreenState();
+}
+
+class _WebViewScreenState extends State<WebViewScreen> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Theme.of(context).canvasColor,
+        title: Text(
+          humanize(widget.url),
+          style: const TextStyle(
+            fontSize: 12,
+          ),
+          overflow: TextOverflow.ellipsis,
+          textAlign: TextAlign.center,
+        ),
+        centerTitle: true,
+      ),
+      body: WebView(
+        onWebViewCreated: (WebViewController controller) async {
+          final String? html = await locator.get<CacheRepository>().getHtml(
+                url: widget.url,
+              );
+
+          if (html != null) {
+            await controller.loadHtmlString(html);
+          }
+        },
+      ),
+    );
+  }
+
+  static String humanize(String link) {
+    final String humanized = link
+        .replaceFirst(RegExp('https?://'), '')
+        .replaceFirst(RegExp(r'www\.'), '');
+    return humanized;
+  }
+}

lib/screens/widgets/comment_tile.dart

@@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider<CollapseCubit>(
+      key: ValueKey<String>('${comment.id}-BlocProvider'),
       lazy: false,
       create: (_) => CollapseCubit(
         commentId: comment.id,
@@ -209,30 +210,62 @@ class CommentTile extends StatelessWidget {
                                       top: 6,
                                       bottom: 12,
                                     ),
-                                    child: SelectableLinkify(
+                                    child: comment is BuildableComment
-                                      key: ObjectKey(comment),
+                                        ? SelectableText.rich(
-                                      text: comment.text,
+                                            key: ValueKey<int>(comment.id),
-                                      style: TextStyle(
+                                            buildTextSpan(
-                                        fontSize: MediaQuery.of(context)
+                                              (comment as BuildableComment)
-                                                .textScaleFactor *
+                                                  .elements,
-                                            15,
+                                              style: TextStyle(
-                                      ),
+                                                fontSize: MediaQuery.of(context)
-                                      linkStyle: TextStyle(
+                                                        .textScaleFactor *
-                                        fontSize: MediaQuery.of(context)
+                                                    15,
-                                                .textScaleFactor *
+                                              ),
-                                            15,
+                                              linkStyle: TextStyle(
-                                        color: Colors.orange,
+                                                fontSize: MediaQuery.of(context)
-                                      ),
+                                                        .textScaleFactor *
-                                      onOpen: (LinkableElement link) {
+                                                    15,
-                                        if (link.url.contains(
+                                                decoration:
-                                          'news.ycombinator.com/item',
+                                                    TextDecoration.underline,
-                                        )) {
+                                                color: Colors.orange,
-                                          onStoryLinkTapped.call(link.url);
+                                              ),
-                                        } else {
+                                              onOpen: (LinkableElement link) {
-                                          LinkUtil.launch(link.url);
+                                                if (link.url.contains(
-                                        }
+                                                  'news.ycombinator.com/item',
-                                      },
+                                                )) {
-                                    ),
+                                                  onStoryLinkTapped
+                                                      .call(link.url);
+                                                } else {
+                                                  LinkUtil.launch(link.url);
+                                                }
+                                              },
+                                            ),
+                                          )
+                                        : SelectableLinkify(
+                                            key: ValueKey<int>(comment.id),
+                                            text: comment.text,
+                                            style: TextStyle(
+                                              fontSize: MediaQuery.of(context)
+                                                      .textScaleFactor *
+                                                  15,
+                                            ),
+                                            linkStyle: TextStyle(
+                                              fontSize: MediaQuery.of(context)
+                                                      .textScaleFactor *
+                                                  15,
+                                              color: Colors.orange,
+                                            ),
+                                            onOpen: (LinkableElement link) {
+                                              if (link.url.contains(
+                                                'news.ycombinator.com/item',
+                                              )) {
+                                                onStoryLinkTapped
+                                                    .call(link.url);
+                                              } else {
+                                                LinkUtil.launch(link.url);
+                                              }
+                                            },
+                                          ),
                                   ),
                                 const Divider(
                                   height: 0,

lib/screens/widgets/items_list_view.dart

@@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                         )
                       : null,
                   child: StoryTile(
-                    key: ObjectKey(e),
+                    key: ValueKey<int>(e.id),
                     story: e,
                     onTap: () => onTap(e),
                     showWebPreview: showWebPreview,

lib/screens/widgets/link_preview/link_preview.dart

@@ -13,6 +13,7 @@ class LinkPreview extends StatefulWidget {
     required this.link,
     required this.story,
     required this.showMetadata,
+    required this.offlineReading,
     this.cache = const Duration(days: 30),
     this.titleStyle,
     this.bodyStyle,
@@ -100,6 +101,7 @@ class LinkPreview extends StatefulWidget {
   final List<BoxShadow>? boxShadow;
 
   final bool showMetadata;
+  final bool offlineReading;
 
   @override
   _LinkPreviewState createState() => _LinkPreviewState();
@@ -107,7 +109,7 @@ class LinkPreview extends StatefulWidget {
 
 class _LinkPreviewState extends State<LinkPreview> {
   InfoBase? _info;
-  String? _errorTitle, _errorBody, _url;
+  String? _errorTitle, _errorBody;
   bool _loading = false;
 
   @override
@@ -117,35 +119,19 @@ class _LinkPreviewState extends State<LinkPreview> {
         'Oops! Unable to parse the url. We have '
             'sent feedback to our developers & '
             'we will try to fix this in our next release. Thanks!';
-    _url = widget.link.trim();
 
-    if (_url?.isNotEmpty ?? false) {
+    _loading = true;
-      _info = WebAnalyzer.getInfoFromCache(_url);
+    _getInfo();
-    } else {
-      _info = WebAnalyzer.getInfoFromCache(widget.story.id.toString());
-    }
 
-    if (_info == null) {
-      _loading = true;
-      _getInfo();
-    }
     super.initState();
   }
 
   Future<void> _getInfo() async {
-    if (_url!.startsWith('http') || _url!.startsWith('https')) {
+    _info = await WebAnalyzer.getInfo(
-      _info = await WebAnalyzer.getInfo(
+      story: widget.story,
-        _url,
+      cache: widget.cache,
-        story: widget.story,
+      offlineReading: widget.offlineReading,
-        cache: widget.cache,
+    );
-      );
-    } else {
-      _info = await WebAnalyzer.getInfo(
-        widget.story.id.toString(),
-        story: widget.story,
-        cache: widget.cache,
-      );
-    }
 
     if (mounted) {
       setState(() {
@@ -188,8 +174,8 @@ class _LinkPreviewState extends State<LinkPreview> {
         key: widget.key ?? Key(widget.link),
         metadata: widget.story.simpleMetadata,
         url: widget.link,
-        title: title!,
+        title: widget.story.title,
-        description: desc!,
+        description: desc ?? title ?? 'no comment yet.',
         imageUri: imageUri,
         imagePath: Constants.hackerNewsLogoPath,
         onTap: _launchURL,
@@ -228,40 +214,29 @@ class _LinkPreviewState extends State<LinkPreview> {
 
     Widget loadedWidget;
 
-    if (_info is WebImageInfo) {
+    final WebInfo? info = _info as WebInfo?;
-      final String img = (_info as WebImageInfo?)?.image ?? '';
+    loadedWidget = _info == null
-      loadedWidget = _buildLinkContainer(
+        ? _buildLinkContainer(
-        _height,
+            _height,
-        title: _errorTitle,
+            title: _errorTitle,
-        desc: _errorBody,
+            desc: _errorBody,
-        imageUri:
+            imageUri: null,
-            widget.showMultimedia ? (img.trim() == '' ? null : img) : null,
+          )
-      );
+        : _buildLinkContainer(
-    } else {
+            _height,
-      final WebInfo? info = _info as WebInfo?;
+            title: _errorTitle,
-      loadedWidget = _info == null
+            desc: WebAnalyzer.isNotEmpty(info!.description)
-          ? _buildLinkContainer(
+                ? info.description
-              _height,
+                : _errorBody,
-              title: _errorTitle,
+            imageUri: widget.showMultimedia
-              desc: _errorBody,
+                ? (WebAnalyzer.isNotEmpty(info.image)
-              imageUri: null,
+                    ? info.image
-            )
+                    : WebAnalyzer.isNotEmpty(info.icon)
-          : _buildLinkContainer(
+                        ? info.icon
-              _height,
+                        : null)
-              title: _errorTitle,
+                : null,
-              desc: WebAnalyzer.isNotEmpty(info!.description)
+            isIcon: !WebAnalyzer.isNotEmpty(info.image),
-                  ? info.description
+          );
-                  : _errorBody,
-              imageUri: widget.showMultimedia
-                  ? (WebAnalyzer.isNotEmpty(info.image)
-                      ? info.image
-                      : WebAnalyzer.isNotEmpty(info.icon)
-                          ? info.icon
-                          : null)
-                  : null,
-              isIcon: !WebAnalyzer.isNotEmpty(info.image),
-            );
-    }
 
     return AnimatedCrossFade(
       firstChild: loadingWidget,

lib/screens/widgets/link_preview/web_analyzer.dart

@@ -16,6 +16,7 @@ import 'package:http/io_client.dart';
 
 abstract class InfoBase {
   late DateTime _timeout;
+  late bool _shouldRetry;
 
   Map<String, dynamic> toJson();
 }
@@ -94,12 +95,12 @@ class WebAnalyzer {
 
   /// Get web information
   /// return [InfoBase]
-  static InfoBase? getInfoFromCache(String? url) {
+  static InfoBase? getInfoFromCache(String? cacheKey) {
-    final InfoBase? info = cacheMap[url];
+    final InfoBase? info = cacheMap[cacheKey];
 
     if (info != null) {
       if (!info._timeout.isAfter(DateTime.now())) {
-        cacheMap.remove(url);
+        cacheMap.remove(cacheKey);
       }
     }
     return info;
@@ -107,73 +108,76 @@ class WebAnalyzer {
 
   /// Get web information
   /// return [InfoBase]
-  static Future<InfoBase?> getInfo(
+  static Future<InfoBase?> getInfo({
-    String? url, {
     required Story story,
     Duration cache = const Duration(hours: 24),
     bool multimedia = true,
+    required bool offlineReading,
   }) async {
-    InfoBase? info = getInfoFromCache(url);
+    final String key = getKey(story);
+    final String url = story.url;
+
+    InfoBase? info = getInfoFromCache(key);
+
     if (info != null) return info;
 
     if (story.url.isEmpty && story.text.isNotEmpty) {
       info = WebInfo(
         title: story.title,
         description: story.text,
-      ).._timeout = DateTime.now().add(cache);
+      )
-      cacheMap[story.id.toString()] = info;
+        .._timeout = DateTime.now().add(cache)
+        .._shouldRetry = false;
+
+      cacheMap[key] = info;
+
+      return info;
+    }
+
+    if (offlineReading) {
+      int index = 0;
+      Comment? comment;
+
+      while (comment == null && index < story.kids.length) {
+        comment = await locator
+            .get<CacheRepository>()
+            .getCachedComment(id: story.kids.elementAt(index));
+        index++;
+      }
+
+      info = WebInfo(
+        title: story.title,
+        description: comment != null ? '${comment.by}: ${comment.text}' : null,
+      )
+        .._shouldRetry = false
+        .._timeout = DateTime.now();
+
+      cacheMap[key] = info;
 
       return info;
     }
 
     try {
-      info = await _getInfoByIsolate(url, multimedia);
+      info = await _getInfoByIsolate(
-
+        url: url,
-      if (info != null) {
+        multimedia: multimedia,
-        info._timeout = DateTime.now().add(cache);
+        story: story,
-        cacheMap[url] = info;
-      }
-    } catch (e) {
-      //locator.get<Logger>().log(Level.error, e);
-    }
-
-    if ((info == null ||
-            info is WebImageInfo ||
-            (info is WebInfo && (info.description?.isEmpty ?? true))) &&
-        story.kids.isNotEmpty) {
-      bool shouldRetry = false;
-      final Comment? comment = await locator
-          .get<StoriesRepository>()
-          .fetchCommentBy(id: story.kids.first)
-          .catchError((Object err) async {
-        int index = 0;
-        Comment? comment;
-
-        while (comment == null && index < story.kids.length) {
-          comment = await locator
-              .get<CacheRepository>()
-              .getCachedComment(id: story.kids.elementAt(index));
-          index++;
-        }
-
-        shouldRetry = true;
-        return comment;
-      });
-
-      info = WebInfo(
-        description:
-            comment != null ? '${comment.by}: ${comment.text}' : 'no comments',
-        image: info is WebInfo ? info.image : (info as WebImageInfo?)?.image,
-        icon: info is WebInfo ? info.icon : null,
       );
 
-      if (!shouldRetry) {
+      if (info != null && !info._shouldRetry) {
         info._timeout = DateTime.now().add(cache);
-        cacheMap[url] = info;
+        cacheMap[key] = info;
       }
-    }
 
-    return info;
+      return info;
+    } catch (e) {
+      return WebInfo(
+        title: story.title,
+        description: story.text,
+      )
+        .._shouldRetry = true
+        .._timeout = DateTime.now();
+    }
   }
 
   static Future<InfoBase?> _getInfo(String url, bool? multimedia) async {
@@ -195,60 +199,116 @@ class WebAnalyzer {
     return _getWebInfo(response, url, multimedia);
   }
 
-  static Future<InfoBase?> _getInfoByIsolate(
+  static Future<InfoBase?> _getInfoByIsolate({
     String? url,
-    bool multimedia,
+    required bool multimedia,
-  ) async {
+    required Story story,
-    final List<dynamic>? res = await compute(
+  }) async {
-      _isolate,
+    List<dynamic>? res;
-      <dynamic>[url, multimedia],
-    );
 
+    if (url != null) {
+      res = await compute(
+        _fetchInfoFromUrl,
+        <dynamic>[url, multimedia],
+      );
+    }
+
+    late final bool shouldRetry;
     InfoBase? info;
+    String? fallbackDescription;
+
+    if (res == null || isEmpty(res[2] as String?)) {
+      final String? commentText = await compute(
+        _fetchInfoFromStory,
+        <int>[story.id, ...story.kids],
+      );
+
+      shouldRetry = commentText == null;
+      fallbackDescription = commentText ?? 'no comment yet';
+    } else {
+      shouldRetry = false;
+    }
+
     if (res != null) {
       if (res[0] == '0') {
         info = WebInfo(
-          title: res[1] as String?,
+          title: story.title,
-          description:
+          description: isEmpty(res[2] as String?)
-              res[2] == null ? null : (res[2] as String).removeAllEmojis(),
+              ? (fallbackDescription ??
+                  (story.text.isEmpty ? res[1] as String? : story.text))
+              : (res[2] as String).removeAllEmojis(),
           icon: res[3] as String?,
           image: res[4] as String?,
-        );
+        ).._shouldRetry = shouldRetry;
-      } else if (res[0] == '1') {
+      } else {
-        info = WebVideoInfo(image: res[1] as String);
+        info = WebInfo(
-      } else if (res[0] == '2') {
+          image: res[1] as String,
-        info = WebImageInfo(image: res[1] as String);
+          title: story.title,
+          description: story.text.isEmpty ? fallbackDescription : story.text,
+        ).._shouldRetry = shouldRetry;
       }
+    } else {
+      return WebInfo(
+        title: story.title,
+        description: fallbackDescription,
+      ).._shouldRetry = shouldRetry;
     }
 
     return info;
   }
 
-  static Future<List<dynamic>?> _isolate(dynamic message) async {
+  static Future<List<dynamic>?> _fetchInfoFromUrl(dynamic message) async {
-    // ignore: avoid_dynamic_calls
+    try {
-    final String url = message[0] as String;
+      // ignore: avoid_dynamic_calls
-    // ignore: avoid_dynamic_calls
+      final String url = message[0] as String;
-    final bool multimedia = message[1] as bool;
+      // ignore: avoid_dynamic_calls
+      final bool multimedia = message[1] as bool;
 
-    final InfoBase? info = await _getInfo(url, multimedia);
+      final InfoBase? info = await _getInfo(url, multimedia);
 
-    if (info is WebInfo) {
+      if (info is WebInfo) {
-      return <dynamic>[
+        return <dynamic>[
-        '0',
+          '0',
-        info.title,
+          info.title,
-        info.description,
+          info.description,
-        info.icon,
+          info.icon,
-        info.image
+          info.image
-      ];
+        ];
-    } else if (info is WebVideoInfo) {
+      } else if (info is WebVideoInfo) {
-      return <dynamic>['1', info.image];
+        return <dynamic>['1', info.image];
-    } else if (info is WebImageInfo) {
+      } else if (info is WebImageInfo) {
-      return <dynamic>['2', info.image];
+        return <dynamic>['2', info.image];
-    } else {
+      } else {
+        return null;
+      }
+    } catch (_) {
       return null;
     }
   }
 
+  static Future<String?> _fetchInfoFromStory(List<int> meta) async {
+    final StoriesRepository storiesRepository = StoriesRepository();
+    final int storyId = meta.first;
+    List<int> kids = meta.sublist(1, meta.length);
+
+    // Kids of stories from search results are always empty, so here we try
+    // to fetch the story itself first and see if the kids are still empty.
+    if (kids.isEmpty) {
+      final Story? story = await storiesRepository.fetchStoryBy(storyId);
+
+      if (story == null) return null;
+
+      kids = story.kids;
+
+      if (kids.isEmpty) return null;
+    }
+
+    final Comment? comment =
+        await storiesRepository.fetchCommentBy(id: kids.first);
+
+    return comment != null ? '${comment.by}: ${comment.text}' : null;
+  }
+
   static bool _certificateCheck(X509Certificate cert, String host, int port) =>
       true;
 
@@ -275,46 +335,45 @@ class WebAnalyzer {
       ..headers['accept'] =
           'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9';
 
-    final IOStreamedResponse stream =
+    try {
-        await client.send(request).catchError((dynamic err) {
+      final IOStreamedResponse stream =
-      // locator.get<Logger>().log(
+          await client.send(request).timeout(const Duration(seconds: 10));
-      //       Level.error,
-      //       'Error in getting the link => ${request.url}\n$err',
-      //     );
-    });
 
-    if (stream.statusCode == HttpStatus.movedTemporarily ||
+      if (stream.statusCode == HttpStatus.movedTemporarily ||
-        stream.statusCode == HttpStatus.movedPermanently) {
+          stream.statusCode == HttpStatus.movedPermanently) {
-      if (stream.isRedirect && count < 6) {
+        if (stream.isRedirect && count < 6) {
-        final String? location = stream.headers['location'];
+          final String? location = stream.headers['location'];
-        if (location != null) {
+          if (location != null) {
-          url = location;
+            url = location;
-          if (location.startsWith('/')) {
+            if (location.startsWith('/')) {
-            url = uri.origin + location;
+              url = uri.origin + location;
+            }
           }
+          if (stream.headers['set-cookie'] != null) {
+            cookie = stream.headers['set-cookie'];
+          }
+          count++;
+          client.close();
+          return _requestUrl(url, count: count, cookie: cookie);
         }
-        if (stream.headers['set-cookie'] != null) {
+      } else if (stream.statusCode == HttpStatus.ok) {
-          cookie = stream.headers['set-cookie'];
+        res = await Response.fromStream(stream);
-        }
+        if (uri.host == 'm.tb.cn') {
-        count++;
+          final RegExpMatch? match =
-        client.close();
+              RegExp(r"var url = \'(.*)\'").firstMatch(res.body);
-        return _requestUrl(url, count: count, cookie: cookie);
+          if (match != null) {
-      }
+            final String? newUrl = match.group(1);
-    } else if (stream.statusCode == HttpStatus.ok) {
+            if (newUrl != null) {
-      res = await Response.fromStream(stream);
+              return _requestUrl(newUrl, count: count, cookie: cookie);
-      if (uri.host == 'm.tb.cn') {
+            }
-        final RegExpMatch? match =
-            RegExp(r"var url = \'(.*)\'").firstMatch(res.body);
-        if (match != null) {
-          final String? newUrl = match.group(1);
-          if (newUrl != null) {
-            return _requestUrl(newUrl, count: count, cookie: cookie);
           }
         }
       }
+      client.close();
+      return res;
+    } catch (_) {
+      return null;
     }
-    client.close();
-    return res;
   }
 
   static Future<InfoBase?> _getWebInfo(
@@ -500,4 +559,7 @@ class WebAnalyzer {
     }
     return source;
   }
+
+  static String getKey(Story story) =>
+      story.url.isNotEmpty ? story.url : story.id.toString();
 }

lib/screens/widgets/story_tile.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
+import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
@@ -43,6 +45,7 @@ class StoryTile extends StatelessWidget {
             child: LinkPreview(
               story: story,
               link: story.url,
+              offlineReading: context.read<StoriesBloc>().state.offlineReading,
               placeholderWidget: FadeIn(
                 child: SizedBox(
                   height: height,

lib/utils/link_util.dart

@@ -1,11 +1,38 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:hacki/config/locator.dart';
+import 'package:hacki/main.dart';
+import 'package:hacki/repositories/repositories.dart';
+import 'package:hacki/screens/screens.dart' show WebViewScreen;
 import 'package:url_launcher/url_launcher.dart';
 
 abstract class LinkUtil {
   static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
 
-  static void launch(String link, {bool useReader = false}) {
+  static void launch(
+    String link, {
+    bool useReader = false,
+    bool offlineReading = false,
+  }) {
+    if (offlineReading) {
+      locator
+          .get<CacheRepository>()
+          .hasCachedWebPage(url: link)
+          .then((bool cached) {
+        if (cached) {
+          HackiApp.navigatorKey.currentState?.push<void>(
+            MaterialPageRoute<void>(
+              builder: (BuildContext context) => WebViewScreen(url: link),
+            ),
+          );
+        }
+      });
+
+      return;
+    }
+
     Uri rinseLink(String link) {
       final RegExp regex = RegExp(r'\)|].*$');
       if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
@@ -20,17 +47,21 @@ abstract class LinkUtil {
     canLaunchUrl(uri).then((bool val) {
       if (val) {
         if (link.contains('http')) {
-          _browser
+          if (Platform.isAndroid) {
-              .open(
+            launchUrl(uri, mode: LaunchMode.externalApplication);
-                url: uri,
+          } else {
-                options: ChromeSafariBrowserClassOptions(
+            _browser
-                  ios: IOSSafariOptions(
+                .open(
-                    entersReaderIfAvailable: useReader,
+                  url: uri,
-                    preferredControlTintColor: Colors.orange,
+                  options: ChromeSafariBrowserClassOptions(
+                    ios: IOSSafariOptions(
+                      entersReaderIfAvailable: useReader,
+                      preferredControlTintColor: Colors.orange,
+                    ),
                   ),
-                ),
+                )
-              )
+                .onError((_, __) => launchUrl(uri));
-              .onError((_, __) => launchUrl(uri));
+          }
         } else {
           launchUrl(uri);
         }

pubspec.lock

@@ -99,20 +99,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
-  chewie:
-    dependency: transitive
-    description:
-      name: chewie
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.3"
-  chewie_audio:
-    dependency: transitive
-    description:
-      name: chewie_audio
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
   clipboard:
     dependency: "direct main"
     description:
@@ -204,13 +190,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.17.1"
-  cupertino_icons:
-    dependency: transitive
-    description:
-      name: cupertino_icons
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.4"
   dbus:
     dependency: transitive
     description:
@@ -316,13 +295,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0+1"
-  flutter_html:
-    dependency: "direct main"
-    description:
-      name: flutter_html
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.1"
   flutter_inappwebview:
     dependency: "direct main"
     description:
@@ -330,13 +302,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.4.3+7"
-  flutter_layout_grid:
-    dependency: transitive
-    description:
-      name: flutter_layout_grid
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.6"
   flutter_linkify:
     dependency: "direct main"
     description:
@@ -365,13 +330,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.0"
-  flutter_math_fork:
-    dependency: transitive
-    description:
-      name: flutter_math_fork
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.0"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -414,6 +372,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
+  flutter_siri_suggestions:
+    dependency: "direct main"
+    description:
+      name: flutter_siri_suggestions
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -421,13 +386,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
-  flutter_svg:
-    dependency: transitive
-    description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.23.0+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -613,13 +571,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
-  numerus:
-    dependency: transitive
-    description:
-      name: numerus
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
   octo_image:
     dependency: transitive
     description:
@@ -641,20 +592,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.1"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.5.1+1"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -804,6 +741,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
+  share_plus:
+    dependency: "direct main"
+    description:
+      name: share_plus
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.0.8"
+  share_plus_linux:
+    dependency: transitive
+    description:
+      name: share_plus_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
+  share_plus_macos:
+    dependency: transitive
+    description:
+      name: share_plus_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.3"
+  share_plus_web:
+    dependency: transitive
+    description:
+      name: share_plus_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
+  share_plus_windows:
+    dependency: transitive
+    description:
+      name: share_plus_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1032,7 +1011,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.3"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1103,41 +1082,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
-  video_player:
-    dependency: transitive
-    description:
-      name: video_player
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.2"
-  video_player_android:
-    dependency: transitive
-    description:
-      name: video_player_android
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.3"
-  video_player_avfoundation:
-    dependency: transitive
-    description:
-      name: video_player_avfoundation
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.4"
-  video_player_platform_interface:
-    dependency: transitive
-    description:
-      name: video_player_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.1.2"
-  video_player_web:
-    dependency: transitive
-    description:
-      name: video_player_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.10"
   vm_service:
     dependency: transitive
     description:
@@ -1202,12 +1146,12 @@ packages:
     source: hosted
     version: "1.0.1"
   webview_flutter:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.0"
+    version: "3.0.4"
   webview_flutter_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.14+53
+version: 0.2.20+62
 publish_to: none
 
 environment:
@@ -28,11 +28,11 @@ dependencies:
   flutter_cache_manager: ^3.3.0
   flutter_fadein: ^2.0.0
   flutter_feather_icons: 2.0.0+1
-  flutter_html: ^2.2.1
   flutter_inappwebview: ^5.4.3+4
   flutter_linkify: ^5.0.2
   flutter_local_notifications: ^9.5.0
   flutter_secure_storage: ^5.0.2
+  flutter_siri_suggestions: ^2.1.0
   flutter_slidable: ^1.2.1
   font_awesome_flutter: ^9.2.0
   gbk_codec: ^0.4.0
@@ -56,6 +56,7 @@ dependencies:
   responsive_builder: ^0.4.2
   rxdart: ^0.27.3
   sembast: ^3.1.1+1
+  share_plus: ^4.0.8
   shared_preferences: ^2.0.11
   shared_preferences_android: ^2.0.11
   shared_preferences_ios: ^2.0.11
@@ -64,8 +65,9 @@ dependencies:
     path: components/synced_shared_preferences
   tuple: ^2.0.0
   universal_platform: ^1.0.0+1
-  url_launcher: ^6.0.10
+  url_launcher: ^6.1.3
   wakelock: ^0.6.1+2
+  webview_flutter: ^3.0.4
   workmanager: ^0.5.0
 
 dev_dependencies: