fixed background color of nav bar on Android. (#72 )

v0.2.31 (#71 )
* bumped version. * bumped version. * bumped version * bumped version. * downgrade flutter version. * Use transparent color for navigation bar (#70) * Use transparent color for navigation bar * Fixed whitespace Co-authored-by: Niklas Weinhart <git@weinhart.net> * bumped ios version. * bumped versions. * updated min screen width. * removed print. * fixed stack overflow in EditCubit. * added integration test. * bumped version. Co-authored-by: wnhrt <github@weinhart.net> Co-authored-by: Niklas Weinhart <git@weinhart.net>
2025-08-06 18:24:42 +08:00 · 2022-09-17 00:44:27 -07:00 · 2022-09-16 22:37:16 -07:00 · 2022-08-05 22:13:30 -07:00 · 2022-07-06 20:37:18 -07:00 · 2022-07-06 17:04:14 -07:00
173 changed files with 3891 additions and 1914 deletions
--- a/.github/FUNDING.yml
+++ b/.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']
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    env:
      JAVA_VERSION: "11.0"
-      FLUTTER_VERSION: "3.0.0"
+      FLUTTER_VERSION: "3.3.2"
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v2
@ -20,7 +20,7 @@ jobs:
          java-version: '17'
      - uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.3.2'
          channel: 'stable'
      - run: flutter pub get
      - run: flutter analyze
--- a/README.md
+++ b/README.md
@ -1,15 +1,13 @@

 # <img width="64" src="https://user-images.githubusercontent.com/7277662/167775086-0b234f28-dee4-44f6-aae4-14a28ed4bbb6.png"> Hacki for Hacker News

-A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
+A [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.

 [![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
-[![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)
-[![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)
+[![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)
 [![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>
+[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)

 [<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)

@ -36,24 +34,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="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="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="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="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="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png"> 
+   <img width="200" alt="01" src="assets/screenshots/01.png"> 
+   <img width="200" alt="02" src="assets/screenshots/02.png"> 
+   <img width="200" alt="03" src="assets/screenshots/03.png"> 
+   <img width="200" alt="04" src="assets/screenshots/04.png"> 
+   <img width="200" alt="05" src="assets/screenshots/05.png"> 
+   <img width="200" alt="06" src="assets/screenshots/06.png"> 
+   <img width="200" alt="07" src="assets/screenshots/07.png"> 
+   <img width="200" alt="08" src="assets/screenshots/08.png"> 
+   <img width="200" alt="09" src="assets/screenshots/09.png"> 
+   <img width="200" alt="10" src="assets/screenshots/10.png"> 
+   <img width="200" alt="11" src="assets/screenshots/11.png"> 
+   <img width="200" alt="12" src="assets/screenshots/12.png"> 
   
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162733-906c4afd-39a8-48ae-946a-8019b327eaa0.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162735-f2b25119-4702-4308-b2f5-281a2a2c5901.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163024-6dcd65b6-bada-4c1c-95af-387fd4f42fb2.png"> 
-   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163033-7bcf7038-b9aa-4ce4-8b58-64578eae8531.png"> 
+   <img width="400" alt="ipad-01" src="assets/screenshots/ipad-01.png"> 
+   <img width="400" alt="ipad-02" src="assets/screenshots/ipad-02.png"> 
+   <img width="400" alt="ipad-03" src="assets/screenshots/ipad-03.png"> 
+   <img width="400" alt="ipad-04" src="assets/screenshots/ipad-04.png"> 
 </p>

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {


 android {
-    compileSdkVersion 31
+    compileSdkVersion 33

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
@ -49,10 +49,9 @@ android {
    }

    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "com.jiaqifeng.hacki"
        minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
    }
@ -78,5 +77,5 @@ flutter {
 }

 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -16,14 +16,18 @@
    </queries>

   <application
-        android:label="hacki"
-        android:icon="@mipmap/ic_launcher">
+        android:label="Hacki"
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
+        android:usesCleartextTraffic="true">
        <activity
            android:name=".MainActivity"
            android:launchMode="singleTop"
            android:theme="@style/LaunchTheme"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:hardwareAccelerated="true"
+            android:exported="true"
            android:windowSoftInputMode="adjustResize">
            <!-- Specifies an Android theme to apply to this Activity as soon as
                 the Android process has started. This theme is visible to the user
@ -52,6 +56,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 -->
--- a/android/app/src/main/res/xml/backup_rules.xml
+++ b/android/app/src/main/res/xml/backup_rules.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude domain="sharedpref" path="FlutterSecureStorage"/>
+</full-backup-content>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.0'
    repositories {
        google()
        mavenCentral()
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
--- a/assets/screenshots/01.png
+++ b/assets/screenshots/01.png
--- a/assets/screenshots/02.png
+++ b/assets/screenshots/02.png
--- a/assets/screenshots/03.png
+++ b/assets/screenshots/03.png
--- a/assets/screenshots/04.png
+++ b/assets/screenshots/04.png
--- a/assets/screenshots/05.png
+++ b/assets/screenshots/05.png
--- a/assets/screenshots/06.png
+++ b/assets/screenshots/06.png
--- a/assets/screenshots/07.png
+++ b/assets/screenshots/07.png
--- a/assets/screenshots/08.png
+++ b/assets/screenshots/08.png
--- a/assets/screenshots/09.png
+++ b/assets/screenshots/09.png
--- a/assets/screenshots/10.png
+++ b/assets/screenshots/10.png
--- a/assets/screenshots/11.png
+++ b/assets/screenshots/11.png
--- a/assets/screenshots/12.png
+++ b/assets/screenshots/12.png
--- a/assets/screenshots/ipad-01.png
+++ b/assets/screenshots/ipad-01.png
--- a/assets/screenshots/ipad-02.png
+++ b/assets/screenshots/ipad-02.png
--- a/assets/screenshots/ipad-03.png
+++ b/assets/screenshots/ipad-03.png
--- a/assets/screenshots/ipad-04.png
+++ b/assets/screenshots/ipad-04.png
--- a/fastlane/metadata/android/en-US/changelogs/22.txt
+++ b/fastlane/metadata/android/en-US/changelogs/22.txt
@ -1 +0,0 @@
- Bugfixes.
--- a/fastlane/metadata/android/en-US/changelogs/23.txt
+++ b/fastlane/metadata/android/en-US/changelogs/23.txt
@ -1 +0,0 @@
- Updates to UI.
--- a/fastlane/metadata/android/en-US/changelogs/24.txt
+++ b/fastlane/metadata/android/en-US/changelogs/24.txt
@ -1 +0,0 @@
- Updates to UI.
--- a/fastlane/metadata/android/en-US/changelogs/25.txt
+++ b/fastlane/metadata/android/en-US/changelogs/25.txt
@ -1 +0,0 @@
- Updates to UI.
--- a/fastlane/metadata/android/en-US/changelogs/26.txt
+++ b/fastlane/metadata/android/en-US/changelogs/26.txt
@ -1 +0,0 @@
- Tapping on comments in notification and history screen will lead you directly to the comment.
--- a/fastlane/metadata/android/en-US/changelogs/27.txt
+++ b/fastlane/metadata/android/en-US/changelogs/27.txt
@ -1,3 +0,0 @@
- Tapping on comment in notification or history screen will now lead you directly to the comment.
- Fixed the bug where reply box cannot be expanded in editing mode.
- Fixed inconsistent font size in history screen.
--- a/fastlane/metadata/android/en-US/changelogs/28.txt
+++ b/fastlane/metadata/android/en-US/changelogs/28.txt
@ -1 +0,0 @@
- Added offline mode.
--- a/fastlane/metadata/android/en-US/changelogs/29.txt
+++ b/fastlane/metadata/android/en-US/changelogs/29.txt
@ -1,2 +0,0 @@
- Added offline mode.
- Bugfixes.
--- a/fastlane/metadata/android/en-US/changelogs/30.txt
+++ b/fastlane/metadata/android/en-US/changelogs/30.txt
@ -1,2 +0,0 @@
- Added offline mode.
- Bugfixes.
--- a/fastlane/metadata/android/en-US/changelogs/31.txt
+++ b/fastlane/metadata/android/en-US/changelogs/31.txt
@ -1,2 +0,0 @@
- Added offline mode.
- Bugfixes.
--- a/fastlane/metadata/android/en-US/changelogs/34.txt
+++ b/fastlane/metadata/android/en-US/changelogs/34.txt
@ -1,3 +0,0 @@
- Pick up where you left off.
- Swipe left on comment tile to view its parents without scrolling all the way up.
- Huge performance boost.
--- a/fastlane/metadata/android/en-US/changelogs/35.txt
+++ b/fastlane/metadata/android/en-US/changelogs/35.txt
@ -1,3 +0,0 @@
- Pick up where you left off.
- Swipe left on comment tile to view its parents without scrolling all the way up.
- Huge performance boost.
--- a/fastlane/metadata/android/en-US/changelogs/36.txt
+++ b/fastlane/metadata/android/en-US/changelogs/36.txt
@ -1,3 +0,0 @@
- Pick up where you left off.
- Swipe left on comment tile to view its parents without scrolling all the way up.
- Huge performance boost.
--- a/fastlane/metadata/android/en-US/changelogs/37.txt
+++ b/fastlane/metadata/android/en-US/changelogs/37.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/38.txt
+++ b/fastlane/metadata/android/en-US/changelogs/38.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/39.txt
+++ b/fastlane/metadata/android/en-US/changelogs/39.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/40.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/41.txt
+++ b/fastlane/metadata/android/en-US/changelogs/41.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/42.txt
+++ b/fastlane/metadata/android/en-US/changelogs/42.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/43.txt
+++ b/fastlane/metadata/android/en-US/changelogs/43.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/44.txt
+++ b/fastlane/metadata/android/en-US/changelogs/44.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/45.txt
+++ b/fastlane/metadata/android/en-US/changelogs/45.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/46.txt
+++ b/fastlane/metadata/android/en-US/changelogs/46.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/47.txt
+++ b/fastlane/metadata/android/en-US/changelogs/47.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/48.txt
+++ b/fastlane/metadata/android/en-US/changelogs/48.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/49.txt
+++ b/fastlane/metadata/android/en-US/changelogs/49.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/50.txt
+++ b/fastlane/metadata/android/en-US/changelogs/50.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/51.txt
+++ b/fastlane/metadata/android/en-US/changelogs/51.txt
@ -1,4 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/52.txt
+++ b/fastlane/metadata/android/en-US/changelogs/52.txt
@ -1,5 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/53.txt
+++ b/fastlane/metadata/android/en-US/changelogs/53.txt
@ -1,6 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/54.txt
+++ b/fastlane/metadata/android/en-US/changelogs/54.txt
@ -1,6 +0,0 @@
- 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.
--- a/fastlane/metadata/android/en-US/changelogs/58.txt
+++ b/fastlane/metadata/android/en-US/changelogs/58.txt
@ -0,0 +1 @@
+- Offline mode now includes web pages.
--- a/fastlane/metadata/android/en-US/changelogs/59.txt
+++ b/fastlane/metadata/android/en-US/changelogs/59.txt
@ -0,0 +1 @@
+- Offline mode now includes web pages.
--- a/fastlane/metadata/android/en-US/changelogs/60.txt
+++ b/fastlane/metadata/android/en-US/changelogs/60.txt
@ -0,0 +1 @@
+- Offline mode now includes web pages.
--- a/fastlane/metadata/android/en-US/changelogs/61.txt
+++ b/fastlane/metadata/android/en-US/changelogs/61.txt
@ -0,0 +1 @@
+- Offline mode now includes web pages.
--- a/fastlane/metadata/android/en-US/changelogs/62.txt
+++ b/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.
--- a/fastlane/metadata/android/en-US/changelogs/63.txt
+++ b/fastlane/metadata/android/en-US/changelogs/63.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/64.txt
+++ b/fastlane/metadata/android/en-US/changelogs/64.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/65.txt
+++ b/fastlane/metadata/android/en-US/changelogs/65.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/66.txt
+++ b/fastlane/metadata/android/en-US/changelogs/66.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/67.txt
+++ b/fastlane/metadata/android/en-US/changelogs/67.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/68.txt
+++ b/fastlane/metadata/android/en-US/changelogs/68.txt
@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/69.txt
+++ b/fastlane/metadata/android/en-US/changelogs/69.txt
@ -0,0 +1,3 @@
+- Lazy loading.
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/70.txt
+++ b/fastlane/metadata/android/en-US/changelogs/70.txt
@ -0,0 +1,3 @@
+- Lazy loading.
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/71.txt
+++ b/fastlane/metadata/android/en-US/changelogs/71.txt
@ -0,0 +1,3 @@
+- Lazy loading.
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/72.txt
+++ b/fastlane/metadata/android/en-US/changelogs/72.txt
@ -0,0 +1,3 @@
+- Lazy loading.
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/73.txt
+++ b/fastlane/metadata/android/en-US/changelogs/73.txt
@ -0,0 +1,3 @@
+- Lazy loading.
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.
--- a/fastlane/metadata/android/en-US/changelogs/74.txt
+++ b/fastlane/metadata/android/en-US/changelogs/74.txt
@ -0,0 +1,2 @@
+- Bumped Flutter version.
+- Updated navigation bar background color.
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
--- a/integration_test/scrolling_test.dart
+++ b/integration_test/scrolling_test.dart
@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hacki/main.dart' as app;
+import 'package:hacki/screens/widgets/widgets.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  final IntegrationTestWidgetsFlutterBinding binding =
+      IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  testWidgets('Scrolling test', (WidgetTester tester) async {
+    await app.main(testing: true);
+    await tester.pumpAndSettle();
+
+    final Finder bestTabFinder = find.widgetWithText(Tab, 'BEST');
+
+    expect(bestTabFinder, findsOneWidget);
+
+    Future<void> scrollDown(WidgetTester tester) async {
+      await tester.timedDragFrom(
+        const Offset(100, 200),
+        const Offset(100, -700),
+        const Duration(seconds: 2),
+      );
+      await tester.pump();
+    }
+
+    Future<void> scrollUp(WidgetTester tester) async {
+      await tester.timedDragFrom(
+        const Offset(100, 200),
+        const Offset(100, 700),
+        const Duration(seconds: 1),
+      );
+      await tester.pump();
+    }
+
+    await binding.traceAction(
+      () async {
+        await tester.tap(bestTabFinder);
+        await tester.pump();
+
+        const int count = 10;
+
+        for (int i = 0; i < count; i++) {
+          await scrollDown(tester);
+        }
+
+        for (int i = 0; i < count - 3; i++) {
+          await scrollUp(tester);
+        }
+
+        await tester.pumpAndSettle(const Duration(seconds: 2));
+
+        final Finder storyFinder = find.byType(StoryTile);
+
+        expect(storyFinder, findsWidgets);
+
+        final Finder firstStoryFinder = storyFinder.first;
+
+        expect(firstStoryFinder, findsOneWidget);
+
+        await tester.tap(firstStoryFinder);
+        await tester.pump(const Duration(seconds: 4));
+      },
+      reportKey: 'scrolling_timeline',
+    );
+  });
+}
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
+# platform :ios, '11.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@ -37,8 +37,5 @@ end
 post_install do |installer|
  installer.pods_project.targets.each do |target|
    flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-     config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
-    end
  end
 end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -14,15 +14,21 @@ 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)
+  - integration_test (0.0.1):
+    - Flutter
  - OrderedSet (5.0.0)
  - path_provider_ios (0.0.1):
    - Flutter
  - 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 +38,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 +51,15 @@ 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`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
  - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - 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 +81,16 @@ 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"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/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 +99,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:
@ -98,24 +108,26 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
  flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
  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

-PODFILE CHECKSUM: e4c97c7a9aacaeda4b952f7ef9ea29e47660f622
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3

 COCOAPODS: 1.11.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -549,7 +549,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -568,16 +568,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.31;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -635,7 +635,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@ -684,7 +684,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@ -705,16 +705,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.31;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -736,16 +736,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.31;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/lib/blocs/stories/stories_bloc.dart
+++ b/lib/blocs/stories/stories_bloc.dart
@ -7,7 +7,9 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
+import 'package:logger/logger.dart';
 import 'package:responsive_builder/responsive_builder.dart';
+import 'package:rxdart/rxdart.dart';

 part 'stories_event.dart';
 part 'stories_state.dart';
@ -15,15 +17,18 @@ part 'stories_state.dart';
 class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
  StoriesBloc({
    required PreferenceCubit preferenceCubit,
-    CacheRepository? cacheRepository,
+    OfflineRepository? offlineRepository,
    StoriesRepository? storiesRepository,
    PreferenceRepository? preferenceRepository,
+    Logger? logger,
  })  : _preferenceCubit = preferenceCubit,
-        _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
+        _offlineRepository =
+            offlineRepository ?? locator.get<OfflineRepository>(),
        _storiesRepository =
            storiesRepository ?? locator.get<StoriesRepository>(),
        _preferenceRepository =
            preferenceRepository ?? locator.get<PreferenceRepository>(),
+        _logger = logger ?? locator.get<Logger>(),
        super(const StoriesState.init()) {
    on<StoriesInitialize>(onInitialize);
    on<StoriesRefresh>(onRefresh);
@ -32,15 +37,17 @@ 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);
  }

  final PreferenceCubit _preferenceCubit;
-  final CacheRepository _cacheRepository;
+  final OfflineRepository _offlineRepository;
  final StoriesRepository _storiesRepository;
  final PreferenceRepository _preferenceRepository;
+  final Logger _logger;
  DeviceScreenType? deviceScreenType;
  StreamSubscription<PreferenceState>? _streamSubscription;
  static const int _smallPageSize = 10;
@ -48,6 +55,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,
@ -61,7 +77,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
        add(StoriesPageSizeChanged(pageSize: pageSize));
      }
    });
-    final bool hasCachedStories = await _cacheRepository.hasCachedStories;
+    final bool hasCachedStories = await _offlineRepository.hasCachedStories;
    final bool isComplexTile = _preferenceCubit.state.showComplexStoryTile;
    final int pageSize = _getPageSize(isComplexTile: isComplexTile);
    emit(
@ -70,11 +86,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
        currentPageSize: pageSize,
      ),
    );
-    await loadStories(of: StoryType.top, emit: emit);
-    await loadStories(of: StoryType.latest, emit: emit);
-    await loadStories(of: StoryType.ask, emit: emit);
-    await loadStories(of: StoryType.show, emit: emit);
-    await loadStories(of: StoryType.jobs, emit: emit);
+    for (final StoryType type in types) {
+      await loadStories(of: type, emit: emit);
+    }
  }

  Future<void> loadStories({
@ -82,13 +96,13 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
    required Emitter<StoriesState> emit,
  }) async {
    if (state.offlineReading) {
-      final List<int> ids = await _cacheRepository.getCachedStoryIds(of: of);
+      final List<int> ids = await _offlineRepository.getCachedStoryIds(of: of);
      emit(
        state
            .copyWithStoryIdsUpdated(of: of, to: ids)
            .copyWithCurrentPageUpdated(of: of, to: 0),
      );
-      _cacheRepository
+      _offlineRepository
          .getCachedStoriesStream(
        ids: ids.sublist(0, min(ids.length, state.currentPageSize)),
      )
@ -159,7 +173,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
      }

      if (state.offlineReading) {
-        _cacheRepository
+        _offlineRepository
            .getCachedStoriesStream(
          ids: state.storyIdsByType[event.type]!.sublist(
            lower,
@ -233,56 +247,46 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
      ),
    );

-    await _cacheRepository.deleteAllStoryIds();
-    await _cacheRepository.deleteAllStories();
-    await _cacheRepository.deleteAllComments();
+    await _offlineRepository.deleteAllStoryIds();
+    await _offlineRepository.deleteAllStories();
+    await _offlineRepository.deleteAllComments();

-    final List<int> topIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.top);
-    final List<int> newIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.latest);
-    final List<int> askIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.ask);
-    final List<int> showIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.show);
-    final List<int> jobIds =
-        await _storiesRepository.fetchStoryIds(of: StoryType.jobs);
+    final Set<int> prioritizedIds = <int>{};
+    final List<StoryType> prioritizedTypes = <StoryType>[...types]
+      ..remove(StoryType.latest);

-    await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
-    await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
+    for (final StoryType type in prioritizedTypes) {
+      final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
+      await _offlineRepository.cacheStoryIds(of: type, ids: ids);
+      prioritizedIds.addAll(ids);
+    }

-    final List<int> allIds = <int>[
-      ...topIds,
-      ...newIds,
-      ...askIds,
-      ...showIds,
-      ...jobIds
-    ];
+    emit(
+      state.copyWith(
+        storiesDownloaded: 0,
+        storiesToBeDownloaded: prioritizedIds.length,
+      ),
+    );

    try {
-      _storiesRepository
-          .fetchStoriesStream(ids: allIds)
-          .listen((Story story) async {
-        if (story.kids.isNotEmpty) {
-          await _cacheRepository.cacheStory(story: story);
-          _storiesRepository
-              .fetchAllChildrenComments(ids: story.kids)
-              .listen((Comment? comment) async {
-            if (comment != null) {
-              await _cacheRepository.cacheComment(comment: comment);
-            }
-          });
-        }
-      }).onDone(() {
-        emit(
-          state.copyWith(
-            downloadStatus: StoriesDownloadStatus.finished,
-          ),
-        );
-      });
+      await fetchAndCacheStories(
+        prioritizedIds,
+        includingWebPage: event.includingWebPage,
+        isPrioritized: true,
+      );
+
+      final Set<int> latestIds = <int>{};
+      final List<int> ids = await _storiesRepository.fetchStoryIds(
+        of: StoryType.latest,
+      );
+      await _offlineRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
+      latestIds.addAll(ids);
+
+      await fetchAndCacheStories(
+        latestIds,
+        includingWebPage: event.includingWebPage,
+        isPrioritized: false,
+      );
    } catch (_) {
      emit(
        state.copyWith(
@ -292,6 +296,80 @@ 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 _offlineRepository.cacheStory(story: story);
+
+      if (story.url.isNotEmpty && includingWebPage) {
+        _logger.i('downloading ${story.url}');
+        await _offlineRepository.cacheUrl(url: story.url);
+      }
+
+      _storiesRepository
+          .fetchAllChildrenComments(ids: story.kids)
+          .whereType<Comment>()
+          .listen(
+            (Comment comment) => unawaited(
+              _offlineRepository.cacheComment(comment: comment),
+            ),
+          )
+          .onDone(() => add(StoryDownloaded(skipped: false)));
+    }
+  }
+
+  void onStoryDownloaded(StoryDownloaded event, Emitter<StoriesState> emit) {
+    if (event.skipped) {
+      final int updatedStoriesToBeDownloaded = state.storiesToBeDownloaded - 1;
+
+      emit(
+        state.copyWith(
+          storiesToBeDownloaded: updatedStoriesToBeDownloaded,
+          downloadStatus:
+              state.storiesDownloaded == updatedStoriesToBeDownloaded
+                  ? StoriesDownloadStatus.finished
+                  : null,
+        ),
+      );
+    } else {
+      final int updatedStoriesDownloaded = state.storiesDownloaded + 1;
+      final int updatedStoriesToBeDownloaded =
+          updatedStoriesDownloaded > state.storiesToBeDownloaded
+              ? state.storiesToBeDownloaded + 1
+              : state.storiesToBeDownloaded;
+
+      emit(
+        state.copyWith(
+          storiesDownloaded: updatedStoriesDownloaded,
+          storiesToBeDownloaded: updatedStoriesToBeDownloaded,
+          downloadStatus:
+              updatedStoriesDownloaded == updatedStoriesToBeDownloaded
+                  ? StoriesDownloadStatus.finished
+                  : null,
+        ),
+      );
+    }
+  }
+
  Future<void> onPageSizeChanged(
    StoriesPageSizeChanged event,
    Emitter<StoriesState> emit,
@ -304,9 +382,10 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
    StoriesExitOffline event,
    Emitter<StoriesState> emit,
  ) async {
-    await _cacheRepository.deleteAllStoryIds();
-    await _cacheRepository.deleteAllStories();
-    await _cacheRepository.deleteAllComments();
+    await _offlineRepository.deleteAllStoryIds();
+    await _offlineRepository.deleteAllStories();
+    await _offlineRepository.deleteAllComments();
+    await _offlineRepository.deleteAllWebPages();
    emit(state.copyWith(offlineReading: false));
    add(StoriesInitialize());
  }
--- a/lib/blocs/stories/stories_event.dart
+++ b/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 {
--- a/lib/blocs/stories/stories_state.dart
+++ b/lib/blocs/stories/stories_state.dart
@ -23,11 +23,14 @@ class StoriesState extends Equatable {
    required this.offlineReading,
    required this.downloadStatus,
    required this.currentPageSize,
+    required this.storiesDownloaded,
+    required this.storiesToBeDownloaded,
  });

  const StoriesState.init({
    this.storiesByType = const <StoryType, List<Story>>{
      StoryType.top: <Story>[],
+      StoryType.best: <Story>[],
      StoryType.latest: <Story>[],
      StoryType.ask: <Story>[],
      StoryType.show: <Story>[],
@ -35,6 +38,7 @@ class StoriesState extends Equatable {
    },
    this.storyIdsByType = const <StoryType, List<int>>{
      StoryType.top: <int>[],
+      StoryType.best: <int>[],
      StoryType.latest: <int>[],
      StoryType.ask: <int>[],
      StoryType.show: <int>[],
@ -42,6 +46,7 @@ class StoriesState extends Equatable {
    },
    this.statusByType = const <StoryType, StoriesStatus>{
      StoryType.top: StoriesStatus.initial,
+      StoryType.best: StoriesStatus.initial,
      StoryType.latest: StoriesStatus.initial,
      StoryType.ask: StoriesStatus.initial,
      StoryType.show: StoriesStatus.initial,
@ -49,6 +54,7 @@ class StoriesState extends Equatable {
    },
    this.currentPageByType = const <StoryType, int>{
      StoryType.top: 0,
+      StoryType.best: 0,
      StoryType.latest: 0,
      StoryType.ask: 0,
      StoryType.show: 0,
@ -57,7 +63,9 @@ class StoriesState extends Equatable {
  })  : offlineReading = false,
        downloadStatus = StoriesDownloadStatus.initial,
        currentPageSize = 0,
-        readStoriesIds = const <int>{};
+        readStoriesIds = const <int>{},
+        storiesDownloaded = 0,
+        storiesToBeDownloaded = 0;

  final Map<StoryType, List<Story>> storiesByType;
  final Map<StoryType, List<int>> storyIdsByType;
@ -67,6 +75,8 @@ class StoriesState extends Equatable {
  final StoriesDownloadStatus downloadStatus;
  final bool offlineReading;
  final int currentPageSize;
+  final int storiesDownloaded;
+  final int storiesToBeDownloaded;

  StoriesState copyWith({
    Map<StoryType, List<Story>>? storiesByType,
@ -77,6 +87,8 @@ class StoriesState extends Equatable {
    StoriesDownloadStatus? downloadStatus,
    bool? offlineReading,
    int? currentPageSize,
+    int? storiesDownloaded,
+    int? storiesToBeDownloaded,
  }) {
    return StoriesState(
      storiesByType: storiesByType ?? this.storiesByType,
@ -87,6 +99,9 @@ class StoriesState extends Equatable {
      offlineReading: offlineReading ?? this.offlineReading,
      downloadStatus: downloadStatus ?? this.downloadStatus,
      currentPageSize: currentPageSize ?? this.currentPageSize,
+      storiesDownloaded: storiesDownloaded ?? this.storiesDownloaded,
+      storiesToBeDownloaded:
+          storiesToBeDownloaded ?? this.storiesToBeDownloaded,
    );
  }

@ -98,18 +113,12 @@ class StoriesState extends Equatable {
    final Map<StoryType, List<Story>> newMap =
        Map<StoryType, List<Story>>.from(storiesByType);
    newMap[of] = List<Story>.from(newMap[of]!)..add(story);
-    return StoriesState(
+    return copyWith(
      storiesByType: newMap,
-      storyIdsByType: storyIdsByType,
-      statusByType: statusByType,
-      currentPageByType: currentPageByType,
      readStoriesIds: <int>{
        ...readStoriesIds,
        if (hasRead) story.id,
      },
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
    );
  }

@ -120,15 +129,8 @@ class StoriesState extends Equatable {
    final Map<StoryType, List<int>> newMap =
        Map<StoryType, List<int>>.from(storyIdsByType);
    newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
+    return copyWith(
      storyIdsByType: newMap,
-      statusByType: statusByType,
-      currentPageByType: currentPageByType,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
    );
  }

@ -139,15 +141,8 @@ class StoriesState extends Equatable {
    final Map<StoryType, StoriesStatus> newMap =
        Map<StoryType, StoriesStatus>.from(statusByType);
    newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
+    return copyWith(
      statusByType: newMap,
-      currentPageByType: currentPageByType,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
    );
  }

@ -158,15 +153,8 @@ class StoriesState extends Equatable {
    final Map<StoryType, int> newMap =
        Map<StoryType, int>.from(currentPageByType);
    newMap[of] = to;
-    return StoriesState(
-      storiesByType: storiesByType,
-      storyIdsByType: storyIdsByType,
-      statusByType: statusByType,
+    return copyWith(
      currentPageByType: newMap,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
    );
  }

@ -183,15 +171,11 @@ class StoriesState extends Equatable {
    final Map<StoryType, int> newCurrentPageMap =
        Map<StoryType, int>.from(currentPageByType);
    newCurrentPageMap[of] = 0;
-    return StoriesState(
+    return copyWith(
      storiesByType: newStoriesMap,
      storyIdsByType: newStoryIdsMap,
      statusByType: newStatusMap,
      currentPageByType: newCurrentPageMap,
-      readStoriesIds: readStoriesIds,
-      offlineReading: offlineReading,
-      downloadStatus: downloadStatus,
-      currentPageSize: currentPageSize,
    );
  }

@ -205,5 +189,7 @@ class StoriesState extends Equatable {
        offlineReading,
        downloadStatus,
        currentPageSize,
+        storiesDownloaded,
+        storiesToBeDownloaded,
      ];
 }
--- a/lib/config/constants.dart
+++ b/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';
--- a/lib/config/custom_log_filter.dart
+++ b/lib/config/custom_log_filter.dart
@ -0,0 +1,31 @@
+import 'package:logger/logger.dart';
+
+class CustomLogFilter extends LogFilter {
+  @override
+  // ignore: overridden_fields
+  Level? level = Level.verbose;
+
+  /// The minimal level allowed in production.
+  static const Level _minimalLevel = Level.info;
+
+  @override
+  bool shouldLog(LogEvent event) {
+    bool shouldLog = false;
+
+    if (event.level.index >= _minimalLevel.index) {
+      return true;
+    }
+
+    assert(
+      () {
+        if (event.level.index >= level!.index) {
+          shouldLog = true;
+        }
+        return true;
+      }(),
+      '',
+    );
+
+    return shouldLog;
+  }
+}
--- a/lib/config/custom_router.dart
+++ b/lib/config/custom_router.dart
@ -10,8 +10,8 @@ class CustomRouter {
    switch (settings.name) {
      case HomeScreen.routeName:
        return HomeScreen.route();
-      case StoryScreen.routeName:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+      case ItemScreen.routeName:
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
      case SubmitScreen.routeName:
        return SubmitScreen.route();
      default:
@ -22,8 +22,8 @@ class CustomRouter {
  /// Nested routing for bottom navigation bar.
  static Route<dynamic> onGenerateNestedRoute(RouteSettings settings) {
    switch (settings.name) {
-      case StoryScreen.routeName:
-        return StoryScreen.route(settings.arguments! as StoryScreenArgs);
+      case ItemScreen.routeName:
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
      case SubmitScreen.routeName:
        return SubmitScreen.route();
      default:
--- a/lib/config/locator.dart
+++ b/lib/config/locator.dart
@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
+import 'package:hacki/config/custom_log_filter.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/services/services.dart';
 import 'package:logger/logger.dart';
@ -10,16 +11,17 @@ final GetIt locator = GetIt.instance;
 /// Set up [GetIt] locator.
 Future<void> setUpLocator() async {
  locator
+    ..registerSingleton<Logger>(Logger(filter: CustomLogFilter()))
    ..registerSingleton<StoriesRepository>(StoriesRepository())
    ..registerSingleton<PreferenceRepository>(PreferenceRepository())
    ..registerSingleton<SearchRepository>(SearchRepository())
    ..registerSingleton<AuthRepository>(AuthRepository())
    ..registerSingleton<PostRepository>(PostRepository())
    ..registerSingleton<SembastRepository>(SembastRepository())
-    ..registerSingleton<CacheRepository>(CacheRepository())
-    ..registerSingleton<CacheService>(CacheService())
+    ..registerSingleton<OfflineRepository>(OfflineRepository())
+    ..registerSingleton<DraftCache>(DraftCache())
+    ..registerSingleton<CommentCache>(CommentCache())
    ..registerSingleton<LocalNotification>(LocalNotification())
-    ..registerSingleton<Logger>(Logger())
    ..registerSingleton<RouteObserver<ModalRoute<dynamic>>>(
      RouteObserver<ModalRoute<dynamic>>(),
    );
--- a/lib/cubits/collapse/collapse_cubit.dart
+++ b/lib/cubits/collapse/collapse_cubit.dart
@ -10,31 +10,31 @@ part 'collapse_state.dart';
 class CollapseCubit extends Cubit<CollapseState> {
  CollapseCubit({
    required int commentId,
-    CacheService? cacheService,
+    CollapseCache? collapseCache,
  })  : _commentId = commentId,
-        _cacheService = cacheService ?? locator.get<CacheService>(),
+        _collapseCache = collapseCache ?? locator.get<CollapseCache>(),
        super(const CollapseState.init());

  final int _commentId;
-  final CacheService _cacheService;
+  final CollapseCache _collapseCache;
  late final StreamSubscription<Map<int, Set<int>>> _streamSubscription;

  void init() {
    _streamSubscription =
-        _cacheService.hiddenComments.listen(hiddenCommentsStreamListener);
+        _collapseCache.hiddenComments.listen(hiddenCommentsStreamListener);

    emit(
      state.copyWith(
-        collapsedCount: _cacheService.totalHidden(_commentId),
-        collapsed: _cacheService.isCollapsed(_commentId),
-        hidden: _cacheService.isHidden(_commentId),
+        collapsedCount: _collapseCache.totalHidden(_commentId),
+        collapsed: _collapseCache.isCollapsed(_commentId),
+        hidden: _collapseCache.isHidden(_commentId),
      ),
    );
  }

  void collapse() {
    if (state.collapsed) {
-      _cacheService.uncollapse(_commentId);
+      _collapseCache.uncollapse(_commentId);

      emit(
        state.copyWith(
@ -43,7 +43,7 @@ class CollapseCubit extends Cubit<CollapseState> {
        ),
      );
    } else {
-      final int count = _cacheService.collapse(_commentId);
+      final int count = _collapseCache.collapse(_commentId);

      emit(
        state.copyWith(
--- a/lib/cubits/comments/comments_cubit.dart
+++ b/lib/cubits/comments/comments_cubit.dart
@ -1,36 +1,66 @@
 import 'dart:async';

 import 'package:bloc/bloc.dart';
+import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:hacki/config/locator.dart';
+import 'package:hacki/main.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
+import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
+import 'package:logger/logger.dart';

 part 'comments_state.dart';

 class CommentsCubit extends Cubit<CommentsState> {
  CommentsCubit({
-    CacheService? cacheService,
-    CacheRepository? cacheRepository,
+    required CollapseCache collapseCache,
+    CommentCache? commentCache,
+    OfflineRepository? offlineRepository,
    StoriesRepository? storiesRepository,
    SembastRepository? sembastRepository,
+    Logger? logger,
    required bool offlineReading,
-    required Story story,
-  })  : _cacheService = cacheService ?? locator.get<CacheService>(),
-        _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
+    required Item item,
+    required FetchMode defaultFetchMode,
+    required CommentsOrder defaultCommentsOrder,
+  })  : _collapseCache = collapseCache,
+        _commentCache = commentCache ?? locator.get<CommentCache>(),
+        _offlineRepository =
+            offlineRepository ?? locator.get<OfflineRepository>(),
        _storiesRepository =
            storiesRepository ?? locator.get<StoriesRepository>(),
        _sembastRepository =
            sembastRepository ?? locator.get<SembastRepository>(),
-        super(CommentsState.init(offlineReading: offlineReading, story: story));
+        _logger = logger ?? locator.get<Logger>(),
+        super(
+          CommentsState.init(
+            offlineReading: offlineReading,
+            item: item,
+            fetchMode: defaultFetchMode,
+            order: defaultCommentsOrder,
+          ),
+        );

-  final CacheService _cacheService;
-  final CacheRepository _cacheRepository;
+  final CollapseCache _collapseCache;
+  final CommentCache _commentCache;
+  final OfflineRepository _offlineRepository;
  final StoriesRepository _storiesRepository;
  final SembastRepository _sembastRepository;
+  final Logger _logger;
+
+  /// The [StreamSubscription] for stream (both lazy or eager)
+  /// fetching comments posted directly to the story.
  StreamSubscription<Comment>? _streamSubscription;

+  /// The map of [StreamSubscription] for streams
+  /// fetching comments lazily. [int] is the id of parent comment.
+  final Map<int, StreamSubscription<Comment>> _streamSubscriptions =
+      <int, StreamSubscription<Comment>>{};
+
  static const int _pageSize = 20;

  @override
@ -42,6 +72,7 @@ class CommentsCubit extends Cubit<CommentsState> {

  Future<void> init({
    bool onlyShowTargetComment = false,
+    bool useCommentCache = false,
    List<Comment>? targetParents,
  }) async {
    if (onlyShowTargetComment && (targetParents?.isNotEmpty ?? false)) {
@ -54,7 +85,7 @@ class CommentsCubit extends Cubit<CommentsState> {
      );

      _streamSubscription = _storiesRepository
-          .fetchCommentsStream(
+          .fetchAllCommentsRecursivelyStream(
            ids: targetParents!.last.kids,
            level: targetParents.last.level + 1,
          )
@ -64,34 +95,53 @@ class CommentsCubit extends Cubit<CommentsState> {
      return;
    }

-    emit(state.copyWith(status: CommentsStatus.loading));
+    emit(
+      state.copyWith(
+        status: CommentsStatus.loading,
+        comments: <Comment>[],
+        currentPage: 0,
+      ),
+    );

-    final Story story = state.story;
-    final Story updatedStory = state.offlineReading
-        ? story
-        : await _storiesRepository.fetchStoryBy(story.id) ?? story;
+    final Item item = state.item;
+    final Item updatedItem = state.offlineReading
+        ? item
+        : await _storiesRepository.fetchItemBy(id: item.id) ?? item;
+    final List<int> kids = sortKids(updatedItem.kids);

-    emit(state.copyWith(story: updatedStory));
+    emit(state.copyWith(item: updatedItem));

    if (state.offlineReading) {
-      _streamSubscription = _cacheRepository
-          .getCachedCommentsStream(ids: updatedStory.kids)
+      _streamSubscription = _offlineRepository
+          .getCachedCommentsStream(ids: kids)
          .listen(_onCommentFetched)
        ..onDone(_onDone);
    } else {
-      _streamSubscription = _storiesRepository
-          .fetchCommentsStream(ids: updatedStory.kids)
-          .listen(_onCommentFetched)
-        ..onDone(_onDone);
+      switch (state.fetchMode) {
+        case FetchMode.lazy:
+          _streamSubscription = _storiesRepository
+              .fetchCommentsStream(
+                ids: kids,
+                getFromCache: useCommentCache ? _commentCache.getComment : null,
+              )
+              .listen(_onCommentFetched)
+            ..onDone(_onDone);
+          break;
+        case FetchMode.eager:
+          _streamSubscription = _storiesRepository
+              .fetchAllCommentsRecursivelyStream(
+                ids: kids,
+                getFromCache: useCommentCache ? _commentCache.getComment : null,
+              )
+              .listen(_onCommentFetched)
+            ..onDone(_onDone);
+          break;
+      }
    }
  }

  Future<void> refresh() async {
-    final bool offlineReading = await _cacheRepository.hasCachedStories;
-
-    _cacheService.resetCollapsedComments();
-
-    if (offlineReading) {
+    if (state.offlineReading) {
      emit(
        state.copyWith(
          status: CommentsStatus.loaded,
@ -103,43 +153,179 @@ class CommentsCubit extends Cubit<CommentsState> {
    emit(
      state.copyWith(
        status: CommentsStatus.loading,
-        comments: <Comment>[],
      ),
    );

-    await _streamSubscription?.cancel();
+    _collapseCache.resetCollapsedComments();

-    final Story story = state.story;
-    final Story updatedStory =
-        await _storiesRepository.fetchStoryBy(story.id) ?? story;
-    _streamSubscription = _storiesRepository
-        .fetchCommentsStream(ids: updatedStory.kids)
-        .listen(_onCommentFetched)
-      ..onDone(_onDone);
+    await _streamSubscription?.cancel();
+    for (final int id in _streamSubscriptions.keys) {
+      await _streamSubscriptions[id]?.cancel();
+    }
+    _streamSubscriptions.clear();

    emit(
      state.copyWith(
-        story: updatedStory,
+        comments: <Comment>[],
+        currentPage: 0,
+      ),
+    );
+
+    final Item item = state.item;
+    final Item updatedItem =
+        await _storiesRepository.fetchItemBy(id: item.id) ?? item;
+    final List<int> kids = sortKids(updatedItem.kids);
+
+    if (state.fetchMode == FetchMode.lazy) {
+      _streamSubscription = _storiesRepository
+          .fetchCommentsStream(
+            ids: kids,
+          )
+          .listen(_onCommentFetched)
+        ..onDone(_onDone);
+    } else {
+      _streamSubscription = _storiesRepository
+          .fetchAllCommentsRecursivelyStream(
+            ids: kids,
+          )
+          .listen(_onCommentFetched)
+        ..onDone(_onDone);
+    }
+
+    emit(
+      state.copyWith(
+        item: updatedItem,
        status: CommentsStatus.loaded,
      ),
    );
  }

  void loadAll(Story story) {
+    HapticFeedback.lightImpact();
    emit(
      state.copyWith(
        onlyShowTargetComment: false,
-        comments: <Comment>[],
-        story: story,
+        item: story,
      ),
    );
    init();
  }

-  void loadMore() {
-    if (_streamSubscription != null) {
-      emit(state.copyWith(status: CommentsStatus.loading));
-      _streamSubscription?.resume();
+  /// [comment] is only used for lazy fetching.
+  void loadMore({Comment? comment}) {
+    switch (state.fetchMode) {
+      case FetchMode.lazy:
+        if (comment == null) return;
+        if (_streamSubscriptions.containsKey(comment.id)) return;
+
+        final int level = comment.level + 1;
+        int offset = 0;
+
+        /// Ignoring because the subscription will be cancelled in close()
+        // ignore: cancel_subscriptions
+        final StreamSubscription<Comment> streamSubscription =
+            _storiesRepository
+                .fetchCommentsStream(ids: comment.kids)
+                .listen((Comment cmt) {
+          _collapseCache.addKid(cmt.id, to: cmt.parent);
+          _commentCache.cacheComment(cmt);
+          _sembastRepository.cacheComment(cmt);
+
+          final List<LinkifyElement> elements = _linkify(
+            cmt.text,
+          );
+
+          final BuildableComment buildableComment =
+              BuildableComment.fromComment(cmt, elements: elements);
+
+          emit(
+            state.copyWith(
+              comments: <Comment>[...state.comments]..insert(
+                  state.comments.indexOf(comment) + offset + 1,
+                  buildableComment.copyWith(level: level),
+                ),
+            ),
+          );
+          offset++;
+        })
+              ..onDone(() {
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              })
+              ..onError((dynamic error) {
+                _logger.e(error);
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              });
+
+        _streamSubscriptions[comment.id] = streamSubscription;
+        break;
+      case FetchMode.eager:
+        if (_streamSubscription != null) {
+          emit(state.copyWith(status: CommentsStatus.loading));
+          _streamSubscription?.resume();
+        }
+        break;
+    }
+  }
+
+  Future<void> loadParentThread() async {
+    unawaited(HapticFeedback.lightImpact());
+    emit(state.copyWith(fetchParentStatus: CommentsStatus.loading));
+    final Story? parent =
+        await _storiesRepository.fetchParentStory(id: state.item.id);
+
+    if (parent == null) {
+      return;
+    } else {
+      await HackiApp.navigatorKey.currentState?.pushNamed(
+        ItemScreen.routeName,
+        arguments: ItemScreenArgs(item: parent),
+      );
+
+      emit(
+        state.copyWith(
+          fetchParentStatus: CommentsStatus.loaded,
+        ),
+      );
+    }
+  }
+
+  void onOrderChanged(CommentsOrder? order) {
+    if (order == null) return;
+    if (state.order == order) return;
+    HapticFeedback.selectionClick();
+    _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      s.cancel();
+    }
+    _streamSubscriptions.clear();
+    emit(state.copyWith(order: order));
+    init(useCommentCache: true);
+  }
+
+  void onFetchModeChanged(FetchMode? fetchMode) {
+    if (fetchMode == null) return;
+    if (state.fetchMode == fetchMode) return;
+    _collapseCache.resetCollapsedComments();
+    HapticFeedback.selectionClick();
+    _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      s.cancel();
+    }
+    _streamSubscriptions.clear();
+    emit(state.copyWith(fetchMode: fetchMode));
+    init(useCommentCache: true);
+  }
+
+  List<int> sortKids(List<int> kids) {
+    switch (state.order) {
+      case CommentsOrder.natural:
+        return kids;
+      case CommentsOrder.newestFirst:
+        return kids.sorted((int a, int b) => b.compareTo(a));
+      case CommentsOrder.oldestFirst:
+        return kids.sorted((int a, int b) => a.compareTo(b));
    }
  }

@ -155,34 +341,77 @@ class CommentsCubit extends Cubit<CommentsState> {

  void _onCommentFetched(Comment? comment) {
    if (comment != null) {
-      _cacheService
-        ..addKid(comment.id, to: comment.parent)
-        ..cacheComment(comment);
+      _collapseCache.addKid(comment.id, to: comment.parent);
+      _commentCache.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();
+      if (state.fetchMode == FetchMode.eager) {
+        if (updatedComments.length >=
+                _pageSize + _pageSize * state.currentPage &&
+            updatedComments.length <=
+                _pageSize * 2 + _pageSize * state.currentPage) {
+          final bool isHidden = _collapseCache.isHidden(comment.id);

-        emit(
-          state.copyWith(
-            currentPage: state.currentPage + 1,
-            status: CommentsStatus.loaded,
-          ),
-        );
+          if (!isHidden) {
+            _streamSubscription?.pause();
+          }
+
+          emit(
+            state.copyWith(
+              currentPage: state.currentPage + 1,
+              status: CommentsStatus.loaded,
+            ),
+          );
+        }
      }
    }
  }

+  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();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      await s.cancel();
+    }
    await super.close();
  }
 }
--- a/lib/cubits/comments/comments_state.dart
+++ b/lib/cubits/comments/comments_state.dart
@ -8,12 +8,25 @@ enum CommentsStatus {
  failure,
 }

+enum CommentsOrder {
+  natural,
+  newestFirst,
+  oldestFirst,
+}
+
+enum FetchMode {
+  lazy,
+  eager,
+}
+
 class CommentsState extends Equatable {
  const CommentsState({
-    required this.story,
+    required this.item,
    required this.comments,
    required this.status,
-    required this.collapsed,
+    required this.fetchParentStatus,
+    required this.order,
+    required this.fetchMode,
    required this.onlyShowTargetComment,
    required this.offlineReading,
    required this.currentPage,
@ -21,35 +34,43 @@ class CommentsState extends Equatable {

  CommentsState.init({
    required this.offlineReading,
-    required this.story,
+    required this.item,
+    required this.fetchMode,
+    required this.order,
  })  : comments = <Comment>[],
        status = CommentsStatus.init,
-        collapsed = false,
+        fetchParentStatus = CommentsStatus.init,
        onlyShowTargetComment = false,
        currentPage = 0;

-  final Story story;
+  final Item item;
  final List<Comment> comments;
  final CommentsStatus status;
-  final bool collapsed;
+  final CommentsStatus fetchParentStatus;
+  final CommentsOrder order;
+  final FetchMode fetchMode;
  final bool onlyShowTargetComment;
  final bool offlineReading;
  final int currentPage;

  CommentsState copyWith({
-    Story? story,
+    Item? item,
    List<Comment>? comments,
    CommentsStatus? status,
-    bool? collapsed,
+    CommentsStatus? fetchParentStatus,
+    CommentsOrder? order,
+    FetchMode? fetchMode,
    bool? onlyShowTargetComment,
    bool? offlineReading,
    int? currentPage,
  }) {
    return CommentsState(
-      story: story ?? this.story,
+      item: item ?? this.item,
      comments: comments ?? this.comments,
+      fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
      status: status ?? this.status,
-      collapsed: collapsed ?? this.collapsed,
+      order: order ?? this.order,
+      fetchMode: fetchMode ?? this.fetchMode,
      onlyShowTargetComment:
          onlyShowTargetComment ?? this.onlyShowTargetComment,
      offlineReading: offlineReading ?? this.offlineReading,
@ -57,12 +78,16 @@ class CommentsState extends Equatable {
    );
  }

+  Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
+
  @override
  List<Object?> get props => <Object?>[
-        story,
+        item,
        comments,
        status,
-        collapsed,
+        fetchParentStatus,
+        order,
+        fetchMode,
        onlyShowTargetComment,
        offlineReading,
        currentPage,
--- a/lib/cubits/cubits.dart
+++ b/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';
--- a/lib/cubits/edit/edit_cubit.dart
+++ b/lib/cubits/edit/edit_cubit.dart
@ -1,26 +1,27 @@
-import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/utils/debouncer.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';

 part 'edit_state.dart';

-class EditCubit extends Cubit<EditState> {
-  EditCubit({CacheService? cacheService})
-      : _cacheService = cacheService ?? locator.get<CacheService>(),
+class EditCubit extends HydratedCubit<EditState> {
+  EditCubit({DraftCache? draftCache})
+      : _draftCache = draftCache ?? locator.get<DraftCache>(),
        _debouncer = Debouncer(delay: const Duration(seconds: 1)),
        super(const EditState.init());

-  final CacheService _cacheService;
+  final DraftCache _draftCache;
  final Debouncer _debouncer;

  void onReplyTapped(Item item) {
    emit(
      EditState(
        replyingTo: item,
-        text: _cacheService.getDraft(replyingTo: item.id),
+        text: _draftCache.getDraft(replyingTo: item.id),
      ),
    );
  }
@ -44,9 +45,10 @@ class EditCubit extends Cubit<EditState> {

  void onReplySubmittedSuccessfully() {
    if (state.replyingTo != null) {
-      _cacheService.removeDraft(replyingTo: state.replyingTo!.id);
+      _draftCache.removeDraft(replyingTo: state.replyingTo!.id);
    }
    emit(const EditState.init());
+    clear();
  }

  void onTextChanged(String text) {
@ -54,11 +56,61 @@ class EditCubit extends Cubit<EditState> {
    if (state.replyingTo != null) {
      final int? id = state.replyingTo?.id;
      _debouncer.run(() {
-        _cacheService.cacheDraft(
+        _draftCache.cacheDraft(
          text: text,
          replyingTo: id!,
        );
      });
    }
  }
+
+  void deleteDraft() => clear();
+
+  bool called = false;
+
+  @override
+  EditState? fromJson(Map<String, dynamic> json) {
+    final String text = json['text'] as String? ?? '';
+    final Map<String, dynamic>? itemJson =
+        json['item'] as Map<String, dynamic>?;
+    final Item? replyingTo = itemJson == null ? null : Item.fromJson(itemJson);
+
+    if (replyingTo != null && text.isNotEmpty) {
+      _draftCache.cacheDraft(text: text, replyingTo: replyingTo.id);
+
+      final EditState state = EditState(
+        text: text,
+        replyingTo: replyingTo,
+      );
+
+      _cachedState = state;
+
+      return state;
+    }
+
+    return state;
+  }
+
+  @override
+  Map<String, dynamic>? toJson(EditState state) {
+    EditState selected = state;
+
+    if (state.replyingTo == null ||
+        (state.replyingTo?.id != _cachedState.replyingTo?.id &&
+            state.text.isNullOrEmpty)) {
+      selected = _cachedState;
+    }
+
+    if (selected.text.isNullOrEmpty) {
+      clear();
+      return null;
+    }
+
+    return <String, dynamic>{
+      'text': selected.text ?? '',
+      'item': selected.replyingTo?.toJson(),
+    };
+  }
+
+  static EditState _cachedState = const EditState.init();
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jiaqi Feng	a2c66a0075	fixed background color of nav bar on Android. (#72 )	2022-09-17 00:44:27 -07:00
Jiaqi Feng	5f43fd6968	v0.2.31 (#71 ) * bumped version. * bumped version. * bumped version * bumped version. * downgrade flutter version. * Use transparent color for navigation bar (#70) * Use transparent color for navigation bar * Fixed whitespace Co-authored-by: Niklas Weinhart <git@weinhart.net> * bumped ios version. * bumped versions. * updated min screen width. * removed print. * fixed stack overflow in EditCubit. * added integration test. * bumped version. Co-authored-by: wnhrt <github@weinhart.net> Co-authored-by: Niklas Weinhart <git@weinhart.net>	2022-09-16 22:37:16 -07:00
Jiaqi Feng	d83381a7fd	v0.2.30 (#68 ) * bumped version. * cache in case app gets killed in the background. * bumped flutter version. * updated * improved 'ReplyBox'. * fixed lint. * fixed EditCubit. * updated EditCubit. * fixed navigation in tablet mode. * clear cache after submission.	2022-08-05 22:13:30 -07:00
Jiaqi Feng	764ff09345	v0.2.29-hotfix (#67 ) * fixed datetime extension. * updated README.md	2022-07-06 20:37:18 -07:00
Jiaqi Feng	ab449adce2	v0.2.29 (#66 ) * fixed stuff. * fixed UI. * bumped version.	2022-07-06 17:04:14 -07:00
Jiaqi Feng	2ec41b26f2	updated README.md	2022-07-06 16:23:05 -07:00
Jiaqi Feng	19f2107d95	v0.2.28 (#65 ) * bumped version. * fixed comments cubit and story tile. * cancel subscription on error.	2022-07-02 01:14:40 -07:00
Jiaqi Feng	c9b2d82dfc	v0.2.27 (#64 ) * bumped version. * fixed comment cubit. * fixed share button. * fixed share dialog. * added lazy loading. * bumped version. * fixed lazy loading. * bumped version. * updated screenshots. * added customization of fetch mode and comments order. * updated screenshots. * added haptic feedback.	2022-06-30 18:32:11 -07:00
Jiaqi Feng	56e442b09f	v0.2.26 (#63 ) * added integration test. * replace listview with listview.builder * added cache. * bumped version. * bumped version. * updated github action. * bumped version. * fixed time machine cubit. * fixed time machine cubit. * reverted changes. * removed keepAliveMixin	2022-06-28 17:32:50 -07:00
Livinglist	9069efcced	improved logging.	2022-06-28 12:08:02 -07:00
Livinglist	bf6a5667dc	fixed naming.	2022-06-28 12:01:36 -07:00
Jiaqi Feng	cff73a010b	v0.2.25 (#62 ) * bumped version. * improved cache. * improved comment cache. * updated default val for navigationMode.	2022-06-28 00:08:07 -07:00
Jiaqi Feng	f0d6cac3fd	v0.2.24 (#61 ) * bumped version. * improved collapse. * improved download speed. * improved err handling. * improved error handling. * improved error handling. * improved logging. * improved logging. * bumped version.	2022-06-27 00:47:22 -07:00
Jiaqi Feng	a90d52f348	v0.2.23 (#60 ) * fixed #58 * bumped version.	2022-06-23 19:38:14 -07:00
Jiaqi Feng	cff4a3c5c4	v0.2.22 (#59 ) * bumped version. * cleaned up code. * bumped version. * fixed lint. * updated android config. * prevent backup of secure storage. * small fix. * cleaned up code. * cleaned up. * small fix	2022-06-22 23:44:49 -07:00
Livinglist	502faaf188	corrected spelling.	2022-06-22 10:28:27 -07:00
Jiaqi Feng	b952f349fc	v0.2.21 (#57 ) * replaced StoryScreen with ItemScreen. * use ItemScreen for share extension. * fixed getItemId() * bumped version. * force new screen on viewing comments in separate thread. * disable comment thread if comment is deleted or dead. * navigate to new screen on viewing parent thread. * bumped version. * fixed inconsistent fontsize. * bumped version.	2022-06-21 20:20:09 -07:00
Jiaqi Feng	9cefffa518	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.	2022-06-21 02:38:24 -07:00
Jiaqi Feng	fe630ea7a9	v0.2.20 (#55 ) * 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.	2022-06-21 02:15:42 -07:00
Jiaqi Feng	459ab961d1	v0.2.19 hotfix (#52 ) * improved offline mode. * bumped version. * reset stories count on download event. * fixed overflow.	2022-06-18 23:40:56 -07:00
Livinglist	362d7005df	fixed jank while exiting story screen.	2022-06-18 11:44:34 -07:00
Livinglist	6b7c1d42de	fixed offline mode.	2022-06-18 02:38:31 -07:00
Jiaqi Feng	2a889bca56	v0.2.19 (#51 ) * improved comments loading. * added web page caching to offline mode. * improved offline webview. * fixed web analyzer. * updated description.	2022-06-18 02:18:03 -07:00
Jiaqi Feng	e25026f129	created FUNDING.yml	2022-06-17 21:25:24 -07:00
Jiaqi Feng	fefc86275d	v0.2.18 (#49 ) * allow plaintext http connections (#48) via https://stackoverflow.com/a/56837613 I was unable to open an article just now, and a fww minutes later unable to open a comment (since the webview is still being forced on my not-yet-updated client, i have to find the artocle to open it. * bumped version. * improved link preview. * added share button. * added ability to launch third party app for url on Android. * added support for siri suggestions. * bumped version. * added support for app links on Android. Co-authored-by: Efreak <Efreak@users.noreply.github.com>	2022-06-15 23:56:45 -07:00
Livinglist	1a73a6991e	updated screenshots.	2022-06-10 02:28:31 -07:00
Livinglist	36d7f4606e	updated screenshots.	2022-06-10 02:27:22 -07:00
Jiaqi Feng	9312c56dd0	v0.2.17 (#47 ) * improved story screen scrolling. * bumped version. * shrink instead of return on tapping back button. #42 * allowed users to view other user's profile. #45 * bumped version. * added back underline to links. * fixed overlow of popup menu,	2022-06-10 02:10:23 -07:00
Jiaqi Feng	6e71de5913	updated README.md	2022-06-05 22:39:54 -07:00
Jiaqi Feng	a9590af3e9	v0.2.16 (#41 ) * bumped version. * add badges for fdroid, GitHub release versions (#40) * updated README.md * replaced jobs with best. * updated README.md Co-authored-by: Efreak <Efreak@users.noreply.github.com>	2022-06-05 22:34:48 -07:00
				`@ -1 +0,0 @@`
				`- Tapping on comments in notification and history screen will lead you directly to the comment.`