bump versions. (#97)

* bumped version.

* fix time machine.

.github/workflows/commit_check.yml

@@ -0,0 +1,25 @@
+name: Commit Guard
+
+on:
+  push:
+    branches:
+      - "**"
+      - '!master'
+
+jobs:
+  releases:
+    name: Check commit
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      FLUTTER_VERSION: "3.3.10"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.3.10'
+          channel: 'stable'
+      - run: flutter pub get
+      - run: flutter format --set-exit-if-changed .
+      - run: flutter analyze
+      - run: flutter test

.github/workflows/github-actions.yml

@@ -1,32 +0,0 @@
-name: Releases
-
-on: 
-  push:
-#     tags:
-#     - '*'
-  
-jobs:
-  releases:
-    name: release apk
-    runs-on: ubuntu-latest
-    env:
-      JAVA_VERSION: "11.0"
-      FLUTTER_VERSION: "3.0.0"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
-      - uses: subosito/flutter-action@v2
-        with:
-          flutter-version: '3.0.0'
-          channel: 'stable'
-      - run: flutter pub get
-      - run: flutter analyze
-#       - run: flutter test
-#       - run: flutter build apk --release
-#       - uses: ncipollo/release-action@v1
-#         with:
-#          artifacts: "build/app/outputs/flutter-apk/*.apk"
-#          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish_ios.yml

@@ -0,0 +1,53 @@
+name: Publish (iOS)
+
+on:
+  # Allow manual builds of this workflow
+  workflow_dispatch: {}
+  # Run the workflow whenever a new tag named 'v*' is pushed
+  push:
+    branches:
+      - master
+
+jobs:
+  build_and_publish:
+    runs-on: macos-latest
+    timeout-minutes: 30
+
+    env:
+      # Point the `ruby/setup-ruby` action at this Gemfile, so it
+      # caches dependencies for us.
+      BUNDLE_GEMFILE: ${{ github.workspace }}/ios/Gemfile
+
+    steps:
+      - name: Check out from git
+        uses: actions/checkout@v2
+      # Configure ruby according to our .ruby-version
+      - name: Setup ruby & Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      # Set up flutter (feel free to adjust the version below)
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          flutter-version: 3.3.10
+      - run: flutter pub get
+      - run: flutter format --set-exit-if-changed .
+      - run: flutter analyze
+      # Start an ssh-agent that will provide the SSH key from the
+      # SSH_PRIVATE_KEY secret to `fastlane match`
+      - name: Setup SSH key
+        env:
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        run: |
+            ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+            ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
+      - name: Download dependencies
+        run: flutter pub get
+      - name: Build & Publish to TestFlight with Fastlane
+        env:
+          APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+        run: cd ios && bundle exec fastlane beta

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "flutter"]
+	path = submodules/flutter
+	url = https://github.com/flutter/flutter

.ruby-version

@@ -0,0 +1 @@
+2.7.5

README.md

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

analysis_options.yaml

@@ -6,4 +6,8 @@ linter:
     library_private_types_in_public_api: false
     omit_local_variable_types: false
     one_member_abstracts: false
-    always_specify_types: true
+    always_specify_types: true
+
+analyzer:
+  exclude:
+    - "submodules/**"

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,16 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+
+ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
+import com.android.build.OutputFile
+android.applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+        def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+        if (abiVersionCode != null) {
+            output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
+        }
+    }
 }

android/app/src/main/AndroidManifest.xml

@@ -16,8 +16,10 @@
     </queries>
 
    <application
-        android:label="hacki"
+        android:label="Hacki"
         android:icon="@mipmap/ic_launcher"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"
@@ -25,6 +27,7 @@
             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

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>

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"
     }
 }

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

@@ -1 +0,0 @@
-- Bugfixes.

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

@@ -1 +0,0 @@
-- Updates to UI.

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

@@ -1 +0,0 @@
-- Updates to UI.

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

@@ -1 +0,0 @@
-- Updates to UI.

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.

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.

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

@@ -1 +0,0 @@
-- Added offline mode.

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

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

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

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

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

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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.

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

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

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

@@ -1,7 +0,0 @@
-- 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/64.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,2 @@
+- Bumped Flutter version.
+- Updated navigation bar background color.

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

@@ -0,0 +1,2 @@
+- Bumped Flutter version.
+- Updated navigation bar background color.

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

@@ -0,0 +1,2 @@
+- Fixed app icon.
+- Added font size setting to comments screen.

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

@@ -0,0 +1,2 @@
+- Fixed app icon.
+- Added font size setting to comments screen.

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

@@ -0,0 +1 @@
+- Fixed time machine.

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

@@ -0,0 +1 @@
+- Fixed time machine.

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',
+    );
+  });
+}

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>

ios/Gemfile

@@ -0,0 +1,4 @@
+ source "https://rubygems.org"
+
+ gem "fastlane"
+ gem "cocoapods"

ios/Gemfile.lock

@@ -0,0 +1,285 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    artifactory (3.0.15)
+    atomos (0.1.3)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.680.0)
+    aws-sdk-core (3.168.4)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.61.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.117.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    claide (1.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.3)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.6.3)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.1.10)
+    declarative (0.0.20)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    excon (0.95.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.2.6)
+    fastlane (2.211.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
+      optparse (~> 0.1.1)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.32.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.9.2)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.44.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.3.0)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.5.0)
+    memoist (0.16.2)
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    naturally (2.2.1)
+    netrc (0.11.0)
+    optparse (0.1.1)
+    os (1.1.4)
+    plist (3.6.0)
+    public_suffix (4.0.7)
+    rake (13.0.6)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.5)
+    rouge (2.0.7)
+    ruby-macho (2.5.1)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.3)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.8)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
+    webrick (1.7.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.22.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  universal-darwin-21
+  x86_64-darwin-19
+
+DEPENDENCIES
+  cocoapods
+  fastlane
+
+BUNDLED WITH
+   2.3.22

ios/Podfile

@@ -1,6 +1,3 @@
-# Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
-
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
@@ -37,8 +34,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

ios/Podfile.lock

@@ -19,7 +19,11 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
+  - integration_test (0.0.1):
+    - Flutter
   - OrderedSet (5.0.0)
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_ios (0.0.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
@@ -50,6 +54,8 @@ DEPENDENCIES:
   - 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`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/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`)
@@ -80,6 +86,10 @@ EXTERNAL SOURCES:
     :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"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_ios:
     :path: ".symlinks/plugins/path_provider_ios/ios"
   receive_sharing_intent:
@@ -103,13 +113,15 @@ 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
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
@@ -122,6 +134,6 @@ SPEC CHECKSUMS:
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
   workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
 
-PODFILE CHECKSUM: e4c97c7a9aacaeda4b952f7ef9ea29e47660f622
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -56,7 +56,7 @@
 		};
 		E51D52B8283B464E00FC8DD8 /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 8;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
@@ -64,7 +64,7 @@
 				E530B1B4283B54DA004E8EB6 /* Action Extension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 1;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
@@ -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;
@@ -567,20 +567,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				INFOPLIST_KEY_CFBundleDisplayName = Hacki;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.news";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.21;
+				MARKETING_VERSION = 0.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.jiaqi.hacki";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -635,7 +640,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 +689,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;
@@ -704,20 +709,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				INFOPLIST_KEY_CFBundleDisplayName = Hacki;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.news";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.21;
+				MARKETING_VERSION = 0.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.jiaqi.hacki";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -735,20 +745,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				INFOPLIST_KEY_CFBundleDisplayName = Hacki;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.news";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.21;
+				MARKETING_VERSION = 0.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.jiaqi.hacki";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -767,9 +782,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -786,6 +803,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Share-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "hacki share extension profile";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -806,9 +825,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -824,6 +845,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Share-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.jiaqi.hacki.Share-Extension";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -842,9 +865,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -860,6 +885,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Share-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "hacki share extension profile";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -880,9 +907,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Action Extension/Action Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Action Extension/Info.plist";
@@ -899,6 +928,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Action-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "hacki action extension profile";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -921,9 +952,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Action Extension/Action Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Action Extension/Info.plist";
@@ -939,6 +972,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Action-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.jiaqi.hacki.Action-Extension";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -959,9 +994,11 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Action Extension/Action Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = QMWX3X2NF7;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QMWX3X2NF7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Action Extension/Info.plist";
@@ -977,6 +1014,8 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jiaqi.hacki.Action-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "hacki action extension profile";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

ios/Runner/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>https</string>
@@ -72,5 +72,7 @@
 	<array>
 		<string>applinks:example.com</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 </dict>
 </plist>

ios/Share Extension/Info.plist

@@ -7,10 +7,10 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>NSExtensionActivationRule</key>
-            <dict>
-            	<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-            	<integer>1</integer>
-            </dict>
+			<dict>
+				<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+				<integer>1</integer>
+			</dict>
 		</dict>
 		<key>NSExtensionMainStoryboard</key>
 		<string>MainInterface</string>

ios/fastlane/Appfile

@@ -0,0 +1,8 @@
+app_identifier("com.jiaqi.hacki") # The bundle identifier of your app
+apple_id("georgefung78@Live.com") # Your Apple Developer Portal username
+
+itc_team_id("120097292") # App Store Connect Team ID
+team_id("QMWX3X2NF7") # Developer Portal Team ID
+
+# For more information about the Appfile, see:
+#     https://docs.fastlane.tools/advanced/#appfile

ios/fastlane/Fastfile

@@ -0,0 +1,80 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+## Update these lines to match your project!
+# Bundle Identifier used for the iOS App on the App Store Connect portal
+APP_IDENTIFIER = 'com.jiaqi.hacki'
+# Issuer ID from the Keys section of https://appstoreconnect.apple.com/access/users
+APPSTORECONNECT_ISSUER_ID = '0b588ac9-5b3e-4420-867a-a33decce7b91'
+# Key ID from the key matching the `APP_STORE_CONNECT_API_KEY_KEY` secret, found under the Keys section of https://appstoreconnect.apple.com/access/users
+APPSTORECONNECT_KEY_ID = 'DPNP8R66QS'
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:ios)
+
+platform :ios do
+  desc "Push a new beta build to TestFlight"
+
+  lane :beta do |options|
+    setup_ci if ENV['CI']
+
+    is_example_repo = ENV['CI'] && ENV['GITHUB_REPOSITORY'] == 'jorgenpt/flutter_github_example'
+
+    # Download code signing certificates using `match` (and the `MATCH_PASSWORD` secret)
+    sync_code_signing(
+      type: "appstore",
+      app_identifier: [APP_IDENTIFIER, "#{APP_IDENTIFIER}.Share-Extension", "#{APP_IDENTIFIER}.Action-Extension"],
+      readonly: true
+    )
+
+    # We expose the key data using `APP_STORE_CONNECT_API_KEY_KEY` secret on GH
+    app_store_connect_api_key(
+      key_id: APPSTORECONNECT_KEY_ID,
+      issuer_id: APPSTORECONNECT_ISSUER_ID
+    )
+latest_testflight_build_number
+    # Figure out the build number (and optionally build name)
+    new_build_number = ( + 1)
+
+    # Prep the xcodeproject from Flutter without building (`--config-only`)
+    sh(
+      "flutter", "build", "ios", "--config-only",
+      "--release", "--no-pub", "--no-codesign",
+      "--build-number", new_build_number.to_s
+    )
+
+    version = get_version_number(xcodeproj: "Runner.xcodeproj", target: 'Runner')
+
+    increment_version_number(
+      version_number: version
+    )
+
+    increment_build_number({
+      build_number: latest_testflight_build_number + 1
+    })
+  
+    # Build & sign using Runner.xcworkspace
+    build_app(
+      workspace: "Runner.xcworkspace",
+      scheme: "Runner",
+      output_directory: "../build/ios/archive"
+    )
+
+    upload_to_testflight(
+      # This takes a long time, so don't waste GH runner minutes (but it means manually needing to
+      # set the build live for external testers).
+      skip_waiting_for_build_processing: true,
+    )
+  end
+end

ios/fastlane/Matchfile

@@ -0,0 +1,13 @@
+git_url("git@github.com:Livinglist/certificates.git")
+
+storage_mode("git")
+
+type("development") # The default type, can be: appstore, adhoc, enterprise or development
+
+# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
+# username("user@fastlane.tools") # Your Apple Developer Portal username
+
+# For all available options run `fastlane match --help`
+# Remove the # in the beginning of the line to enable the other options
+
+# The docs are available on https://docs.fastlane.tools/actions/match

lib/blocs/auth/auth_bloc.dart

@@ -20,7 +20,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
             storiesRepository ?? locator.get<StoriesRepository>(),
         _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
-        super(AuthState.init()) {
+        super(const AuthState.init()) {
     on<AuthInitialize>(onInitialize);
     on<AuthLogin>(onLogin);
     on<AuthLogout>(onLogout);
@@ -101,7 +101,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   Future<void> onLogout(AuthLogout event, Emitter<AuthState> emit) async {
     emit(
       state.copyWith(
-        user: User.empty(),
+        user: const User.empty(),
         isLoggedIn: false,
         agreedToEULA: false,
       ),

lib/blocs/auth/auth_state.dart

@@ -14,8 +14,8 @@ class AuthState extends Equatable {
     required this.agreedToEULA,
   });
 
-  AuthState.init()
-      : user = User.empty(),
+  const AuthState.init()
+      : user = const User.empty(),
         isLoggedIn = false,
         status = AuthStatus.loaded,
         agreedToEULA = false;

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);
@@ -39,9 +44,10 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   }
 
   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;
@@ -71,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(
@@ -90,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)),
       )
@@ -167,7 +173,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       }
 
       if (state.offlineReading) {
-        _cacheRepository
+        _offlineRepository
             .getCachedStoriesStream(
           ids: state.storyIdsByType[event.type]!.sublist(
             lower,
@@ -241,9 +247,9 @@ 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 Set<int> prioritizedIds = <int>{};
     final List<StoryType> prioritizedTypes = <StoryType>[...types]
@@ -251,7 +257,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
 
     for (final StoryType type in prioritizedTypes) {
       final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
-      await _cacheRepository.cacheStoryIds(of: type, ids: ids);
+      await _offlineRepository.cacheStoryIds(of: type, ids: ids);
       prioritizedIds.addAll(ids);
     }
 
@@ -273,7 +279,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       final List<int> ids = await _storiesRepository.fetchStoryIds(
         of: StoryType.latest,
       );
-      await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
+      await _offlineRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
       latestIds.addAll(ids);
 
       await fetchAndCacheStories(
@@ -281,12 +287,6 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         includingWebPage: event.includingWebPage,
         isPrioritized: false,
       );
-
-      emit(
-        state.copyWith(
-          downloadStatus: StoriesDownloadStatus.finished,
-        ),
-      );
     } catch (_) {
       emit(
         state.copyWith(
@@ -318,44 +318,53 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         continue;
       }
 
-      await _cacheRepository.cacheStory(story: story);
+      await _offlineRepository.cacheStory(story: story);
 
       if (story.url.isNotEmpty && includingWebPage) {
-        await _cacheRepository.cacheUrl(url: story.url);
+        _logger.i('downloading ${story.url}');
+        await _offlineRepository.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;
+          .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: state.storiesToBeDownloaded - 1,
+          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:
-              updatedStoriesDownloaded > state.storiesToBeDownloaded
-                  ? state.storiesToBeDownloaded + 1
-                  : state.storiesToBeDownloaded,
+          storiesToBeDownloaded: updatedStoriesToBeDownloaded,
+          downloadStatus:
+              updatedStoriesDownloaded == updatedStoriesToBeDownloaded
+                  ? StoriesDownloadStatus.finished
+                  : null,
         ),
       );
     }
@@ -373,10 +382,10 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     StoriesExitOffline event,
     Emitter<StoriesState> emit,
   ) async {
-    await _cacheRepository.deleteAllStoryIds();
-    await _cacheRepository.deleteAllStories();
-    await _cacheRepository.deleteAllComments();
-    await _cacheRepository.deleteAllWebPages();
+    await _offlineRepository.deleteAllStoryIds();
+    await _offlineRepository.deleteAllStories();
+    await _offlineRepository.deleteAllComments();
+    await _offlineRepository.deleteAllWebPages();
     emit(state.copyWith(offlineReading: false));
     add(StoriesInitialize());
   }

lib/config/constants.dart

@@ -48,3 +48,8 @@ abstract class Constants {
     '(ㆆ_ㆆ)',
   ];
 }
+
+abstract class RegExpConstants {
+  static const String linkSuffix = r'(\)|])(.)*$';
+  static const String number = '[0-9]+';
+}

lib/config/custom_log_filter.dart

@@ -0,0 +1,30 @@
+import 'package:logger/logger.dart';
+
+class CustomLogFilter extends LogFilter {
+  @override
+  Level? get 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;
+  }
+}

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

lib/cubits/collapse/collapse_cubit.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
+import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/services/services.dart';
 
 part 'collapse_state.dart';
@@ -10,31 +11,34 @@ part 'collapse_state.dart';
 class CollapseCubit extends Cubit<CollapseState> {
   CollapseCubit({
     required int commentId,
-    CacheService? cacheService,
+    required CommentsCubit? commentsCubit,
+    CollapseCache? collapseCache,
   })  : _commentId = commentId,
-        _cacheService = cacheService ?? locator.get<CacheService>(),
+        _collapseCache = collapseCache ?? locator.get<CollapseCache>(),
+        _commentsCubit = commentsCubit,
         super(const CollapseState.init());
 
   final int _commentId;
-  final CacheService _cacheService;
+  final CollapseCache _collapseCache;
+  final CommentsCubit? _commentsCubit;
   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,12 +47,21 @@ class CollapseCubit extends Cubit<CollapseState> {
         ),
       );
     } else {
-      final int count = _cacheService.collapse(_commentId);
+      if (_commentsCubit == null) return;
+
+      final Set<int> collapsedCommentIds = _collapseCache.collapse(_commentId);
+      final int lastCommentId = _commentsCubit!.state.comments.last.id;
+      final bool shouldLoadMore = _commentId == lastCommentId ||
+          collapsedCommentIds.contains(lastCommentId);
+
+      if (shouldLoadMore) {
+        _commentsCubit!.loadMore();
+      }
 
       emit(
         state.copyWith(
           collapsed: true,
-          collapsedCount: state.collapsed ? 0 : count,
+          collapsedCount: state.collapsed ? 0 : collapsedCommentIds.length,
         ),
       );
     }

lib/cubits/comments/comments_cubit.dart

@@ -11,31 +11,56 @@ 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 Item item,
-  })  : _cacheService = cacheService ?? locator.get<CacheService>(),
-        _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
+    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, item: item));
+        _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
@@ -47,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)) {
@@ -59,7 +85,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       );
 
       _streamSubscription = _storiesRepository
-          .fetchCommentsStream(
+          .fetchAllCommentsRecursivelyStream(
             ids: targetParents!.last.kids,
             level: targetParents.last.level + 1,
           )
@@ -69,35 +95,48 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
-    emit(state.copyWith(status: CommentsStatus.loading));
+    emit(
+      state.copyWith(
+        status: CommentsStatus.loading,
+        comments: <Comment>[],
+        currentPage: 0,
+      ),
+    );
 
     final Item item = state.item;
     final Item updatedItem = state.offlineReading
         ? item
         : await _storiesRepository.fetchItemBy(id: item.id) ?? item;
-    final List<int> kids = () {
-      switch (state.order) {
-        case CommentsOrder.natural:
-          return updatedItem.kids;
-        case CommentsOrder.newestFirst:
-          return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
-        case CommentsOrder.oldestFirst:
-          return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
-      }
-    }();
+    final List<int> kids = sortKids(updatedItem.kids);
 
     emit(state.copyWith(item: updatedItem));
 
     if (state.offlineReading) {
-      _streamSubscription = _cacheRepository
+      _streamSubscription = _offlineRepository
           .getCachedCommentsStream(ids: kids)
           .listen(_onCommentFetched)
         ..onDone(_onDone);
     } else {
-      _streamSubscription = _storiesRepository
-          .fetchCommentsStream(ids: 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;
+      }
     }
   }
 
@@ -111,37 +150,47 @@ class CommentsCubit extends Cubit<CommentsState> {
       return;
     }
 
-    _cacheService
-      ..resetComments()
-      ..resetCollapsedComments();
-
     emit(
       state.copyWith(
         status: CommentsStatus.loading,
-        comments: <Comment>[],
       ),
     );
 
+    _collapseCache.resetCollapsedComments();
+
     await _streamSubscription?.cancel();
+    for (final int id in _streamSubscriptions.keys) {
+      await _streamSubscriptions[id]?.cancel();
+    }
+    _streamSubscriptions.clear();
+
+    emit(
+      state.copyWith(
+        comments: <Comment>[],
+        currentPage: 0,
+      ),
+    );
 
     final Item item = state.item;
     final Item updatedItem =
         await _storiesRepository.fetchItemBy(id: item.id) ?? item;
-    final List<int> kids = () {
-      switch (state.order) {
-        case CommentsOrder.natural:
-          return updatedItem.kids;
-        case CommentsOrder.newestFirst:
-          return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
-        case CommentsOrder.oldestFirst:
-          return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
-      }
-    }();
+    final List<int> kids = sortKids(updatedItem.kids);
 
-    _streamSubscription = _storiesRepository
-        .fetchCommentsStream(ids: kids)
-        .listen(_onCommentFetched)
-      ..onDone(_onDone);
+    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(
@@ -156,17 +205,69 @@ class CommentsCubit extends Cubit<CommentsState> {
     emit(
       state.copyWith(
         onlyShowTargetComment: false,
-        comments: <Comment>[],
         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}) {
+    if (comment == null && state.status == CommentsStatus.loading) return;
+
+    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;
     }
   }
 
@@ -193,11 +294,41 @@ class CommentsCubit extends Cubit<CommentsState> {
   }
 
   void onOrderChanged(CommentsOrder? order) {
-    HapticFeedback.selectionClick();
     if (order == null) return;
+    if (state.order == order) return;
+    HapticFeedback.selectionClick();
     _streamSubscription?.cancel();
-    emit(state.copyWith(order: order, comments: <Comment>[]));
-    init();
+    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));
+    }
   }
 
   void _onDone() {
@@ -212,9 +343,8 @@ 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(
@@ -231,21 +361,24 @@ class CommentsCubit extends Cubit<CommentsState> {
 
       emit(state.copyWith(comments: updatedComments));
 
-      if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
-          updatedComments.length <=
-              _pageSize * 2 + _pageSize * state.currentPage) {
-        final bool isHidden = _cacheService.isHidden(comment.id);
+      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);
 
-        if (!isHidden) {
-          _streamSubscription?.pause();
+          if (!isHidden) {
+            _streamSubscription?.pause();
+          }
+
+          emit(
+            state.copyWith(
+              currentPage: state.currentPage + 1,
+              status: CommentsStatus.loaded,
+            ),
+          );
         }
-
-        emit(
-          state.copyWith(
-            currentPage: state.currentPage + 1,
-            status: CommentsStatus.loaded,
-          ),
-        );
       }
     }
   }
@@ -278,6 +411,9 @@ class CommentsCubit extends Cubit<CommentsState> {
   @override
   Future<void> close() async {
     await _streamSubscription?.cancel();
+    for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
+      await s.cancel();
+    }
     await super.close();
   }
 }

lib/cubits/comments/comments_state.dart

@@ -8,12 +8,6 @@ enum CommentsStatus {
   failure,
 }
 
-enum CommentsOrder {
-  natural,
-  newestFirst,
-  oldestFirst,
-}
-
 class CommentsState extends Equatable {
   const CommentsState({
     required this.item,
@@ -21,6 +15,7 @@ class CommentsState extends Equatable {
     required this.status,
     required this.fetchParentStatus,
     required this.order,
+    required this.fetchMode,
     required this.onlyShowTargetComment,
     required this.offlineReading,
     required this.currentPage,
@@ -29,10 +24,11 @@ class CommentsState extends Equatable {
   CommentsState.init({
     required this.offlineReading,
     required this.item,
+    required this.fetchMode,
+    required this.order,
   })  : comments = <Comment>[],
         status = CommentsStatus.init,
         fetchParentStatus = CommentsStatus.init,
-        order = CommentsOrder.natural,
         onlyShowTargetComment = false,
         currentPage = 0;
 
@@ -41,6 +37,7 @@ class CommentsState extends Equatable {
   final CommentsStatus status;
   final CommentsStatus fetchParentStatus;
   final CommentsOrder order;
+  final FetchMode fetchMode;
   final bool onlyShowTargetComment;
   final bool offlineReading;
   final int currentPage;
@@ -51,6 +48,7 @@ class CommentsState extends Equatable {
     CommentsStatus? status,
     CommentsStatus? fetchParentStatus,
     CommentsOrder? order,
+    FetchMode? fetchMode,
     bool? onlyShowTargetComment,
     bool? offlineReading,
     int? currentPage,
@@ -61,6 +59,7 @@ class CommentsState extends Equatable {
       fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
       status: status ?? this.status,
       order: order ?? this.order,
+      fetchMode: fetchMode ?? this.fetchMode,
       onlyShowTargetComment:
           onlyShowTargetComment ?? this.onlyShowTargetComment,
       offlineReading: offlineReading ?? this.offlineReading,
@@ -68,6 +67,8 @@ class CommentsState extends Equatable {
     );
   }
 
+  Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
+
   @override
   List<Object?> get props => <Object?>[
         item,
@@ -75,6 +76,7 @@ class CommentsState extends Equatable {
         status,
         fetchParentStatus,
         order,
+        fetchMode,
         onlyShowTargetComment,
         offlineReading,
         currentPage,

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();
 }

lib/cubits/notification/notification_cubit.dart

@@ -30,12 +30,9 @@ class NotificationCubit extends Cubit<NotificationState> {
     _authBloc.stream.listen((AuthState authState) {
       if (authState.isLoggedIn && authState.username != _username) {
         // Get the user setting.
-        _preferenceRepository.shouldShowNotification
-            .then((bool showNotification) {
-          if (showNotification) {
-            init();
-          }
-        });
+        if (_preferenceCubit.state.showNotification) {
+          Future<void>.delayed(const Duration(seconds: 2), init);
+        }
 
         // Listen for setting changes in the future.
         _preferenceCubit.stream.listen((PreferenceState prefState) {

lib/cubits/preference/preference_cubit.dart

@@ -1,6 +1,8 @@
 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/repositories/repositories.dart';
 
 part 'preference_state.dart';
@@ -9,69 +11,67 @@ class PreferenceCubit extends Cubit<PreferenceState> {
   PreferenceCubit({PreferenceRepository? storageRepository})
       : _preferenceRepository =
             storageRepository ?? locator.get<PreferenceRepository>(),
-        super(const PreferenceState.init()) {
+        super(PreferenceState.init()) {
     init();
   }
 
   final PreferenceRepository _preferenceRepository;
 
   void init() {
-    _preferenceRepository.shouldShowNotification
-        .then((bool value) => emit(state.copyWith(showNotification: value)));
-    _preferenceRepository.shouldShowComplexStoryTile.then(
-      (bool value) => emit(state.copyWith(showComplexStoryTile: value)),
-    );
-    _preferenceRepository.shouldShowWebFirst
-        .then((bool value) => emit(state.copyWith(showWebFirst: value)));
-    _preferenceRepository.shouldShowEyeCandy
-        .then((bool value) => emit(state.copyWith(showEyeCandy: value)));
-    _preferenceRepository.trueDarkMode
-        .then((bool value) => emit(state.copyWith(useTrueDark: value)));
-    _preferenceRepository.readerMode
-        .then((bool value) => emit(state.copyWith(useReader: value)));
-    _preferenceRepository.markReadStories
-        .then((bool value) => emit(state.copyWith(markReadStories: value)));
-    _preferenceRepository.shouldShowMetadata
-        .then((bool value) => emit(state.copyWith(showMetadata: value)));
+    for (final BooleanPreference p
+        in Preference.allPreferences.whereType<BooleanPreference>()) {
+      initPreference<bool>(p).then<bool?>((bool? value) {
+        final Preference<dynamic> updatedPreference = p.copyWith(val: value);
+        emit(state.copyWithPreference(updatedPreference));
+        return null;
+      });
+    }
+
+    for (final IntPreference p
+        in Preference.allPreferences.whereType<IntPreference>()) {
+      initPreference<int>(p).then<int?>((int? value) {
+        final Preference<dynamic> updatedPreference = p.copyWith(val: value);
+        emit(state.copyWithPreference(updatedPreference));
+        return null;
+      });
+    }
   }
 
-  void toggleNotificationMode() {
-    emit(state.copyWith(showNotification: !state.showNotification));
-    _preferenceRepository.toggleNotificationMode();
+  Future<T?> initPreference<T>(Preference<T> preference) async {
+    switch (T) {
+      case int:
+        final int? value = await _preferenceRepository.getInt(preference.key);
+        return value as T?;
+      case bool:
+        final bool? value = await _preferenceRepository.getBool(preference.key);
+        return value as T?;
+      default:
+        throw UnimplementedError();
+    }
   }
 
-  void toggleDisplayMode() {
-    emit(state.copyWith(showComplexStoryTile: !state.showComplexStoryTile));
-    _preferenceRepository.toggleDisplayMode();
+  void toggle(BooleanPreference preference) {
+    final BooleanPreference updatedPreference =
+        preference.copyWith(val: !preference.val) as BooleanPreference;
+    emit(state.copyWithPreference(updatedPreference));
+    _preferenceRepository.setBool(preference.key, !preference.val);
   }
 
-  void toggleNavigationMode() {
-    emit(state.copyWith(showWebFirst: !state.showWebFirst));
-    _preferenceRepository.toggleNavigationMode();
-  }
+  void update<T>(Preference<T> preference, {required T to}) {
+    final T value = to;
+    final Preference<T> updatedPreference = preference.copyWith(val: value);
 
-  void toggleEyeCandyMode() {
-    emit(state.copyWith(showEyeCandy: !state.showEyeCandy));
-    _preferenceRepository.toggleEyeCandyMode();
-  }
+    emit(state.copyWithPreference(updatedPreference));
 
-  void toggleTrueDarkMode() {
-    emit(state.copyWith(useTrueDark: !state.useTrueDark));
-    _preferenceRepository.toggleTrueDarkMode();
-  }
-
-  void toggleReaderMode() {
-    emit(state.copyWith(useReader: !state.useReader));
-    _preferenceRepository.toggleReaderMode();
-  }
-
-  void toggleMarkReadStoriesMode() {
-    emit(state.copyWith(markReadStories: !state.markReadStories));
-    _preferenceRepository.toggleMarkReadStoriesMode();
-  }
-
-  void toggleMetadataMode() {
-    emit(state.copyWith(showMetadata: !state.showMetadata));
-    _preferenceRepository.toggleMetadataMode();
+    switch (T) {
+      case int:
+        _preferenceRepository.setInt(preference.key, value as int);
+        break;
+      case bool:
+        _preferenceRepository.setBool(preference.key, value as bool);
+        break;
+      default:
+        throw UnimplementedError();
+    }
   }
 }

lib/cubits/preference/preference_state.dart

@@ -2,66 +2,81 @@ part of 'preference_cubit.dart';
 
 class PreferenceState extends Equatable {
   const PreferenceState({
-    required this.showNotification,
-    required this.showComplexStoryTile,
-    required this.showWebFirst,
-    required this.showEyeCandy,
-    required this.useTrueDark,
-    required this.useReader,
-    required this.markReadStories,
-    required this.showMetadata,
+    required this.preferences,
   });
 
-  const PreferenceState.init()
-      : showNotification = false,
-        showComplexStoryTile = false,
-        showWebFirst = false,
-        showEyeCandy = false,
-        useTrueDark = false,
-        useReader = false,
-        markReadStories = false,
-        showMetadata = false;
+  PreferenceState.init()
+      : preferences = <Preference<dynamic>>{...Preference.allPreferences};
 
-  final bool showNotification;
-  final bool showComplexStoryTile;
-  final bool showWebFirst;
-  final bool showEyeCandy;
-  final bool useTrueDark;
-  final bool useReader;
-  final bool markReadStories;
-  final bool showMetadata;
+  final Set<Preference<dynamic>> preferences;
 
   PreferenceState copyWith({
-    bool? showNotification,
-    bool? showComplexStoryTile,
-    bool? showWebFirst,
-    bool? showEyeCandy,
-    bool? useTrueDark,
-    bool? useReader,
-    bool? markReadStories,
-    bool? showMetadata,
+    Set<Preference<dynamic>>? preferences,
   }) {
     return PreferenceState(
-      showNotification: showNotification ?? this.showNotification,
-      showComplexStoryTile: showComplexStoryTile ?? this.showComplexStoryTile,
-      showWebFirst: showWebFirst ?? this.showWebFirst,
-      showEyeCandy: showEyeCandy ?? this.showEyeCandy,
-      useTrueDark: useTrueDark ?? this.useTrueDark,
-      useReader: useReader ?? this.useReader,
-      markReadStories: markReadStories ?? this.markReadStories,
-      showMetadata: showMetadata ?? this.showMetadata,
+      preferences: preferences ?? this.preferences,
     );
   }
 
+  PreferenceState copyWithPreference<T extends Preference<dynamic>>(
+    T preference,
+  ) {
+    return PreferenceState(
+      preferences: <Preference<dynamic>>{
+        ...preferences.toList()
+          ..remove(preference)
+          ..insert(Preference.allPreferences.indexOf(preference), preference),
+      },
+    );
+  }
+
+  bool isOn<T extends BooleanPreference>(T preference) {
+    return preferences
+        .whereType<BooleanPreference>()
+        .singleWhere(
+          (BooleanPreference e) => e.runtimeType == preference.runtimeType,
+        )
+        .val;
+  }
+
+  bool _isOn<T extends BooleanPreference>() {
+    return preferences
+        .whereType<BooleanPreference>()
+        .singleWhere(
+          (BooleanPreference e) => e.runtimeType == T,
+        )
+        .val;
+  }
+
+  bool get showNotification => _isOn<NotificationModePreference>();
+
+  bool get showComplexStoryTile => _isOn<DisplayModePreference>();
+
+  bool get showWebFirst => _isOn<NavigationModePreference>();
+
+  bool get showEyeCandy => _isOn<EyeCandyModePreference>();
+
+  bool get useTrueDark => _isOn<TrueDarkModePreference>();
+
+  bool get useReader => _isOn<ReaderModePreference>();
+
+  bool get markReadStories => _isOn<MarkReadStoriesModePreference>();
+
+  bool get showMetadata => _isOn<MetadataModePreference>();
+
+  bool get tapAnywhereToCollapse => _isOn<CollapseModePreference>();
+
+  FetchMode get fetchMode => FetchMode.values
+      .elementAt(preferences.singleWhereType<FetchModePreference>().val);
+
+  CommentsOrder get order => CommentsOrder.values
+      .elementAt(preferences.singleWhereType<CommentsOrderPreference>().val);
+
+  FontSize get fontSize => FontSize.values
+      .elementAt(preferences.singleWhereType<FontSizePreference>().val);
+
   @override
   List<Object?> get props => <Object?>[
-        showNotification,
-        showComplexStoryTile,
-        showWebFirst,
-        showEyeCandy,
-        useTrueDark,
-        useReader,
-        markReadStories,
-        showMetadata,
+        ...preferences.map<dynamic>((Preference<dynamic> e) => e.val),
       ];
 }

lib/cubits/search/search_cubit.dart

@@ -23,73 +23,71 @@ class SearchCubit extends Cubit<SearchState> {
       state.copyWith(
         results: <Story>[],
         status: SearchStatus.loading,
-        searchFilters: state.searchFilters.copyWith(query: query, page: 0),
+        params: state.params.copyWith(query: query, page: 0),
       ),
     );
-    streamSubscription = _searchRepository
-        .search(filters: state.searchFilters)
-        .listen(_onStoryFetched)
-      ..onDone(() {
-        emit(state.copyWith(status: SearchStatus.loaded));
-      });
+    streamSubscription =
+        _searchRepository.search(params: state.params).listen(_onStoryFetched)
+          ..onDone(() {
+            emit(state.copyWith(status: SearchStatus.loaded));
+          });
   }
 
   void loadMore() {
     if (state.status != SearchStatus.loading) {
-      final int updatedPage = state.searchFilters.page + 1;
+      final int updatedPage = state.params.page + 1;
       emit(
         state.copyWith(
           status: SearchStatus.loadingMore,
-          searchFilters: state.searchFilters.copyWith(page: updatedPage),
+          params: state.params.copyWith(page: updatedPage),
         ),
       );
-      streamSubscription = _searchRepository
-          .search(filters: state.searchFilters)
-          .listen(_onStoryFetched)
-        ..onDone(() {
-          emit(state.copyWith(status: SearchStatus.loaded));
-        });
+      streamSubscription =
+          _searchRepository.search(params: state.params).listen(_onStoryFetched)
+            ..onDone(() {
+              emit(state.copyWith(status: SearchStatus.loaded));
+            });
     }
   }
 
   void addFilter<T extends SearchFilter>(T filter) {
-    if (state.searchFilters.contains<T>()) {
+    if (state.params.contains<T>()) {
       emit(
         state.copyWith(
-          searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
+          params: state.params.copyWithFilterRemoved<T>(),
         ),
       );
     }
 
     emit(
       state.copyWith(
-        searchFilters: state.searchFilters.copyWithFilterAdded(filter),
+        params: state.params.copyWithFilterAdded(filter),
       ),
     );
 
-    search(state.searchFilters.query);
+    search(state.params.query);
   }
 
   void removeFilter<T extends SearchFilter>() {
     emit(
       state.copyWith(
-        searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
+        params: state.params.copyWithFilterRemoved<T>(),
       ),
     );
 
-    search(state.searchFilters.query);
+    search(state.params.query);
   }
 
   void onSortToggled() {
     emit(
       state.copyWith(
-        searchFilters: state.searchFilters.copyWith(
-          sorted: !state.searchFilters.sorted,
+        params: state.params.copyWith(
+          sorted: !state.params.sorted,
         ),
       ),
     );
 
-    search(state.searchFilters.query);
+    search(state.params.query);
   }
 
   void _onStoryFetched(Story story) {

lib/cubits/search/search_state.dart

@@ -11,27 +11,27 @@ class SearchState extends Equatable {
   const SearchState({
     required this.status,
     required this.results,
-    required this.searchFilters,
+    required this.params,
   });
 
   SearchState.init()
       : status = SearchStatus.initial,
         results = <Story>[],
-        searchFilters = SearchFilters.init();
+        params = SearchParams.init();
 
   final List<Story> results;
   final SearchStatus status;
-  final SearchFilters searchFilters;
+  final SearchParams params;
 
   SearchState copyWith({
     List<Story>? results,
     SearchStatus? status,
-    SearchFilters? searchFilters,
+    SearchParams? params,
   }) {
     return SearchState(
       results: results ?? this.results,
       status: status ?? this.status,
-      searchFilters: searchFilters ?? this.searchFilters,
+      params: params ?? this.params,
     );
   }
 
@@ -39,6 +39,6 @@ class SearchState extends Equatable {
   List<Object?> get props => <Object?>[
         status,
         results,
-        searchFilters,
+        params,
       ];
 }

lib/cubits/split_view/split_view_cubit.dart

@@ -3,18 +3,24 @@ import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
+import 'package:logger/logger.dart';
 
 part 'split_view_state.dart';
 
 class SplitViewCubit extends Cubit<SplitViewState> {
-  SplitViewCubit({CacheService? cacheService})
-      : _cacheService = cacheService ?? locator.get<CacheService>(),
+  SplitViewCubit({
+    CommentCache? commentCache,
+    Logger? logger,
+  })  : _commentCache = commentCache ?? locator.get<CommentCache>(),
+        _logger = logger ?? locator.get<Logger>(),
         super(const SplitViewState.init());
 
-  final CacheService _cacheService;
+  final Logger _logger;
+  final CommentCache _commentCache;
 
   void updateItemScreenArgs(ItemScreenArgs args) {
-    _cacheService.resetCollapsedComments();
+    _logger.i('resetting comments in CommentCache');
+    _commentCache.resetComments();
     emit(state.copyWith(itemScreenArgs: args));
   }
 

lib/cubits/time_machine/time_machine_cubit.dart

@@ -3,34 +3,34 @@ import 'package:equatable/equatable.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart' show Comment;
 import 'package:hacki/repositories/repositories.dart';
-import 'package:hacki/services/cache_service.dart';
+import 'package:hacki/services/services.dart';
 
 part 'time_machine_state.dart';
 
 class TimeMachineCubit extends Cubit<TimeMachineState> {
   TimeMachineCubit({
     SembastRepository? sembastRepository,
-    CacheService? cacheService,
+    CommentCache? commentCache,
   })  : _sembastRepository =
             sembastRepository ?? locator.get<SembastRepository>(),
-        _cacheService = cacheService ?? locator.get<CacheService>(),
+        _commentCache = commentCache ?? locator.get<CommentCache>(),
         super(TimeMachineState.init());
 
   final SembastRepository _sembastRepository;
-  final CacheService _cacheService;
+  final CommentCache _commentCache;
 
   Future<void> activateTimeMachine(Comment comment) async {
     emit(state.copyWith(parents: <Comment>[]));
 
     final List<Comment> parents = <Comment>[];
-    Comment? parent = _cacheService.getComment(comment.parent);
+    Comment? parent = _commentCache.getComment(comment.parent);
     parent ??= await _sembastRepository.getCachedComment(id: comment.parent);
 
     while (parent != null) {
       parents.insert(0, parent);
 
       final int parentId = parent.parent;
-      parent = _cacheService.getComment(parentId);
+      parent = _commentCache.getComment(parentId);
       parent ??= await _sembastRepository.getCachedComment(id: parentId);
     }
 

lib/cubits/user/user_cubit.dart

@@ -10,7 +10,7 @@ class UserCubit extends Cubit<UserState> {
   UserCubit({StoriesRepository? storiesRepository})
       : _storiesRepository =
             storiesRepository ?? locator.get<StoriesRepository>(),
-        super(UserState.init());
+        super(const UserState.init());
 
   final StoriesRepository _storiesRepository;