update story tile. (#175)

* bumped version.

* fix time machine.

.github/workflows/commit_check.yml

@@ -0,0 +1,23 @@
+name: Commit Guard
+
+on:
+  push:
+    branches:
+      - "**"
+      - '!master'
+
+jobs:
+  releases:
+    name: Check commit
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: checkout all the submodules
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - run: submodules/flutter/bin/flutter doctor
+      - run: submodules/flutter/bin/flutter pub get
+      - run: submodules/flutter/bin/dart format --set-exit-if-changed lib test integration_test
+      - run: submodules/flutter/bin/flutter analyze lib test integration_test
+      - run: submodules/flutter/bin/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.3"
-    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.3'
-          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,52 @@
+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@v3
+        with:
+          submodules: recursive
+      - run: submodules/flutter/bin/flutter doctor
+      - run: submodules/flutter/bin/flutter pub get
+      - run: submodules/flutter/bin/dart format --set-exit-if-changed lib test integration_test
+      - run: submodules/flutter/bin/flutter analyze lib test integration_test
+      - run: submodules/flutter/bin/flutter test
+      
+      # Configure ruby according to our .ruby-version
+      - name: Setup ruby & Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      # 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: 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

@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.2.4.0.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 linter:
   rules:
     parameter_assignments: false
@@ -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 32
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +51,7 @@ android {
     defaultConfig {
         applicationId "com.jiaqifeng.hacki"
         minSdkVersion 26
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -79,3 +79,14 @@ flutter {
 dependencies {
     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
+        }
+    }
+}

assets/eula.md

@@ -0,0 +1,18 @@
+## End-user License Agreement
+This policy applies to the usage of the Hacki app.
+
+Please read this Mobile Application End User License Agreement (“EULA”) carefully before using the Hacki mobile application ("Mobile App"), which allows You to read and contribute to Hacker News from Your mobile device. This EULA forms a binding legal agreement between you (and any other entity on whose behalf you accept these terms) (collectively “You” or “Your”) and Hacki (each separately a “Party” and collectively the “Parties”) as of the date you download the Mobile App. Your use of the Mobile App is subject to this EULA.
+
+### Changes to this EULA
+Hacki reserves the right to modify this EULA at any time and for any reason. You are responsible for complying with the updated EULA. Your continued use of the Mobile App indicates Your consent to the updated terms.
+
+### No Included Maintenance and Support
+Hacki may deploy changes, updates, or enhancements to the Mobile App at any time. Hacki may provide maintenance and support for the Mobile App, but has no obligation whatsoever to furnish such services to You and may terminate such services at any time without notice.
+
+### No Warranty
+Hacki expressly disclaims all warranties of any kind, whether express or implied.
+
+The Mobile App is only available for supported devices and might not work on every device. Determining whether Your device is a supported or compatible device for use of the Mobile App is solely Your responsibility, and downloading the Mobile App is done at Your own risk. Smartsheet does not represent or warrant that the Mobile App and Your device are compatible or that the Mobile App will work on Your device.
+
+### Your Consent
+By using the app, you consent to the end-user license agreement.

assets/privacy_policy.md

@@ -0,0 +1,48 @@
+## Privacy Policy
+This policy applies to all information collected or submitted on Hacki.
+
+### Information we collect
+Hacki collects anonymous statistics such as crash reports and feature usage. These data are solely used to track app's health and are only stored locally on your device and only got sent to us when you choose to do so.
+
+### Ads and analytics
+Hacki does not serve ads.
+
+Hacki collects aggregate, anonymous statistics to improve the app but these data are only stored locally on your device and only got sent to us when you choose to do so.
+
+### Information usage
+We use the information we collect to operate and improve our website, apps, and customer support.
+
+We do not share personal information with outside parties except to the extent necessary to accomplish Hacki’s functionality.
+
+We may disclose your information in response to subpoenas, court orders, or other legal requirements; to exercise our legal rights or defend against legal claims; to investigate, prevent, or take action regarding illegal activities, suspected fraud or abuse, violations of our policies; or to protect our rights and property.
+
+### Security
+Hacki uses the official Hacker News API for fetching data from Hacker News.
+
+When logging in, usernames and passwords are securely sent to Hacker News' servers for authentication.
+
+### Third-party links and content
+Hacki displays links and content from third-party websites. These websites have their own independent privacy policies, and we have no responsibility or liability for their content or activities.
+
+#### California Online Privacy Protection Act Compliance
+Hacki complies with the California Online Privacy Protection Act. We therefore will not distribute your personal information to outside parties without your consent.
+
+#### Children’s Online Privacy Protection Act Compliance
+Hacki never collects or maintain information at our website from those we actually know are under 13, and no part of our website is structured to attract anyone under 13.
+
+#### Information for European Union Customers
+By using Hacki and providing your information, you authorize us to collect, use, and store your information outside of the European Union.
+
+#### International Transfers of Information
+Information may be processed, stored, and used outside of the country in which you are located. Data privacy laws vary across jurisdictions, and different laws may be applicable to your data depending on where it is processed, stored, or used.
+
+### Your Consent
+By using the app, you consent to the privacy policy.
+
+### Contacting Us
+If you have questions regarding this privacy policy, you may e-mail me us at jfeng@fastmail.com.
+
+### Changes to this policy
+If we decide to change this privacy policy, we will post those changes on this page.
+
+February 27, 2023: First published.

components/synced_shared_preferences/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.2.4.0.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 linter:
   rules:
     parameter_assignments: false

components/synced_shared_preferences/ios/Classes/SwiftSyncedSharedPreferencesPlugin.swift

@@ -1,5 +1,82 @@
 import Flutter
 import UIKit
+import Foundation
+
+typealias APNSHandler = ()->Void
+
+let keyKey = "key"
+let valKey = "val"
+
+final class SharedPrefsCore {
+    fileprivate static let shared: SharedPrefsCore = SharedPrefsCore()
+
+    fileprivate func setBool(key: String?, val: Bool?) -> Bool {
+        guard let key = key,
+              let val = val else {
+            return false
+        }
+
+        let keyStore = NSUbiquitousKeyValueStore()
+        let allVals = keyStore.dictionaryRepresentation;
+        let allKeys = allVals.keys
+
+        // Limit is 1024, reserve rest slots for fav and pins.
+        if allKeys.count >= 1000 {
+            for key in allKeys.filter({ $0.contains("hasRead") }) {
+                keyStore.removeObject(forKey: key)
+            }
+        }
+
+        keyStore.set(val, forKey: key)
+        return true
+    }
+
+    fileprivate func getBool(key: String?) -> Bool {
+        guard let key = key else {
+            return false
+        }
+
+        let keyStore = NSUbiquitousKeyValueStore()
+        let val = keyStore.bool(forKey: key)
+
+        return val
+    }
+
+    fileprivate func setStringList(key: String?, val: [String]?) -> Bool {
+        guard let key = key,
+              let val = val else {
+            return false
+        }
+
+        let keyStore = NSUbiquitousKeyValueStore()
+        keyStore.set(val, forKey: key)
+
+        return true
+    }
+
+    fileprivate func getStringList(key: String?) -> [Any] {
+        guard let key = key else {
+            return [Any]()
+        }
+
+        let keyStore = NSUbiquitousKeyValueStore()
+        let list = keyStore.array(forKey: key) as [Any]? ?? [Any]()
+
+        return list
+    }
+
+    fileprivate func clearAll() -> Bool{
+        let keyStore = NSUbiquitousKeyValueStore()
+        let allVals = keyStore.dictionaryRepresentation;
+        let allKeys = allVals.keys
+
+        for key in allKeys.filter({ $0.contains("hasRead") }) {
+            keyStore.removeObject(forKey: key)
+        }
+
+        return true
+    }
+}
 
 public class SwiftSyncedSharedPreferencesPlugin: NSObject, FlutterPlugin {
     public static func register(with registrar: FlutterPluginRegistrar) {
@@ -7,46 +84,49 @@ public class SwiftSyncedSharedPreferencesPlugin: NSObject, FlutterPlugin {
         let instance = SwiftSyncedSharedPreferencesPlugin()
         registrar.addMethodCallDelegate(instance, channel: channel)
     }
-    
+
     public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         switch call.method {
         case "setBool":
             if let params  = call.arguments as? [String: Any] {
-                let info: [String: Any] = ["result": result,
-                                           "params": params]
-                NotificationCenter.default.post(name: Notification.Name("setBool"), object: nil, userInfo: info)
+                let val = params[valKey] as? Bool
+                let key = params[keyKey] as? String
+
+                let res = SharedPrefsCore.shared.setBool(key: key, val: val)
+                result(res)
             }
-            
+
             return
         case "getBool":
             if let params  = call.arguments as? [String: Any] {
-                let info: [String: Any] = ["result": result,
-                                           "params": params]
-                NotificationCenter.default.post(name: Notification.Name("getBool"), object: nil, userInfo: info)
+                let key = params[keyKey] as? String
+                let res = SharedPrefsCore.shared.getBool(key: key)
+                result(res)
             }
-            
+
             return
         case "setStringList":
             if let params  = call.arguments as? [String: Any] {
-                let info: [String: Any] = ["result": result,
-                                           "params": params]
-                NotificationCenter.default.post(name: Notification.Name("setStringList"), object: nil, userInfo: info)
+                let val = params[valKey] as? [String]
+                let key = params[keyKey] as? String
+
+                let res = SharedPrefsCore.shared.setStringList(key: key, val: val)
+                result(res)
             }
-            
+
             return
         case "getStringList":
             if let params  = call.arguments as? [String: Any] {
-                let info: [String: Any] = ["result": result,
-                                           "params": params]
-                NotificationCenter.default.post(name: Notification.Name("getStringList"), object: nil, userInfo: info)
+                let key = params[keyKey] as? String
+                let res = SharedPrefsCore.shared.getStringList(key: key)
+                result(res)
             }
-            
+
             return
         case "clearAll":
             if let params  = call.arguments as? [String: Any] {
-                let info: [String: Any] = ["result": result,
-                                           "params": params]
-                NotificationCenter.default.post(name: Notification.Name("clearAll"), object: nil, userInfo: info)
+                let res = SharedPrefsCore.shared.clearAll()
+                result(res)
             }
             
             return

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.

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

@@ -0,0 +1,3 @@
+- Customization of tab bar.
+- Option to enable swipe gesture for switching between tabs.
+- Access to action menu from home screen.

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

@@ -0,0 +1,5 @@
+- Customization of tab bar.
+- Option to enable swipe gesture for switching between tabs.
+- Access to action menu from home screen.
+- Access to Wikipedia and Wiktionary from text selection toolbar.
+- Quotes and emphasis rendering.

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

@@ -0,0 +1,5 @@
+- Customization of tab bar.
+- Option to enable swipe gesture for switching between tabs.
+- Access to action menu from home screen.
+- Access to Wikipedia and Wiktionary from text selection toolbar.
+- Quotes and emphasis rendering.

integration_test/app_test.dart

@@ -1,46 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:hacki/main.dart' as app;
-import 'package:hacki/screens/widgets/story_tile.dart';
-import 'package:integration_test/integration_test.dart';
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  group('performance test', () {
-    testWidgets('scrolling performance on ItemScreen',
-        (WidgetTester tester) async {
-      await app.main(testing: true);
-      await tester.pump();
-
-      final Finder bestStoryTabFinder = find.text('BEST');
-
-      await tester.tap(bestStoryTabFinder);
-      await tester.pumpAndSettle(const Duration(seconds: 3));
-
-      final Finder storyTileFinder = find.byType(StoryTile);
-
-      await tester.tap(storyTileFinder.first);
-      await tester.pumpAndSettle(const Duration(seconds: 3));
-
-      TestGesture gesture = await tester.startGesture(const Offset(0, 300));
-      await gesture.moveBy(const Offset(0, -300));
-      await tester.pump();
-
-      gesture = await tester.startGesture(const Offset(0, 300));
-      await gesture.moveBy(const Offset(0, -300));
-      await tester.pump();
-
-      gesture = await tester.startGesture(const Offset(0, 300));
-      await gesture.moveBy(const Offset(0, -300));
-      await tester.pump();
-
-      gesture = await tester.startGesture(const Offset(0, 300));
-      await gesture.moveBy(const Offset(0, 900));
-      await tester.pump();
-
-      gesture = await tester.startGesture(const Offset(0, 300));
-      await gesture.moveBy(const Offset(0, -900));
-      await tester.pump();
-    });
-  });
-}

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

@@ -3,6 +3,8 @@ PODS:
     - Flutter
     - ReachabilitySwift
   - Flutter (1.0.0)
+  - flutter_email_sender (0.0.1):
+    - Flutter
   - flutter_inappwebview (0.0.1):
     - Flutter
     - flutter_inappwebview/Core (= 0.0.1)
@@ -12,7 +14,7 @@ PODS:
     - OrderedSet (~> 5.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_secure_storage (3.3.1):
+  - flutter_secure_storage (6.0.0):
     - Flutter
   - flutter_siri_suggestions (0.0.1):
     - Flutter
@@ -22,15 +24,19 @@ PODS:
   - integration_test (0.0.1):
     - Flutter
   - OrderedSet (5.0.0)
-  - path_provider_ios (0.0.1):
+  - package_info_plus (0.4.5):
     - Flutter
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - ReachabilitySwift (5.0.0)
   - receive_sharing_intent (0.0.1):
     - Flutter
   - share_plus (0.0.1):
     - Flutter
-  - shared_preferences_ios (0.0.1):
+  - shared_preferences_foundation (0.0.1):
     - Flutter
+    - FlutterMacOS
   - sqflite (0.0.2):
     - Flutter
     - FMDB (>= 2.7.5)
@@ -48,15 +54,17 @@ PODS:
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - Flutter (from `Flutter`)
+  - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_siri_suggestions (from `.symlinks/plugins/flutter_siri_suggestions/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
-  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -75,6 +83,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   Flutter:
     :path: Flutter
+  flutter_email_sender:
+    :path: ".symlinks/plugins/flutter_email_sender/ios"
   flutter_inappwebview:
     :path: ".symlinks/plugins/flutter_inappwebview/ios"
   flutter_local_notifications:
@@ -85,14 +95,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_siri_suggestions/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
-  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider_ios/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
-  shared_preferences_ios:
-    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
   synced_shared_preferences:
@@ -108,26 +120,28 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
-  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  url_launcher_ios: fb12c43172927bb5cf75aeebd073f883801f1993
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
   workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
 
-PODFILE CHECKSUM: e4c97c7a9aacaeda4b952f7ef9ea29e47660f622
+PODFILE CHECKSUM: d28e9a1c7bee335d05ddd795703aad5bf05bb937
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -21,7 +21,6 @@
 		E530B1AD283B54DA004E8EB6 /* ActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E530B1AC283B54DA004E8EB6 /* ActionViewController.swift */; };
 		E530B1B0283B54DA004E8EB6 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E530B1AE283B54DA004E8EB6 /* MainInterface.storyboard */; };
 		E530B1B4283B54DA004E8EB6 /* Action Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = E530B1A6283B54DA004E8EB6 /* Action Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		E54B4753282B3B8900579261 /* HackiCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E54B4752282B3B8900579261 /* HackiCore.swift */; };
 		E575B6F127EBC6DB002B1508 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E575B6F027EBC6DA002B1508 /* CloudKit.framework */; };
 		FC507E94AA7767C155787DB3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFB5AA41D6C22D228077D166 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
@@ -56,7 +55,7 @@
 		};
 		E51D52B8283B464E00FC8DD8 /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 8;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
@@ -64,7 +63,7 @@
 				E530B1B4283B54DA004E8EB6 /* Action Extension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 1;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
@@ -97,7 +96,6 @@
 		E530B1AF283B54DA004E8EB6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
 		E530B1B1283B54DA004E8EB6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E530B1B9283B54E4004E8EB6 /* Action Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Action Extension.entitlements"; sourceTree = "<group>"; };
-		E54B4752282B3B8900579261 /* HackiCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HackiCore.swift; sourceTree = "<group>"; };
 		E575B6EF27EBC6C6002B1508 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		E575B6F027EBC6DA002B1508 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
 		E59F28EE283B477D00512089 /* Share Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Share Extension.entitlements"; sourceTree = "<group>"; };
@@ -177,7 +175,6 @@
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-				E54B4752282B3B8900579261 /* HackiCore.swift */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
@@ -363,6 +360,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -416,6 +414,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -437,7 +436,6 @@
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-				E54B4753282B3B8900579261 /* HackiCore.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -549,7 +547,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 +565,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				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.26;
+				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 +638,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 +687,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 +707,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				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.26;
+				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 +743,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
-				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.26;
+				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 +780,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 +801,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 +823,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 +843,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 +863,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 +883,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 +905,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 +926,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 +950,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 +970,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 +992,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 +1012,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/AppDelegate.swift

@@ -1,9 +1,9 @@
 import UIKit
 import Flutter
 import workmanager
-import shared_preferences_ios
+import shared_preferences_foundation
 import flutter_secure_storage
-import path_provider_ios
+import path_provider_foundation
 import flutter_local_notifications
 
 @UIApplicationMain
@@ -16,10 +16,10 @@ import flutter_local_notifications
         
         let center = UNUserNotificationCenter.current()
         center.delegate = self
-
-        HackiCore.start()
         
         WorkmanagerPlugin.register(with: self.registrar(forPlugin: "be.tramckrijte.workmanager.WorkmanagerPlugin")!)
+
+        WorkmanagerPlugin.registerTask(withIdentifier: "workmanager.background.task")
         
         if #available(iOS 10.0, *) {
             UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
@@ -28,8 +28,8 @@ import flutter_local_notifications
         
         WorkmanagerPlugin.setPluginRegistrantCallback { registry in
             GeneratedPluginRegistrant.register(with: registry)
-            FLTSharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")!)
-            FLTPathProviderPlugin.register(with: registry.registrar(forPlugin: "io.flutter.plugins.pathprovider.PathProviderPlugin")!)
+            SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")!)
+            PathProviderPlugin.register(with: registry.registrar(forPlugin: "io.flutter.plugins.pathprovider.PathProviderPlugin")!)
             FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin")!)
         }
         

ios/Runner/HackiCore.swift

@@ -1,134 +0,0 @@
-//
-//  HackiCore.swift
-//  Runner
-//
-//  Created by Jiaqi Feng on 5/10/22.
-//
-
-import Foundation
-import Flutter
-
-extension Notification.Name {
-    static let setBool = Notification.Name("setBool")
-    static let getBool = Notification.Name("getBool")
-    static let setStringList = Notification.Name("setStringList")
-    static let getStringList = Notification.Name("getStringList")
-    static let clearAll = Notification.Name("clearAll")
-}
-
-typealias APNSHandler = ()->Void
-
-final class HackiCore: NSObject {
-    private static let keyKey = "key"
-    private static let valKey = "val"
-    
-    private static let shared: HackiCore = HackiCore()
-    private let notificationCenter = NotificationCenter.default
-    
-    // Called at app launch
-    class func start() {
-        shared.registerNotifications()
-    }
-    
-    private class func setupFlutterEvent(channelName: String, handler: NSObjectProtocol & FlutterStreamHandler) {
-        guard let rootVC = UIApplication.shared.delegate?.window.unsafelyUnwrapped?.rootViewController as? FlutterViewController else { return }
-        let eventChannel = FlutterEventChannel(name: channelName, binaryMessenger: rootVC.binaryMessenger)
-        eventChannel.setStreamHandler(handler)
-    }
-    
-    private func registerNotifications() {
-        // SyncedSharedPreferences
-        notificationCenter.addObserver(self, selector: #selector(setBool(_:)), name: .setBool, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(getBool(_:)), name: .getBool, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(setStringList(_:)), name: .setStringList, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(getStringList(_:)), name: .getStringList, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(clearAll(_:)), name: .clearAll, object: nil)
-    }
-    
-    @objc private func setBool(_ notification: Notification) {
-        guard let resultCompletionBlock: FlutterResult = notification.userInfo?["result"] as? FlutterResult else { fatalError(" failed to obtain result block") }
-        guard
-            let params = notification.userInfo?["params"] as? [String: Any],
-            let key = params[HackiCore.keyKey] as? String,
-            let val = params[HackiCore.valKey] as? Bool else {
-            resultCompletionBlock(false)
-            return
-        }
-        
-        let keyStore = NSUbiquitousKeyValueStore()
-        let allVals = keyStore.dictionaryRepresentation;
-        let allKeys = allVals.keys
-        
-        // Limit is 1024, reserve rest slots for fav and pins.
-        if allKeys.count >= 1000 {
-            for key in allKeys.filter({ $0.contains("hasRead") }) {
-                keyStore.removeObject(forKey: key)
-            }
-        }
-        
-        keyStore.set(val, forKey: key)
-        
-        resultCompletionBlock(true)
-    }
-    
-    @objc private func getBool(_ notification: Notification) {
-        guard let resultCompletionBlock: FlutterResult = notification.userInfo?["result"] as? FlutterResult else { fatalError(" failed to obtain result block") }
-        guard
-            let params = notification.userInfo?["params"] as? [String: Any],
-            let key = params[HackiCore.keyKey] as? String else {
-            resultCompletionBlock(false)
-            return
-        }
-        
-        let keyStore = NSUbiquitousKeyValueStore()
-        let val = keyStore.bool(forKey: key)
-        
-        resultCompletionBlock(val)
-    }
-    
-    @objc private func setStringList(_ notification: Notification) {
-        guard let resultCompletionBlock: FlutterResult = notification.userInfo?["result"] as? FlutterResult else { fatalError(" failed to obtain result block") }
-        guard
-            let params = notification.userInfo?["params"] as? [String: Any],
-            let key = params[HackiCore.keyKey] as? String,
-            let val = params[HackiCore.valKey] as? [String] else {
-            resultCompletionBlock(false)
-            return
-        }
-        
-        let keyStore = NSUbiquitousKeyValueStore()
-        keyStore.set(val, forKey: key)
-        
-        resultCompletionBlock(true)
-    }
-    
-    @objc private func getStringList(_ notification: Notification) {
-        guard let resultCompletionBlock: FlutterResult = notification.userInfo?["result"] as? FlutterResult else { fatalError(" failed to obtain result block") }
-        guard
-            let params = notification.userInfo?["params"] as? [String: Any],
-            let key = params[HackiCore.keyKey] as? String else {
-            resultCompletionBlock(false)
-            return
-        }
-        
-        let keyStore = NSUbiquitousKeyValueStore()
-        let list = keyStore.array(forKey: key) as [Any]? ?? [Any]()
-        
-        resultCompletionBlock(list)
-    }
-    
-    @objc private func clearAll(_ notification: Notification) {
-        guard let resultCompletionBlock: FlutterResult = notification.userInfo?["result"] as? FlutterResult else { fatalError(" failed to obtain result block") }
-        
-        let keyStore = NSUbiquitousKeyValueStore()
-        let allVals = keyStore.dictionaryRepresentation;
-        let allKeys = allVals.keys
-        
-        for key in allKeys.filter({ $0.contains("hasRead") }) {
-            keyStore.removeObject(forKey: key)
-        }
-        
-        resultCompletionBlock(true)
-    }
-}
-

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,9 @@
 	<array>
 		<string>applinks:example.com</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </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(
+      "/Users/runner/work/Hacki/Hacki/submodules/flutter/bin/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);
@@ -41,20 +41,20 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     await _authRepository.loggedIn.then((bool loggedIn) async {
       if (loggedIn) {
         final String? username = await _authRepository.username;
-        final User user =
-            await _storiesRepository.fetchUserBy(userId: username!);
+        final User user = await _storiesRepository.fetchUser(id: username!);
 
         emit(
           state.copyWith(
             isLoggedIn: true,
             user: user,
+            status: AuthStatus.loaded,
           ),
         );
       } else {
         emit(
           state.copyWith(
-            status: AuthStatus.loaded,
             isLoggedIn: false,
+            status: AuthStatus.loaded,
           ),
         );
       }
@@ -84,8 +84,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     );
 
     if (successful) {
-      final User user =
-          await _storiesRepository.fetchUserBy(userId: event.username);
+      final User user = await _storiesRepository.fetchUser(id: event.username);
       emit(
         state.copyWith(
           user: user,
@@ -101,7 +100,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

@@ -37,6 +37,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     on<StoryRead>(onStoryRead);
     on<StoriesLoaded>(onStoriesLoaded);
     on<StoriesDownload>(onDownload);
+    on<StoriesCancelDownload>(onCancelDownload);
     on<StoryDownloaded>(onStoryDownloaded);
     on<StoriesExitOffline>(onExitOffline);
     on<StoriesPageSizeChanged>(onPageSizeChanged);
@@ -55,75 +56,72 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   static const int _tabletSmallPageSize = 15;
   static const int _tabletLargePageSize = 25;
 
-  /// Types of story to be shown in the tab bar.
-  static const Set<StoryType> types = <StoryType>{
-    StoryType.top,
-    StoryType.best,
-    StoryType.latest,
-    StoryType.ask,
-    StoryType.show,
-  };
-
   Future<void> onInitialize(
     StoriesInitialize event,
     Emitter<StoriesState> emit,
   ) async {
     _streamSubscription ??=
         _preferenceCubit.stream.listen((PreferenceState event) {
-      final bool isComplexTile = event.showComplexStoryTile;
-      final int pageSize = _getPageSize(isComplexTile: isComplexTile);
+      final bool isComplexTile = event.complexStoryTileEnabled;
+      final int pageSize = getPageSize(isComplexTile: isComplexTile);
 
       if (pageSize != state.currentPageSize) {
         add(StoriesPageSizeChanged(pageSize: pageSize));
       }
     });
     final bool hasCachedStories = await _offlineRepository.hasCachedStories;
-    final bool isComplexTile = _preferenceCubit.state.showComplexStoryTile;
-    final int pageSize = _getPageSize(isComplexTile: isComplexTile);
+    final bool isComplexTile = _preferenceCubit.state.complexStoryTileEnabled;
+    final int pageSize = getPageSize(isComplexTile: isComplexTile);
     emit(
       const StoriesState.init().copyWith(
-        offlineReading: hasCachedStories,
+        offlineReading: hasCachedStories &&
+            // Only go into offline mode in the next session.
+            state.downloadStatus == StoriesDownloadStatus.initial,
         currentPageSize: pageSize,
+        downloadStatus: state.downloadStatus,
+        storiesDownloaded: state.storiesDownloaded,
+        storiesToBeDownloaded: state.storiesToBeDownloaded,
       ),
     );
-    for (final StoryType type in types) {
-      await loadStories(of: type, emit: emit);
+    for (final StoryType type in StoryType.values) {
+      await loadStories(type: type, emit: emit);
     }
   }
 
   Future<void> loadStories({
-    required StoryType of,
+    required StoryType type,
     required Emitter<StoriesState> emit,
   }) async {
     if (state.offlineReading) {
-      final List<int> ids = await _offlineRepository.getCachedStoryIds(of: of);
+      final List<int> ids =
+          await _offlineRepository.getCachedStoryIds(type: type);
       emit(
         state
-            .copyWithStoryIdsUpdated(of: of, to: ids)
-            .copyWithCurrentPageUpdated(of: of, to: 0),
+            .copyWithStoryIdsUpdated(type: type, to: ids)
+            .copyWithCurrentPageUpdated(type: type, to: 0),
       );
       _offlineRepository
           .getCachedStoriesStream(
         ids: ids.sublist(0, min(ids.length, state.currentPageSize)),
       )
           .listen((Story story) {
-        add(StoryLoaded(story: story, type: of));
+        add(StoryLoaded(story: story, type: type));
       }).onDone(() {
-        add(StoriesLoaded(type: of));
+        add(StoriesLoaded(type: type));
       });
     } else {
-      final List<int> ids = await _storiesRepository.fetchStoryIds(of: of);
+      final List<int> ids = await _storiesRepository.fetchStoryIds(type: type);
       emit(
         state
-            .copyWithStoryIdsUpdated(of: of, to: ids)
-            .copyWithCurrentPageUpdated(of: of, to: 0),
+            .copyWithStoryIdsUpdated(type: type, to: ids)
+            .copyWithCurrentPageUpdated(type: type, to: 0),
       );
       _storiesRepository
           .fetchStoriesStream(ids: ids.sublist(0, state.currentPageSize))
           .listen((Story story) {
-        add(StoryLoaded(story: story, type: of));
+        add(StoryLoaded(story: story, type: type));
       }).onDone(() {
-        add(StoriesLoaded(type: of));
+        add(StoriesLoaded(type: type));
       });
     }
   }
@@ -134,7 +132,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   ) async {
     emit(
       state.copyWithStatusUpdated(
-        of: event.type,
+        type: event.type,
         to: StoriesStatus.loading,
       ),
     );
@@ -142,27 +140,29 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     if (state.offlineReading) {
       emit(
         state.copyWithStatusUpdated(
-          of: event.type,
+          type: event.type,
           to: StoriesStatus.loaded,
         ),
       );
     } else {
-      emit(state.copyWithRefreshed(of: event.type));
-      await loadStories(of: event.type, emit: emit);
+      emit(state.copyWithRefreshed(type: event.type));
+      await loadStories(type: event.type, emit: emit);
     }
   }
 
   void onLoadMore(StoriesLoadMore event, Emitter<StoriesState> emit) {
     emit(
       state.copyWithStatusUpdated(
-        of: event.type,
+        type: event.type,
         to: StoriesStatus.loading,
       ),
     );
 
     final int currentPage = state.currentPageByType[event.type]!;
     final int len = state.storyIdsByType[event.type]!.length;
-    emit(state.copyWithCurrentPageUpdated(of: event.type, to: currentPage + 1));
+    emit(
+      state.copyWithCurrentPageUpdated(type: event.type, to: currentPage + 1),
+    );
     final int currentPageSize = state.currentPageSize;
     final int lower = currentPageSize * (currentPage + 1);
     int upper = currentPageSize + lower;
@@ -212,7 +212,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     } else {
       emit(
         state.copyWithStatusUpdated(
-          of: event.type,
+          type: event.type,
           to: StoriesStatus.loaded,
         ),
       );
@@ -226,7 +226,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     final bool hasRead = await _preferenceRepository.hasRead(event.story.id);
     emit(
       state.copyWithStoryAdded(
-        of: event.type,
+        type: event.type,
         story: event.story,
         hasRead: hasRead,
       ),
@@ -234,7 +234,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   }
 
   void onStoriesLoaded(StoriesLoaded event, Emitter<StoriesState> emit) {
-    emit(state.copyWithStatusUpdated(of: event.type, to: StoriesStatus.loaded));
+    emit(
+      state.copyWithStatusUpdated(type: event.type, to: StoriesStatus.loaded),
+    );
   }
 
   Future<void> onDownload(
@@ -252,12 +254,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     await _offlineRepository.deleteAllComments();
 
     final Set<int> prioritizedIds = <int>{};
-    final List<StoryType> prioritizedTypes = <StoryType>[...types]
+
+    /// Prioritizing all types of stories except StoryType.latest since
+    /// new stories tend to have less or no comment at all.
+    final List<StoryType> prioritizedTypes = <StoryType>[...StoryType.values]
       ..remove(StoryType.latest);
 
     for (final StoryType type in prioritizedTypes) {
-      final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
-      await _offlineRepository.cacheStoryIds(of: type, ids: ids);
+      final List<int> ids = await _storiesRepository.fetchStoryIds(type: type);
+      await _offlineRepository.cacheStoryIds(type: type, ids: ids);
       prioritizedIds.addAll(ids);
     }
 
@@ -277,9 +282,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
 
       final Set<int> latestIds = <int>{};
       final List<int> ids = await _storiesRepository.fetchStoryIds(
-        of: StoryType.latest,
+        type: StoryType.latest,
       );
-      await _offlineRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
+      await _offlineRepository.cacheStoryIds(type: StoryType.latest, ids: ids);
       latestIds.addAll(ids);
 
       await fetchAndCacheStories(
@@ -296,13 +301,41 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     }
   }
 
+  Future<void> onCancelDownload(
+    StoriesCancelDownload event,
+    Emitter<StoriesState> emit,
+  ) async {
+    emit(
+      state.copyWith(
+        downloadStatus: StoriesDownloadStatus.canceled,
+      ),
+    );
+  }
+
   Future<void> fetchAndCacheStories(
     Iterable<int> ids, {
     required bool includingWebPage,
     required bool isPrioritized,
   }) async {
+    final List<StreamSubscription<Comment>> downloadStreams =
+        <StreamSubscription<Comment>>[];
     for (final int id in ids) {
-      final Story? story = await _storiesRepository.fetchStoryBy(id);
+      if (state.downloadStatus == StoriesDownloadStatus.canceled) {
+        _logger.d('aborting downloading');
+
+        for (final StreamSubscription<Comment> stream in downloadStreams) {
+          await stream.cancel();
+        }
+
+        _logger.d('deleting downloaded contents');
+        await _offlineRepository.deleteAllStoryIds();
+        await _offlineRepository.deleteAllStories();
+        await _offlineRepository.deleteAllComments();
+        break;
+      }
+
+      _logger.d('fetching story $id');
+      final Story? story = await _storiesRepository.fetchStory(id: id);
 
       if (story == null) {
         if (isPrioritized) {
@@ -325,15 +358,37 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         await _offlineRepository.cacheUrl(url: story.url);
       }
 
-      _storiesRepository
+      /// Not awaiting the completion of comments stream because otherwise
+      /// it's going to take forever to finish downloading all the stories
+      /// since we need to make a single http call for each comment.
+      ///
+      /// In other words, we are prioritizing the story itself instead of
+      /// the comments in the story.
+      late final StreamSubscription<Comment>? downloadStream;
+      downloadStream = _storiesRepository
           .fetchAllChildrenComments(ids: story.kids)
           .whereType<Comment>()
           .listen(
-            (Comment comment) => unawaited(
-              _offlineRepository.cacheComment(comment: comment),
-            ),
-          )
-          .onDone(() => add(StoryDownloaded(skipped: false)));
+        (Comment comment) {
+          if (state.downloadStatus == StoriesDownloadStatus.canceled) {
+            _logger.d('aborting downloading from comments stream');
+            downloadStream?.cancel();
+            return;
+          }
+
+          _logger.d('fetched comment ${comment.id}');
+          unawaited(
+            _offlineRepository.cacheComment(comment: comment),
+          );
+        },
+      )..onDone(() {
+          _logger.d(
+            '''finished downloading story ${story.id} with ${story.descendants} comments''',
+          );
+          add(StoryDownloaded(skipped: false));
+        });
+
+      downloadStreams.add(downloadStream);
     }
   }
 
@@ -374,7 +429,6 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     StoriesPageSizeChanged event,
     Emitter<StoriesState> emit,
   ) async {
-    emit(const StoriesState.init());
     add(StoriesInitialize());
   }
 
@@ -418,7 +472,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
 
   bool hasRead(Story story) => state.readStoriesIds.contains(story.id);
 
-  int _getPageSize({required bool isComplexTile}) {
+  int getPageSize({required bool isComplexTile}) {
     int pageSize = isComplexTile ? _smallPageSize : _largePageSize;
 
     if (deviceScreenType != DeviceScreenType.mobile) {

lib/blocs/stories/stories_event.dart

@@ -46,6 +46,13 @@ class StoriesDownload extends StoriesEvent {
   List<Object?> get props => <Object?>[includingWebPage];
 }
 
+class StoriesCancelDownload extends StoriesEvent {
+  StoriesCancelDownload();
+
+  @override
+  List<Object?> get props => <Object?>[];
+}
+
 class StoryDownloaded extends StoriesEvent {
   StoryDownloaded({required this.skipped});
 

lib/blocs/stories/stories_state.dart

@@ -11,6 +11,7 @@ enum StoriesDownloadStatus {
   downloading,
   finished,
   failure,
+  canceled,
 }
 
 class StoriesState extends Equatable {
@@ -34,7 +35,6 @@ class StoriesState extends Equatable {
       StoryType.latest: <Story>[],
       StoryType.ask: <Story>[],
       StoryType.show: <Story>[],
-      StoryType.jobs: <Story>[],
     },
     this.storyIdsByType = const <StoryType, List<int>>{
       StoryType.top: <int>[],
@@ -42,7 +42,6 @@ class StoriesState extends Equatable {
       StoryType.latest: <int>[],
       StoryType.ask: <int>[],
       StoryType.show: <int>[],
-      StoryType.jobs: <int>[],
     },
     this.statusByType = const <StoryType, StoriesStatus>{
       StoryType.top: StoriesStatus.initial,
@@ -50,7 +49,6 @@ class StoriesState extends Equatable {
       StoryType.latest: StoriesStatus.initial,
       StoryType.ask: StoriesStatus.initial,
       StoryType.show: StoriesStatus.initial,
-      StoryType.jobs: StoriesStatus.initial,
     },
     this.currentPageByType = const <StoryType, int>{
       StoryType.top: 0,
@@ -58,7 +56,6 @@ class StoriesState extends Equatable {
       StoryType.latest: 0,
       StoryType.ask: 0,
       StoryType.show: 0,
-      StoryType.jobs: 0,
     },
   })  : offlineReading = false,
         downloadStatus = StoriesDownloadStatus.initial,
@@ -106,13 +103,13 @@ class StoriesState extends Equatable {
   }
 
   StoriesState copyWithStoryAdded({
-    required StoryType of,
+    required StoryType type,
     required Story story,
     required bool hasRead,
   }) {
     final Map<StoryType, List<Story>> newMap =
         Map<StoryType, List<Story>>.from(storiesByType);
-    newMap[of] = List<Story>.from(newMap[of]!)..add(story);
+    newMap[type] = List<Story>.from(newMap[type]!)..add(story);
     return copyWith(
       storiesByType: newMap,
       readStoriesIds: <int>{
@@ -123,54 +120,54 @@ class StoriesState extends Equatable {
   }
 
   StoriesState copyWithStoryIdsUpdated({
-    required StoryType of,
+    required StoryType type,
     required List<int> to,
   }) {
     final Map<StoryType, List<int>> newMap =
         Map<StoryType, List<int>>.from(storyIdsByType);
-    newMap[of] = to;
+    newMap[type] = to;
     return copyWith(
       storyIdsByType: newMap,
     );
   }
 
   StoriesState copyWithStatusUpdated({
-    required StoryType of,
+    required StoryType type,
     required StoriesStatus to,
   }) {
     final Map<StoryType, StoriesStatus> newMap =
         Map<StoryType, StoriesStatus>.from(statusByType);
-    newMap[of] = to;
+    newMap[type] = to;
     return copyWith(
       statusByType: newMap,
     );
   }
 
   StoriesState copyWithCurrentPageUpdated({
-    required StoryType of,
+    required StoryType type,
     required int to,
   }) {
     final Map<StoryType, int> newMap =
         Map<StoryType, int>.from(currentPageByType);
-    newMap[of] = to;
+    newMap[type] = to;
     return copyWith(
       currentPageByType: newMap,
     );
   }
 
-  StoriesState copyWithRefreshed({required StoryType of}) {
+  StoriesState copyWithRefreshed({required StoryType type}) {
     final Map<StoryType, List<Story>> newStoriesMap =
         Map<StoryType, List<Story>>.from(storiesByType);
-    newStoriesMap[of] = <Story>[];
+    newStoriesMap[type] = <Story>[];
     final Map<StoryType, List<int>> newStoryIdsMap =
         Map<StoryType, List<int>>.from(storyIdsByType);
-    newStoryIdsMap[of] = <int>[];
+    newStoryIdsMap[type] = <int>[];
     final Map<StoryType, StoriesStatus> newStatusMap =
         Map<StoryType, StoriesStatus>.from(statusByType);
-    newStatusMap[of] = StoriesStatus.loading;
+    newStatusMap[type] = StoriesStatus.loading;
     final Map<StoryType, int> newCurrentPageMap =
         Map<StoryType, int>.from(currentPageByType);
-    newCurrentPageMap[of] = 0;
+    newCurrentPageMap[type] = 0;
     return copyWith(
       storiesByType: newStoriesMap,
       storyIdsByType: newStoryIdsMap,

lib/config/constants.dart

@@ -1,6 +1,10 @@
+import 'package:hacki/extensions/extensions.dart';
+
 abstract class Constants {
   static const String endUserAgreementLink =
-      'https://www.termsfeed.com/live/c1417f5c-a48b-4bd7-93b2-9cd4577bfc45';
+      'https://github.com/Livinglist/Hacki/blob/master/assets/eula.md';
+  static const String privacyPolicyLink =
+      'https://github.com/Livinglist/Hacki/blob/master/assets/privacy_policy.md';
   static const String hackerNewsLogoLink =
       'https://pbs.twimg.com/profile_images/469397708986269696/iUrYEOpJ_400x400.png';
   static const String portfolioLink = 'https://livinglist.github.io';
@@ -10,6 +14,13 @@ abstract class Constants {
   static const String googlePlayLink =
       'https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US';
   static const String sponsorLink = 'https://github.com/sponsors/Livinglist';
+  static const String guidelineLink =
+      'https://news.ycombinator.com/newsguidelines.html';
+  static const String githubIssueLink =
+      '$githubLink/issues/new?title=Found+a+bug+in+Hacki&body=Please+describe+the+problem.';
+  static const String wikipediaLink = 'https://en.wikipedia.org/wiki/';
+  static const String wiktionaryLink = 'https://en.wiktionary.org/wiki/';
+  static const String supportEmail = 'georgefung98@gmail.com';
 
   static const String _imagePath = 'assets/images';
   static const String hackerNewsLogoPath = '$_imagePath/hacker_news_logo.png';
@@ -20,6 +31,8 @@ abstract class Constants {
       '$_imagePath/comment_tile_right_slide.png';
   static const String commentTileTopTapPath =
       '$_imagePath/comment_tile_top_tap.png';
+  static const String logFilename = 'hacki_log.txt';
+  static const String previousLogFileName = 'old_hacki_log.txt';
 
   /// Feature ids for feature discovery.
   static const String featureAddStoryToFavList = 'add_story_to_fav_list';
@@ -27,16 +40,16 @@ abstract class Constants {
   static const String featureLogIn = 'log_in';
   static const String featurePinToTop = 'pin_to_top';
 
-  static const List<String> happyFaces = <String>[
+  static final String happyFace = <String>[
     '(๑•̀ㅂ•́)و✧',
     '( ͡• ͜ʖ ͡•)',
     '( ͡~ ͜ʖ ͡°)',
     '٩(˘◡˘)۶',
     '(─‿‿─)',
     '(¬‿¬)',
-  ];
+  ].pickRandomly()!;
 
-  static const List<String> sadFaces = <String>[
+  static final String sadFace = <String>[
     'ಥ_ಥ',
     '(╯°□°）╯︵ ┻━┻',
     r'¯\_(ツ)_/¯',
@@ -46,5 +59,20 @@ abstract class Constants {
     '(ㆆ_ㆆ)',
     'ʕ•́ᴥ•̀ʔっ',
     '(ㆆ_ㆆ)',
-  ];
+  ].pickRandomly()!;
+
+  static final String magicWord = <String>[
+    'to be over the rainbow!',
+    'to infinity and beyond!',
+    'to see the future.',
+  ].pickRandomly()!;
+
+  static final String errorMessage = 'Something went wrong...$sadFace';
+  static final String loginErrorMessage =
+      '''Failed to log in $sadFace, this could happen if your account requires a CAPTCHA, please try logging in inside a browser to see if this is the case, if so, you may try logging in here again later after CAPTCHA is no longer needed.''';
+}
+
+abstract class RegExpConstants {
+  static const String linkSuffix = r'(\)|]|,|\*)(.)*$';
+  static const String number = '[0-9]+';
 }

lib/config/custom_log_filter.dart

@@ -2,8 +2,7 @@ import 'package:logger/logger.dart';
 
 class CustomLogFilter extends LogFilter {
   @override
-  // ignore: overridden_fields
-  Level? level = Level.verbose;
+  Level? get level => Level.verbose;
 
   /// The minimal level allowed in production.
   static const Level _minimalLevel = Level.info;

lib/config/custom_router.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:hacki/config/constants.dart';
 import 'package:hacki/screens/screens.dart';
 
 /// Custom router.
@@ -39,8 +40,8 @@ class CustomRouter {
         appBar: AppBar(
           title: const Text('Error'),
         ),
-        body: const Center(
-          child: Text('Something went wrong!'),
+        body: Center(
+          child: Text(Constants.errorMessage),
         ),
       ),
     );

lib/config/file_output.dart

@@ -0,0 +1,41 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:logger/logger.dart';
+
+/// Writes the log output to a file.
+/// Temporary solution to not being able to access
+// ignore: comment_references
+/// the original [FileOutput] from [Logger]
+class CustomFileOutput extends LogOutput {
+  CustomFileOutput({
+    required this.file,
+    this.overrideExisting = false,
+    this.encoding = utf8,
+  });
+
+  final File file;
+  final bool overrideExisting;
+  final Encoding encoding;
+  IOSink? _sink;
+
+  @override
+  void init() {
+    _sink = file.openWrite(
+      mode: overrideExisting ? FileMode.writeOnly : FileMode.writeOnlyAppend,
+      encoding: encoding,
+    );
+  }
+
+  @override
+  void output(OutputEvent event) {
+    _sink?.writeAll(event.lines, '\n');
+    _sink?.writeln();
+  }
+
+  @override
+  Future<void> destroy() async {
+    await _sink?.flush();
+    await _sink?.close();
+  }
+}

lib/config/locator.dart

@@ -1,8 +1,11 @@
+import 'dart:io';
+
 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:hacki/utils/utils.dart';
 import 'package:logger/logger.dart';
 
 /// Global [GetIt.instance].
@@ -10,8 +13,16 @@ final GetIt locator = GetIt.instance;
 
 /// Set up [GetIt] locator.
 Future<void> setUpLocator() async {
+  final File logOutputFile = await LogUtil.initLogFile();
+
   locator
-    ..registerSingleton<Logger>(Logger(filter: CustomLogFilter()))
+    ..registerSingleton<Logger>(
+      Logger(
+        filter: CustomLogFilter(),
+        printer: LogUtil.logPrinter,
+        output: LogUtil.logOutput(logOutputFile),
+      ),
+    )
     ..registerSingleton<StoriesRepository>(StoriesRepository())
     ..registerSingleton<PreferenceRepository>(PreferenceRepository())
     ..registerSingleton<SearchRepository>(SearchRepository())

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,13 +11,16 @@ part 'collapse_state.dart';
 class CollapseCubit extends Cubit<CollapseState> {
   CollapseCubit({
     required int commentId,
+    required CommentsCubit? commentsCubit,
     CollapseCache? collapseCache,
   })  : _commentId = commentId,
         _collapseCache = collapseCache ?? locator.get<CollapseCache>(),
+        _commentsCubit = commentsCubit,
         super(const CollapseState.init());
 
   final int _commentId;
   final CollapseCache _collapseCache;
+  final CommentsCubit? _commentsCubit;
   late final StreamSubscription<Map<int, Set<int>>> _streamSubscription;
 
   void init() {
@@ -43,12 +47,21 @@ class CollapseCubit extends Cubit<CollapseState> {
         ),
       );
     } else {
-      final int count = _collapseCache.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

@@ -3,14 +3,18 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_linkify/flutter_linkify.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/main.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/services.dart';
+import 'package:hacki/utils/linkifier_util.dart';
+import 'package:linkify/linkify.dart';
+import 'package:logger/logger.dart';
+import 'package:rxdart/rxdart.dart';
 
 part 'comments_state.dart';
 
@@ -21,8 +25,11 @@ class CommentsCubit extends Cubit<CommentsState> {
     OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     SembastRepository? sembastRepository,
+    Logger? logger,
     required bool offlineReading,
     required Item item,
+    required FetchMode defaultFetchMode,
+    required CommentsOrder defaultCommentsOrder,
   })  : _collapseCache = collapseCache,
         _commentCache = commentCache ?? locator.get<CommentCache>(),
         _offlineRepository =
@@ -31,15 +38,32 @@ class CommentsCubit extends Cubit<CommentsState> {
             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 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
@@ -52,59 +76,86 @@ class CommentsCubit extends Cubit<CommentsState> {
   Future<void> init({
     bool onlyShowTargetComment = false,
     bool useCommentCache = false,
-    List<Comment>? targetParents,
+    List<Comment>? targetAncestors,
   }) async {
-    if (onlyShowTargetComment && (targetParents?.isNotEmpty ?? false)) {
+    if (onlyShowTargetComment && (targetAncestors?.isNotEmpty ?? false)) {
       emit(
         state.copyWith(
-          comments: targetParents,
+          comments: targetAncestors,
           onlyShowTargetComment: true,
-          status: CommentsStatus.loaded,
+          status: CommentsStatus.allLoaded,
         ),
       );
 
       _streamSubscription = _storiesRepository
-          .fetchCommentsStream(
-            ids: targetParents!.last.kids,
-            level: targetParents.last.level + 1,
+          .fetchAllCommentsRecursivelyStream(
+            ids: targetAncestors!.last.kids,
+            level: targetAncestors.last.level + 1,
           )
+          .asyncMap(_toBuildableComment)
+          .whereNotNull()
           .listen(_onCommentFetched)
         ..onDone(_onDone);
 
       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;
+        : await _storiesRepository.fetchItem(id: item.id).then(_toBuildable) ??
+            item;
     final List<int> kids = sortKids(updatedItem.kids);
 
     emit(state.copyWith(item: updatedItem));
 
+    late final Stream<Comment> commentStream;
+
     if (state.offlineReading) {
-      _streamSubscription = _offlineRepository
-          .getCachedCommentsStream(ids: kids)
-          .listen(_onCommentFetched)
-        ..onDone(_onDone);
+      commentStream = _offlineRepository.getCachedCommentsStream(ids: kids);
     } else {
-      _streamSubscription = _storiesRepository
-          .fetchCommentsStream(
+      switch (state.fetchMode) {
+        case FetchMode.lazy:
+          commentStream = _storiesRepository.fetchCommentsStream(
             ids: kids,
             getFromCache: useCommentCache ? _commentCache.getComment : null,
-          )
-          .listen(_onCommentFetched)
-        ..onDone(_onDone);
+          );
+          break;
+        case FetchMode.eager:
+          commentStream = _storiesRepository.fetchAllCommentsRecursivelyStream(
+            ids: kids,
+            getFromCache: useCommentCache ? _commentCache.getComment : null,
+          );
+          break;
+      }
     }
+
+    _streamSubscription = commentStream
+        .asyncMap(_toBuildableComment)
+        .whereNotNull()
+        .listen(_onCommentFetched)
+      ..onDone(_onDone);
   }
 
   Future<void> refresh() async {
+    emit(
+      state.copyWith(
+        status: CommentsStatus.loading,
+      ),
+    );
+
     if (state.offlineReading) {
       emit(
         state.copyWith(
-          status: CommentsStatus.loaded,
+          status: CommentsStatus.allLoaded,
         ),
       );
       return;
@@ -112,29 +163,44 @@ class CommentsCubit extends Cubit<CommentsState> {
 
     _collapseCache.resetCollapsedComments();
 
+    await _streamSubscription?.cancel();
+    for (final int id in _streamSubscriptions.keys) {
+      await _streamSubscriptions[id]?.cancel();
+    }
+    _streamSubscriptions.clear();
+
     emit(
       state.copyWith(
-        status: CommentsStatus.loading,
         comments: <Comment>[],
+        currentPage: 0,
       ),
     );
 
-    await _streamSubscription?.cancel();
-
     final Item item = state.item;
     final Item updatedItem =
-        await _storiesRepository.fetchItemBy(id: item.id) ?? item;
+        await _storiesRepository.fetchItem(id: item.id) ?? item;
     final List<int> kids = sortKids(updatedItem.kids);
 
-    _streamSubscription = _storiesRepository
-        .fetchCommentsStream(ids: kids)
+    late final Stream<Comment> commentStream;
+    if (state.fetchMode == FetchMode.lazy) {
+      commentStream = _storiesRepository.fetchCommentsStream(
+        ids: kids,
+      );
+    } else {
+      commentStream = _storiesRepository.fetchAllCommentsRecursivelyStream(
+        ids: kids,
+      );
+    }
+
+    _streamSubscription = commentStream
+        .asyncMap(_toBuildableComment)
+        .whereNotNull()
         .listen(_onCommentFetched)
       ..onDone(_onDone);
 
     emit(
       state.copyWith(
         item: updatedItem,
-        status: CommentsStatus.loaded,
       ),
     );
   }
@@ -144,25 +210,73 @@ 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)
+                .asyncMap(_toBuildableComment)
+                .whereNotNull()
+                .listen((Comment cmt) {
+          _collapseCache.addKid(cmt.id, to: cmt.parent);
+          _commentCache.cacheComment(cmt);
+          _sembastRepository.cacheComment(cmt);
+
+          emit(
+            state.copyWith(
+              comments: <Comment>[...state.comments]..insert(
+                  state.comments.indexOf(comment) + offset + 1,
+                  cmt.copyWith(level: level),
+                ),
+            ),
+          );
+          offset++;
+        })
+              ..onDone(() {
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              })
+              ..onError((dynamic error) {
+                _logger.e(error);
+                _streamSubscriptions[comment.id]?.cancel();
+                _streamSubscriptions.remove(comment.id);
+              });
+
+        _streamSubscriptions[comment.id] = streamSubscription;
+        break;
+      case FetchMode.eager:
+        if (_streamSubscription != null) {
+          emit(state.copyWith(status: CommentsStatus.loading));
+          _streamSubscription?.resume();
+        }
+        break;
     }
   }
 
   Future<void> loadParentThread() async {
     unawaited(HapticFeedback.lightImpact());
     emit(state.copyWith(fetchParentStatus: CommentsStatus.loading));
-    final Story? parent =
-        await _storiesRepository.fetchParentStory(id: state.item.id);
+    final Story? parent = await _storiesRepository
+        .fetchParentStory(id: state.item.id)
+        .then(_toBuildableStory);
 
     if (parent == null) {
       return;
@@ -181,10 +295,29 @@ 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>[]));
+    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);
   }
 
@@ -209,73 +342,99 @@ class CommentsCubit extends Cubit<CommentsState> {
     );
   }
 
-  void _onCommentFetched(Comment? comment) {
+  void _onCommentFetched(BuildableComment? comment) {
     if (comment != null) {
       _collapseCache.addKid(comment.id, to: comment.parent);
       _commentCache.cacheComment(comment);
       _sembastRepository.cacheComment(comment);
 
-      final List<LinkifyElement> elements = _linkify(
-        comment.text,
-      );
-
-      final BuildableComment buildableComment =
-          BuildableComment.fromComment(comment, elements: elements);
-
       final List<Comment> updatedComments = <Comment>[
         ...state.comments,
-        buildableComment
+        comment
       ];
 
       emit(state.copyWith(comments: updatedComments));
 
-      if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
-          updatedComments.length <=
-              _pageSize * 2 + _pageSize * state.currentPage) {
-        final bool isHidden = _collapseCache.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(
+                status: CommentsStatus.loaded,
+              ),
+            );
+          }
+
+          emit(
+            state.copyWith(
+              currentPage: state.currentPage + 1,
+            ),
+          );
         }
-
-        emit(
-          state.copyWith(
-            currentPage: state.currentPage + 1,
-            status: CommentsStatus.loaded,
-          ),
-        );
       }
     }
   }
 
-  static List<LinkifyElement> _linkify(
-    String text, {
-    LinkifyOptions options = const LinkifyOptions(),
-    List<Linkifier> linkifiers = const <Linkifier>[
-      UrlLinkifier(),
-      EmailLinkifier(),
-    ],
-  }) {
-    List<LinkifyElement> list = <LinkifyElement>[TextElement(text)];
+  static Future<Item?> _toBuildable(Item? item) async {
+    if (item == null) return null;
 
-    if (text.isEmpty) {
-      return <LinkifyElement>[];
+    switch (item.runtimeType) {
+      case Comment:
+        return _toBuildableComment(item as Comment);
+      case Story:
+        return _toBuildableStory(item as Story);
     }
 
-    if (linkifiers.isEmpty) {
-      return list;
+    return null;
+  }
+
+  static Future<BuildableComment?> _toBuildableComment(Comment? comment) async {
+    if (comment == null) return null;
+
+    final List<LinkifyElement> elements =
+        await compute<String, List<LinkifyElement>>(
+      LinkifierUtil.linkify,
+      comment.text,
+    );
+
+    final BuildableComment buildableComment =
+        BuildableComment.fromComment(comment, elements: elements);
+
+    return buildableComment;
+  }
+
+  static Future<BuildableStory?> _toBuildableStory(Story? story) async {
+    if (story == null) {
+      return null;
+    } else if (story.text.isEmpty) {
+      return BuildableStory.fromTitleOnlyStory(story);
     }
 
-    for (final Linkifier linkifier in linkifiers) {
-      list = linkifier.parse(list, options);
-    }
+    final List<LinkifyElement> elements =
+        await compute<String, List<LinkifyElement>>(
+      LinkifierUtil.linkify,
+      story.text,
+    );
 
-    return list;
+    final BuildableStory buildableStory =
+        BuildableStory.fromStory(story, elements: elements);
+
+    return buildableStory;
   }
 
   @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,15 +67,18 @@ class CommentsState extends Equatable {
     );
   }
 
+  Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
+
   @override
   List<Object?> get props => <Object?>[
         item,
-        comments,
         status,
         fetchParentStatus,
         order,
+        fetchMode,
         onlyShowTargetComment,
         offlineReading,
         currentPage,
+        comments,
       ];
 }

lib/cubits/cubits.dart

@@ -13,6 +13,7 @@ export 'reminder/reminder_cubit.dart';
 export 'search/search_cubit.dart';
 export 'split_view/split_view_cubit.dart';
 export 'submit/submit_cubit.dart';
+export 'tab/tab_cubit.dart';
 export 'time_machine/time_machine_cubit.dart';
 export 'user/user_cubit.dart';
 export 'vote/vote_cubit.dart';

lib/cubits/edit/edit_cubit.dart

@@ -1,13 +1,14 @@
-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> {
+class EditCubit extends HydratedCubit<EditState> {
   EditCubit({DraftCache? draftCache})
       : _draftCache = draftCache ?? locator.get<DraftCache>(),
         _debouncer = Debouncer(delay: const Duration(seconds: 1)),
@@ -47,6 +48,7 @@ class EditCubit extends Cubit<EditState> {
       _draftCache.removeDraft(replyingTo: state.replyingTo!.id);
     }
     emit(const EditState.init());
+    clear();
   }
 
   void onTextChanged(String text) {
@@ -61,4 +63,54 @@ class EditCubit extends Cubit<EditState> {
       });
     }
   }
+
+  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/fav/fav_cubit.dart

@@ -73,7 +73,7 @@ class FavCubit extends Cubit<FavState> {
       ),
     );
 
-    final Item? item = await _storiesRepository.fetchItemBy(id: id);
+    final Item? item = await _storiesRepository.fetchItem(id: id);
 
     if (item == null) return;
 

lib/cubits/fav/fav_state.dart

@@ -42,9 +42,9 @@ class FavState extends Equatable {
 
   @override
   List<Object?> get props => <Object?>[
-        favIds,
-        favItems,
         status,
         currentPage,
+        favIds,
+        favItems,
       ];
 }

lib/cubits/history/history_cubit.dart

@@ -28,7 +28,7 @@ class HistoryCubit extends Cubit<HistoryState> {
         final String username = authState.username;
 
         _storiesRepository
-            .fetchSubmitted(of: username)
+            .fetchSubmitted(userId: username)
             .then((List<int>? submittedIds) {
           emit(
             state.copyWith(
@@ -94,7 +94,7 @@ class HistoryCubit extends Cubit<HistoryState> {
     );
 
     _storiesRepository
-        .fetchSubmitted(of: username)
+        .fetchSubmitted(userId: username)
         .then((List<int>? submittedIds) {
       emit(state.copyWith(submittedIds: submittedIds));
       if (submittedIds != null) {

lib/cubits/history/history_state.dart

@@ -42,9 +42,9 @@ class HistoryState extends Equatable {
 
   @override
   List<Object?> get props => <Object?>[
-        submittedIds,
-        submittedItems,
         status,
         currentPage,
+        submittedIds,
+        submittedItems,
       ];
 }

lib/cubits/notification/notification_cubit.dart

@@ -30,19 +30,16 @@ 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.notificationEnabled) {
+          Future<void>.delayed(const Duration(seconds: 2), init);
+        }
 
         // Listen for setting changes in the future.
         _preferenceCubit.stream.listen((PreferenceState prefState) {
           final bool isActive = _timer?.isActive ?? false;
-          if (prefState.showNotification && !isActive) {
+          if (prefState.notificationEnabled && !isActive) {
             init();
-          } else if (!prefState.showNotification) {
+          } else if (!prefState.notificationEnabled) {
             _timer?.cancel();
           }
         });
@@ -84,7 +81,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
     for (final int id in commentsToBeLoaded) {
       Comment? comment = await _sembastRepository.getComment(id: id);
-      comment ??= await _storiesRepository.fetchCommentBy(id: id);
+      comment ??= await _storiesRepository.fetchComment(id: id);
       if (comment != null) {
         emit(
           state.copyWith(
@@ -129,7 +126,8 @@ class NotificationCubit extends Cubit<NotificationState> {
   }
 
   Future<void> refresh() async {
-    if (_authBloc.state.isLoggedIn && _preferenceCubit.state.showNotification) {
+    if (_authBloc.state.isLoggedIn &&
+        _preferenceCubit.state.notificationEnabled) {
       emit(
         state.copyWith(
           status: NotificationStatus.loading,
@@ -161,7 +159,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
       for (final int id in commentsToBeLoaded) {
         Comment? comment = await _sembastRepository.getComment(id: id);
-        comment ??= await _storiesRepository.fetchCommentBy(id: id);
+        comment ??= await _storiesRepository.fetchComment(id: id);
         if (comment != null) {
           emit(state.copyWith(comments: <Comment>[...state.comments, comment]));
         }
@@ -186,7 +184,7 @@ class NotificationCubit extends Cubit<NotificationState> {
 
   Future<void> _fetchReplies() {
     return _storiesRepository
-        .fetchSubmitted(of: _authBloc.state.username)
+        .fetchSubmitted(userId: _authBloc.state.username)
         .then((List<int>? submittedItems) async {
       if (submittedItems != null) {
         final List<int> subscribedItems = submittedItems.sublist(
@@ -195,7 +193,7 @@ class NotificationCubit extends Cubit<NotificationState> {
         );
 
         for (final int id in subscribedItems) {
-          await _storiesRepository.fetchItemBy(id: id).then((Item? item) async {
+          await _storiesRepository.fetchItem(id: id).then((Item? item) async {
             final List<int> kids = item?.kids ?? <int>[];
             final List<int> previousKids =
                 (await _sembastRepository.kids(of: id)) ?? <int>[];
@@ -218,7 +216,7 @@ class NotificationCubit extends Cubit<NotificationState> {
                     ]..sort((int lhs, int rhs) => rhs.compareTo(lhs)),
                   );
                   await _storiesRepository
-                      .fetchCommentBy(id: newCommentId)
+                      .fetchComment(id: newCommentId)
                       .then((Comment? comment) {
                     if (comment != null && !comment.dead && !comment.deleted) {
                       _sembastRepository

lib/cubits/notification/notification_state.dart

@@ -77,11 +77,11 @@ class NotificationState extends Equatable {
 
   @override
   List<Object?> get props => <Object?>[
-        comments,
-        unreadCommentsIds,
-        allCommentsIds,
         currentPage,
         offset,
         status,
+        comments,
+        unreadCommentsIds,
+        allCommentsIds,
       ];
 }

lib/cubits/poll/poll_cubit.dart

@@ -33,7 +33,7 @@ class PollCubit extends Cubit<PollState> {
 
     if (pollOptionsIds.isEmpty || refresh) {
       final Story? updatedStory =
-          await _storiesRepository.fetchStoryBy(_story.id);
+          await _storiesRepository.fetchStory(id: _story.id);
 
       if (updatedStory != null) {
         pollOptionsIds = updatedStory.parts;

lib/cubits/preference/preference_cubit.dart

@@ -1,77 +1,78 @@
 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';
+import 'package:logger/logger.dart';
 
 part 'preference_state.dart';
 
 class PreferenceCubit extends Cubit<PreferenceState> {
-  PreferenceCubit({PreferenceRepository? storageRepository})
-      : _preferenceRepository =
-            storageRepository ?? locator.get<PreferenceRepository>(),
-        super(const PreferenceState.init()) {
+  PreferenceCubit({
+    PreferenceRepository? preferenceRepository,
+    Logger? logger,
+  })  : _preferenceRepository =
+            preferenceRepository ?? locator.get<PreferenceRepository>(),
+        _logger = logger ?? locator.get<Logger>(),
+        super(PreferenceState.init()) {
     init();
   }
 
   final PreferenceRepository _preferenceRepository;
+  final Logger _logger;
 
   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 update<T>(Preference<T> preference, {required T to}) {
+    final T value = to;
+    final Preference<T> updatedPreference = preference.copyWith(val: value);
 
-  void toggleNavigationMode() {
-    emit(state.copyWith(showWebFirst: !state.showWebFirst));
-    _preferenceRepository.toggleNavigationMode();
-  }
+    _logger.i('updating $preference to $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,105 @@ 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 notificationEnabled => _isOn<NotificationModePreference>();
+
+  bool get complexStoryTileEnabled => _isOn<DisplayModePreference>();
+
+  bool get webFirstEnabled => _isOn<NavigationModePreference>();
+
+  bool get eyeCandyEnabled => _isOn<EyeCandyModePreference>();
+
+  bool get trueDarkEnabled => _isOn<TrueDarkModePreference>();
+
+  bool get readerEnabled => _isOn<ReaderModePreference>();
+
+  bool get markReadStoriesEnabled => _isOn<MarkReadStoriesModePreference>();
+
+  bool get metadataEnabled => _isOn<MetadataModePreference>();
+
+  bool get urlEnabled => _isOn<StoryUrlModePreference>();
+
+  bool get tapAnywhereToCollapseEnabled => _isOn<CollapseModePreference>();
+
+  bool get swipeGestureEnabled => _isOn<SwipeGesturePreference>();
+
+  List<StoryType> get tabs {
+    final String result =
+        preferences.singleWhereType<TabOrderPreference>().val.toString();
+    final List<int> tabIndexes = List<int>.generate(
+      result.length,
+      (int index) => result.codeUnitAt(index) - 48,
+    );
+    final List<StoryType> tabs = tabIndexes
+        .map((int index) => StoryType.values.elementAt(index))
+        .toList();
+
+    if (tabs.length < StoryType.values.length) {
+      tabs.insert(0, StoryType.values.first);
+    }
+    return tabs;
+  }
+
+  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);
+
+  Font get font =>
+      Font.values.elementAt(preferences.singleWhereType<FontPreference>().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

@@ -15,87 +15,131 @@ class SearchCubit extends Cubit<SearchState> {
 
   final SearchRepository _searchRepository;
 
-  StreamSubscription<Story>? streamSubscription;
+  StreamSubscription<Item>? streamSubscription;
 
   void search(String query) {
     streamSubscription?.cancel();
     emit(
       state.copyWith(
-        results: <Story>[],
+        results: <Item>[],
         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(_onItemFetched)
+          ..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(_onItemFetched)
+            ..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>() {
+    if (state.params.contains<T>() == false) return;
+
     emit(
       state.copyWith(
-        searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
+        params: state.params.copyWithFilterRemoved<T>(),
       ),
     );
 
-    search(state.searchFilters.query);
+    search(state.params.query);
+  }
+
+  void onToggled(TypeTagFilter filter) {
+    if (state.params.contains<TypeTagFilter>() &&
+        state.params.get<TypeTagFilter>() == filter) {
+      removeFilter<TypeTagFilter>();
+    } else {
+      removeFilter<TypeTagFilter>();
+      addFilter<TypeTagFilter>(filter);
+    }
   }
 
   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) {
+  void onDateTimeRangeUpdated(DateTime start, DateTime end) {
+    final DateTime updatedStart = start.copyWith(
+      second: 0,
+      millisecond: 0,
+      microsecond: 0,
+    );
+    final DateTime updatedEnd = end.copyWith(
+      second: 0,
+      millisecond: 0,
+      microsecond: 0,
+    );
+    final DateTime? existingStart =
+        state.params.get<DateTimeRangeFilter>()?.startTime;
+    final DateTime? existingEnd =
+        state.params.get<DateTimeRangeFilter>()?.endTime;
+
+    if (existingStart == updatedStart && existingEnd == updatedEnd) return;
+
+    addFilter(
+      DateTimeRangeFilter(
+        startTime: updatedStart,
+        endTime: updatedEnd,
+      ),
+    );
+  }
+
+  void onPostedByChanged(String? username) {
+    if (username == null) {
+      removeFilter<PostedByFilter>();
+    } else {
+      addFilter(PostedByFilter(author: username));
+    }
+  }
+
+  void _onItemFetched(Item item) {
     emit(
       state.copyWith(
-        results: List<Story>.from(state.results)..add(story),
+        results: List<Item>.from(state.results)..add(item),
       ),
     );
   }

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();
+        results = <Item>[],
+        params = SearchParams.init();
 
-  final List<Story> results;
+  final List<Item> results;
   final SearchStatus status;
-  final SearchFilters searchFilters;
+  final SearchParams params;
 
   SearchState copyWith({
-    List<Story>? results,
+    List<Item>? 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/tab/tab_cubit.dart

@@ -0,0 +1,46 @@
+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/models/models.dart';
+import 'package:logger/logger.dart';
+
+part 'tab_state.dart';
+
+class TabCubit extends Cubit<TabState> {
+  TabCubit({
+    required PreferenceCubit preferenceCubit,
+    Logger? logger,
+  })  : _preferenceCubit = preferenceCubit,
+        _logger = logger ?? locator.get<Logger>(),
+        super(TabState.init());
+
+  final PreferenceCubit _preferenceCubit;
+  final Logger _logger;
+
+  void init() {
+    final List<StoryType> tabs = _preferenceCubit.state.tabs;
+
+    _logger.i('updating tabs to $tabs');
+
+    emit(state.copyWith(tabs: tabs));
+  }
+
+  void update(int startIndex, int endIndex) {
+    _logger.d('updating ${state.tabs} by moving $startIndex to $endIndex');
+    final StoryType tab = state.tabs.elementAt(startIndex);
+    final List<StoryType> updatedTabs = List<StoryType>.from(state.tabs)
+      ..insert(endIndex, tab)
+      ..removeAt(startIndex < endIndex ? startIndex : startIndex + 1);
+    _logger.d(updatedTabs);
+    emit(state.copyWith(tabs: updatedTabs));
+
+    // Check to make sure there's no duplicate.
+    if (updatedTabs.toSet().length == StoryType.values.length) {
+      _preferenceCubit.update<int>(
+        TabOrderPreference(),
+        to: StoryType.convertToSettingsValue(updatedTabs),
+      );
+    }
+  }
+}

lib/cubits/tab/tab_state.dart

@@ -0,0 +1,18 @@
+part of 'tab_cubit.dart';
+
+class TabState extends Equatable {
+  const TabState({required this.tabs});
+
+  TabState.init() : tabs = <StoryType>[];
+
+  final List<StoryType> tabs;
+
+  TabState copyWith({
+    List<StoryType>? tabs,
+  }) {
+    return TabState(tabs: tabs ?? this.tabs);
+  }
+
+  @override
+  List<Object?> get props => <Object?>[tabs];
+}

lib/cubits/time_machine/time_machine_cubit.dart

@@ -20,20 +20,20 @@ class TimeMachineCubit extends Cubit<TimeMachineState> {
   final CommentCache _commentCache;
 
   Future<void> activateTimeMachine(Comment comment) async {
-    emit(state.copyWith(parents: <Comment>[]));
+    emit(state.copyWith(ancestors: <Comment>[]));
 
-    final List<Comment> parents = <Comment>[];
+    final List<Comment> ancestors = <Comment>[];
     Comment? parent = _commentCache.getComment(comment.parent);
     parent ??= await _sembastRepository.getCachedComment(id: comment.parent);
 
     while (parent != null) {
-      parents.insert(0, parent);
+      ancestors.insert(0, parent);
 
       final int parentId = parent.parent;
       parent = _commentCache.getComment(parentId);
       parent ??= await _sembastRepository.getCachedComment(id: parentId);
     }
 
-    emit(state.copyWith(parents: parents));
+    emit(state.copyWith(ancestors: ancestors));
   }
 }

lib/cubits/time_machine/time_machine_state.dart

@@ -1,18 +1,18 @@
 part of 'time_machine_cubit.dart';
 
 class TimeMachineState extends Equatable {
-  const TimeMachineState({required this.parents});
+  const TimeMachineState({required this.ancestors});
 
-  TimeMachineState.init() : parents = <Comment>[];
+  TimeMachineState.init() : ancestors = <Comment>[];
 
-  final List<Comment> parents;
+  final List<Comment> ancestors;
 
   TimeMachineState copyWith({
-    List<Comment>? parents,
+    List<Comment>? ancestors,
   }) {
-    return TimeMachineState(parents: parents ?? this.parents);
+    return TimeMachineState(ancestors: ancestors ?? this.ancestors);
   }
 
   @override
-  List<Object?> get props => <Object?>[parents];
+  List<Object?> get props => <Object?>[ancestors];
 }

lib/cubits/user/user_cubit.dart

@@ -10,13 +10,13 @@ class UserCubit extends Cubit<UserState> {
   UserCubit({StoriesRepository? storiesRepository})
       : _storiesRepository =
             storiesRepository ?? locator.get<StoriesRepository>(),
-        super(UserState.init());
+        super(const UserState.init());
 
   final StoriesRepository _storiesRepository;
 
   void init({required String userId}) {
     emit(state.copyWith(status: UserStatus.loading));
-    _storiesRepository.fetchUserBy(userId: userId).then((User user) {
+    _storiesRepository.fetchUser(id: userId).then((User user) {
       emit(state.copyWith(user: user, status: UserStatus.loaded));
     }).onError((_, __) {
       emit(state.copyWith(status: UserStatus.failure));

lib/cubits/user/user_state.dart

@@ -13,8 +13,8 @@ class UserState extends Equatable {
     required this.status,
   });
 
-  UserState.init()
-      : user = User.empty(),
+  const UserState.init()
+      : user = const User.empty(),
         status = UserStatus.initial;
 
   final User user;

lib/extensions/context_extension.dart

@@ -1,7 +1,11 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/config/constants.dart';
+import 'package:hacki/styles/styles.dart';
 
-extension TryReadContext on BuildContext {
+extension ContextExtension on BuildContext {
   T? tryRead<T>() {
     try {
       return read<T>();
@@ -9,4 +13,73 @@ extension TryReadContext on BuildContext {
       return null;
     }
   }
+
+  void showSnackBar({
+    required String content,
+    VoidCallback? action,
+    String? label,
+  }) {
+    ScaffoldMessenger.of(this).showSnackBar(
+      SnackBar(
+        backgroundColor: Palette.deepOrange,
+        content: Text(content),
+        action: action != null && label != null
+            ? SnackBarAction(
+                label: label,
+                onPressed: action,
+                textColor: Theme.of(this).textTheme.bodyLarge?.color,
+              )
+            : null,
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
+  void showErrorSnackBar() => showSnackBar(
+        content: Constants.errorMessage,
+      );
+
+  Rect? get rect {
+    final RenderBox? box = findRenderObject() as RenderBox?;
+    final Rect? rect =
+        box == null ? null : box.localToGlobal(Offset.zero) & box.size;
+    return rect;
+  }
+
+  static double _screenWidth = 0;
+  static double _storyTileHeight = 0;
+  static int _storyTileMaxLines = 4;
+  static const double _screenWidthLowerBound = 430;
+  static const double _screenWidthUpperBound = 850;
+  static const double _picHeightLowerBound = 110;
+  static const double _picHeightUpperBound = 128;
+  static const double _smallPicHeight = 100;
+  static const double _picHeightFactor = 0.3;
+
+  double get storyTileHeight {
+    final double screenWidth =
+        min(MediaQuery.of(this).size.height, MediaQuery.of(this).size.width);
+
+    if (screenWidth == _screenWidth) {
+      return _storyTileHeight;
+    } else {
+      _screenWidth = screenWidth;
+    }
+
+    final bool showSmallerPreviewPic = screenWidth > _screenWidthLowerBound &&
+        screenWidth < _screenWidthUpperBound;
+    final double height = showSmallerPreviewPic
+        ? _smallPicHeight
+        : (screenWidth * _picHeightFactor)
+            .clamp(_picHeightLowerBound, _picHeightUpperBound);
+    final int maxLines = height == _smallPicHeight ? 3 : 4;
+    _storyTileMaxLines = maxLines;
+
+    _storyTileHeight = height;
+    return height;
+  }
+
+  int get storyTileMaxLines {
+    return _storyTileMaxLines;
+  }
 }

lib/extensions/date_time_extension.dart

@@ -7,10 +7,8 @@ extension DateTimeExtension on DateTime {
       return '$gap year${gap == 1 ? '' : 's'} ago';
     } else if (diff.inDays > 30) {
       int gap = now.month - month;
-      if (gap == 0) {
-        gap = 1;
-      } else if (gap < 0) {
-        gap = now.month + (12 - month);
+      if (gap <= 0) {
+        gap = now.month + 12 - month;
       }
       return '$gap month${gap == 1 ? '' : 's'} ago';
     } else if (diff.inDays >= 1) {

lib/extensions/extensions.dart

@@ -3,6 +3,7 @@ export 'date_time_extension.dart';
 export 'int_extension.dart';
 export 'list_extension.dart';
 export 'object_extension.dart';
+export 'set_extension.dart';
 export 'state_extension.dart';
 export 'string_extension.dart';
 export 'widget_extension.dart';

lib/extensions/object_extension.dart

@@ -1,7 +1,8 @@
-import 'dart:developer' as dev;
+import 'package:hacki/config/locator.dart';
+import 'package:logger/logger.dart';
 
 extension ObjectExtension on Object {
   void log({String identifier = ''}) {
-    dev.log('$identifier ${toString()}', level: 2000);
+    locator.get<Logger>().d('$identifier ${toString()}');
   }
 }

lib/extensions/set_extension.dart

@@ -0,0 +1,13 @@
+extension SetExtension<E> on Set<E> {
+  void removeWhereType<T extends E>() {
+    return removeWhere((E e) => e is T);
+  }
+
+  bool hasType<T extends E>() {
+    return whereType<T>().isNotEmpty;
+  }
+
+  T singleWhereType<T extends E>() {
+    return whereType<T>().single;
+  }
+}

lib/extensions/state_extension.dart

@@ -1,9 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/blocs/auth/auth_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/main.dart';
+import 'package:hacki/models/models.dart';
+import 'package:hacki/screens/item/models/models.dart';
+import 'package:hacki/screens/item/widgets/widgets.dart';
 import 'package:hacki/screens/screens.dart' show ItemScreen, ItemScreenArgs;
 import 'package:hacki/styles/styles.dart';
+import 'package:share_plus/share_plus.dart';
 
 extension StateExtension on State {
   void showSnackBar({
@@ -11,22 +18,15 @@ extension StateExtension on State {
     VoidCallback? action,
     String? label,
   }) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        backgroundColor: Palette.deepOrange,
-        content: Text(content),
-        action: action != null && label != null
-            ? SnackBarAction(
-                label: label,
-                onPressed: action,
-                textColor: Theme.of(context).textTheme.bodyText1?.color,
-              )
-            : null,
-        behavior: SnackBarBehavior.floating,
-      ),
+    context.showSnackBar(
+      content: content,
+      action: action,
+      label: label,
     );
   }
 
+  void showErrorSnackBar() => context.showErrorSnackBar();
+
   Future<void>? goToItemScreen({
     required ItemScreenArgs args,
     bool forceNewScreen = false,
@@ -44,4 +44,188 @@ extension StateExtension on State {
 
     return Future<void>.value();
   }
+
+  void onMoreTapped(Item item, Rect? rect) {
+    HapticFeedback.lightImpact();
+
+    if (item.dead || item.deleted) {
+      return;
+    }
+
+    final bool isBlocked =
+        context.read<BlocklistCubit>().state.blocklist.contains(item.by);
+    showModalBottomSheet<MenuAction>(
+      context: context,
+      isScrollControlled: true,
+      builder: (BuildContext context) {
+        return MorePopupMenu(
+          item: item,
+          isBlocked: isBlocked,
+          onLoginTapped: onLoginTapped,
+        );
+      },
+    ).then((MenuAction? action) {
+      if (action != null) {
+        switch (action) {
+          case MenuAction.upvote:
+            break;
+          case MenuAction.downvote:
+            break;
+          case MenuAction.fav:
+            onFavTapped(item);
+            break;
+          case MenuAction.share:
+            onShareTapped(item, rect);
+            break;
+          case MenuAction.flag:
+            onFlagTapped(item);
+            break;
+          case MenuAction.block:
+            onBlockTapped(item, isBlocked: isBlocked);
+            break;
+          case MenuAction.cancel:
+            break;
+        }
+      }
+    });
+  }
+
+  void onFavTapped(Item item) {
+    final FavCubit favCubit = context.read<FavCubit>();
+    final bool isFav = favCubit.state.favIds.contains(item.id);
+    if (isFav) {
+      favCubit.removeFav(item.id);
+    } else {
+      favCubit.addFav(item.id);
+    }
+  }
+
+  Future<void> onShareTapped(Item item, Rect? rect) async {
+    late final String? linkToShare;
+    if (item.url.isNotEmpty) {
+      linkToShare = await showModalBottomSheet<String>(
+        context: context,
+        builder: (BuildContext context) {
+          return Container(
+            height: 140,
+            color: Theme.of(context).canvasColor,
+            child: Material(
+              child: Column(
+                children: <Widget>[
+                  ListTile(
+                    onTap: () => Navigator.pop(context, item.url),
+                    title: const Text('Link to article'),
+                  ),
+                  ListTile(
+                    onTap: () => Navigator.pop(
+                      context,
+                      'https://news.ycombinator.com/item?id=${item.id}',
+                    ),
+                    title: const Text('Link to HN'),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      );
+    } else {
+      linkToShare = 'https://news.ycombinator.com/item?id=${item.id}';
+    }
+
+    if (linkToShare != null) {
+      await Share.share(
+        linkToShare,
+        sharePositionOrigin: rect,
+      );
+    }
+  }
+
+  void onFlagTapped(Item item) {
+    showDialog<bool>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Flag this comment?'),
+          content: Text(
+            'Flag this comment posted by ${item.by}?',
+            style: const TextStyle(
+              color: Palette.grey,
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: const Text(
+                'Cancel',
+              ),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: const Text(
+                'Yes',
+              ),
+            ),
+          ],
+        );
+      },
+    ).then((bool? yesTapped) {
+      if (yesTapped ?? false) {
+        context.read<AuthBloc>().add(AuthFlag(item: item));
+        showSnackBar(content: 'Comment flagged!');
+      }
+    });
+  }
+
+  void onBlockTapped(Item item, {required bool isBlocked}) {
+    showDialog<bool>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text('${isBlocked ? 'Unblock' : 'Block'} this user?'),
+          content: Text(
+            'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
+            ' and ${isBlocked ? 'display' : 'hide'} '
+            'comments posted by this user?',
+            style: const TextStyle(
+              color: Palette.grey,
+            ),
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: const Text(
+                'Cancel',
+              ),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: const Text(
+                'Yes',
+              ),
+            ),
+          ],
+        );
+      },
+    ).then((bool? yesTapped) {
+      if (yesTapped ?? false) {
+        if (isBlocked) {
+          context.read<BlocklistCubit>().removeFromBlocklist(item.by);
+        } else {
+          context.read<BlocklistCubit>().addToBlocklist(item.by);
+        }
+        showSnackBar(content: 'User ${isBlocked ? 'unblocked' : 'blocked'}!');
+      }
+    });
+  }
+
+  void onLoginTapped() {
+    showDialog<void>(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext context) {
+        return const LoginDialog();
+      },
+    );
+  }
 }

lib/extensions/string_extension.dart

@@ -1,11 +1,15 @@
+import 'package:hacki/config/constants.dart';
+
 extension StringExtension on String {
-  int? getItemId() {
-    final RegExp regex = RegExp(r'\d+$');
-    final RegExp exception = RegExp(r'\)|].*$');
+  int? get itemId {
+    final RegExp regex = RegExp(RegExpConstants.number);
+    final RegExp exception = RegExp(RegExpConstants.linkSuffix);
     final String match = regex.stringMatch(replaceAll(exception, '')) ?? '';
     return int.tryParse(match);
   }
 
+  bool get isStoryLink => contains('news.ycombinator.com/item');
+
   String removeAllEmojis() {
     final RegExp regex = RegExp(
       r'(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])',
@@ -13,3 +17,12 @@ extension StringExtension on String {
     return replaceAllMapped(regex, (_) => '');
   }
 }
+
+extension OptionalStringExtension on String? {
+  bool get isNullOrEmpty {
+    if (this == null) return true;
+    return this!.trim().isEmpty;
+  }
+
+  bool get isNotNullOrEmpty => !isNullOrEmpty;
+}

lib/extensions/widget_extension.dart

@@ -1,4 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:hacki/config/constants.dart';
+import 'package:hacki/models/models.dart';
+import 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart';
+import 'package:hacki/utils/utils.dart';
 
 extension WidgetModifier on Widget {
   Widget padded([EdgeInsetsGeometry value = const EdgeInsets.all(12)]) {
@@ -7,4 +11,62 @@ extension WidgetModifier on Widget {
       child: this,
     );
   }
+
+  Widget contextMenuBuilder(
+    BuildContext context,
+    EditableTextState editableTextState, {
+    required Item item,
+  }) {
+    final int start = editableTextState.textEditingValue.selection.base.offset;
+    final int end = editableTextState.textEditingValue.selection.end;
+
+    final List<ContextMenuButtonItem> items = <ContextMenuButtonItem>[
+      ...editableTextState.contextMenuButtonItems,
+    ];
+
+    if (start != -1 && end != -1) {
+      String selectedText = item.text.substring(start, end);
+
+      if (item is Buildable) {
+        final Iterable<EmphasisElement> emphasisElements =
+            (item as Buildable).elements.whereType<EmphasisElement>();
+
+        int count = 1;
+        while (selectedText.contains(' ') && count <= emphasisElements.length) {
+          final int s = (start + count * 2).clamp(0, item.text.length);
+          final int e = (end + count * 2).clamp(0, item.text.length);
+          selectedText = item.text.substring(s, e);
+          count++;
+        }
+
+        count = 1;
+        while (selectedText.contains(' ') && count <= emphasisElements.length) {
+          final int s = (start - count * 2).clamp(0, item.text.length);
+          final int e = (end - count * 2).clamp(0, item.text.length);
+          selectedText = item.text.substring(s, e);
+          count++;
+        }
+      }
+
+      items.addAll(<ContextMenuButtonItem>[
+        ContextMenuButtonItem(
+          onPressed: () => LinkUtil.launch(
+            '''${Constants.wikipediaLink}$selectedText''',
+          ),
+          label: 'Wikipedia',
+        ),
+        ContextMenuButtonItem(
+          onPressed: () => LinkUtil.launch(
+            '''${Constants.wiktionaryLink}$selectedText''',
+          ),
+          label: 'Wiktionary',
+        ),
+      ]);
+    }
+
+    return AdaptiveTextSelectionToolbar.buttonItems(
+      anchors: editableTextState.contextMenuAnchors,
+      buttonItems: items,
+    );
+  }
 }

lib/main.dart

@@ -2,10 +2,12 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:equatable/equatable.dart';
 import 'package:feature_discovery/feature_discovery.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
@@ -13,12 +15,14 @@ import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/custom_router.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
-import 'package:hacki/repositories/repositories.dart' show PreferenceRepository;
+import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/services/custom_bloc_observer.dart';
 import 'package:hacki/services/fetcher.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hive/hive.dart';
+import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:logger/logger.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:rxdart/rxdart.dart' show BehaviorSubject;
 import 'package:shared_preferences/shared_preferences.dart';
@@ -34,11 +38,36 @@ final BehaviorSubject<String?> siriSuggestionSubject =
 
 late final bool isTesting;
 
+void notificationReceiver(NotificationResponse details) =>
+    selectNotificationSubject.add(details.payload);
+
 Future<void> main({bool testing = false}) async {
   WidgetsFlutterBinding.ensureInitialized();
 
   isTesting = testing;
 
+  final Directory tempDir = await getTemporaryDirectory();
+  final String tempPath = tempDir.path;
+  Hive.init(tempPath);
+
+  await setUpLocator();
+
+  EquatableConfig.stringify = true;
+
+  FlutterError.onError = (FlutterErrorDetails details) {
+    locator.get<Logger>().e(
+          details.summary,
+          details.exceptionAsString(),
+          details.stack,
+        );
+  };
+
+  final HydratedStorage storage = await HydratedStorage.build(
+    storageDirectory: kIsWeb
+        ? HydratedStorage.webStorageDirectory
+        : await getTemporaryDirectory(),
+  );
+
   if (Platform.isIOS) {
     unawaited(
       Workmanager().initialize(
@@ -50,8 +79,8 @@ Future<void> main({bool testing = false}) async {
         FlutterLocalNotificationsPlugin();
     const AndroidInitializationSettings initializationSettingsAndroid =
         AndroidInitializationSettings('@mipmap/ic_launcher');
-    const IOSInitializationSettings initializationSettingsIOS =
-        IOSInitializationSettings();
+    const DarwinInitializationSettings initializationSettingsIOS =
+        DarwinInitializationSettings();
     const InitializationSettings initializationSettings =
         InitializationSettings(
       android: initializationSettingsAndroid,
@@ -59,7 +88,8 @@ Future<void> main({bool testing = false}) async {
     );
     await flutterLocalNotificationsPlugin.initialize(
       initializationSettings,
-      onSelectNotification: selectNotificationSubject.add,
+      onDidReceiveBackgroundNotificationResponse: notificationReceiver,
+      onDidReceiveNotificationResponse: notificationReceiver,
     );
     await flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
@@ -79,39 +109,40 @@ Future<void> main({bool testing = false}) async {
         siriSuggestionSubject.add(storyId);
       },
     );
+  } else if (Platform.isAndroid) {
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(
+        statusBarColor: Palette.transparent,
+        systemNavigationBarColor: Palette.transparent,
+        systemNavigationBarDividerColor: Palette.transparent,
+      ),
+    );
+
+    await SystemChrome.setEnabledSystemUIMode(
+      SystemUiMode.edgeToEdge,
+      overlays: <SystemUiOverlay>[SystemUiOverlay.top],
+    );
   }
 
-  final Directory tempDir = await getTemporaryDirectory();
-  final String tempPath = tempDir.path;
-  Hive.init(tempPath);
-
-  await setUpLocator();
-
   final AdaptiveThemeMode? savedThemeMode = await AdaptiveTheme.getThemeMode();
   final SharedPreferences prefs = await SharedPreferences.getInstance();
   final bool trueDarkMode =
-      prefs.getBool(PreferenceRepository.trueDarkModeKey) ?? false;
+      prefs.getBool(const TrueDarkModePreference().key) ?? false;
+  final Font font = Font.values.elementAt(
+    prefs.getInt(FontPreference().key) ?? Font.roboto.index,
+  );
 
-  if (kReleaseMode) {
-    runApp(
-      HackiApp(
-        savedThemeMode: savedThemeMode,
-        trueDarkMode: trueDarkMode,
-      ),
-    );
-  } else {
-    BlocOverrides.runZoned(
-      () {
-        runApp(
-          HackiApp(
-            savedThemeMode: savedThemeMode,
-            trueDarkMode: trueDarkMode,
-          ),
-        );
-      },
-      blocObserver: CustomBlocObserver(),
-    );
-  }
+  Bloc.observer = CustomBlocObserver();
+
+  HydratedBloc.storage = storage;
+
+  runApp(
+    HackiApp(
+      savedThemeMode: savedThemeMode,
+      trueDarkMode: trueDarkMode,
+      font: font,
+    ),
+  );
 }
 
 class HackiApp extends StatelessWidget {
@@ -119,9 +150,11 @@ class HackiApp extends StatelessWidget {
     super.key,
     this.savedThemeMode,
     required this.trueDarkMode,
+    required this.font,
   });
 
   final AdaptiveThemeMode? savedThemeMode;
+  final Font font;
   final bool trueDarkMode;
 
   static final GlobalKey<NavigatorState> navigatorKey =
@@ -187,15 +220,26 @@ class HackiApp extends StatelessWidget {
           lazy: false,
           create: (BuildContext context) => PostCubit(),
         ),
+        BlocProvider<EditCubit>(
+          lazy: false,
+          create: (BuildContext context) => EditCubit(),
+        ),
+        BlocProvider<TabCubit>(
+          create: (BuildContext context) => TabCubit(
+            preferenceCubit: context.read<PreferenceCubit>(),
+          )..init(),
+        )
       ],
       child: AdaptiveTheme(
         light: ThemeData(
           primarySwatch: Palette.orange,
+          fontFamily: font.name,
         ),
         dark: ThemeData(
           brightness: Brightness.dark,
           primarySwatch: Palette.orange,
           canvasColor: trueDarkMode ? Palette.black : null,
+          fontFamily: font.name,
         ),
         initial: savedThemeMode ?? AdaptiveThemeMode.system,
         builder: (ThemeData theme, ThemeData darkTheme) {
@@ -203,6 +247,7 @@ class HackiApp extends StatelessWidget {
             brightness: Brightness.dark,
             primarySwatch: Palette.orange,
             canvasColor: Palette.black,
+            fontFamily: font.name,
           );
           return FutureBuilder<AdaptiveThemeMode?>(
             future: AdaptiveTheme.getThemeMode(),
@@ -214,9 +259,9 @@ class HackiApp extends StatelessWidget {
               return BlocBuilder<PreferenceCubit, PreferenceState>(
                 buildWhen:
                     (PreferenceState previous, PreferenceState current) =>
-                        previous.useTrueDark != current.useTrueDark,
+                        previous.trueDarkEnabled != current.trueDarkEnabled,
                 builder: (BuildContext context, PreferenceState prefState) {
-                  final bool useTrueDark = prefState.useTrueDark &&
+                  final bool useTrueDark = prefState.trueDarkEnabled &&
                       (mode == AdaptiveThemeMode.dark ||
                           (mode == AdaptiveThemeMode.system &&
                               SchedulerBinding

lib/models/comment.dart

@@ -1,99 +0,0 @@
-import 'dart:convert';
-
-import 'package:hacki/models/item.dart';
-
-class Comment extends Item {
-  Comment({
-    required super.id,
-    required super.time,
-    required super.parent,
-    required super.score,
-    required super.by,
-    required super.text,
-    required super.kids,
-    required super.dead,
-    required super.deleted,
-    required this.level,
-  }) : super(
-          descendants: 0,
-          parts: <int>[],
-          title: '',
-          url: '',
-          type: '',
-        );
-
-  Comment.fromJson(Map<String, dynamic> json, {this.level = 0})
-      : super(
-          id: json['id'] as int? ?? 0,
-          time: json['time'] as int? ?? 0,
-          by: json['by'] as String? ?? '',
-          text: json['text'] as String? ?? '',
-          kids: (json['kids'] as List<dynamic>?)?.cast<int>() ?? <int>[],
-          parent: json['parent'] as int? ?? 0,
-          deleted: json['deleted'] as bool? ?? false,
-          score: json['score'] as int? ?? 0,
-          descendants: 0,
-          dead: json['dead'] as bool? ?? false,
-          parts: <int>[],
-          title: '',
-          url: '',
-          type: '',
-        );
-
-  final int level;
-
-  String get metadata => '''by $by $postedDate''';
-
-  Comment copyWith({int? level}) {
-    return Comment(
-      id: id,
-      time: time,
-      parent: parent,
-      score: score,
-      by: by,
-      text: text,
-      kids: kids,
-      dead: dead,
-      deleted: deleted,
-      level: level ?? this.level,
-    );
-  }
-
-  Map<String, dynamic> toJson() => <String, dynamic>{
-        'id': id,
-        'time': time,
-        'by': by,
-        'text': text,
-        'kids': kids,
-        'parent': parent,
-        'deleted': deleted,
-        'dead': dead,
-        'score': score,
-        'level': level,
-      };
-
-  @override
-  String toString() {
-    final String prettyString =
-        const JsonEncoder.withIndent('  ').convert(this);
-    return 'Comment $prettyString';
-  }
-
-  @override
-  List<Object?> get props => <Object?>[
-        id,
-        score,
-        descendants,
-        time,
-        by,
-        title,
-        url,
-        kids,
-        dead,
-        parts,
-        deleted,
-        parent,
-        text,
-        type,
-      ];
-}

lib/models/comments_order.dart

@@ -0,0 +1,9 @@
+enum CommentsOrder {
+  natural('Natural'),
+  newestFirst('Newest first'),
+  oldestFirst('Oldest first');
+
+  const CommentsOrder(this.description);
+
+  final String description;
+}