add View root button. (#212)

android/app/build.gradle

@@ -50,7 +50,7 @@ android {
 
     defaultConfig {
         applicationId "com.jiaqifeng.hacki"
-        minSdkVersion 30
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

components/in_app_review/.gitignore

@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/

components/in_app_review/.metadata

@@ -0,0 +1,39 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled.
+
+version:
+  revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+  channel: stable
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+    - platform: android
+      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+    - platform: ios
+      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+    - platform: macos
+      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+    - platform: windows
+      create_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+      base_revision: e3c29ec00c9c825c891d75054c63fcc46454dca1
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

components/in_app_review/CHANGELOG.md

@@ -0,0 +1,102 @@
+# [2.0.6]
+- Update Android Play Core dependency to Play Review 2.0.1.
+
+# [2.0.5]
+
+- Migrate Android Play Core dependency to Play Review 2.0.0.
+- Recreate the example app.
+- Update in_app_review_platform_interface to 2.0.4
+
+# [2.0.4]
+
+- Migrate maven repository from jcenter to mavenCentral
+- `isAvailable()` now returns `false` on web.
+
+# [2.0.3]
+
+- Fix iOS no-scene exception. ([#41](https://github.com/britannio/in_app_review/issues/41))
+# [2.0.2]
+
+- Replace iOS Swift code with Objective-C to add compatibility with Objective-C Flutter apps.
+
+# [2.0.1]
+
+- Fix rare null pointer exception on Android
+- Fix MissingPluginException on MacOS
+- Bump the minimum Dart SDK version from `2.12.0-0` to `2.12.0`.
+- Bump the minimum Flutter version to `2.0.0`.
+- Update in_app_review_platform_interface to 2.0.2
+
+# [2.0.0]
+
+- Migrate to null safety.
+
+# [1.0.4]
+
+- Update in_app_review_platform_interface to 1.0.5
+- Remove dependency on `package_info`.
+- Handle `openStoreListing()` with native code for Android, iOS and MacOS.
+
+# [1.0.3]
+
+- Update in_app_review_platform_interface to 1.0.4
+- Update android compileSdkVersion to 29.
+- Lower dependency version constraints.
+
+# [1.0.2]
+
+- Update in_app_review_platform_interface to 1.0.3
+- Open the App Store directly instead of via the Safari View Controller.
+- Add automated tests.
+- Improve docs.
+
+# [1.0.1+1]
+
+- Update in_app_review_platform_interface to 1.0.2
+
+# [1.0.0]
+
+- Migrate to use `in_app_review_platform_interface`.
+- Add Windows support for `openStoreListing`.
+
+# [0.2.1+1]
+
+- Improve iOS testing docs.
+
+# [0.2.1]
+
+- Update dependencies.
+- Android Play Core Library V1.8.2 release notes:
+    - Fixed UI flickering in the In-App Review API
+
+# [0.2.0+4]
+
+- Remove deprecated API warning.
+- Update dependencies.
+
+# [0.2.0+3]
+
+- Instructions in the README have been improved along with the example.
+
+# [0.2.0+2]
+
+- Update changelog format
+
+# [0.2.0+1]
+
+- Update MacOS testing instructions
+
+# [0.2.0] Breaking Change
+
+- Add MacOS support
+- Rename `openStoreListing(iOSAppStoreId: '')` to `openStoreListing(appStoreId: '')` 
+
+# [0.1.0]
+
+- Improve docs
+- Set Android minSdkVersion to 16
+- Refactor Android Plugin
+
+# [0.0.1]
+
+Initial release

components/in_app_review/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Britannio Jarrett
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

components/in_app_review/android/.gitignore

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.cxx

components/in_app_review/android/build.gradle

@@ -0,0 +1,49 @@
+group 'dev.britannio.in_app_review'
+version '1.0-SNAPSHOT'
+
+buildscript {
+    ext.kotlin_version = '1.6.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 31
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+    dependencies {
+
+    }
+}

components/in_app_review/android/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'in_app_review'

components/in_app_review/android/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="dev.britannio.in_app_review">
+</manifest>

components/in_app_review/android/src/main/java/dev/britannio/in_app_review/InAppReviewPlugin.java

@@ -0,0 +1,59 @@
+package dev.britannio.in_app_review;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.embedding.engine.plugins.activity.ActivityAware;
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+
+/**
+ * InAppReviewPlugin
+ */
+public class InAppReviewPlugin implements FlutterPlugin, MethodCallHandler {
+    /// The MethodChannel that will the communication between Flutter and native Android
+    ///
+    /// This local reference serves to register the plugin with the Flutter Engine and unregister it
+    /// when the Flutter Engine is detached from the Activity
+    private MethodChannel channel;
+
+
+    private final String TAG = "InAppReviewPlugin";
+
+    @Override
+    public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+        channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "dev.britannio.in_app_review");
+        channel.setMethodCallHandler(this);
+    }
+
+
+    @Override
+    public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
+        Log.i(TAG, "onMethodCall: " + call.method);
+        switch (call.method) {
+            case "isAvailable":
+            case "requestReview":
+            case "openStoreListing":
+            default:
+                result.notImplemented();
+                break;
+        }
+    }
+
+    @Override
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+        channel.setMethodCallHandler(null);
+    }
+}

components/in_app_review/ios/.gitignore

@@ -0,0 +1,38 @@
+.idea/
+.vagrant/
+.sconsign.dblite
+.svn/
+
+.DS_Store
+*.swp
+profile
+
+DerivedData/
+build/
+GeneratedPluginRegistrant.h
+GeneratedPluginRegistrant.m
+
+.generated/
+
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+xcuserdata
+
+*.moved-aside
+
+*.pyc
+*sync/
+Icon?
+.tags*
+
+/Flutter/Generated.xcconfig
+/Flutter/ephemeral/
+/Flutter/flutter_export_environment.sh

components/in_app_review/ios/Classes/InAppReviewPlugin.h

@@ -0,0 +1,4 @@
+#import <Flutter/Flutter.h>
+
+@interface InAppReviewPlugin : NSObject<FlutterPlugin>
+@end

components/in_app_review/ios/Classes/InAppReviewPlugin.m

@@ -0,0 +1,107 @@
+#import "InAppReviewPlugin.h"
+
+@import StoreKit;
+@implementation InAppReviewPlugin
+
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+    
+    FlutterMethodChannel* channel = [FlutterMethodChannel methodChannelWithName:@"dev.britannio.in_app_review" binaryMessenger:[registrar messenger]];
+    
+    InAppReviewPlugin* instance = [[InAppReviewPlugin alloc] init];
+    [registrar addMethodCallDelegate:instance channel:channel];
+}
+
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+    
+    [self logMessage:@"handle" details:call.method];
+    
+    if ([call.method isEqual:@"requestReview"]) {
+        [self requestReview:result];
+    } else if ([call.method isEqual:@"isAvailable"]) {
+        [self isAvailable:result];
+    } else if ([call.method isEqual:@"openStoreListing"]) {
+        [self openStoreListingWithStoreId:call.arguments result:result];
+    } else {
+        [self logMessage:@"method not implemented"];
+        result(FlutterMethodNotImplemented);
+    }
+}
+
+- (void) requestReview:(FlutterResult)result {
+    if (@available(iOS 14, *)) {
+        [self logMessage:@"iOS 14+"];
+        UIWindowScene *scene = [self findActiveScene];
+        [SKStoreReviewController requestReviewInScene:scene];
+        result(nil);
+    } else if (@available(iOS 10.3, *)) {
+        [self logMessage:@"iOS 10.3+"];
+        [SKStoreReviewController requestReview];
+        result(nil);
+    } else {
+        result([FlutterError errorWithCode:@"unavailable"
+                                   message:@"In-App Review unavailable"
+                                   details:nil]);
+    }
+}
+
+- (UIWindowScene *) findActiveScene  API_AVAILABLE(ios(13.0)){
+    for (UIWindowScene *scene in UIApplication.sharedApplication.connectedScenes) {
+        
+        if (scene.activationState == UISceneActivationStateForegroundActive) {
+            return scene;
+        }
+        
+    }
+    
+    return nil;
+}
+
+- (void) isAvailable:(FlutterResult)result {
+    if (@available(iOS 10.3, *)) {
+        [self logMessage:@"available"];
+        result(@YES);
+    } else {
+        [self logMessage:@"unavailable"];
+        result(@NO);
+    }
+}
+
+- (void) openStoreListingWithStoreId:(NSString *)storeId result:(FlutterResult)result {
+    
+    if (!storeId) {
+        result([FlutterError errorWithCode:@"no-store-id"
+                                   message:@"Your store id must be passed as the method channel's argument"
+                                   details:nil]);
+        return;
+    }
+    
+    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://apps.apple.com/app/id%@?action=write-review", storeId]];
+    
+    if (!url) {
+        result([FlutterError errorWithCode:@"url-construct-fail"
+                                   message:@"Failed to construct url"
+                                   details:nil]);
+        return;
+    }
+        
+    UIApplication *app = [UIApplication sharedApplication];
+    if (@available(iOS 10.0, *)) {
+        [app openURL:url options:@{} completionHandler:nil];
+    } else {
+        [app openURL:url];
+    }
+}
+
+
+#pragma mark - Logging Helpers
+
+- (void) logMessage:(NSString *) message {
+    NSLog(@"InAppReviewPlugin: %@", message);
+}
+
+- (void) logMessage:(NSString *) message
+            details:(NSString *) details {
+    NSLog(@"InAppReviewPlugin: %@ %@", message, details);
+}
+
+@end

components/in_app_review/ios/in_app_review.podspec

@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint in_app_review.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'in_app_review'
+  s.version          = '0.2.0'
+  s.summary          = 'Flutter plugin for showing the In-App Review/System Rating pop up.'
+  s.description      = <<-DESC
+  Flutter plugin for showing the In-App Review/System Rating pop up..
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Britannio Jarrett' => 'britanniojarrett@gmail.com' }
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.dependency 'Flutter'
+  s.platform = :ios, '9.0'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+end

components/in_app_review/lib/in_app_review.dart

@@ -0,0 +1,50 @@
+import 'dart:async';
+
+import 'package:in_app_review_platform_interface/in_app_review_platform_interface.dart';
+
+class InAppReview {
+  InAppReview._();
+
+  static final InAppReview instance = InAppReview._();
+
+  /// Checks if the device is able to show a review dialog.
+  ///
+  /// On Android the Google Play Store must be installed and the device must be
+  /// running **Android 5 Lollipop(API 21)** or higher.
+  ///
+  /// iOS devices must be running **iOS version 10.3** or higher.
+  ///
+  /// MacOS devices must be running **MacOS version 10.14** or higher
+  Future<bool> isAvailable() => InAppReviewPlatform.instance.isAvailable();
+
+  /// Attempts to show the review dialog. It's recommended to first check if
+  /// the device supports this feature via [isAvailable].
+  ///
+  /// To improve the users experience, iOS and Android enforce limitations
+  /// that might prevent this from working after a few tries. iOS & MacOS users
+  /// can also disable this feature entirely in the App Store settings.
+  ///
+  /// More info and guidance:
+  /// https://developer.android.com/guide/playcore/in-app-review#when-to-request
+  /// https://developer.apple.com/design/human-interface-guidelines/ios/system-capabilities/ratings-and-reviews/
+  /// https://developer.apple.com/design/human-interface-guidelines/macos/system-capabilities/ratings-and-reviews/
+  Future<void> requestReview() => InAppReviewPlatform.instance.requestReview();
+
+  /// Opens the Play Store on Android, the App Store with a review
+  /// screen on iOS & MacOS and the Microsoft Store on Windows.
+  ///
+  /// [appStoreId] is required for iOS & MacOS.
+  ///
+  /// [microsoftStoreId] is required for Windows.
+  Future<void> openStoreListing({
+    /// Required for iOS & MacOS.
+    String? appStoreId,
+
+    /// Required for Windows.
+    String? microsoftStoreId,
+  }) =>
+      InAppReviewPlatform.instance.openStoreListing(
+        appStoreId: appStoreId,
+        microsoftStoreId: microsoftStoreId,
+      );
+}

components/in_app_review/macos/Classes/InAppReviewPlugin.swift

@@ -0,0 +1,42 @@
+import Cocoa
+import FlutterMacOS
+import StoreKit
+
+public class InAppReviewPlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    let channel = FlutterMethodChannel(name: "dev.britannio.in_app_review", binaryMessenger: registrar.messenger)
+    let instance = InAppReviewPlugin()
+    registrar.addMethodCallDelegate(instance, channel: channel)
+  }
+
+  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+    switch call.method {
+    case "requestReview":
+      //App Store Review
+      if #available(OSX 10.14, *) {
+        SKStoreReviewController.requestReview()
+        result(nil)
+      } else {
+        result(FlutterError(code: "unavailable", message: "In-App Review unavailable", details: nil))
+      }
+    case "isAvailable":
+      if #available(OSX 10.14, *) {
+        result(true)
+      } else {
+        result(false)
+      }
+    case "openStoreListing":
+        let storeId : String = call.arguments as! String;
+        
+        guard let writeReviewURL = URL(string: "macappstore://apps.apple.com/app/id" + storeId + "?action=write-review")
+        else {
+            result(FlutterError(code: "url_construct_fail", message: "Failed to construct url", details: nil))
+            return
+        }
+        NSWorkspace.shared.open(writeReviewURL)
+        result(nil);
+    default:
+      result(FlutterMethodNotImplemented)
+    }
+  }
+}

components/in_app_review/macos/in_app_review.podspec

@@ -0,0 +1,22 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint in_app_review.podspec' to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'in_app_review'
+  s.version          = '0.2.0'
+  s.summary          = 'Flutter plugin for showing the In-App Review/System Rating pop up.'
+  s.description      = <<-DESC
+  Flutter plugin for showing the In-App Review/System Rating pop up.
+                       DESC
+  s.homepage         = 'https://github.com/britannio/in_app_review'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Britannio Jarrett' => 'britanniojarrett@gmail.com' }
+  s.source           = { :path => '.' }
+  s.source_files     = 'Classes/**/*'
+  s.dependency 'FlutterMacOS'
+
+  s.platform = :osx, '10.11'
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  s.swift_version = '5.0'
+end

components/in_app_review/pubspec.yaml

@@ -0,0 +1,46 @@
+name: in_app_review
+description: Flutter plugin for showing the In-App Review/System Rating pop up on Android, iOS and MacOS. It makes it easy for users to rate your app.
+version: 2.0.6
+homepage: https://github.com/britannio/in_app_review/tree/master/in_app_review
+
+environment:
+  sdk: '>=2.12.0 <3.0.0'
+  flutter: ">=2.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  
+  in_app_review_platform_interface: ^2.0.4
+  
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  mockito: ^5.0.0
+  plugin_platform_interface: ^2.0.0
+
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec
+
+# The following section is specific to Flutter packages.
+flutter:
+  # This section identifies this Flutter project as a plugin project.
+  # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.)
+  # which should be registered in the plugin registry. This is required for
+  # using method channels.
+  # The Android 'package' specifies package in which the registered class is.
+  # This is required for using method channels on Android.
+  # The 'ffiPlugin' specifies that native code should be built and bundled.
+  # This is required for using `dart:ffi`.
+  # All these are used by the tooling to maintain consistency when
+  # adding or updating assets for this project.
+  plugin:
+    platforms:
+      android:
+        package: dev.britannio.in_app_review
+        pluginClass: InAppReviewPlugin
+      ios:
+        pluginClass: InAppReviewPlugin
+      macos:
+        pluginClass: InAppReviewPlugin

components/in_app_review/test/in_app_review_test.dart

@@ -0,0 +1,108 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:in_app_review/in_app_review.dart';
+import 'package:in_app_review_platform_interface/in_app_review_platform_interface.dart';
+import 'package:mockito/mockito.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  final inAppReview = InAppReview.instance;
+  late MockInAppReviewPlatform platform;
+
+  setUp(() {
+    platform = MockInAppReviewPlatform();
+    InAppReviewPlatform.instance = platform;
+  });
+
+  tearDown(() {
+    verifyNoMoreInteractions(platform);
+  });
+
+  group('isAvailable', () {
+    test(
+      'should call InAppReviewPlatform.isAvailable()',
+      () async {
+        // ARRANGE
+        when(platform.isAvailable()).thenAnswer((_) async => true);
+
+        // ACT
+        final result = await inAppReview.isAvailable();
+
+        // ASSERT
+        verify(platform.isAvailable());
+        expect(result, isTrue);
+      },
+    );
+  });
+  group('requestReview', () {
+    test(
+      'should call InAppReviewPlatform.requestReview()',
+      () async {
+        // ARRANGE
+        when(platform.requestReview()).thenAnswer((_) async {});
+
+        // ACT
+        await inAppReview.requestReview();
+
+        // ASSERT
+        verify(platform.requestReview());
+      },
+    );
+  });
+  group('openStoreListing', () {
+    test(
+      'should call InAppReviewPlatform.openStoreListing()',
+      () async {
+        // ARRANGE
+        const appStoreId = 'app_store_id';
+        const microsoftStoreId = 'microsoft_store_id';
+        when(platform.openStoreListing(
+          appStoreId: appStoreId,
+          microsoftStoreId: microsoftStoreId,
+        )).thenAnswer((_) async {});
+
+        // ACT
+        await inAppReview.openStoreListing(
+          appStoreId: appStoreId,
+          microsoftStoreId: microsoftStoreId,
+        );
+
+        // ASSERT
+        verify(platform.openStoreListing(
+          appStoreId: appStoreId,
+          microsoftStoreId: microsoftStoreId,
+        ));
+      },
+    );
+  });
+}
+
+class MockInAppReviewPlatform extends Mock
+    with MockPlatformInterfaceMixin
+    implements InAppReviewPlatform {
+  @override
+  Future<bool> isAvailable() => super.noSuchMethod(
+        Invocation.method(#isAvailable, null),
+        returnValue: Future.value(true),
+      );
+
+  @override
+  Future<void> requestReview() => super.noSuchMethod(
+        Invocation.method(#requestReview, null),
+        returnValue: Future<void>.value(),
+      );
+
+  @override
+  Future<void> openStoreListing({
+    String? appStoreId,
+    String? microsoftStoreId,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #openStoreListing,
+          null,
+          {#appStoreId: appStoreId, #microsoftStoreId: microsoftStoreId},
+        ),
+        returnValue: Future<void>.value(),
+      );
+}

components/in_app_review_platform_interface/.gitignore

@@ -0,0 +1,12 @@
+.DS_Store
+.dart_tool/
+
+.packages
+.pub/
+
+build/
+
+
+pubspec.lock
+.flutter-plugins
+.flutter-plugins-dependencies

components/in_app_review_platform_interface/CHANGELOG.md

@@ -0,0 +1,46 @@
+# [2.0.4]
+
+- Update usage of `pkg:url_launcher` to address deprecations.
+
+# [2.0.3]
+
+- `isAvailable()` now returns `false` on web.
+
+# [2.0.2]
+
+- Bump the minimum Flutter version to `2.0.0`.
+
+# [2.0.1]
+
+- Bump the minimum Dart SDK version from `2.12.0-0` to `2.12.0`.
+
+# [2.0.0]
+
+- Migrate to null safety.
+
+# [1.0.5]
+
+- Remove dependency on `package_info`.
+- Handle `openStoreListing()` with native code for Android, iOS and MacOS.
+
+# [1.0.4]
+
+- Lower dependency version constraints
+
+# [1.0.3]
+
+- Open the App Store directly instead of via the Safari View Controller.
+- Add automated tests.
+
+# [1.0.2]
+
+- Rename `openStoreListing(windowsStoreId: '')` to `openStoreListing(microsoftStoreId: '')`.
+- Update dependencies.
+
+# [1.0.1]
+
+- Remove unnecessary files.
+
+# [1.0.0]
+
+- Initial release.

components/in_app_review_platform_interface/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Britannio Jarrett
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

components/in_app_review_platform_interface/README.md

@@ -0,0 +1,26 @@
+# in_app_review_platform_interface
+
+A common platform interface for the [`in_app_review`][1] plugin.
+
+This interface allows platform-specific implementations of the `in_app_review`
+plugin, as well as the plugin itself, to ensure they are supporting the
+same interface.
+
+# Usage
+
+To implement a new platform-specific implementation of `in_app_review`, extend
+[`InAppReviewPlatform`][2] with an implementation that performs the
+platform-specific behavior, and when you register your plugin, set the default
+`InAppReviewPlatform` by calling
+`InAppReviewPlatform.instance = MyInAppReview()`.
+
+# Note on breaking changes
+
+Strongly prefer non-breaking changes (such as adding a method to the interface)
+over breaking changes for this package.
+
+See https://flutter.dev/go/platform-interface-breaking-changes for a discussion
+on why a less-clean interface is preferable to a breaking change.
+
+[1]: ../in_app_review
+[2]: lib/in_app_review_platform_interface.dart

components/in_app_review_platform_interface/lib/in_app_review_platform_interface.dart

@@ -0,0 +1,71 @@
+import 'package:in_app_review_platform_interface/method_channel_in_app_review.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+/// The interface that implementations of in_app_review must implement.
+///
+/// Platform implementations should extend this class rather than implement it
+/// as `in_app_review` does not consider newly added methods to be breaking
+/// changes. Extending this class (using `extends`) ensures that the subclass
+/// will get the default implementation, while platform implementations that
+/// `implements` this interface will be broken by newly added
+/// [InAppReviewPlatform] methods.
+abstract class InAppReviewPlatform extends PlatformInterface {
+  InAppReviewPlatform() : super(token: _token);
+
+  static InAppReviewPlatform _instance = MethodChannelInAppReview();
+
+  static final Object _token = Object();
+
+  static InAppReviewPlatform get instance => _instance;
+
+  /// Platform-specific plugins should set this with their own platform-specific
+  /// class that extends [InAppReviewPlatform] when they register themselves.
+  static set instance(InAppReviewPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  /// Checks if the device is able to show a review dialog.
+  ///
+  /// On Android the Google Play Store must be installed and the device must be
+  /// running **Android 5 Lollipop(API 21)** or higher.
+  ///
+  /// iOS devices must be running **iOS version 10.3** or higher.
+  ///
+  /// MacOS devices must be running **MacOS version 10.14** or higher
+  Future<bool> isAvailable() {
+    throw UnimplementedError('isAvailable() has not been implemented.');
+  }
+
+  /// Attempts to show the review dialog. It's recommended to first check if
+  /// this cannot be done via [isAvailable]. If it is not available then
+  /// you can open the store listing via [openStoreListing].
+  ///
+  /// To improve the users experience, iOS and Android enforce limitations
+  /// that might prevent this from working after a few tries. iOS & MacOS users
+  /// can also disable this feature entirely in the App Store settings.
+  ///
+  /// More info and guidance:
+  /// https://developer.android.com/guide/playcore/in-app-review#when-to-request
+  /// https://developer.apple.com/design/human-interface-guidelines/ios/system-capabilities/ratings-and-reviews/
+  /// https://developer.apple.com/design/human-interface-guidelines/macos/system-capabilities/ratings-and-reviews/
+  Future<void> requestReview() {
+    throw UnimplementedError('requestReview() has not been implemented.');
+  }
+
+  /// Opens the Play Store on Android, the App Store with a review
+  /// screen on iOS & MacOS and the Microsoft Store on Windows.
+  ///
+  /// [appStoreId] is required for iOS & MacOS.
+  ///
+  /// [microsoftStoreId] is required for Windows.
+  Future<void> openStoreListing({
+    /// Required for iOS & MacOS.
+    String? appStoreId,
+
+    /// Required for Windows.
+    String? microsoftStoreId,
+  }) {
+    throw UnimplementedError('openStoreListing() has not been implemented.');
+  }
+}

components/in_app_review_platform_interface/lib/method_channel_in_app_review.dart

@@ -0,0 +1,65 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:platform/platform.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+import 'in_app_review_platform_interface.dart';
+
+/// An implementation of [InAppReviewPlatform] that uses method channels.
+class MethodChannelInAppReview extends InAppReviewPlatform {
+  MethodChannel _channel = MethodChannel('dev.britannio.in_app_review');
+  Platform _platform = const LocalPlatform();
+
+  @visibleForTesting
+  set channel(MethodChannel channel) => _channel = channel;
+
+  @visibleForTesting
+  set platform(Platform platform) => _platform = platform;
+
+  @override
+  Future<bool> isAvailable() async {
+    if (kIsWeb) return false;
+    return _channel
+        .invokeMethod<bool>('isAvailable')
+        .then((bool? available) => available ?? false, onError: (_) => false);
+  }
+
+  @override
+  Future<void> requestReview() => _channel.invokeMethod('requestReview');
+
+  @override
+  Future<void> openStoreListing({
+    String? appStoreId,
+    String? microsoftStoreId,
+  }) async {
+    final bool isiOS = _platform.isIOS;
+    final bool isMacOS = _platform.isMacOS;
+    final bool isAndroid = _platform.isAndroid;
+    final bool isWindows = _platform.isWindows;
+
+    if (isiOS || isMacOS) {
+      await _channel.invokeMethod(
+        'openStoreListing',
+        ArgumentError.checkNotNull(appStoreId, 'appStoreId'),
+      );
+    } else if (isAndroid) {
+      await _channel.invokeMethod('openStoreListing');
+    } else if (isWindows) {
+      ArgumentError.checkNotNull(microsoftStoreId, 'microsoftStoreId');
+      await _launchUrl(
+        'ms-windows-store://review/?ProductId=$microsoftStoreId',
+      );
+    } else {
+      throw UnsupportedError(
+        'Platform(${_platform.operatingSystem}) not supported',
+      );
+    }
+  }
+
+  Future<void> _launchUrl(String url) async {
+    if (!await canLaunchUrlString(url)) return;
+    await launchUrlString(url, mode: LaunchMode.externalNonBrowserApplication);
+  }
+}

components/in_app_review_platform_interface/pubspec.yaml

@@ -0,0 +1,24 @@
+name: in_app_review_platform_interface
+description: A common platform interface for the in_app_review plugin.
+# NOTE: We strongly prefer non-breaking changes, even at the expense of a
+# less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
+version: 2.0.4
+homepage: https://github.com/britannio/in_app_review/tree/master/in_app_review_platform_interface
+
+environment:
+  sdk: '>=2.12.0 <3.0.0'
+  flutter: ">=2.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+  url_launcher: ^6.1.0
+  plugin_platform_interface: ^2.0.0
+  platform: ^3.0.0
+
+  
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+    

components/in_app_review_platform_interface/test/method_channel_in_app_review_test.dart

@@ -0,0 +1,136 @@
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:in_app_review_platform_interface/method_channel_in_app_review.dart';
+import 'package:platform/platform.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  late MethodChannelInAppReview methodChannelInAppReview;
+  late List<MethodCall> log = <MethodCall>[];
+  const MethodChannel channel = MethodChannel('dev.britannio.in_app_review');
+
+  setUp(() {
+    methodChannelInAppReview = MethodChannelInAppReview();
+    methodChannelInAppReview.channel = channel;
+    log = <MethodCall>[];
+  });
+
+  tearDown(() {
+    log.clear();
+  });
+
+  channel.setMockMethodCallHandler((MethodCall call) async {
+    log.add(call);
+
+    switch (call.method) {
+      case 'isAvailable':
+        return true;
+      case 'requestReview':
+      case 'openStoreListing':
+        return null;
+      default:
+        assert(false);
+        return null;
+    }
+  });
+
+  group('isAvailable', () {
+    test(
+      'should invoke the isAvailable method channel',
+      () async {
+        // ACT
+        final bool result = await methodChannelInAppReview.isAvailable();
+
+        // ASSERT
+        expect(log, <Matcher>[isMethodCall('isAvailable', arguments: null)]);
+        expect(result, isTrue);
+      },
+    );
+  });
+
+  group('requestReview', () {
+    test(
+      'should invoke the requestReview method channel',
+      () async {
+        // ACT
+        await methodChannelInAppReview.requestReview();
+
+        // ASSERT
+        expect(log, <Matcher>[isMethodCall('requestReview', arguments: null)]);
+      },
+    );
+  });
+
+  group('openStoreListing', () {
+    test(
+      'should invoke the openStoreListing method channel on Android',
+      () async {
+        // ARRANGE
+        methodChannelInAppReview.platform =
+            FakePlatform(operatingSystem: 'android');
+
+        // ACT
+        await methodChannelInAppReview.openStoreListing();
+
+        // ASSERT
+        expect(
+          log,
+          <Matcher>[isMethodCall('openStoreListing', arguments: null)],
+        );
+      },
+    );
+    test(
+      'should invoke the openStoreListing method channel on iOS',
+      () async {
+        // ARRANGE
+        methodChannelInAppReview.platform =
+            FakePlatform(operatingSystem: 'ios');
+        final String appStoreId = "store_id";
+
+        // ACT
+        await methodChannelInAppReview.openStoreListing(appStoreId: appStoreId);
+
+        // ASSERT
+        expect(log,
+            <Matcher>[isMethodCall('openStoreListing', arguments: appStoreId)]);
+      },
+    );
+    test(
+      'should invoke the openStoreListing method channel on MacOS',
+      () async {
+        // ARRANGE
+        methodChannelInAppReview.platform =
+            FakePlatform(operatingSystem: 'macos');
+        final String appStoreId = "store_id";
+
+        // ACT
+        await methodChannelInAppReview.openStoreListing(appStoreId: appStoreId);
+
+        // ASSERT
+        expect(log,
+            <Matcher>[isMethodCall('openStoreListing', arguments: appStoreId)]);
+      },
+    );
+    test(
+      'should invoke the openStoreListing method channel on Windows',
+      () async {
+        // ARRANGE
+        methodChannelInAppReview.platform =
+            FakePlatform(operatingSystem: 'windows');
+        final String microsoftStoreId = 'store_id';
+
+        // ACT
+        await methodChannelInAppReview.openStoreListing(
+          microsoftStoreId: microsoftStoreId,
+        );
+
+        // ASSERT
+        expect(log, <Matcher>[
+          isMethodCall('openStoreListing', arguments: microsoftStoreId)
+        ]);
+      },
+      skip:
+          'The windows uwp implementation still uses the url_launcher package',
+    );
+  });
+}

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

@@ -0,0 +1 @@
+- Navigation shortcuts.

ios/Podfile.lock

@@ -2,6 +2,8 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
+  - device_info_plus (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_email_sender (0.0.1):
     - Flutter
@@ -21,6 +23,8 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
+  - in_app_review (0.2.0):
+    - Flutter
   - integration_test (0.0.1):
     - Flutter
   - OrderedSet (5.0.0)
@@ -53,12 +57,14 @@ PODS:
 
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_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`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
@@ -81,6 +87,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
   flutter_email_sender:
@@ -93,6 +101,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   flutter_siri_suggestions:
     :path: ".symlinks/plugins/flutter_siri_suggestions/ios"
+  in_app_review:
+    :path: ".symlinks/plugins/in_app_review/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
   package_info_plus:
@@ -120,6 +130,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
@@ -127,6 +138,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
   integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e

lib/blocs/auth/auth_bloc.dart

@@ -41,7 +41,12 @@ 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.fetchUser(id: username!);
+        User? user = await _storiesRepository.fetchUser(id: username!);
+
+        /// According to Hacker News' API documentation,
+        /// if user has no public activity (posting a comment or story),
+        /// then it will not be available from the API.
+        user ??= User.emptyWithId(username);
 
         emit(
           state.copyWith(
@@ -84,10 +89,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     );
 
     if (successful) {
-      final User user = await _storiesRepository.fetchUser(id: event.username);
+      final User? user = await _storiesRepository.fetchUser(id: event.username);
       emit(
         state.copyWith(
-          user: user,
+          user: user ?? User.emptyWithId(event.username),
           isLoggedIn: true,
           status: AuthStatus.loaded,
         ),

lib/blocs/stories/stories_bloc.dart

@@ -17,11 +17,13 @@ part 'stories_state.dart';
 class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   StoriesBloc({
     required PreferenceCubit preferenceCubit,
+    required FilterCubit filterCubit,
     OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     PreferenceRepository? preferenceRepository,
     Logger? logger,
   })  : _preferenceCubit = preferenceCubit,
+        _filterCubit = filterCubit,
         _offlineRepository =
             offlineRepository ?? locator.get<OfflineRepository>(),
         _storiesRepository =
@@ -45,6 +47,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   }
 
   final PreferenceCubit _preferenceCubit;
+  final FilterCubit _filterCubit;
   final OfflineRepository _offlineRepository;
   final StoriesRepository _storiesRepository;
   final PreferenceRepository _preferenceRepository;
@@ -74,7 +77,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     final int pageSize = getPageSize(isComplexTile: isComplexTile);
     emit(
       const StoriesState.init().copyWith(
-        offlineReading: hasCachedStories &&
+        isOfflineReading: hasCachedStories &&
             // Only go into offline mode in the next session.
             state.downloadStatus == StoriesDownloadStatus.initial,
         currentPageSize: pageSize,
@@ -92,7 +95,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     required StoryType type,
     required Emitter<StoriesState> emit,
   }) async {
-    if (state.offlineReading) {
+    if (state.isOfflineReading) {
       final List<int> ids =
           await _offlineRepository.getCachedStoryIds(type: type);
       emit(
@@ -137,7 +140,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       ),
     );
 
-    if (state.offlineReading) {
+    if (state.isOfflineReading) {
       emit(
         state.copyWithStatusUpdated(
           type: event.type,
@@ -172,7 +175,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         upper = len;
       }
 
-      if (state.offlineReading) {
+      if (state.isOfflineReading) {
         _offlineRepository
             .getCachedStoriesStream(
           ids: state.storyIdsByType[event.type]!.sublist(
@@ -224,10 +227,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     Emitter<StoriesState> emit,
   ) async {
     final bool hasRead = await _preferenceRepository.hasRead(event.story.id);
+    final bool hidden = _filterCubit.state.keywords.any(
+      (String keyword) =>
+          event.story.title.toLowerCase().contains(keyword) ||
+          event.story.text.toLowerCase().contains(keyword),
+    );
     emit(
       state.copyWithStoryAdded(
         type: event.type,
-        story: event.story,
+        story: event.story.copyWith(hidden: hidden),
         hasRead: hasRead,
       ),
     );
@@ -440,7 +448,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     await _offlineRepository.deleteAllStories();
     await _offlineRepository.deleteAllComments();
     await _offlineRepository.deleteAllWebPages();
-    emit(state.copyWith(offlineReading: false));
+    emit(state.copyWith(isOfflineReading: false));
     add(StoriesInitialize());
   }
 

lib/blocs/stories/stories_state.dart

@@ -21,7 +21,7 @@ class StoriesState extends Equatable {
     required this.statusByType,
     required this.currentPageByType,
     required this.readStoriesIds,
-    required this.offlineReading,
+    required this.isOfflineReading,
     required this.downloadStatus,
     required this.currentPageSize,
     required this.storiesDownloaded,
@@ -57,7 +57,7 @@ class StoriesState extends Equatable {
       StoryType.ask: 0,
       StoryType.show: 0,
     },
-  })  : offlineReading = false,
+  })  : isOfflineReading = false,
         downloadStatus = StoriesDownloadStatus.initial,
         currentPageSize = 0,
         readStoriesIds = const <int>{},
@@ -70,7 +70,7 @@ class StoriesState extends Equatable {
   final Map<StoryType, int> currentPageByType;
   final Set<int> readStoriesIds;
   final StoriesDownloadStatus downloadStatus;
-  final bool offlineReading;
+  final bool isOfflineReading;
   final int currentPageSize;
   final int storiesDownloaded;
   final int storiesToBeDownloaded;
@@ -82,7 +82,7 @@ class StoriesState extends Equatable {
     Map<StoryType, int>? currentPageByType,
     Set<int>? readStoriesIds,
     StoriesDownloadStatus? downloadStatus,
-    bool? offlineReading,
+    bool? isOfflineReading,
     int? currentPageSize,
     int? storiesDownloaded,
     int? storiesToBeDownloaded,
@@ -93,7 +93,7 @@ class StoriesState extends Equatable {
       statusByType: statusByType ?? this.statusByType,
       currentPageByType: currentPageByType ?? this.currentPageByType,
       readStoriesIds: readStoriesIds ?? this.readStoriesIds,
-      offlineReading: offlineReading ?? this.offlineReading,
+      isOfflineReading: isOfflineReading ?? this.isOfflineReading,
       downloadStatus: downloadStatus ?? this.downloadStatus,
       currentPageSize: currentPageSize ?? this.currentPageSize,
       storiesDownloaded: storiesDownloaded ?? this.storiesDownloaded,
@@ -183,7 +183,7 @@ class StoriesState extends Equatable {
         statusByType,
         currentPageByType,
         readStoriesIds,
-        offlineReading,
+        isOfflineReading,
         downloadStatus,
         currentPageSize,
         storiesDownloaded,

lib/config/constants.dart

@@ -7,7 +7,7 @@ abstract class Constants {
       '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';
+  static const String portfolioLink = 'https://github.com/Livinglist';
   static const String githubLink = 'https://github.com/Livinglist/Hacki';
   static const String appStoreLink =
       'https://apps.apple.com/us/app/hacki/id1602043763?action=write-review';
@@ -39,6 +39,8 @@ abstract class Constants {
   static const String featureOpenStoryInWebView = 'open_story_in_web_view';
   static const String featureLogIn = 'log_in';
   static const String featurePinToTop = 'pin_to_top';
+  static const String featureJumpUpButton = 'jump_up_button';
+  static const String featureJumpDownButton = 'jump_down_button';
 
   static final String happyFace = <String>[
     '(๑•̀ㅂ•́)و✧',

lib/config/locator.dart

@@ -32,7 +32,8 @@ Future<void> setUpLocator() async {
     ..registerSingleton<OfflineRepository>(OfflineRepository())
     ..registerSingleton<DraftCache>(DraftCache())
     ..registerSingleton<CommentCache>(CommentCache())
-    ..registerSingleton<LocalNotification>(LocalNotification())
+    ..registerSingleton<LocalNotificationService>(LocalNotificationService())
+    ..registerSingleton(AppReviewService())
     ..registerSingleton<RouteObserver<ModalRoute<dynamic>>>(
       RouteObserver<ModalRoute<dynamic>>(),
     );

lib/cubits/collapse/collapse_cubit.dart

@@ -3,7 +3,6 @@ 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';
@@ -11,16 +10,13 @@ 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() {
@@ -47,16 +43,7 @@ class CollapseCubit extends Cubit<CollapseState> {
         ),
       );
     } else {
-      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(

lib/cubits/comments/comments_cubit.dart

@@ -1,36 +1,40 @@
 import 'dart:async';
+import 'dart:math';
 
 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:hacki/config/locator.dart';
+import 'package:hacki/cubits/cubits.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:hacki/utils/utils.dart';
 import 'package:linkify/linkify.dart';
 import 'package:logger/logger.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 part 'comments_state.dart';
 
 class CommentsCubit extends Cubit<CommentsState> {
   CommentsCubit({
+    required FilterCubit filterCubit,
     required CollapseCache collapseCache,
     CommentCache? commentCache,
     OfflineRepository? offlineRepository,
     StoriesRepository? storiesRepository,
     SembastRepository? sembastRepository,
     Logger? logger,
-    required bool offlineReading,
+    required bool isOfflineReading,
     required Item item,
     required FetchMode defaultFetchMode,
     required CommentsOrder defaultCommentsOrder,
-  })  : _collapseCache = collapseCache,
+  })  : _filterCubit = filterCubit,
+        _collapseCache = collapseCache,
         _commentCache = commentCache ?? locator.get<CommentCache>(),
         _offlineRepository =
             offlineRepository ?? locator.get<OfflineRepository>(),
@@ -41,13 +45,14 @@ class CommentsCubit extends Cubit<CommentsState> {
         _logger = logger ?? locator.get<Logger>(),
         super(
           CommentsState.init(
-            offlineReading: offlineReading,
+            isOfflineReading: isOfflineReading,
             item: item,
             fetchMode: defaultFetchMode,
             order: defaultCommentsOrder,
           ),
         );
 
+  final FilterCubit _filterCubit;
   final CollapseCache _collapseCache;
   final CommentCache _commentCache;
   final OfflineRepository _offlineRepository;
@@ -64,8 +69,6 @@ class CommentsCubit extends Cubit<CommentsState> {
   final Map<int, StreamSubscription<Comment>> _streamSubscriptions =
       <int, StreamSubscription<Comment>>{};
 
-  static const int _pageSize = 20;
-
   @override
   void emit(CommentsState state) {
     if (!isClosed) {
@@ -109,17 +112,17 @@ class CommentsCubit extends Cubit<CommentsState> {
     );
 
     final Item item = state.item;
-    final Item updatedItem = state.offlineReading
+    final Item updatedItem = state.isOfflineReading
         ? item
         : await _storiesRepository.fetchItem(id: item.id).then(_toBuildable) ??
             item;
-    final List<int> kids = sortKids(updatedItem.kids);
+    final List<int> kids = _sortKids(updatedItem.kids);
 
     emit(state.copyWith(item: updatedItem));
 
     late final Stream<Comment> commentStream;
 
-    if (state.offlineReading) {
+    if (state.isOfflineReading) {
       commentStream = _offlineRepository.getCachedCommentsStream(ids: kids);
     } else {
       switch (state.fetchMode) {
@@ -152,7 +155,7 @@ class CommentsCubit extends Cubit<CommentsState> {
       ),
     );
 
-    if (state.offlineReading) {
+    if (state.isOfflineReading) {
       emit(
         state.copyWith(
           status: CommentsStatus.allLoaded,
@@ -179,7 +182,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     final Item item = state.item;
     final Item updatedItem =
         await _storiesRepository.fetchItem(id: item.id) ?? item;
-    final List<int> kids = sortKids(updatedItem.kids);
+    final List<int> kids = _sortKids(updatedItem.kids);
 
     late final Stream<Comment> commentStream;
     if (state.fetchMode == FetchMode.lazy) {
@@ -206,7 +209,7 @@ class CommentsCubit extends Cubit<CommentsState> {
   }
 
   void loadAll(Story story) {
-    HapticFeedback.lightImpact();
+    HapticFeedbackUtil.light();
     emit(
       state.copyWith(
         onlyShowTargetComment: false,
@@ -217,7 +220,11 @@ class CommentsCubit extends Cubit<CommentsState> {
   }
 
   /// [comment] is only used for lazy fetching.
-  void loadMore({Comment? comment}) {
+  void loadMore({
+    Comment? comment,
+    void Function(Comment)? onCommentFetched,
+    VoidCallback? onDone,
+  }) {
     if (comment == null && state.status == CommentsStatus.loading) return;
 
     switch (state.fetchMode) {
@@ -265,18 +272,19 @@ class CommentsCubit extends Cubit<CommentsState> {
       case FetchMode.eager:
         if (_streamSubscription != null) {
           emit(state.copyWith(status: CommentsStatus.loading));
-          _streamSubscription?.resume();
+          _streamSubscription
+            ?..resume()
+            ..onData(onCommentFetched);
         }
         break;
     }
   }
 
   Future<void> loadParentThread() async {
-    unawaited(HapticFeedback.lightImpact());
+    HapticFeedbackUtil.light();
     emit(state.copyWith(fetchParentStatus: CommentsStatus.loading));
-    final Story? parent = await _storiesRepository
-        .fetchParentStory(id: state.item.id)
-        .then(_toBuildableStory);
+    final Item? parent =
+        await _storiesRepository.fetchItem(id: state.item.parent);
 
     if (parent == null) {
       return;
@@ -294,10 +302,33 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
+  Future<void> loadRootThread() async {
+    HapticFeedbackUtil.light();
+    emit(state.copyWith(fetchRootStatus: CommentsStatus.loading));
+    final Story? parent = await _storiesRepository
+        .fetchParentStory(id: state.item.id)
+        .then(_toBuildableStory);
+
+    if (parent == null) {
+      return;
+    } else {
+      await HackiApp.navigatorKey.currentState?.pushNamed(
+        ItemScreen.routeName,
+        arguments: ItemScreenArgs(item: parent),
+      );
+
+      emit(
+        state.copyWith(
+          fetchRootStatus: CommentsStatus.loaded,
+        ),
+      );
+    }
+  }
+
   void onOrderChanged(CommentsOrder? order) {
     if (order == null) return;
     if (state.order == order) return;
-    HapticFeedback.selectionClick();
+    HapticFeedbackUtil.selection();
     _streamSubscription?.cancel();
     for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
       s.cancel();
@@ -311,7 +342,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     if (fetchMode == null) return;
     if (state.fetchMode == fetchMode) return;
     _collapseCache.resetCollapsedComments();
-    HapticFeedback.selectionClick();
+    HapticFeedbackUtil.selection();
     _streamSubscription?.cancel();
     for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
       s.cancel();
@@ -321,7 +352,82 @@ class CommentsCubit extends Cubit<CommentsState> {
     init(useCommentCache: true);
   }
 
-  List<int> sortKids(List<int> kids) {
+  void jump(
+    ItemScrollController itemScrollController,
+    ItemPositionsListener itemPositionsListener,
+  ) {
+    final int totalComments = state.comments.length;
+    final List<Comment> onScreenComments = itemPositionsListener
+        .itemPositions.value
+        // The header is also a part of the list view,
+        // thus ignoring it here.
+        .where((ItemPosition e) => e.index >= 1 && e.itemLeadingEdge < 0.7)
+        .sorted((ItemPosition a, ItemPosition b) => a.index.compareTo(b.index))
+        .map(
+          (ItemPosition e) => e.index <= state.comments.length
+              ? state.comments.elementAt(e.index - 1)
+              : null,
+        )
+        .whereNotNull()
+        .toList();
+
+    /// The index of last comment visible on screen.
+    final int lastVisibleIndex = state.comments.indexOf(onScreenComments.last);
+    final int startIndex = min(lastVisibleIndex + 1, totalComments);
+
+    for (int i = startIndex; i < totalComments; i++) {
+      final Comment cmt = state.comments.elementAt(i);
+
+      if (cmt.isRoot && (cmt.deleted || cmt.dead) == false) {
+        itemScrollController.scrollTo(
+          index: i + 1,
+          alignment: 0.15,
+          duration: const Duration(milliseconds: 400),
+        );
+        return;
+      }
+    }
+  }
+
+  void jumpUp(
+    ItemScrollController itemScrollController,
+    ItemPositionsListener itemPositionsListener,
+  ) {
+    final List<Comment> onScreenComments = itemPositionsListener
+        .itemPositions.value
+        // The header is also a part of the list view,
+        // thus ignoring it here.
+        .where((ItemPosition e) => e.index >= 1 && e.itemLeadingEdge > 0)
+        .sorted((ItemPosition a, ItemPosition b) => a.index.compareTo(b.index))
+        .map(
+          (ItemPosition e) => e.index <= state.comments.length
+              ? state.comments.elementAt(e.index - 1)
+              : null,
+        )
+        .whereNotNull()
+        .toList();
+
+    /// The index of first comment visible on screen.
+    final int firstVisibleIndex = state.comments.indexOf(
+      onScreenComments.firstOrNull ?? state.comments.last,
+    );
+    final int startIndex = max(0, firstVisibleIndex - 1);
+
+    for (int i = startIndex; i >= 0; i--) {
+      final Comment cmt = state.comments.elementAt(i);
+
+      if (cmt.isRoot && (cmt.deleted || cmt.dead) == false) {
+        itemScrollController.scrollTo(
+          index: i + 1,
+          alignment: 0.15,
+          duration: const Duration(milliseconds: 400),
+        );
+        return;
+      }
+    }
+  }
+
+  List<int> _sortKids(List<int> kids) {
     switch (state.order) {
       case CommentsOrder.natural:
         return kids;
@@ -348,37 +454,15 @@ class CommentsCubit extends Cubit<CommentsState> {
       _commentCache.cacheComment(comment);
       _sembastRepository.cacheComment(comment);
 
+      final bool hidden = _filterCubit.state.keywords.any(
+        (String keyword) => comment.text.toLowerCase().contains(keyword),
+      );
       final List<Comment> updatedComments = <Comment>[
         ...state.comments,
-        comment
+        comment.copyWith(hidden: hidden),
       ];
 
       emit(state.copyWith(comments: updatedComments));
-
-      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();
-
-            emit(
-              state.copyWith(
-                status: CommentsStatus.loaded,
-              ),
-            );
-          }
-
-          emit(
-            state.copyWith(
-              currentPage: state.currentPage + 1,
-            ),
-          );
-        }
-      }
     }
   }
 

lib/cubits/comments/comments_state.dart

@@ -14,21 +14,23 @@ class CommentsState extends Equatable {
     required this.comments,
     required this.status,
     required this.fetchParentStatus,
+    required this.fetchRootStatus,
     required this.order,
     required this.fetchMode,
     required this.onlyShowTargetComment,
-    required this.offlineReading,
+    required this.isOfflineReading,
     required this.currentPage,
   });
 
   CommentsState.init({
-    required this.offlineReading,
+    required this.isOfflineReading,
     required this.item,
     required this.fetchMode,
     required this.order,
   })  : comments = <Comment>[],
         status = CommentsStatus.init,
         fetchParentStatus = CommentsStatus.init,
+        fetchRootStatus = CommentsStatus.init,
         onlyShowTargetComment = false,
         currentPage = 0;
 
@@ -36,10 +38,11 @@ class CommentsState extends Equatable {
   final List<Comment> comments;
   final CommentsStatus status;
   final CommentsStatus fetchParentStatus;
+  final CommentsStatus fetchRootStatus;
   final CommentsOrder order;
   final FetchMode fetchMode;
   final bool onlyShowTargetComment;
-  final bool offlineReading;
+  final bool isOfflineReading;
   final int currentPage;
 
   CommentsState copyWith({
@@ -47,22 +50,24 @@ class CommentsState extends Equatable {
     List<Comment>? comments,
     CommentsStatus? status,
     CommentsStatus? fetchParentStatus,
+    CommentsStatus? fetchRootStatus,
     CommentsOrder? order,
     FetchMode? fetchMode,
     bool? onlyShowTargetComment,
-    bool? offlineReading,
+    bool? isOfflineReading,
     int? currentPage,
   }) {
     return CommentsState(
       item: item ?? this.item,
       comments: comments ?? this.comments,
       fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
+      fetchRootStatus: fetchRootStatus ?? this.fetchRootStatus,
       status: status ?? this.status,
       order: order ?? this.order,
       fetchMode: fetchMode ?? this.fetchMode,
       onlyShowTargetComment:
           onlyShowTargetComment ?? this.onlyShowTargetComment,
-      offlineReading: offlineReading ?? this.offlineReading,
+      isOfflineReading: isOfflineReading ?? this.isOfflineReading,
       currentPage: currentPage ?? this.currentPage,
     );
   }
@@ -74,10 +79,11 @@ class CommentsState extends Equatable {
         item,
         status,
         fetchParentStatus,
+        fetchRootStatus,
         order,
         fetchMode,
         onlyShowTargetComment,
-        offlineReading,
+        isOfflineReading,
         currentPage,
         comments,
       ];

lib/cubits/cubits.dart

@@ -3,6 +3,7 @@ export 'collapse/collapse_cubit.dart';
 export 'comments/comments_cubit.dart';
 export 'edit/edit_cubit.dart';
 export 'fav/fav_cubit.dart';
+export 'filter/filter_cubit.dart';
 export 'history/history_cubit.dart';
 export 'notification/notification_cubit.dart';
 export 'pin/pin_cubit.dart';

lib/cubits/filter/filter_cubit.dart

@@ -0,0 +1,40 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:hacki/config/locator.dart';
+import 'package:hacki/repositories/repositories.dart';
+
+part 'filter_state.dart';
+
+class FilterCubit extends Cubit<FilterState> {
+  FilterCubit({PreferenceRepository? preferenceRepository})
+      : _preferenceRepository =
+            preferenceRepository ?? locator.get<PreferenceRepository>(),
+        super(FilterState.init()) {
+    init();
+  }
+
+  final PreferenceRepository _preferenceRepository;
+
+  void init() {
+    _preferenceRepository.filterKeywords.then(
+      (List<String> keywords) => emit(
+        state.copyWith(
+          keywords: keywords.toSet(),
+        ),
+      ),
+    );
+  }
+
+  void addKeyword(String keyword) {
+    final Set<String> updated = Set<String>.from(state.keywords)..add(keyword);
+    emit(state.copyWith(keywords: updated));
+    _preferenceRepository.updateFilterKeywords(updated.toList(growable: false));
+  }
+
+  void removeKeyword(String keyword) {
+    final Set<String> updated = Set<String>.from(state.keywords)
+      ..remove(keyword);
+    emit(state.copyWith(keywords: updated));
+    _preferenceRepository.updateFilterKeywords(updated.toList(growable: false));
+  }
+}

lib/cubits/filter/filter_state.dart

@@ -0,0 +1,20 @@
+part of 'filter_cubit.dart';
+
+class FilterState extends Equatable {
+  const FilterState({
+    required this.keywords,
+  });
+
+  FilterState.init() : keywords = <String>{};
+
+  final Set<String> keywords;
+
+  FilterState copyWith({Set<String>? keywords}) {
+    return FilterState(
+      keywords: keywords ?? this.keywords,
+    );
+  }
+
+  @override
+  List<Object?> get props => <Object?>[keywords];
+}

lib/cubits/preference/preference_state.dart

@@ -52,8 +52,6 @@ class PreferenceState extends Equatable {
 
   bool get complexStoryTileEnabled => _isOn<DisplayModePreference>();
 
-  bool get webFirstEnabled => _isOn<NavigationModePreference>();
-
   bool get eyeCandyEnabled => _isOn<EyeCandyModePreference>();
 
   bool get trueDarkEnabled => _isOn<TrueDarkModePreference>();

lib/cubits/user/user_cubit.dart

@@ -16,8 +16,13 @@ class UserCubit extends Cubit<UserState> {
 
   void init({required String userId}) {
     emit(state.copyWith(status: UserStatus.loading));
-    _storiesRepository.fetchUser(id: userId).then((User user) {
-      emit(state.copyWith(user: user, status: UserStatus.loaded));
+    _storiesRepository.fetchUser(id: userId).then((User? user) {
+      emit(
+        state.copyWith(
+          user: user ?? User.emptyWithId(userId),
+          status: UserStatus.loaded,
+        ),
+      );
     }).onError((_, __) {
       emit(state.copyWith(status: UserStatus.failure));
       return;

lib/extensions/context_extension.dart

@@ -30,7 +30,6 @@ extension ContextExtension on BuildContext {
                 textColor: Theme.of(this).textTheme.bodyLarge?.color,
               )
             : null,
-        behavior: SnackBarBehavior.floating,
       ),
     );
   }

lib/extensions/date_time_extension.dart

@@ -1,5 +1,5 @@
 extension DateTimeExtension on DateTime {
-  String toReadableString() {
+  String toTimeAgoString() {
     final DateTime now = DateTime.now();
     final Duration diff = now.difference(this);
     if (diff.inDays > 365) {

lib/extensions/object_extension.dart

@@ -2,7 +2,7 @@ import 'package:hacki/config/locator.dart';
 import 'package:logger/logger.dart';
 
 extension ObjectExtension on Object {
-  void log({String identifier = ''}) {
+  void log([String identifier = '']) {
     locator.get<Logger>().d('$identifier ${toString()}');
   }
 

lib/extensions/state_extension.dart

@@ -1,5 +1,4 @@
 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';
@@ -10,6 +9,7 @@ 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:hacki/utils/utils.dart';
 import 'package:share_plus/share_plus.dart';
 
 extension StateExtension on State {
@@ -46,7 +46,7 @@ extension StateExtension on State {
   }
 
   void onMoreTapped(Item item, Rect? rect) {
-    HapticFeedback.lightImpact();
+    HapticFeedbackUtil.light();
 
     if (item.dead || item.deleted) {
       return;
@@ -58,10 +58,12 @@ extension StateExtension on State {
       context: context,
       isScrollControlled: true,
       builder: (BuildContext context) {
-        return MorePopupMenu(
-          item: item,
-          isBlocked: isBlocked,
-          onLoginTapped: onLoginTapped,
+        return SafeArea(
+          child: MorePopupMenu(
+            item: item,
+            isBlocked: isBlocked,
+            onLoginTapped: onLoginTapped,
+          ),
         );
       },
     ).then((MenuAction? action) {
@@ -106,24 +108,26 @@ extension StateExtension on State {
       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}',
+          return SafeArea(
+            child: ColoredBox(
+              color: Theme.of(context).canvasColor,
+              child: Material(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    ListTile(
+                      onTap: () => Navigator.pop(context, item.url),
+                      title: const Text('Link to article'),
                     ),
-                    title: const Text('Link to HN'),
-                  ),
-                ],
+                    ListTile(
+                      onTap: () => Navigator.pop(
+                        context,
+                        'https://news.ycombinator.com/item?id=${item.id}',
+                      ),
+                      title: const Text('Link to HN'),
+                    ),
+                  ],
+                ),
               ),
             ),
           );

lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:equatable/equatable.dart';
 import 'package:feature_discovery/feature_discovery.dart';
 import 'package:flutter/foundation.dart';
@@ -17,9 +18,9 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 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:hacki/utils/theme_util.dart';
 import 'package:hive/hive.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:logger/logger.dart';
@@ -110,13 +111,19 @@ Future<void> main({bool testing = false}) async {
       },
     );
   } else if (Platform.isAndroid) {
-    SystemChrome.setSystemUIOverlayStyle(
-      const SystemUiOverlayStyle(
-        statusBarColor: Palette.transparent,
-        systemNavigationBarColor: Palette.transparent,
-        systemNavigationBarDividerColor: Palette.transparent,
-      ),
-    );
+    final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+    final AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
+    final int sdk = androidInfo.version.sdkInt;
+
+    if (sdk > 28) {
+      SystemChrome.setSystemUIOverlayStyle(
+        const SystemUiOverlayStyle(
+          statusBarColor: Palette.transparent,
+          systemNavigationBarColor: Palette.transparent,
+          systemNavigationBarDividerColor: Palette.transparent,
+        ),
+      );
+    }
 
     await SystemChrome.setEnabledSystemUIMode(
       SystemUiMode.edgeToEdge,
@@ -132,7 +139,8 @@ Future<void> main({bool testing = false}) async {
     prefs.getInt(FontPreference().key) ?? Font.roboto.index,
   );
 
-  Bloc.observer = CustomBlocObserver();
+  //Uncomment this line to log events from bloc/cubit.
+  //Bloc.observer = CustomBlocObserver();
 
   HydratedBloc.storage = storage;
 
@@ -168,9 +176,14 @@ class HackiApp extends StatelessWidget {
           lazy: false,
           create: (BuildContext context) => PreferenceCubit(),
         ),
+        BlocProvider<FilterCubit>(
+          lazy: false,
+          create: (BuildContext context) => FilterCubit(),
+        ),
         BlocProvider<StoriesBloc>(
           create: (BuildContext context) => StoriesBloc(
             preferenceCubit: context.read<PreferenceCubit>(),
+            filterCubit: context.read<FilterCubit>(),
           ),
         ),
         BlocProvider<AuthBloc>(
@@ -256,6 +269,10 @@ class HackiApp extends StatelessWidget {
               AsyncSnapshot<AdaptiveThemeMode?> snapshot,
             ) {
               final AdaptiveThemeMode? mode = snapshot.data;
+              ThemeUtil.updateAndroidStatusBarSetting(
+                Theme.of(context).brightness,
+                mode,
+              );
               return BlocBuilder<PreferenceCubit, PreferenceState>(
                 buildWhen:
                     (PreferenceState previous, PreferenceState current) =>

lib/models/font.dart

@@ -1,10 +1,28 @@
 enum Font {
   roboto('Roboto'),
-  robotoSlab('Roboto Slab'),
+  robotoSlab('Roboto Slab', isSerif: true),
   ubuntu('Ubuntu'),
-  ubuntuMono('Ubuntu Mono');
+  ubuntuMono('Ubuntu Mono'),
+  notoSerif('Noto Serif', isSerif: true);
 
-  const Font(this.label);
+  const Font(this.uiLabel, {this.isSerif = false});
 
-  final String label;
+  final String uiLabel;
+  final bool isSerif;
+
+  static Font fromString(String? val) {
+    switch (val) {
+      case 'robotoSlab':
+        return Font.robotoSlab;
+      case 'ubuntu':
+        return Font.ubuntu;
+      case 'ubuntuMono':
+        return Font.ubuntuMono;
+      case 'notoSerif':
+        return Font.notoSerif;
+      case 'roboto':
+      default:
+        return Font.roboto;
+    }
+  }
 }

lib/models/item/buildable_comment.dart

@@ -15,6 +15,7 @@ class BuildableComment extends Comment with Buildable {
     required super.kids,
     required super.dead,
     required super.deleted,
+    required super.hidden,
     required super.level,
     required this.elements,
   });
@@ -31,6 +32,7 @@ class BuildableComment extends Comment with Buildable {
           dead: comment.dead,
           deleted: comment.deleted,
           level: comment.level,
+          hidden: comment.hidden,
         );
 
   @override

lib/models/item/buildable_story.dart

@@ -17,6 +17,7 @@ class BuildableStory extends Story with Buildable {
     required super.type,
     required super.url,
     required super.parts,
+    required super.hidden,
     required this.elements,
   });
 
@@ -33,6 +34,7 @@ class BuildableStory extends Story with Buildable {
           type: story.type,
           url: story.url,
           parts: story.parts,
+          hidden: story.hidden,
         );
 
   BuildableStory.fromTitleOnlyStory(Story story)

lib/models/item/comment.dart

@@ -11,6 +11,7 @@ class Comment extends Item {
     required super.kids,
     required super.dead,
     required super.deleted,
+    required super.hidden,
     required this.level,
   }) : super(
           descendants: 0,
@@ -24,9 +25,14 @@ class Comment extends Item {
 
   final int level;
 
-  String get metadata => '''by $by $postedDate''';
+  String get metadata => '''by $by $timeAgo''';
 
-  Comment copyWith({int? level}) {
+  bool get isRoot => level == 0;
+
+  Comment copyWith({
+    int? level,
+    bool? hidden,
+  }) {
     return Comment(
       id: id,
       time: time,
@@ -37,6 +43,7 @@ class Comment extends Item {
       kids: kids,
       dead: dead,
       deleted: deleted,
+      hidden: hidden ?? this.hidden,
       level: level ?? this.level,
     );
   }

lib/models/item/item.dart

@@ -28,6 +28,7 @@ class Item extends Equatable {
     required this.type,
     required this.parts,
     required this.descendants,
+    required this.hidden,
   });
 
   Item.empty()
@@ -39,9 +40,10 @@ class Item extends Equatable {
         title = '',
         url = '',
         kids = <int>[],
-        dead = false,
         parts = <int>[],
+        dead = false,
         deleted = false,
+        hidden = false,
         parent = 0,
         text = '',
         type = '';
@@ -60,7 +62,8 @@ class Item extends Equatable {
         deleted = json['deleted'] as bool? ?? false,
         parent = json['parent'] as int? ?? 0,
         parts = (json['parts'] as List<dynamic>?)?.cast<int>() ?? <int>[],
-        type = json['type'] as String? ?? '';
+        type = json['type'] as String? ?? '',
+        hidden = json['hidden'] as bool? ?? false;
 
   final int id;
   final int time;
@@ -73,6 +76,11 @@ class Item extends Equatable {
   final bool deleted;
   final bool dead;
 
+  /// Whether or not the item should be hidden.
+  /// true if any of filter keywords set by user presents in [text]
+  /// or [title].
+  final bool hidden;
+
   final String by;
   final String text;
   final String url;
@@ -82,8 +90,8 @@ class Item extends Equatable {
   final List<int> kids;
   final List<int> parts;
 
-  String get postedDate =>
-      DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
+  String get timeAgo =>
+      DateTime.fromMillisecondsSinceEpoch(time * 1000).toTimeAgoString();
 
   bool get isPoll => type == 'poll';
 
@@ -128,5 +136,6 @@ class Item extends Equatable {
         type,
         parts,
         descendants,
+        hidden,
       ];
 }

lib/models/item/poll_option.dart

@@ -20,6 +20,7 @@ class PollOption extends Item {
           descendants: 0,
           dead: false,
           deleted: false,
+          hidden: false,
         );
 
   PollOption.empty()

lib/models/item/story.dart

@@ -14,6 +14,7 @@ class Story extends Item {
     required super.text,
     required super.kids,
     required super.parts,
+    required super.hidden,
   }) : super(
           dead: false,
           deleted: false,
@@ -38,15 +39,36 @@ class Story extends Item {
           parent: 0,
           text: '',
           type: '',
+          hidden: false,
         );
 
   Story.fromJson(super.json) : super.fromJson();
 
+  Story copyWith({bool? hidden}) {
+    return Story(
+      descendants: descendants,
+      id: id,
+      score: score,
+      time: time,
+      by: by,
+      title: title,
+      type: type,
+      url: url,
+      text: text,
+      kids: kids,
+      parts: parts,
+      hidden: hidden ?? this.hidden,
+    );
+  }
+
   String get metadata =>
-      '''$score point${score > 1 ? 's' : ''} by $by $postedDate | $descendants comment${descendants > 1 ? 's' : ''}''';
+      '''$score point${score > 1 ? 's' : ''} by $by $timeAgo | $descendants comment${descendants > 1 ? 's' : ''}''';
+
+  String get screenReaderLabel =>
+      '''$title, at $readableUrl, by $by $timeAgo. This story has $score point${score > 1 ? 's' : ''} and $descendants comment${descendants > 1 ? 's' : ''}''';
 
   String get simpleMetadata =>
-      '''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
+      '''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $timeAgo''';
 
   String get readableUrl {
     final Uri url = Uri.parse(this.url);
@@ -55,10 +77,5 @@ class Story extends Item {
   }
 
   @override
-  String toString() {
-    // final String prettyString =
-    //     const JsonEncoder.withIndent('  ').convert(this);
-    // return 'Story $prettyString';
-    return 'Story $id';
-  }
+  String toString() => 'Story $id';
 }

lib/models/preference.dart

@@ -17,7 +17,7 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
   static final List<Preference<dynamic>> allPreferences =
       UnmodifiableListView<Preference<dynamic>>(
     <Preference<dynamic>>[
-      // Order of these first four preferences does not matter.
+      // Order of these preferences does not matter.
       FetchModePreference(),
       CommentsOrderPreference(),
       FontPreference(),
@@ -31,7 +31,6 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
       const NotificationModePreference(),
       const SwipeGesturePreference(),
       const CollapseModePreference(),
-      const NavigationModePreference(),
       const ReaderModePreference(),
       const MarkReadStoriesModePreference(),
       const EyeCandyModePreference(),
@@ -54,7 +53,6 @@ abstract class IntPreference extends Preference<int> {
 const bool _notificationModeDefaultValue = true;
 const bool _swipeGestureModeDefaultValue = false;
 const bool _displayModeDefaultValue = true;
-const bool _navigationModeDefaultValue = false;
 const bool _eyeCandyModeDefaultValue = false;
 const bool _trueDarkModeDefaultValue = false;
 const bool _readerModeDefaultValue = true;
@@ -189,29 +187,6 @@ class StoryUrlModePreference extends BooleanPreference {
   String get subtitle => '''show url in story tile.''';
 }
 
-/// The value deciding whether or not user should be
-/// navigated to web view first. Defaults to false.
-class NavigationModePreference extends BooleanPreference {
-  const NavigationModePreference({bool? val})
-      : super(
-          val: val ?? _navigationModeDefaultValue,
-        );
-
-  @override
-  NavigationModePreference copyWith({required bool? val}) {
-    return NavigationModePreference(val: val);
-  }
-
-  @override
-  String get key => 'navigationMode';
-
-  @override
-  String get title => 'Show Web Page First';
-
-  @override
-  String get subtitle => '''show web page first after tapping on story.''';
-}
-
 class ReaderModePreference extends BooleanPreference {
   const ReaderModePreference({bool? val})
       : super(val: val ?? _readerModeDefaultValue);

lib/models/user.dart

@@ -17,6 +17,12 @@ class User extends Equatable {
         id = '',
         karma = 0;
 
+  const User.emptyWithId(this.id)
+      : about = '',
+        created = 0,
+        delay = 0,
+        karma = 0;
+
   User.fromJson(Map<String, dynamic> json)
       : about = json['about'] as String? ?? '',
         created = json['created'] as int? ?? 0,

lib/repositories/preference_repository.dart

@@ -22,6 +22,7 @@ class PreferenceRepository {
   static const String _usernameKey = 'username';
   static const String _passwordKey = 'password';
   static const String _blocklistKey = 'blocklist';
+  static const String _filterKeywordsKey = 'filterKeywords';
   static const String _pinnedStoriesIdsKey = 'pinnedStoriesIds';
   static const String _unreadCommentsIdsKey = 'unreadCommentsIds';
   static const String _lastReadStoryIdKey = 'lastReadStoryId';
@@ -274,6 +275,20 @@ class PreferenceRepository {
 
   //#endregion
 
+  //#region filter
+
+  Future<List<String>> get filterKeywords async => _prefs.then(
+        (SharedPreferences prefs) =>
+            prefs.getStringList(_filterKeywordsKey) ?? <String>[],
+      );
+
+  Future<void> updateFilterKeywords(List<String> keywords) async {
+    final SharedPreferences prefs = await _prefs;
+    await prefs.setStringList(_filterKeywordsKey, keywords);
+  }
+
+  //#endregion
+
   //#region pins
 
   Future<List<int>> get pinnedStoriesIds async {

lib/repositories/search_repository.dart

@@ -58,6 +58,7 @@ class SearchRepository {
           parent: parentId,
           dead: false,
           deleted: false,
+          hidden: false,
           level: 0,
         );
         yield comment;
@@ -80,6 +81,7 @@ class SearchRepository {
           // response doesn't contain kids and parts.
           kids: const <int>[],
           parts: const <int>[],
+          hidden: false,
         );
         yield story;
       }

lib/repositories/stories_repository.dart

@@ -74,11 +74,14 @@ class StoriesRepository {
 
   /// Fetch a [User] by its [id].
   /// Hacker News uses user's username as [id].
-  Future<User> fetchUser({required String id}) async {
-    final User user = await _firebaseClient
+  Future<User?> fetchUser({required String id}) async {
+    final User? user = await _firebaseClient
         .get('${_baseUrl}user/$id.json')
         .then((dynamic val) {
-      final Map<String, dynamic> json = val as Map<String, dynamic>;
+      final Map<String, dynamic>? json = val as Map<String, dynamic>?;
+
+      if (json == null) return null;
+
       final User user = User.fromJson(json);
       return user;
     });

lib/screens/home/home_screen.dart

@@ -210,12 +210,9 @@ class _HomeScreenState extends State<HomeScreen>
   }
 
   void onStoryTapped(Story story, {bool isPin = false}) {
-    final bool showWebFirst =
-        context.read<PreferenceCubit>().state.webFirstEnabled;
     final bool useReader = context.read<PreferenceCubit>().state.readerEnabled;
     final bool offlineReading =
-        context.read<StoriesBloc>().state.offlineReading;
-    final bool hasRead = isPin || context.read<StoriesBloc>().hasRead(story);
+        context.read<StoriesBloc>().state.isOfflineReading;
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
 
     // If a story is a job story and it has a link to the job posting,
@@ -225,7 +222,9 @@ class _HomeScreenState extends State<HomeScreen>
     if (isJobWithLink) {
       context.read<ReminderCubit>().removeLastReadStoryId();
     } else {
-      final ItemScreenArgs args = ItemScreenArgs(item: story);
+      final ItemScreenArgs args = ItemScreenArgs(
+        item: story,
+      );
 
       context.read<ReminderCubit>().updateLastReadStoryId(story.id);
 
@@ -243,7 +242,7 @@ class _HomeScreenState extends State<HomeScreen>
       }
     }
 
-    if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
+    if (story.url.isNotEmpty && isJobWithLink) {
       LinkUtil.launch(
         story.url,
         useReader: useReader,

lib/screens/home/widgets/pinned_stories.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart' hide Badge;
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
@@ -7,6 +6,7 @@ import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class PinnedStories extends StatelessWidget {
   const PinnedStories({
@@ -32,7 +32,7 @@ class PinnedStories extends StatelessWidget {
                     children: <Widget>[
                       SlidableAction(
                         onPressed: (_) {
-                          HapticFeedback.lightImpact();
+                          HapticFeedbackUtil.light();
                           context.read<PinCubit>().unpinStory(story);
                         },
                         backgroundColor: Palette.red,

lib/screens/item/item_screen.dart

@@ -2,7 +2,6 @@ import 'package:equatable/equatable.dart';
 import 'package:feature_discovery/feature_discovery.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:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
@@ -15,8 +14,8 @@ import 'package:hacki/screens/item/widgets/widgets.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:responsive_builder/responsive_builder.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class ItemScreenArgs extends Equatable {
   const ItemScreenArgs({
@@ -58,14 +57,15 @@ class ItemScreen extends StatefulWidget {
     return MaterialPageRoute<ItemScreen>(
       settings: const RouteSettings(name: routeName),
       builder: (BuildContext context) => RepositoryProvider<CollapseCache>(
-        create: (BuildContext context) => CollapseCache(),
+        create: (_) => CollapseCache(),
         lazy: false,
         child: MultiBlocProvider(
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
               create: (BuildContext context) => CommentsCubit(
-                offlineReading:
-                    context.read<StoriesBloc>().state.offlineReading,
+                filterCubit: context.read<FilterCubit>(),
+                isOfflineReading:
+                    context.read<StoriesBloc>().state.isOfflineReading,
                 item: args.item,
                 collapseCache: context.read<CollapseCache>(),
                 defaultFetchMode:
@@ -99,15 +99,16 @@ class ItemScreen extends StatefulWidget {
         }
       },
       child: RepositoryProvider<CollapseCache>(
-        create: (BuildContext context) => CollapseCache(),
+        create: (_) => CollapseCache(),
         lazy: false,
         child: MultiBlocProvider(
           key: ValueKey<ItemScreenArgs>(args),
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
               create: (BuildContext context) => CommentsCubit(
-                offlineReading:
-                    context.read<StoriesBloc>().state.offlineReading,
+                filterCubit: context.read<FilterCubit>(),
+                isOfflineReading:
+                    context.read<StoriesBloc>().state.isOfflineReading,
                 item: args.item,
                 collapseCache: context.read<CollapseCache>(),
                 defaultFetchMode:
@@ -141,12 +142,9 @@ class ItemScreen extends StatefulWidget {
 class _ItemScreenState extends State<ItemScreen> with RouteAware {
   final TextEditingController commentEditingController =
       TextEditingController();
-  final ScrollController scrollController = ScrollController();
-  final RefreshController refreshController = RefreshController(
-    initialLoadStatus: LoadStatus.idle,
-    initialRefreshStatus: RefreshStatus.refreshing,
-  );
-  final FocusNode focusNode = FocusNode();
+  final ItemScrollController itemScrollController = ItemScrollController();
+  final ItemPositionsListener itemPositionsListener =
+      ItemPositionsListener.create();
   final Throttle storyLinkTapThrottle = Throttle(
     delay: _storyLinkTapThrottleDelay,
   );
@@ -179,6 +177,8 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
             Constants.featurePinToTop,
             Constants.featureAddStoryToFavList,
             Constants.featureOpenStoryInWebView,
+            Constants.featureJumpUpButton,
+            Constants.featureJumpDownButton,
           },
         );
       })
@@ -192,24 +192,14 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
             .subscribe(this, route);
       });
 
-    scrollController.addListener(() {
-      FocusScope.of(context).requestFocus(FocusNode());
-      if (commentEditingController.text.isEmpty) {
-        context.read<EditCubit>().onScrolled();
-      }
-    });
-
     commentEditingController.text = context.read<EditCubit>().state.text ?? '';
   }
 
   @override
   void dispose() {
-    refreshController.dispose();
     commentEditingController.dispose();
-    scrollController.dispose();
     storyLinkTapThrottle.dispose();
     featureDiscoveryDismissThrottle.dispose();
-    focusNode.dispose();
     super.dispose();
   }
 
@@ -224,166 +214,169 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
             BlocListener<PostCubit, PostState>(
               listener: (BuildContext context, PostState postState) {
                 if (postState.status == PostStatus.successful) {
+                  Navigator.popUntil(
+                    context,
+                    (Route<dynamic> route) =>
+                        route.settings.name == ItemScreen.routeName,
+                  );
                   final String verb =
                       context.read<EditCubit>().state.replyingTo == null
                           ? 'updated'
                           : 'submitted';
                   final String msg = 'Comment $verb! ${Constants.happyFace}';
-                  focusNode.unfocus();
-                  HapticFeedback.lightImpact();
+                  HapticFeedbackUtil.light();
                   showSnackBar(content: msg);
                   context.read<EditCubit>().onReplySubmittedSuccessfully();
                   context.read<PostCubit>().reset();
                 } else if (postState.status == PostStatus.failure) {
+                  Navigator.popUntil(
+                    context,
+                    (Route<dynamic> route) =>
+                        route.settings.name == ItemScreen.routeName,
+                  );
                   showErrorSnackBar();
                   context.read<PostCubit>().reset();
                 }
               },
             ),
           ],
-          child: BlocListener<CommentsCubit, CommentsState>(
-            listenWhen: (CommentsState previous, CommentsState current) =>
-                previous.status != current.status,
-            listener: (BuildContext context, CommentsState state) {
-              if (state.status != CommentsStatus.loading) {
-                refreshController
-                  ..refreshCompleted()
-                  ..loadComplete();
+          child: BlocListener<EditCubit, EditState>(
+            listenWhen: (EditState previous, EditState current) {
+              return previous.replyingTo != current.replyingTo ||
+                  previous.itemBeingEdited != current.itemBeingEdited ||
+                  commentEditingController.text != current.text;
+            },
+            listener: (BuildContext context, EditState editState) {
+              if (editState.replyingTo != null ||
+                  editState.itemBeingEdited != null) {
+                if (editState.text == null) {
+                  commentEditingController.clear();
+                } else {
+                  final String text = editState.text!;
+                  commentEditingController
+                    ..text = text
+                    ..selection = TextSelection.fromPosition(
+                      TextPosition(offset: text.length),
+                    );
+                }
+              } else {
+                commentEditingController.clear();
               }
             },
-            child: BlocListener<EditCubit, EditState>(
-              listenWhen: (EditState previous, EditState current) {
-                return previous.replyingTo != current.replyingTo ||
-                    previous.itemBeingEdited != current.itemBeingEdited ||
-                    commentEditingController.text != current.text;
-              },
-              listener: (BuildContext context, EditState editState) {
-                if (editState.replyingTo != null ||
-                    editState.itemBeingEdited != null) {
-                  if (editState.text == null) {
-                    commentEditingController.clear();
-                  } else {
-                    final String text = editState.text!;
-                    commentEditingController
-                      ..text = text
-                      ..selection = TextSelection.fromPosition(
-                        TextPosition(offset: text.length),
-                      );
-                  }
-                } else {
-                  commentEditingController.clear();
-                }
-              },
-              child: widget.splitViewEnabled
-                  ? Material(
-                      child: Stack(
-                        children: <Widget>[
-                          Positioned.fill(
-                            child: MainView(
-                              scrollController: scrollController,
-                              refreshController: refreshController,
-                              commentEditingController:
-                                  commentEditingController,
-                              authState: authState,
-                              focusNode: focusNode,
-                              topPadding: topPadding,
-                              splitViewEnabled: widget.splitViewEnabled,
-                              onMoreTapped: onMoreTapped,
-                              onRightMoreTapped: onRightMoreTapped,
-                            ),
+            child: widget.splitViewEnabled
+                ? Material(
+                    child: Stack(
+                      children: <Widget>[
+                        Positioned.fill(
+                          child: MainView(
+                            itemScrollController: itemScrollController,
+                            itemPositionsListener: itemPositionsListener,
+                            commentEditingController: commentEditingController,
+                            authState: authState,
+                            topPadding: topPadding,
+                            splitViewEnabled: widget.splitViewEnabled,
+                            onMoreTapped: onMoreTapped,
+                            onRightMoreTapped: onRightMoreTapped,
+                            onReplyTapped: showReplyBox,
                           ),
-                          BlocBuilder<SplitViewCubit, SplitViewState>(
-                            buildWhen: (
-                              SplitViewState previous,
-                              SplitViewState current,
-                            ) =>
-                                previous.expanded != current.expanded,
-                            builder: (
-                              BuildContext context,
-                              SplitViewState state,
-                            ) {
-                              return Positioned(
-                                top: Dimens.zero,
-                                left: Dimens.zero,
-                                right: Dimens.zero,
-                                child: CustomAppBar(
-                                  backgroundColor: Theme.of(context)
-                                      .canvasColor
-                                      .withOpacity(0.6),
-                                  item: widget.item,
-                                  scrollController: scrollController,
-                                  splitViewEnabled: state.enabled,
-                                  expanded: state.expanded,
-                                  onZoomTap:
-                                      context.read<SplitViewCubit>().zoom,
-                                  onFontSizeTap: onFontSizeTapped,
-                                  fontSizeIconButtonKey: fontSizeIconButtonKey,
-                                ),
-                              );
-                            },
+                        ),
+                        BlocBuilder<SplitViewCubit, SplitViewState>(
+                          buildWhen: (
+                            SplitViewState previous,
+                            SplitViewState current,
+                          ) =>
+                              previous.expanded != current.expanded,
+                          builder: (
+                            BuildContext context,
+                            SplitViewState state,
+                          ) {
+                            return Positioned(
+                              top: Dimens.zero,
+                              left: Dimens.zero,
+                              right: Dimens.zero,
+                              child: CustomAppBar(
+                                backgroundColor: Theme.of(context)
+                                    .canvasColor
+                                    .withOpacity(0.6),
+                                item: widget.item,
+                                splitViewEnabled: state.enabled,
+                                expanded: state.expanded,
+                                onZoomTap: context.read<SplitViewCubit>().zoom,
+                                onFontSizeTap: onFontSizeTapped,
+                                fontSizeIconButtonKey: fontSizeIconButtonKey,
+                              ),
+                            );
+                          },
+                        ),
+                        Positioned(
+                          right: Dimens.pt12,
+                          bottom: Dimens.pt36,
+                          child: CustomFloatingActionButton(
+                            itemScrollController: itemScrollController,
+                            itemPositionsListener: itemPositionsListener,
                           ),
-                          Positioned(
-                            bottom: Dimens.zero,
-                            left: Dimens.zero,
-                            right: Dimens.zero,
-                            child: ReplyBox(
-                              splitViewEnabled: true,
-                              focusNode: focusNode,
-                              textEditingController: commentEditingController,
-                              onSendTapped: onSendTapped,
-                              onCloseTapped: () {
-                                context.read<EditCubit>().onReplyBoxClosed();
-                                commentEditingController.clear();
-                                focusNode.unfocus();
-                              },
-                              onChanged:
-                                  context.read<EditCubit>().onTextChanged,
-                            ),
-                          ),
-                        ],
-                      ),
-                    )
-                  : Scaffold(
-                      extendBodyBehindAppBar: true,
-                      resizeToAvoidBottomInset: true,
-                      appBar: CustomAppBar(
-                        backgroundColor:
-                            Theme.of(context).canvasColor.withOpacity(0.6),
-                        item: widget.item,
-                        scrollController: scrollController,
-                        onFontSizeTap: onFontSizeTapped,
-                        fontSizeIconButtonKey: fontSizeIconButtonKey,
-                      ),
-                      body: MainView(
-                        scrollController: scrollController,
-                        refreshController: refreshController,
-                        commentEditingController: commentEditingController,
-                        authState: authState,
-                        focusNode: focusNode,
-                        topPadding: topPadding,
-                        splitViewEnabled: widget.splitViewEnabled,
-                        onMoreTapped: onMoreTapped,
-                        onRightMoreTapped: onRightMoreTapped,
-                      ),
-                      bottomSheet: ReplyBox(
-                        focusNode: focusNode,
-                        textEditingController: commentEditingController,
-                        onSendTapped: onSendTapped,
-                        onCloseTapped: () {
-                          context.read<EditCubit>().onReplyBoxClosed();
-                          commentEditingController.clear();
-                          focusNode.unfocus();
-                        },
-                        onChanged: context.read<EditCubit>().onTextChanged,
-                      ),
+                        ),
+                      ],
                     ),
-            ),
+                  )
+                : Scaffold(
+                    extendBodyBehindAppBar: true,
+                    resizeToAvoidBottomInset: true,
+                    appBar: CustomAppBar(
+                      backgroundColor:
+                          Theme.of(context).canvasColor.withOpacity(0.6),
+                      item: widget.item,
+                      onFontSizeTap: onFontSizeTapped,
+                      fontSizeIconButtonKey: fontSizeIconButtonKey,
+                    ),
+                    body: MainView(
+                      itemScrollController: itemScrollController,
+                      itemPositionsListener: itemPositionsListener,
+                      commentEditingController: commentEditingController,
+                      authState: authState,
+                      topPadding: topPadding,
+                      splitViewEnabled: widget.splitViewEnabled,
+                      onMoreTapped: onMoreTapped,
+                      onRightMoreTapped: onRightMoreTapped,
+                      onReplyTapped: showReplyBox,
+                    ),
+                    floatingActionButton: CustomFloatingActionButton(
+                      itemScrollController: itemScrollController,
+                      itemPositionsListener: itemPositionsListener,
+                    ),
+                  ),
           ),
         );
       },
     );
   }
 
+  void showReplyBox() {
+    showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (BuildContext context) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            ReplyBox(
+              textEditingController: commentEditingController,
+              onSendTapped: onSendTapped,
+              onCloseTapped: () {
+                context.read<EditCubit>().onReplyBoxClosed();
+                commentEditingController.clear();
+              },
+              onChanged: context.read<EditCubit>().onTextChanged,
+            ),
+            SizedBox(
+              height: MediaQuery.of(context).viewInsets.bottom,
+            )
+          ],
+        );
+      },
+    );
+  }
+
   void onFontSizeTapped() {
     const Offset offset = Offset.zero;
     final RenderBox overlay =
@@ -422,7 +415,8 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
               ),
             ),
             onTap: () {
-              HapticFeedback.lightImpact();
+              HapticFeedbackUtil.light();
+              locator.get<AppReviewService>().requestReview();
               context.read<PreferenceCubit>().update(
                     FontSizePreference(),
                     to: fontSize.index,
@@ -434,45 +428,47 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
   }
 
   void onRightMoreTapped(Comment comment) {
-    const double bottomSheetHeight = 140;
-
-    HapticFeedback.lightImpact();
+    HapticFeedbackUtil.light();
     showModalBottomSheet<void>(
       context: context,
       builder: (BuildContext context) {
-        return Container(
-          height: bottomSheetHeight,
-          color: Theme.of(context).canvasColor,
-          child: Material(
-            color: Palette.transparent,
-            child: Column(
-              children: <Widget>[
-                ListTile(
-                  leading: const Icon(Icons.av_timer),
-                  title: const Text('View ancestors'),
-                  onTap: () {
-                    Navigator.pop(context);
-                    onTimeMachineActivated(comment);
-                  },
-                  enabled:
-                      comment.level > 0 && !(comment.dead || comment.deleted),
-                ),
-                ListTile(
-                  leading: const Icon(Icons.list),
-                  title: const Text('View in separate thread'),
-                  onTap: () {
-                    Navigator.pop(context);
-                    goToItemScreen(
-                      args: ItemScreenArgs(
-                        item: comment,
-                        useCommentCache: true,
-                      ),
-                      forceNewScreen: true,
-                    );
-                  },
-                  enabled: !(comment.dead || comment.deleted),
-                ),
-              ],
+        return SafeArea(
+          child: ColoredBox(
+            color: Theme.of(context).canvasColor,
+            child: Material(
+              color: Palette.transparent,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  ListTile(
+                    leading: const Icon(Icons.av_timer),
+                    title: const Text('View ancestors'),
+                    onTap: () {
+                      Navigator.pop(context);
+                      onTimeMachineActivated(comment);
+                    },
+                    enabled:
+                        comment.level > 0 && !(comment.dead || comment.deleted),
+                  ),
+                  ListTile(
+                    leading: const Icon(Icons.list),
+                    title: const Text('View in separate thread'),
+                    onTap: () {
+                      locator.get<AppReviewService>().requestReview();
+
+                      Navigator.pop(context);
+                      goToItemScreen(
+                        args: ItemScreenArgs(
+                          item: comment,
+                          useCommentCache: true,
+                        ),
+                        forceNewScreen: true,
+                      );
+                    },
+                    enabled: !(comment.dead || comment.deleted),
+                  ),
+                ],
+              ),
             ),
           ),
         );

lib/screens/item/widgets/custom_app_bar.dart

@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/item/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class CustomAppBar extends AppBar {
   CustomAppBar({
     super.key,
-    required ScrollController scrollController,
     required Item item,
     required Color super.backgroundColor,
     required VoidCallback onFontSizeTap,
@@ -28,15 +27,12 @@ class CustomAppBar extends AppBar {
                   size: TextDimens.pt20,
                 ),
                 onPressed: () {
-                  HapticFeedback.lightImpact();
+                  HapticFeedbackUtil.light();
                   onZoomTap?.call();
                 },
               ),
               const Spacer(),
             ],
-            ScrollUpIconButton(
-              scrollController: scrollController,
-            ),
             IconButton(
               key: fontSizeIconButtonKey,
               icon: Text(

lib/screens/item/widgets/custom_floating_action_button.dart

@@ -0,0 +1,99 @@
+import 'package:feature_discovery/feature_discovery.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/config/constants.dart';
+import 'package:hacki/cubits/cubits.dart';
+import 'package:hacki/screens/widgets/custom_described_feature_overlay.dart';
+import 'package:hacki/styles/palette.dart';
+import 'package:hacki/utils/utils.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+
+class CustomFloatingActionButton extends StatelessWidget {
+  const CustomFloatingActionButton({
+    super.key,
+    required this.itemScrollController,
+    required this.itemPositionsListener,
+  });
+
+  final ItemScrollController itemScrollController;
+  final ItemPositionsListener itemPositionsListener;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<CommentsCubit, CommentsState>(
+      builder: (BuildContext context, CommentsState state) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            CustomDescribedFeatureOverlay(
+              featureId: Constants.featureJumpUpButton,
+              contentLocation: ContentLocation.above,
+              tapTarget: const Icon(
+                Icons.keyboard_arrow_up,
+                color: Palette.white,
+              ),
+              title: const Text('Jump to previous root level comment.'),
+              description: const Text(
+                '''Tapping on this button will take you to the previous off-screen root level comment.''',
+              ),
+              child: FloatingActionButton.small(
+                backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+
+                /// Randomly generated string as heroTag to prevent
+                /// default [FloatingActionButton] animation.
+                heroTag: UniqueKey().hashCode,
+                onPressed: () {
+                  if (state.status == CommentsStatus.loading) return;
+
+                  HapticFeedbackUtil.selection();
+                  context.read<CommentsCubit>().jumpUp(
+                        itemScrollController,
+                        itemPositionsListener,
+                      );
+                },
+                child: Icon(
+                  Icons.keyboard_arrow_up,
+                  color: state.status == CommentsStatus.loading
+                      ? Palette.grey
+                      : Theme.of(context).colorScheme.primary,
+                ),
+              ),
+            ),
+            CustomDescribedFeatureOverlay(
+              featureId: Constants.featureJumpDownButton,
+              tapTarget: const Icon(
+                Icons.keyboard_arrow_down,
+                color: Palette.white,
+              ),
+              title: const Text('Jump to next root level comment.'),
+              description: const Text(
+                '''Tapping on this button will take you to the next off-screen root level comment.''',
+              ),
+              child: FloatingActionButton.small(
+                backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+
+                /// Same as above.
+                heroTag: UniqueKey().hashCode,
+                onPressed: () {
+                  if (state.status == CommentsStatus.loading) return;
+
+                  HapticFeedbackUtil.selection();
+                  context.read<CommentsCubit>().jump(
+                        itemScrollController,
+                        itemPositionsListener,
+                      );
+                },
+                child: Icon(
+                  Icons.keyboard_arrow_down,
+                  color: state.status == CommentsStatus.loading
+                      ? Palette.grey
+                      : Theme.of(context).colorScheme.primary,
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

lib/screens/item/widgets/fav_icon_button.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class FavIconButton extends StatelessWidget {
   const FavIconButton({
@@ -38,7 +38,7 @@ class FavIconButton extends StatelessWidget {
             ),
           ),
           onPressed: () {
-            HapticFeedback.lightImpact();
+            HapticFeedbackUtil.light();
             if (isFav) {
               context.read<FavCubit>().removeFav(storyId);
             } else {

lib/screens/item/widgets/link_icon_button.dart

@@ -24,9 +24,7 @@ class LinkIconButton extends StatelessWidget {
         featureId: Constants.featureOpenStoryInWebView,
         title: Text('Open in Browser'),
         description: Text(
-          'Want more than just reading and replying? '
-          'You can tap here to open this story in a '
-          'browser.',
+          '''You can tap here to open this story in browser.''',
           style: TextStyle(fontSize: TextDimens.pt16),
         ),
         child: Icon(

lib/screens/item/widgets/main_view.dart

@@ -1,5 +1,6 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
@@ -12,31 +13,31 @@ import 'package:hacki/screens/item/widgets/widgets.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class MainView extends StatelessWidget {
   const MainView({
     super.key,
-    required this.scrollController,
-    required this.refreshController,
+    required this.itemScrollController,
+    required this.itemPositionsListener,
     required this.commentEditingController,
     required this.authState,
-    required this.focusNode,
     required this.topPadding,
     required this.splitViewEnabled,
     required this.onMoreTapped,
     required this.onRightMoreTapped,
+    required this.onReplyTapped,
   });
 
-  final ScrollController scrollController;
-  final RefreshController refreshController;
+  final ItemScrollController itemScrollController;
+  final ItemPositionsListener itemPositionsListener;
   final TextEditingController commentEditingController;
   final AuthState authState;
-  final FocusNode focusNode;
   final double topPadding;
   final bool splitViewEnabled;
   final void Function(Item item, Rect? rect) onMoreTapped;
   final ValueChanged<Comment> onRightMoreTapped;
+  final VoidCallback onReplyTapped;
 
   static const int _loadingIndicatorOpacityAnimationDuration = 300;
   static const double _trailingBoxHeight = 240;
@@ -48,131 +49,100 @@ class MainView extends StatelessWidget {
         Positioned.fill(
           child: BlocBuilder<CommentsCubit, CommentsState>(
             builder: (BuildContext context, CommentsState state) {
-              return SmartRefresher(
-                scrollController: scrollController,
-                enablePullUp: !state.onlyShowTargetComment,
-                enablePullDown: !state.onlyShowTargetComment,
-                header: WaterDropMaterialHeader(
-                  backgroundColor: Palette.orange,
-                  offset: topPadding,
-                ),
-                footer: CustomFooter(
-                  loadStyle: LoadStyle.ShowWhenLoading,
-                  builder: (BuildContext context, LoadStatus? mode) {
-                    const double height = 55;
-                    late final Widget body;
+              return Scrollbar(
+                interactive: true,
+                child: RefreshIndicator(
+                  displacement: 100,
+                  onRefresh: () async {
+                    HapticFeedbackUtil.light();
 
-                    if (mode == LoadStatus.idle) {
-                      body = const Text('');
-                    } else if (mode == LoadStatus.loading) {
-                      body = const Text('');
-                    } else if (mode == LoadStatus.failed) {
-                      body = const Text(
-                        '',
-                      );
-                    } else if (mode == LoadStatus.canLoading) {
-                      body = const Text(
-                        '',
-                      );
-                    } else {
-                      body = const Text('');
-                    }
-                    return SizedBox(
-                      height: height,
-                      child: Center(child: body),
-                    );
-                  },
-                ),
-                controller: refreshController,
-                onRefresh: () {
-                  HapticFeedback.lightImpact();
+                    if (context.read<StoriesBloc>().state.isOfflineReading ==
+                            false &&
+                        state.onlyShowTargetComment == false) {
+                      unawaited(context.read<CommentsCubit>().refresh());
 
-                  if (context.read<StoriesBloc>().state.offlineReading) {
-                    refreshController.refreshCompleted();
-                  } else {
-                    context.read<CommentsCubit>().refresh();
-
-                    if (state.item.isPoll) {
-                      context.read<PollCubit>().refresh();
-                    }
-                  }
-                },
-                onLoading: () {
-                  if (state.fetchMode == FetchMode.eager) {
-                    context.read<CommentsCubit>().loadMore();
-                  } else {
-                    refreshController.loadComplete();
-                  }
-                },
-                child: ListView.builder(
-                  primary: false,
-                  itemCount: state.comments.length + 2,
-                  itemBuilder: (BuildContext context, int index) {
-                    if (index == 0) {
-                      return _ParentItemSection(
-                        scrollController: scrollController,
-                        refreshController: refreshController,
-                        commentEditingController: commentEditingController,
-                        state: state,
-                        authState: authState,
-                        focusNode: focusNode,
-                        topPadding: topPadding,
-                        splitViewEnabled: splitViewEnabled,
-                        onMoreTapped: onMoreTapped,
-                        onRightMoreTapped: onRightMoreTapped,
-                      );
-                    } else if (index == state.comments.length + 1) {
-                      if ((state.status == CommentsStatus.allLoaded &&
-                              state.comments.isNotEmpty) ||
-                          state.onlyShowTargetComment) {
-                        return SizedBox(
-                          height: _trailingBoxHeight,
-                          child: Center(
-                            child: Text(Constants.happyFace),
-                          ),
-                        );
-                      } else {
-                        return const SizedBox.shrink();
+                      if (state.item.isPoll) {
+                        context.read<PollCubit>().refresh();
                       }
                     }
-
-                    index = index - 1;
-                    final Comment comment = state.comments.elementAt(index);
-                    return FadeIn(
-                      key: ValueKey<String>('${comment.id}-FadeIn'),
-                      child: CommentTile(
-                        comment: comment,
-                        level: comment.level,
-                        opUsername: state.item.by,
-                        fetchMode: state.fetchMode,
-                        onReplyTapped: (Comment cmt) {
-                          HapticFeedback.lightImpact();
-                          if (cmt.deleted || cmt.dead) {
-                            return;
-                          }
-
-                          if (cmt.id !=
-                              context.read<EditCubit>().state.replyingTo?.id) {
-                            commentEditingController.clear();
-                          }
-
-                          context.read<EditCubit>().onReplyTapped(cmt);
-                          focusNode.requestFocus();
-                        },
-                        onEditTapped: (Comment cmt) {
-                          HapticFeedback.lightImpact();
-                          if (cmt.deleted || cmt.dead) {
-                            return;
-                          }
-                          commentEditingController.clear();
-                          context.read<EditCubit>().onEditTapped(cmt);
-                          focusNode.requestFocus();
-                        },
-                        onMoreTapped: onMoreTapped,
-                        onRightMoreTapped: onRightMoreTapped,
-                      ),
-                    );
                   },
+                  child: ScrollablePositionedList.builder(
+                    physics: const AlwaysScrollableScrollPhysics(),
+                    itemScrollController: itemScrollController,
+                    itemPositionsListener: itemPositionsListener,
+                    itemCount: state.comments.length + 2,
+                    padding: EdgeInsets.only(top: topPadding),
+                    itemBuilder: (BuildContext context, int index) {
+                      if (index == 0) {
+                        return _ParentItemSection(
+                          commentEditingController: commentEditingController,
+                          state: state,
+                          authState: authState,
+                          topPadding: topPadding,
+                          splitViewEnabled: splitViewEnabled,
+                          onMoreTapped: onMoreTapped,
+                          onRightMoreTapped: onRightMoreTapped,
+                          onReplyTapped: onReplyTapped,
+                        );
+                      } else if (index == state.comments.length + 1) {
+                        if ((state.status == CommentsStatus.allLoaded &&
+                                state.comments.isNotEmpty) ||
+                            state.onlyShowTargetComment) {
+                          return SizedBox(
+                            height: _trailingBoxHeight,
+                            child: Center(
+                              child: Text(Constants.happyFace),
+                            ),
+                          );
+                        } else {
+                          return const SizedBox.shrink();
+                        }
+                      }
+
+                      index = index - 1;
+                      final Comment comment = state.comments.elementAt(index);
+                      return FadeIn(
+                        key: ValueKey<String>('${comment.id}-FadeIn'),
+                        child: CommentTile(
+                          comment: comment,
+                          level: comment.level,
+                          opUsername: state.item.by,
+                          fetchMode: state.fetchMode,
+                          onReplyTapped: (Comment cmt) {
+                            HapticFeedbackUtil.light();
+                            if (cmt.deleted || cmt.dead) {
+                              return;
+                            }
+
+                            if (cmt.id !=
+                                context
+                                    .read<EditCubit>()
+                                    .state
+                                    .replyingTo
+                                    ?.id) {
+                              commentEditingController.clear();
+                            }
+
+                            context.read<EditCubit>().onReplyTapped(cmt);
+
+                            onReplyTapped();
+                          },
+                          onEditTapped: (Comment cmt) {
+                            HapticFeedbackUtil.light();
+                            if (cmt.deleted || cmt.dead) {
+                              return;
+                            }
+                            commentEditingController.clear();
+                            context.read<EditCubit>().onEditTapped(cmt);
+
+                            onReplyTapped();
+                          },
+                          onMoreTapped: onMoreTapped,
+                          onRightMoreTapped: onRightMoreTapped,
+                        ),
+                      );
+                    },
+                  ),
                 ),
               );
             },
@@ -198,7 +168,7 @@ class MainView extends StatelessWidget {
               );
             },
           ),
-        )
+        ),
       ],
     );
   }
@@ -206,257 +176,302 @@ class MainView extends StatelessWidget {
 
 class _ParentItemSection extends StatelessWidget {
   const _ParentItemSection({
-    required this.scrollController,
-    required this.refreshController,
     required this.commentEditingController,
     required this.state,
     required this.authState,
-    required this.focusNode,
     required this.topPadding,
     required this.splitViewEnabled,
     required this.onMoreTapped,
     required this.onRightMoreTapped,
+    required this.onReplyTapped,
   });
 
-  final ScrollController scrollController;
-  final RefreshController refreshController;
   final TextEditingController commentEditingController;
   final CommentsState state;
   final AuthState authState;
-  final FocusNode focusNode;
   final double topPadding;
   final bool splitViewEnabled;
   final void Function(Item item, Rect? rect) onMoreTapped;
   final ValueChanged<Comment> onRightMoreTapped;
+  final VoidCallback onReplyTapped;
+
+  static const double _viewParentButtonWidth = 100;
+  static const double _viewRootButtonWidth = 80;
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: <Widget>[
-        SizedBox(
-          height: topPadding,
-        ),
-        if (!splitViewEnabled)
-          const Padding(
-            padding: EdgeInsets.only(bottom: Dimens.pt6),
-            child: OfflineBanner(),
-          ),
-        Slidable(
-          startActionPane: ActionPane(
-            motion: const BehindMotion(),
-            children: <Widget>[
-              SlidableAction(
-                onPressed: (_) {
-                  HapticFeedback.lightImpact();
+    return Semantics(
+      label:
+          '''Posted by ${state.item.by} ${state.item.timeAgo}, ${state.item.title}. ${state.item.text}''',
+      child: Column(
+        children: <Widget>[
+          if (!splitViewEnabled)
+            const Padding(
+              padding: EdgeInsets.only(bottom: Dimens.pt6),
+              child: OfflineBanner(),
+            ),
+          Slidable(
+            startActionPane: ActionPane(
+              motion: const BehindMotion(),
+              children: <Widget>[
+                SlidableAction(
+                  onPressed: (_) {
+                    HapticFeedbackUtil.light();
 
-                  if (state.item.id !=
-                      context.read<EditCubit>().state.replyingTo?.id) {
-                    commentEditingController.clear();
-                  }
-                  context.read<EditCubit>().onReplyTapped(state.item);
-                  focusNode.requestFocus();
-                },
-                backgroundColor: Palette.orange,
-                foregroundColor: Palette.white,
-                icon: Icons.message,
-              ),
-              SlidableAction(
-                onPressed: (BuildContext context) =>
-                    onMoreTapped(state.item, context.rect),
-                backgroundColor: Palette.orange,
-                foregroundColor: Palette.white,
-                icon: Icons.more_horiz,
-              ),
-            ],
-          ),
-          child: Column(
-            children: <Widget>[
-              Padding(
-                padding: const EdgeInsets.only(
-                  left: Dimens.pt6,
-                  right: Dimens.pt6,
+                    if (state.item.id !=
+                        context.read<EditCubit>().state.replyingTo?.id) {
+                      commentEditingController.clear();
+                    }
+                    context.read<EditCubit>().onReplyTapped(state.item);
+
+                    onReplyTapped();
+                  },
+                  backgroundColor: Palette.orange,
+                  foregroundColor: Palette.white,
+                  icon: Icons.message,
                 ),
-                child: Row(
-                  children: <Widget>[
-                    Text(
-                      state.item.by,
-                      style: const TextStyle(
-                        color: Palette.orange,
-                      ),
-                    ),
-                    const Spacer(),
-                    Text(
-                      state.item.postedDate,
-                      style: const TextStyle(
-                        color: Palette.grey,
-                      ),
-                    ),
-                  ],
+                SlidableAction(
+                  onPressed: (BuildContext context) =>
+                      onMoreTapped(state.item, context.rect),
+                  backgroundColor: Palette.orange,
+                  foregroundColor: Palette.white,
+                  icon: Icons.more_horiz,
                 ),
-              ),
-              BlocBuilder<PreferenceCubit, PreferenceState>(
-                buildWhen: (
-                  PreferenceState previous,
-                  PreferenceState current,
-                ) =>
-                    previous.fontSize != current.fontSize,
-                builder: (
-                  BuildContext context,
-                  PreferenceState prefState,
-                ) {
-                  return Column(
+              ],
+            ),
+            child: Column(
+              children: <Widget>[
+                Padding(
+                  padding: const EdgeInsets.only(
+                    left: Dimens.pt6,
+                    right: Dimens.pt6,
+                  ),
+                  child: Row(
                     children: <Widget>[
-                      if (state.item is Story)
-                        InkWell(
-                          onTap: () => LinkUtil.launch(
-                            state.item.url,
-                            useReader: context
-                                .read<PreferenceCubit>()
-                                .state
-                                .readerEnabled,
-                            offlineReading: context
-                                .read<StoriesBloc>()
-                                .state
-                                .offlineReading,
-                          ),
-                          child: Padding(
-                            padding: const EdgeInsets.only(
-                              left: Dimens.pt6,
-                              right: Dimens.pt6,
-                              bottom: Dimens.pt12,
-                              top: Dimens.pt12,
+                      Text(
+                        state.item.by,
+                        style: const TextStyle(
+                          color: Palette.orange,
+                        ),
+                      ),
+                      const Spacer(),
+                      Text(
+                        state.item.timeAgo,
+                        style: const TextStyle(
+                          color: Palette.grey,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                BlocBuilder<PreferenceCubit, PreferenceState>(
+                  buildWhen: (
+                    PreferenceState previous,
+                    PreferenceState current,
+                  ) =>
+                      previous.fontSize != current.fontSize,
+                  builder: (
+                    BuildContext context,
+                    PreferenceState prefState,
+                  ) {
+                    return Column(
+                      children: <Widget>[
+                        if (state.item is Story)
+                          InkWell(
+                            onTap: () => LinkUtil.launch(
+                              state.item.url,
+                              useReader: context
+                                  .read<PreferenceCubit>()
+                                  .state
+                                  .readerEnabled,
+                              offlineReading: context
+                                  .read<StoriesBloc>()
+                                  .state
+                                  .isOfflineReading,
                             ),
-                            child: Text.rich(
-                              TextSpan(
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: prefState.fontSize.fontSize,
-                                  color: Theme.of(context)
-                                      .textTheme
-                                      .bodyLarge
-                                      ?.color,
-                                ),
-                                children: <TextSpan>[
-                                  TextSpan(
-                                    text: state.item.title,
-                                    style: TextStyle(
-                                      fontWeight: FontWeight.bold,
-                                      fontSize: prefState.fontSize.fontSize,
-                                      color: state.item.url.isNotEmpty
-                                          ? Palette.orange
-                                          : null,
-                                    ),
+                            child: Padding(
+                              padding: const EdgeInsets.only(
+                                left: Dimens.pt6,
+                                right: Dimens.pt6,
+                                bottom: Dimens.pt12,
+                                top: Dimens.pt12,
+                              ),
+                              child: Text.rich(
+                                TextSpan(
+                                  style: TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: prefState.fontSize.fontSize,
+                                    color: Theme.of(context)
+                                        .textTheme
+                                        .bodyLarge
+                                        ?.color,
                                   ),
-                                  if (state.item.url.isNotEmpty)
+                                  children: <TextSpan>[
                                     TextSpan(
-                                      text:
-                                          ''' (${(state.item as Story).readableUrl})''',
+                                      semanticsLabel: state.item.title,
+                                      text: state.item.title,
                                       style: TextStyle(
                                         fontWeight: FontWeight.bold,
-                                        fontSize:
-                                            prefState.fontSize.fontSize - 4,
-                                        color: Palette.orange,
+                                        fontSize: prefState.fontSize.fontSize,
+                                        color: state.item.url.isNotEmpty
+                                            ? Palette.orange
+                                            : null,
                                       ),
                                     ),
-                                ],
+                                    if (state.item.url.isNotEmpty)
+                                      TextSpan(
+                                        text:
+                                            ''' (${(state.item as Story).readableUrl})''',
+                                        style: TextStyle(
+                                          fontWeight: FontWeight.bold,
+                                          fontSize:
+                                              prefState.fontSize.fontSize - 4,
+                                          color: Palette.orange,
+                                        ),
+                                      ),
+                                  ],
+                                ),
+                                textAlign: TextAlign.center,
+                                textScaleFactor: MediaQuery.of(
+                                  context,
+                                ).textScaleFactor,
+                              ),
+                            ),
+                          )
+                        else
+                          const SizedBox(
+                            height: Dimens.pt6,
+                          ),
+                        if (state.item.text.isNotEmpty)
+                          SizedBox(
+                            width: double.infinity,
+                            child: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: Dimens.pt10,
+                              ),
+                              child: ItemText(
+                                item: state.item,
                               ),
-                              textAlign: TextAlign.center,
-                              textScaleFactor: MediaQuery.of(
-                                context,
-                              ).textScaleFactor,
                             ),
                           ),
-                        )
-                      else
-                        const SizedBox(
-                          height: Dimens.pt6,
-                        ),
-                      if (state.item.text.isNotEmpty)
-                        SizedBox(
-                          width: double.infinity,
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: Dimens.pt10,
-                            ),
-                            child: ItemText(
-                              item: state.item,
-                            ),
-                          ),
-                        ),
-                    ],
-                  );
-                },
-              ),
-              if (state.item.isPoll)
-                BlocProvider<PollCubit>(
-                  create: (BuildContext context) =>
-                      PollCubit(story: state.item as Story)..init(),
-                  child: const PollView(),
+                      ],
+                    );
+                  },
                 ),
-            ],
-          ),
-        ),
-        if (state.item.text.isNotEmpty)
-          const SizedBox(
-            height: Dimens.pt8,
-          ),
-        const Divider(
-          height: Dimens.zero,
-        ),
-        if (state.onlyShowTargetComment) ...<Widget>[
-          Center(
-            child: TextButton(
-              onPressed: () =>
-                  context.read<CommentsCubit>().loadAll(state.item as Story),
-              child: const Text('View all comments'),
+                if (state.item.isPoll)
+                  BlocProvider<PollCubit>(
+                    create: (BuildContext context) =>
+                        PollCubit(story: state.item as Story)..init(),
+                    child: const PollView(),
+                  ),
+              ],
             ),
           ),
+          if (state.item.text.isNotEmpty)
+            const SizedBox(
+              height: Dimens.pt8,
+            ),
           const Divider(
             height: Dimens.zero,
           ),
-        ] else ...<Widget>[
-          Row(
-            children: <Widget>[
-              if (state.item is Story) ...<Widget>[
-                const SizedBox(
-                  width: Dimens.pt12,
-                ),
-                Text(
-                  '''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
-                  style: const TextStyle(
-                    fontSize: TextDimens.pt13,
+          if (state.onlyShowTargetComment) ...<Widget>[
+            Center(
+              child: TextButton(
+                onPressed: () =>
+                    context.read<CommentsCubit>().loadAll(state.item as Story),
+                child: const Text('View all comments'),
+              ),
+            ),
+            const Divider(
+              height: Dimens.zero,
+            ),
+          ] else ...<Widget>[
+            Row(
+              children: <Widget>[
+                if (state.item is Story) ...<Widget>[
+                  const SizedBox(
+                    width: Dimens.pt12,
                   ),
-                ),
-              ] else ...<Widget>[
-                const SizedBox(
-                  width: Dimens.pt4,
-                ),
-                TextButton(
-                  onPressed: context.read<CommentsCubit>().loadParentThread,
-                  child: state.fetchParentStatus == CommentsStatus.loading
-                      ? const SizedBox(
-                          height: Dimens.pt12,
-                          width: Dimens.pt12,
-                          child: CustomCircularProgressIndicator(
-                            strokeWidth: Dimens.pt2,
+                  Text(
+                    '''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
+                    style: const TextStyle(
+                      fontSize: TextDimens.pt13,
+                    ),
+                  ),
+                ] else ...<Widget>[
+                  const SizedBox(
+                    width: Dimens.pt4,
+                  ),
+                  SizedBox(
+                    width: _viewParentButtonWidth,
+                    child: TextButton(
+                      onPressed: context.read<CommentsCubit>().loadParentThread,
+                      child: state.fetchParentStatus == CommentsStatus.loading
+                          ? const SizedBox(
+                              height: Dimens.pt12,
+                              width: Dimens.pt12,
+                              child: CustomCircularProgressIndicator(
+                                strokeWidth: Dimens.pt2,
+                              ),
+                            )
+                          : const Text(
+                              'View parent',
+                              style: TextStyle(
+                                fontSize: TextDimens.pt13,
+                              ),
+                            ),
+                    ),
+                  ),
+                  SizedBox(
+                    width: _viewRootButtonWidth,
+                    child: TextButton(
+                      onPressed: context.read<CommentsCubit>().loadRootThread,
+                      child: state.fetchRootStatus == CommentsStatus.loading
+                          ? const SizedBox(
+                              height: Dimens.pt12,
+                              width: Dimens.pt12,
+                              child: CustomCircularProgressIndicator(
+                                strokeWidth: Dimens.pt2,
+                              ),
+                            )
+                          : const Text(
+                              'View root',
+                              style: TextStyle(
+                                fontSize: TextDimens.pt13,
+                              ),
+                            ),
+                    ),
+                  ),
+                ],
+                const Spacer(),
+                if (!state.isOfflineReading)
+                  DropdownButton<FetchMode>(
+                    value: state.fetchMode,
+                    underline: const SizedBox.shrink(),
+                    items: FetchMode.values
+                        .map(
+                          (FetchMode val) => DropdownMenuItem<FetchMode>(
+                            value: val,
+                            child: Text(
+                              val.description,
+                              style: const TextStyle(
+                                fontSize: TextDimens.pt13,
+                              ),
+                            ),
                           ),
                         )
-                      : const Text(
-                          'View parent thread',
-                          style: TextStyle(
-                            fontSize: TextDimens.pt13,
-                          ),
-                        ),
+                        .toList(),
+                    onChanged: context.read<CommentsCubit>().onFetchModeChanged,
+                  ),
+                const SizedBox(
+                  width: Dimens.pt6,
                 ),
-              ],
-              const Spacer(),
-              if (!state.offlineReading)
-                DropdownButton<FetchMode>(
-                  value: state.fetchMode,
+                DropdownButton<CommentsOrder>(
+                  value: state.order,
                   underline: const SizedBox.shrink(),
-                  items: FetchMode.values
+                  items: CommentsOrder.values
                       .map(
-                        (FetchMode val) => DropdownMenuItem<FetchMode>(
+                        (CommentsOrder val) => DropdownMenuItem<CommentsOrder>(
                           value: val,
                           child: Text(
                             val.description,
@@ -467,51 +482,31 @@ class _ParentItemSection extends StatelessWidget {
                         ),
                       )
                       .toList(),
-                  onChanged: context.read<CommentsCubit>().onFetchModeChanged,
+                  onChanged: context.read<CommentsCubit>().onOrderChanged,
                 ),
-              const SizedBox(
-                width: Dimens.pt6,
-              ),
-              DropdownButton<CommentsOrder>(
-                value: state.order,
-                underline: const SizedBox.shrink(),
-                items: CommentsOrder.values
-                    .map(
-                      (CommentsOrder val) => DropdownMenuItem<CommentsOrder>(
-                        value: val,
-                        child: Text(
-                          val.description,
-                          style: const TextStyle(
-                            fontSize: TextDimens.pt13,
-                          ),
-                        ),
-                      ),
-                    )
-                    .toList(),
-                onChanged: context.read<CommentsCubit>().onOrderChanged,
-              ),
-              const SizedBox(
-                width: Dimens.pt4,
-              ),
-            ],
-          ),
-          const Divider(
-            height: Dimens.zero,
-          ),
-        ],
-        if (state.comments.isEmpty &&
-            state.status == CommentsStatus.allLoaded) ...<Widget>[
-          const SizedBox(
-            height: 240,
-          ),
-          const Center(
-            child: Text(
-              'Nothing yet',
-              style: TextStyle(color: Palette.grey),
+                const SizedBox(
+                  width: Dimens.pt4,
+                ),
+              ],
             ),
-          ),
+            const Divider(
+              height: Dimens.zero,
+            ),
+          ],
+          if (state.comments.isEmpty &&
+              state.status == CommentsStatus.allLoaded) ...<Widget>[
+            const SizedBox(
+              height: 240,
+            ),
+            const Center(
+              child: Text(
+                'Nothing yet',
+                style: TextStyle(color: Palette.grey),
+              ),
+            ),
+          ],
         ],
-      ],
+      ),
     );
   }
 }

lib/screens/item/widgets/more_popup_menu.dart

@@ -2,12 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:hacki/blocs/blocs.dart';
+import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/item/models/models.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
+import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
 
@@ -23,9 +25,6 @@ class MorePopupMenu extends StatelessWidget {
   final bool isBlocked;
   final VoidCallback onLoginTapped;
 
-  static const double _storySheetHeight = 500;
-  static const double _commentSheetHeight = 480;
-
   @override
   Widget build(BuildContext context) {
     return BlocProvider<VoteCubit>(
@@ -69,75 +68,91 @@ class MorePopupMenu extends StatelessWidget {
         builder: (BuildContext context, VoteState voteState) {
           final bool upvoted = voteState.vote == Vote.up;
           final bool downvoted = voteState.vote == Vote.down;
-          return Container(
-            height: item is Comment ? _commentSheetHeight : _storySheetHeight,
+          return ColoredBox(
             color: Theme.of(context).canvasColor,
             child: Material(
               color: Palette.transparent,
               child: Column(
+                mainAxisSize: MainAxisSize.min,
                 children: <Widget>[
                   BlocProvider<UserCubit>(
                     create: (BuildContext context) =>
                         UserCubit()..init(userId: item.by),
                     child: BlocBuilder<UserCubit, UserState>(
                       builder: (BuildContext context, UserState state) {
-                        return ListTile(
-                          leading: const Icon(
-                            Icons.account_circle,
-                          ),
-                          title: Text(item.by),
-                          subtitle: Text(
-                            state.user.description,
-                          ),
-                          onTap: () {
-                            Navigator.pop(context);
-                            showDialog<void>(
-                              context: context,
-                              builder: (BuildContext context) => AlertDialog(
-                                title: Text('About ${state.user.id}'),
-                                content: state.user.about.isEmpty
-                                    ? Row(
-                                        mainAxisAlignment:
-                                            MainAxisAlignment.center,
-                                        children: const <Widget>[
-                                          Text(
-                                            'empty',
-                                            style: TextStyle(
-                                              color: Palette.grey,
+                        return Semantics(
+                          excludeSemantics: state.status == UserStatus.loading,
+                          child: ListTile(
+                            leading: const Icon(
+                              Icons.account_circle,
+                            ),
+                            title: Text(item.by),
+                            subtitle: Text(
+                              state.user.description,
+                            ),
+                            onTap: () {
+                              Navigator.pop(context);
+                              showDialog<void>(
+                                context: context,
+                                builder: (BuildContext context) => AlertDialog(
+                                  semanticLabel:
+                                      '''About ${state.user.id}. ${state.user.about}''',
+                                  title: Text(
+                                    'About ${state.user.id}',
+                                  ),
+                                  content: state.user.about.isEmpty
+                                      ? Row(
+                                          mainAxisAlignment:
+                                              MainAxisAlignment.center,
+                                          children: const <Widget>[
+                                            Text(
+                                              'empty',
+                                              style: TextStyle(
+                                                color: Palette.grey,
+                                              ),
                                             ),
+                                          ],
+                                        )
+                                      : SelectableLinkify(
+                                          text: HtmlUtil.parseHtml(
+                                            state.user.about,
                                           ),
-                                        ],
-                                      )
-                                    : SelectableLinkify(
-                                        text: HtmlUtil.parseHtml(
-                                          state.user.about,
+                                          linkStyle: const TextStyle(
+                                            color: Palette.orange,
+                                          ),
+                                          onOpen: (LinkableElement link) =>
+                                              LinkUtil.launch(link.url),
+                                          semanticsLabel: state.user.about,
                                         ),
-                                        linkStyle: const TextStyle(
-                                          color: Palette.orange,
-                                        ),
-                                        onOpen: (LinkableElement link) =>
-                                            LinkUtil.launch(link.url),
+                                  actions: <Widget>[
+                                    TextButton(
+                                      onPressed: () {
+                                        locator
+                                            .get<AppReviewService>()
+                                            .requestReview();
+                                        Navigator.pop(context);
+                                        onSearchUserTapped(context);
+                                      },
+                                      child: const Text(
+                                        'Search',
                                       ),
-                                actions: <Widget>[
-                                  TextButton(
-                                    onPressed: () {
-                                      Navigator.pop(context);
-                                      onSearchUserTapped(context);
-                                    },
-                                    child: const Text(
-                                      'Search',
                                     ),
-                                  ),
-                                  TextButton(
-                                    onPressed: () => Navigator.pop(context),
-                                    child: const Text(
-                                      'Okay',
+                                    TextButton(
+                                      onPressed: () {
+                                        locator
+                                            .get<AppReviewService>()
+                                            .requestReview();
+                                        Navigator.pop(context);
+                                      },
+                                      child: const Text(
+                                        'Okay',
+                                      ),
                                     ),
-                                  ),
-                                ],
-                              ),
-                            );
-                          },
+                                  ],
+                                ),
+                              );
+                            },
+                          ),
                         );
                       },
                     ),

lib/screens/item/widgets/pin_icon_button.dart

@@ -1,13 +1,13 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class PinIconButton extends StatelessWidget {
   const PinIconButton({
@@ -49,7 +49,7 @@ class PinIconButton extends StatelessWidget {
                 ),
               ),
               onPressed: () {
-                HapticFeedback.lightImpact();
+                HapticFeedbackUtil.light();
                 if (pinned) {
                   context.read<PinCubit>().unpinStory(story);
                 } else {

lib/screens/item/widgets/poll_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:hacki/blocs/auth/auth_bloc.dart';
@@ -7,6 +6,7 @@ import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class PollView extends StatefulWidget {
   const PollView({super.key});
@@ -100,7 +100,7 @@ class _PollViewState extends State<PollView> {
                           children: <Widget>[
                             IconButton(
                               onPressed: () {
-                                HapticFeedback.lightImpact();
+                                HapticFeedbackUtil.light();
                                 context.read<VoteCubit>().upvote();
                               },
                               icon: Icon(

lib/screens/item/widgets/reply_box.dart

@@ -1,6 +1,5 @@
 import 'package:clipboard/clipboard.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:hacki/cubits/cubits.dart';
@@ -9,12 +8,12 @@ import 'package:hacki/models/item/item.dart';
 import 'package:hacki/screens/screens.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class ReplyBox extends StatefulWidget {
   const ReplyBox({
     super.key,
     this.splitViewEnabled = false,
-    required this.focusNode,
     required this.textEditingController,
     required this.onSendTapped,
     required this.onCloseTapped,
@@ -22,7 +21,6 @@ class ReplyBox extends StatefulWidget {
   });
 
   final bool splitViewEnabled;
-  final FocusNode focusNode;
   final TextEditingController textEditingController;
   final VoidCallback onSendTapped;
   final VoidCallback onCloseTapped;
@@ -47,206 +45,203 @@ class _ReplyBoxState extends State<ReplyBox> {
           previous.itemBeingEdited != current.itemBeingEdited ||
           previous.replyingTo != current.replyingTo,
       builder: (BuildContext context, EditState editState) {
-        return Visibility(
-          visible: editState.showReplyBox,
-          child: BlocBuilder<PostCubit, PostState>(
-            builder: (BuildContext context, PostState postState) {
-              final Item? replyingTo = editState.replyingTo;
-              final bool isLoading = postState.status == PostStatus.loading;
+        return BlocBuilder<PostCubit, PostState>(
+          builder: (BuildContext context, PostState postState) {
+            final Item? replyingTo = editState.replyingTo;
+            final bool isLoading = postState.status == PostStatus.loading;
 
-              return Padding(
-                padding: EdgeInsets.only(
-                  bottom: expanded
-                      ? Dimens.zero
-                      : widget.splitViewEnabled
-                          ? MediaQuery.of(context).viewInsets.bottom
-                          : Dimens.zero,
+            return Padding(
+              padding: EdgeInsets.only(
+                bottom: expanded
+                    ? Dimens.zero
+                    : widget.splitViewEnabled
+                        ? MediaQuery.of(context).viewInsets.bottom
+                        : Dimens.zero,
+              ),
+              child: AnimatedContainer(
+                height: expanded ? expandedHeight : _collapsedHeight,
+                duration: const Duration(milliseconds: 200),
+                decoration: BoxDecoration(
+                  boxShadow: <BoxShadow>[
+                    if (!context.read<SplitViewCubit>().state.enabled)
+                      BoxShadow(
+                        color: expanded ? Palette.transparent : Palette.black26,
+                        blurRadius: Dimens.pt40,
+                      ),
+                  ],
                 ),
-                child: AnimatedContainer(
-                  height: expanded ? expandedHeight : _collapsedHeight,
-                  duration: const Duration(milliseconds: 200),
-                  decoration: BoxDecoration(
-                    boxShadow: <BoxShadow>[
-                      if (!context.read<SplitViewCubit>().state.enabled)
-                        BoxShadow(
-                          color:
-                              expanded ? Palette.transparent : Palette.black26,
-                          blurRadius: Dimens.pt40,
+                child: Material(
+                  child: Column(
+                    children: <Widget>[
+                      if (context.read<SplitViewCubit>().state.enabled)
+                        const Divider(
+                          height: Dimens.zero,
                         ),
-                    ],
-                  ),
-                  child: Material(
-                    child: Column(
-                      children: <Widget>[
-                        if (context.read<SplitViewCubit>().state.enabled)
-                          const Divider(
-                            height: Dimens.zero,
-                          ),
-                        AnimatedContainer(
-                          height: expanded ? Dimens.pt36 : Dimens.zero,
-                          duration: const Duration(milliseconds: 200),
-                        ),
-                        Row(
-                          children: <Widget>[
-                            Expanded(
-                              child: Padding(
-                                padding: const EdgeInsets.only(
-                                  left: Dimens.pt12,
-                                  top: Dimens.pt8,
-                                  bottom: Dimens.pt8,
-                                ),
-                                child: Text(
-                                  replyingTo == null
-                                      ? 'Editing'
-                                      : 'Replying '
-                                          '${replyingTo.by}',
-                                  style: const TextStyle(color: Palette.grey),
-                                  maxLines: 1,
-                                  overflow: TextOverflow.ellipsis,
-                                ),
+                      AnimatedContainer(
+                        height: expanded ? Dimens.pt36 : Dimens.zero,
+                        duration: const Duration(milliseconds: 200),
+                      ),
+                      Row(
+                        children: <Widget>[
+                          Expanded(
+                            child: Padding(
+                              padding: const EdgeInsets.only(
+                                left: Dimens.pt12,
+                                top: Dimens.pt8,
+                                bottom: Dimens.pt8,
+                              ),
+                              child: Text(
+                                replyingTo == null
+                                    ? 'Editing'
+                                    : 'Replying '
+                                        '${replyingTo.by}',
+                                style: const TextStyle(color: Palette.grey),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
                               ),
                             ),
-                            if (!isLoading) ...<Widget>[
-                              ...<Widget>[
-                                if (replyingTo != null)
-                                  AnimatedOpacity(
-                                    opacity:
-                                        expanded ? NumSwitch.on : NumSwitch.off,
-                                    duration: const Duration(milliseconds: 300),
-                                    child: IconButton(
-                                      key: const Key('quote'),
-                                      icon: const Icon(
-                                        FeatherIcons.code,
-                                        color: Palette.orange,
-                                        size: TextDimens.pt18,
-                                      ),
-                                      onPressed:
-                                          expanded ? showTextPopup : null,
+                          ),
+                          if (!isLoading) ...<Widget>[
+                            ...<Widget>[
+                              if (replyingTo != null)
+                                AnimatedOpacity(
+                                  opacity:
+                                      expanded ? NumSwitch.on : NumSwitch.off,
+                                  duration: const Duration(milliseconds: 300),
+                                  child: IconButton(
+                                    key: const Key('quote'),
+                                    icon: const Icon(
+                                      FeatherIcons.code,
+                                      color: Palette.orange,
+                                      size: TextDimens.pt18,
                                     ),
+                                    onPressed: expanded ? showTextPopup : null,
                                   ),
-                                IconButton(
-                                  key: const Key('expand'),
-                                  icon: Icon(
-                                    expanded
-                                        ? FeatherIcons.minimize2
-                                        : FeatherIcons.maximize2,
-                                    color: Palette.orange,
-                                    size: TextDimens.pt18,
-                                  ),
-                                  onPressed: () {
-                                    setState(() {
-                                      expanded = !expanded;
-                                    });
-                                  },
                                 ),
-                              ],
                               IconButton(
-                                key: const Key('close'),
-                                icon: const Icon(
-                                  Icons.close,
+                                key: const Key('expand'),
+                                icon: Icon(
+                                  expanded
+                                      ? FeatherIcons.minimize2
+                                      : FeatherIcons.maximize2,
                                   color: Palette.orange,
+                                  size: TextDimens.pt18,
                                 ),
                                 onPressed: () {
-                                  final EditState state =
-                                      context.read<EditCubit>().state;
-                                  if (state.replyingTo != null &&
-                                      state.text.isNotNullOrEmpty) {
-                                    showDialog<void>(
-                                      context: context,
-                                      builder: (BuildContext context) =>
-                                          AlertDialog(
-                                        title: const Text('Save draft?'),
-                                        actions: <Widget>[
-                                          TextButton(
-                                            onPressed: () {
-                                              context
-                                                  .read<EditCubit>()
-                                                  .deleteDraft();
-                                              Navigator.pop(context);
-                                            },
-                                            child: const Text(
-                                              'No',
-                                              style: TextStyle(
-                                                color: Palette.red,
-                                              ),
-                                            ),
-                                          ),
-                                          TextButton(
-                                            onPressed: () =>
-                                                Navigator.pop(context),
-                                            child: const Text('Yes'),
-                                          ),
-                                        ],
-                                      ),
-                                    );
-                                  }
-                                  widget.onCloseTapped();
-                                  expanded = false;
+                                  setState(() {
+                                    expanded = !expanded;
+                                  });
                                 },
                               ),
                             ],
-                            if (isLoading)
-                              const Padding(
-                                padding: EdgeInsets.symmetric(
-                                  vertical: Dimens.pt12,
-                                  horizontal: Dimens.pt16,
-                                ),
-                                child: SizedBox(
-                                  height: Dimens.pt24,
-                                  width: Dimens.pt24,
-                                  child: CircularProgressIndicator(
-                                    color: Palette.orange,
-                                    strokeWidth: Dimens.pt2,
-                                  ),
-                                ),
-                              )
-                            else
-                              IconButton(
-                                key: const Key('send'),
-                                icon: const Icon(
-                                  Icons.send,
-                                  color: Palette.orange,
-                                ),
-                                onPressed: () {
-                                  widget.onSendTapped();
-                                  expanded = false;
-                                },
+                            IconButton(
+                              key: const Key('close'),
+                              icon: const Icon(
+                                Icons.close,
+                                color: Palette.orange,
                               ),
+                              onPressed: () {
+                                Navigator.pop(context);
+
+                                final EditState state =
+                                    context.read<EditCubit>().state;
+                                if (state.replyingTo != null &&
+                                    state.text.isNotNullOrEmpty) {
+                                  showDialog<void>(
+                                    context: context,
+                                    builder: (BuildContext context) =>
+                                        AlertDialog(
+                                      title: const Text('Save draft?'),
+                                      actions: <Widget>[
+                                        TextButton(
+                                          onPressed: () {
+                                            context
+                                                .read<EditCubit>()
+                                                .deleteDraft();
+                                            Navigator.pop(context);
+                                          },
+                                          child: const Text(
+                                            'No',
+                                            style: TextStyle(
+                                              color: Palette.red,
+                                            ),
+                                          ),
+                                        ),
+                                        TextButton(
+                                          onPressed: () =>
+                                              Navigator.pop(context),
+                                          child: const Text('Yes'),
+                                        ),
+                                      ],
+                                    ),
+                                  );
+                                }
+                                widget.onCloseTapped();
+                                expanded = false;
+                              },
+                            ),
                           ],
-                        ),
-                        Expanded(
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(
-                              horizontal: Dimens.pt16,
-                            ),
-                            child: TextField(
-                              focusNode: widget.focusNode,
-                              controller: widget.textEditingController,
-                              maxLines: 100,
-                              decoration: const InputDecoration(
-                                alignLabelWithHint: true,
-                                contentPadding: EdgeInsets.zero,
-                                hintText: '...',
-                                hintStyle: TextStyle(
-                                  color: Palette.grey,
-                                ),
-                                focusedBorder: InputBorder.none,
-                                border: InputBorder.none,
+                          if (isLoading)
+                            const Padding(
+                              padding: EdgeInsets.symmetric(
+                                vertical: Dimens.pt12,
+                                horizontal: Dimens.pt16,
                               ),
-                              keyboardType: TextInputType.multiline,
-                              textCapitalization: TextCapitalization.sentences,
-                              textInputAction: TextInputAction.newline,
-                              onChanged: widget.onChanged,
+                              child: SizedBox(
+                                height: Dimens.pt24,
+                                width: Dimens.pt24,
+                                child: CircularProgressIndicator(
+                                  color: Palette.orange,
+                                  strokeWidth: Dimens.pt2,
+                                ),
+                              ),
+                            )
+                          else
+                            IconButton(
+                              key: const Key('send'),
+                              icon: const Icon(
+                                Icons.send,
+                                color: Palette.orange,
+                              ),
+                              onPressed: () {
+                                widget.onSendTapped();
+                                expanded = false;
+                              },
                             ),
+                        ],
+                      ),
+                      Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: Dimens.pt16,
+                          ),
+                          child: TextField(
+                            autofocus: true,
+                            controller: widget.textEditingController,
+                            maxLines: 100,
+                            decoration: const InputDecoration(
+                              alignLabelWithHint: true,
+                              contentPadding: EdgeInsets.zero,
+                              hintText: '...',
+                              hintStyle: TextStyle(
+                                color: Palette.grey,
+                              ),
+                              focusedBorder: InputBorder.none,
+                              border: InputBorder.none,
+                            ),
+                            keyboardType: TextInputType.multiline,
+                            textCapitalization: TextCapitalization.sentences,
+                            textInputAction: TextInputAction.newline,
+                            onChanged: widget.onChanged,
                           ),
                         ),
-                      ],
-                    ),
+                      ),
+                    ],
                   ),
                 ),
-              );
-            },
-          ),
+              ),
+            );
+          },
         );
       },
     );
@@ -296,7 +291,7 @@ class _ReplyBoxState extends State<ReplyBox> {
                           ),
                         ),
                         onPressed: () {
-                          HapticFeedback.lightImpact();
+                          HapticFeedbackUtil.light();
                           setState(() {
                             expanded = false;
                           });
@@ -324,7 +319,7 @@ class _ReplyBoxState extends State<ReplyBox> {
                         ),
                         onPressed: () => FlutterClipboard.copy(
                           replyingTo.text,
-                        ).then((_) => HapticFeedback.selectionClick()),
+                        ).then((_) => HapticFeedbackUtil.selection()),
                       ),
                       IconButton(
                         icon: const Icon(

lib/screens/item/widgets/scroll_up_icon_button.dart

@@ -1,58 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_feather_icons/flutter_feather_icons.dart';
-import 'package:hacki/styles/styles.dart';
-
-class ScrollUpIconButton extends StatefulWidget {
-  const ScrollUpIconButton({
-    super.key,
-    required this.scrollController,
-  });
-
-  final ScrollController scrollController;
-
-  @override
-  _ScrollUpIconButtonState createState() => _ScrollUpIconButtonState();
-}
-
-class _ScrollUpIconButtonState extends State<ScrollUpIconButton> {
-  @override
-  void initState() {
-    super.initState();
-
-    widget.scrollController.addListener(() {
-      if (widget.scrollController.offset <= 1000 && mounted) {
-        setState(() {});
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.scrollController.hasClients) {
-      final double curPos = widget.scrollController.offset;
-      final double opacity = curPos / 1000;
-      return Opacity(
-        opacity: opacity.clamp(0, 1),
-        child: IconButton(
-          icon: const Icon(
-            FeatherIcons.chevronsUp,
-            color: Palette.orange,
-            size: TextDimens.pt26,
-          ),
-          onPressed: () {
-            final double curPos = widget.scrollController.offset;
-            widget.scrollController.animateTo(
-              0,
-              curve: Curves.bounceOut,
-              duration: Duration(
-                milliseconds: curPos ~/ 15,
-              ),
-            );
-          },
-        ),
-      );
-    }
-
-    return Container();
-  }
-}

lib/screens/item/widgets/widgets.dart

@@ -1,4 +1,5 @@
 export 'custom_app_bar.dart';
+export 'custom_floating_action_button.dart';
 export 'fav_icon_button.dart';
 export 'link_icon_button.dart';
 export 'login_dialog.dart';
@@ -7,5 +8,4 @@ export 'more_popup_menu.dart';
 export 'pin_icon_button.dart';
 export 'poll_view.dart';
 export 'reply_box.dart';
-export 'scroll_up_icon_button.dart';
 export 'time_machine_dialog.dart';

lib/screens/profile/profile_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
@@ -102,7 +101,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                               .where((Item e) => !e.dead && !e.deleted)
                               .toList(),
                           onRefresh: () {
-                            HapticFeedback.lightImpact();
+                            HapticFeedbackUtil.light();
                             context.read<HistoryCubit>().refresh();
                           },
                           onLoadMore: () {
@@ -166,7 +165,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                               refreshController: refreshControllerFav,
                               items: favState.favItems,
                               onRefresh: () {
-                                HapticFeedback.lightImpact();
+                                HapticFeedbackUtil.light();
                                 context.read<FavCubit>().refresh();
                               },
                               onLoadMore: () {
@@ -221,7 +220,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                               context.read<NotificationCubit>().loadMore();
                             },
                             onRefresh: () {
-                              HapticFeedback.lightImpact();
+                              HapticFeedbackUtil.light();
                               context.read<NotificationCubit>().refresh();
                             },
                           ),

lib/screens/profile/widgets/inbox_view.dart

@@ -118,7 +118,7 @@ class InboxView extends StatelessWidget {
                                     Row(
                                       children: <Widget>[
                                         Text(
-                                          e.postedDate,
+                                          e.timeAgo,
                                           style: const TextStyle(
                                             color: Palette.grey,
                                           ),

lib/screens/profile/widgets/settings.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:clipboard/clipboard.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_email_sender/flutter_email_sender.dart';
@@ -129,7 +128,7 @@ class _SettingsState extends State<Settings> {
                                   .toList(),
                               onChanged: (FetchMode? fetchMode) {
                                 if (fetchMode != null) {
-                                  HapticFeedback.selectionClick();
+                                  HapticFeedbackUtil.selection();
                                   context.read<PreferenceCubit>().update(
                                         FetchModePreference(),
                                         to: fetchMode.index,
@@ -163,7 +162,7 @@ class _SettingsState extends State<Settings> {
                                   .toList(),
                               onChanged: (CommentsOrder? order) {
                                 if (order != null) {
-                                  HapticFeedback.selectionClick();
+                                  HapticFeedbackUtil.selection();
                                   context.read<PreferenceCubit>().update(
                                         CommentsOrderPreference(),
                                         to: order.index,
@@ -202,7 +201,7 @@ class _SettingsState extends State<Settings> {
                         preference as BooleanPreference,
                       ),
                       onChanged: (bool val) {
-                        HapticFeedback.lightImpact();
+                        HapticFeedbackUtil.light();
 
                         context
                             .read<PreferenceCubit>()
@@ -232,6 +231,12 @@ class _SettingsState extends State<Settings> {
                     onTap: showThemeSettingDialog,
                   ),
                   const Divider(),
+                  ListTile(
+                    title: const Text(
+                      'Filter Keywords',
+                    ),
+                    onTap: onFilterKeywordsTapped,
+                  ),
                   ListTile(
                     title: const Text(
                       'Export Favorites',
@@ -329,7 +334,7 @@ class _SettingsState extends State<Settings> {
                         }
                       },
                       title: Text(
-                        font.label,
+                        font.uiLabel,
                         style: TextStyle(fontFamily: font.name),
                       ),
                     ),
@@ -366,22 +371,19 @@ class _SettingsState extends State<Settings> {
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.light,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
-                    AdaptiveTheme.of(context).setLight(),
+                onChanged: updateThemeSetting,
                 title: const Text('Light'),
               ),
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.dark,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
-                    AdaptiveTheme.of(context).setDark(),
+                onChanged: updateThemeSetting,
                 title: const Text('Dark'),
               ),
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.system,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
-                    AdaptiveTheme.of(context).setSystem(),
+                onChanged: updateThemeSetting,
                 title: const Text('System'),
               ),
             ],
@@ -391,6 +393,24 @@ class _SettingsState extends State<Settings> {
     );
   }
 
+  void updateThemeSetting(AdaptiveThemeMode? val) {
+    switch (val) {
+      case AdaptiveThemeMode.light:
+        AdaptiveTheme.of(context).setLight();
+        break;
+      case AdaptiveThemeMode.dark:
+        AdaptiveTheme.of(context).setDark();
+        break;
+      case AdaptiveThemeMode.system:
+      case null:
+        AdaptiveTheme.of(context).setSystem();
+        break;
+    }
+
+    final Brightness brightness = Theme.of(context).brightness;
+    ThemeUtil.updateAndroidStatusBarSetting(brightness, val);
+  }
+
   void showClearCacheDialog() {
     showDialog<void>(
       context: context,
@@ -640,6 +660,100 @@ class _SettingsState extends State<Settings> {
     }
   }
 
+  void onFilterKeywordsTapped() {
+    showDialog<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text(
+            'Filter Keywords',
+            style: TextStyle(
+              fontSize: TextDimens.pt16,
+            ),
+          ),
+          content: BlocBuilder<FilterCubit, FilterState>(
+            builder: (BuildContext context, FilterState state) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                children: <Widget>[
+                  if (state.keywords.isEmpty)
+                    const CenteredText(
+                      text:
+                          '''story or comment that contains keywords here will be hidden.''',
+                    ),
+                  Wrap(
+                    spacing: Dimens.pt4,
+                    children: <Widget>[
+                      for (final String keyword in state.keywords)
+                        ActionChip(
+                          avatar: const Icon(
+                            Icons.close,
+                            size: TextDimens.pt14,
+                          ),
+                          label: Text(keyword),
+                          onPressed: () => context
+                              .read<FilterCubit>()
+                              .removeKeyword(keyword),
+                        ),
+                    ],
+                  ),
+                ],
+              );
+            },
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: onAddKeywordTapped,
+              child: const Text(
+                'Add keyword',
+              ),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text(
+                'Okay',
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  void onAddKeywordTapped() {
+    final TextEditingController controller = TextEditingController();
+    showDialog<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          content: TextField(
+            autofocus: true,
+            controller: controller,
+          ),
+          actions: <Widget>[
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text(
+                'Cancel',
+              ),
+            ),
+            TextButton(
+              onPressed: () {
+                final String keyword = controller.text.trim();
+                if (keyword.isEmpty) return;
+                context.read<FilterCubit>().addKeyword(keyword.toLowerCase());
+                Navigator.pop(context);
+              },
+              child: const Text(
+                'Confirm',
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
   Future<void> onExportFavoritesTapped() async {
     final List<int> allFavorites = context.read<FavCubit>().state.favIds;
 
@@ -651,7 +765,7 @@ class _SettingsState extends State<Settings> {
     try {
       await FlutterClipboard.copy(
         allFavorites.join('\n'),
-      ).whenComplete(HapticFeedback.selectionClick);
+      ).whenComplete(HapticFeedbackUtil.selection);
       showSnackBar(content: 'Ids of favorites have been copied to clipboard.');
     } catch (error, stackTrace) {
       error.logError(stackTrace: stackTrace);

lib/screens/profile/widgets/tab_bar_settings.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class TabBarSettings extends StatefulWidget {
   const TabBarSettings({super.key});
@@ -39,7 +39,7 @@ class _TabBarSettingsState extends State<TabBarSettings> {
                   scrollDirection: Axis.horizontal,
                   physics: const NeverScrollableScrollPhysics(),
                   onReorder: context.read<TabCubit>().update,
-                  onReorderStart: (_) => HapticFeedback.lightImpact(),
+                  onReorderStart: (_) => HapticFeedbackUtil.light(),
                   children: <Widget>[
                     for (final StoryType tab in state.tabs)
                       InkWell(

lib/screens/submit/submit_screen.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class SubmitScreen extends StatefulWidget {
   const SubmitScreen({super.key});
@@ -45,7 +45,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
       listener: (BuildContext context, SubmitState state) {
         if (state.status == SubmitStatus.submitted) {
           Navigator.pop(context);
-          HapticFeedback.lightImpact();
+          HapticFeedbackUtil.light();
           showSnackBar(
             content: 'Post submitted successfully.',
           );

lib/screens/widgets/centered_text.dart

@@ -8,6 +8,12 @@ class CenteredText extends StatelessWidget {
     this.color = Palette.grey,
   });
 
+  const CenteredText.hidden({Key? key})
+      : this(
+          key: key,
+          text: 'hidden',
+        );
+
   const CenteredText.deleted({Key? key})
       : this(
           key: key,

lib/screens/widgets/comment_tile.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:hacki/blocs/blocs.dart';
@@ -9,6 +8,7 @@ import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/utils.dart';
 
 class CommentTile extends StatelessWidget {
   const CommentTile({
@@ -48,7 +48,6 @@ class CommentTile extends StatelessWidget {
       lazy: false,
       create: (_) => CollapseCubit(
         commentId: comment.id,
-        commentsCubit: context.tryRead<CommentsCubit>(),
         collapseCache: context.tryRead<CollapseCache>() ?? CollapseCache(),
       )..init(),
       child: BlocBuilder3<CollapseCubit, CollapseState, PreferenceCubit,
@@ -118,7 +117,7 @@ class CommentTile extends StatelessWidget {
                   child: InkWell(
                     onTap: () {
                       if (actionable) {
-                        HapticFeedback.selectionClick();
+                        HapticFeedbackUtil.selection();
                         context.read<CollapseCubit>().collapse();
                       } else {
                         onTap?.call();
@@ -152,7 +151,7 @@ class CommentTile extends StatelessWidget {
                                 ),
                               const Spacer(),
                               Text(
-                                comment.postedDate,
+                                comment.timeAgo,
                                 style: const TextStyle(
                                   color: Palette.grey,
                                 ),
@@ -171,6 +170,8 @@ class CommentTile extends StatelessWidget {
                                       '''collapsed (${state.collapsedCount + 1})''',
                                   color: Palette.orangeAccent,
                                 )
+                              else if (comment.hidden)
+                                const CenteredText.hidden()
                               else if (comment.deleted)
                                 const CenteredText.deleted()
                               else if (comment.dead)
@@ -182,22 +183,25 @@ class CommentTile extends StatelessWidget {
                                 Padding(
                                   padding: const EdgeInsets.only(
                                     left: Dimens.pt8,
-                                    right: Dimens.pt8,
+                                    right: Dimens.pt2,
                                     top: Dimens.pt6,
                                     bottom: Dimens.pt12,
                                   ),
                                   child: SizedBox(
                                     width: double.infinity,
-                                    child: ItemText(
-                                      key: ValueKey<int>(comment.id),
-                                      item: comment,
-                                      onTap: () {
-                                        if (onTap == null) {
-                                          _onTextTapped(context);
-                                        } else {
-                                          onTap!.call();
-                                        }
-                                      },
+                                    child: Semantics(
+                                      label: '''At level ${comment.level}.''',
+                                      child: ItemText(
+                                        key: ValueKey<int>(comment.id),
+                                        item: comment,
+                                        onTap: () {
+                                          if (onTap == null) {
+                                            _onTextTapped(context);
+                                          } else {
+                                            onTap!.call();
+                                          }
+                                        },
+                                      ),
                                     ),
                                   ),
                                 ),
@@ -216,7 +220,7 @@ class CommentTile extends StatelessWidget {
                                   Expanded(
                                     child: TextButton(
                                       onPressed: () {
-                                        HapticFeedback.selectionClick();
+                                        HapticFeedbackUtil.selection();
                                         context.read<CommentsCubit>().loadMore(
                                               comment: comment,
                                             );
@@ -336,7 +340,7 @@ class CommentTile extends StatelessWidget {
 
   void _onTextTapped(BuildContext context) {
     if (context.read<PreferenceCubit>().state.tapAnywhereToCollapseEnabled) {
-      HapticFeedback.selectionClick();
+      HapticFeedbackUtil.selection();
       context.read<CollapseCubit>().collapse();
     }
   }

lib/screens/widgets/custom_described_feature_overlay.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:feature_discovery/feature_discovery.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:hacki/utils/utils.dart';
 
 class CustomDescribedFeatureOverlay extends StatelessWidget {
   const CustomDescribedFeatureOverlay({
@@ -12,6 +12,7 @@ class CustomDescribedFeatureOverlay extends StatelessWidget {
     required this.tapTarget,
     required this.title,
     required this.description,
+    this.contentLocation = ContentLocation.trivial,
     this.onComplete,
   });
 
@@ -20,6 +21,7 @@ class CustomDescribedFeatureOverlay extends StatelessWidget {
   final Widget title;
   final Widget description;
   final Widget child;
+  final ContentLocation contentLocation;
   final VoidCallback? onComplete;
 
   @override
@@ -32,14 +34,15 @@ class CustomDescribedFeatureOverlay extends StatelessWidget {
       title: title,
       description: description,
       barrierDismissible: false,
+      contentLocation: contentLocation,
       onBackgroundTap: () {
-        unawaited(HapticFeedback.lightImpact());
+        HapticFeedbackUtil.light();
         FeatureDiscovery.completeCurrentStep(context);
         onComplete?.call();
         return Future<bool>.value(true);
       },
       onComplete: () async {
-        unawaited(HapticFeedback.lightImpact());
+        HapticFeedbackUtil.light();
         onComplete?.call();
         return true;
       },

lib/screens/widgets/custom_linkify/custom_linkify.dart

@@ -153,6 +153,7 @@ class SelectableLinkify extends StatelessWidget {
   const SelectableLinkify({
     super.key,
     required this.text,
+    this.semanticsLabel,
     this.linkifiers = defaultLinkifiers,
     this.onOpen,
     this.options = LinkifierUtil.linkifyOptions,
@@ -188,6 +189,8 @@ class SelectableLinkify extends StatelessWidget {
   /// Text to be linkified
   final String text;
 
+  final String? semanticsLabel;
+
   /// The number of font pixels for each logical pixel
   final double textScaleFactor;
 
@@ -317,6 +320,7 @@ class SelectableLinkify extends StatelessWidget {
       selectionControls: selectionControls,
       onSelectionChanged: onSelectionChanged,
       contextMenuBuilder: contextMenuBuilder,
+      semanticsLabel: semanticsLabel,
     );
   }
 

lib/screens/widgets/custom_tab_bar.dart

@@ -1,12 +1,12 @@
 import 'package:badges/badges.dart';
 import 'package:flutter/material.dart' hide Badge;
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/haptic_feedback_util.dart';
 
 class CustomTabBar extends StatefulWidget {
   const CustomTabBar({
@@ -52,7 +52,7 @@ class _CustomTabBarState extends State<CustomTabBar> {
             bottom: Dimens.pt8,
           ),
           onTap: (_) {
-            HapticFeedback.selectionClick();
+            HapticFeedbackUtil.selection();
           },
           tabs: <Widget>[
             for (int i = 0; i < state.tabs.length; i++)

lib/screens/widgets/item_text.dart

@@ -47,6 +47,7 @@ class ItemText extends StatelessWidget {
           editableTextState,
           item: item,
         ),
+        semanticsLabel: item.text,
       );
     } else {
       return SelectableLinkify(
@@ -65,6 +66,7 @@ class ItemText extends StatelessWidget {
           editableTextState,
           item: item,
         ),
+        semanticsLabel: item.text,
       );
     }
   }

lib/screens/widgets/items_list_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
@@ -94,7 +93,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                             children: <Widget>[
                               SlidableAction(
                                 onPressed: (_) {
-                                  HapticFeedback.lightImpact();
+                                  HapticFeedbackUtil.light();
                                   onPinned?.call(e);
                                 },
                                 backgroundColor: Palette.orange,
@@ -200,7 +199,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                               Row(
                                 children: <Widget>[
                                   Text(
-                                    e.postedDate,
+                                    e.timeAgo,
                                     style: const TextStyle(
                                       color: Palette.grey,
                                     ),

lib/screens/widgets/link_preview/link_preview.dart

@@ -7,19 +7,18 @@ import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/link_preview/link_view.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class LinkPreview extends StatefulWidget {
   const LinkPreview({
     super.key,
     required this.link,
     required this.story,
+    required this.onTap,
     required this.showMetadata,
     required this.showUrl,
-    required this.offlineReading,
+    required this.isOfflineReading,
+    required this.titleStyle,
     this.cache = const Duration(days: 30),
-    this.titleStyle,
-    this.bodyStyle,
     this.showMultimedia = true,
     this.backgroundColor = const Color.fromRGBO(235, 235, 235, 1),
     this.bodyMaxLines = 3,
@@ -35,6 +34,7 @@ class LinkPreview extends StatefulWidget {
   });
 
   final Story story;
+  final VoidCallback onTap;
 
   /// Web address (Url that need to be parsed)
   /// For IOS & Web, only HTTP and HTTPS are support
@@ -84,10 +84,7 @@ class LinkPreview extends StatefulWidget {
   final Duration cache;
 
   /// Customize body `TextStyle`
-  final TextStyle? titleStyle;
-
-  /// Customize body `TextStyle`
-  final TextStyle? bodyStyle;
+  final TextStyle titleStyle;
 
   /// Show or Hide image if available defaults to `true`
   final bool showMultimedia;
@@ -105,7 +102,7 @@ class LinkPreview extends StatefulWidget {
 
   final bool showMetadata;
   final bool showUrl;
-  final bool offlineReading;
+  final bool isOfflineReading;
 
   @override
   _LinkPreviewState createState() => _LinkPreviewState();
@@ -135,7 +132,7 @@ class _LinkPreviewState extends State<LinkPreview> {
     _info = await WebAnalyzer.getInfo(
       story: widget.story,
       cache: widget.cache,
-      offlineReading: widget.offlineReading,
+      offlineReading: widget.isOfflineReading,
     );
 
     if (mounted) {
@@ -145,19 +142,6 @@ class _LinkPreviewState extends State<LinkPreview> {
     }
   }
 
-  Future<void> _launchURL(String url) async {
-    final Uri uri = Uri.parse(url);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      try {
-        await launchUrl(uri);
-      } catch (err) {
-        throw Exception('Could not launch $url. Error: $err');
-      }
-    }
-  }
-
   Widget _buildLinkContainer(
     double height, {
     String? title = '',
@@ -188,9 +172,8 @@ class _LinkPreviewState extends State<LinkPreview> {
         description: desc ?? title ?? 'no comment yet.',
         imageUri: imageUri,
         imagePath: Constants.hackerNewsLogoPath,
-        onTap: _launchURL,
+        onTap: widget.onTap,
         titleTextStyle: widget.titleStyle,
-        bodyTextStyle: widget.bodyStyle,
         bodyTextOverflow: widget.bodyTextOverflow,
         bodyMaxLines: widget.bodyMaxLines,
         showMultiMedia: widget.showMultimedia,

lib/screens/widgets/link_preview/link_view.dart

@@ -1,9 +1,15 @@
+import 'dart:math';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/models.dart';
+import 'package:hacki/screens/widgets/link_preview/models/models.dart';
+import 'package:hacki/screens/widgets/tap_down_wrapper.dart';
 import 'package:hacki/styles/styles.dart';
-import 'package:memoize/memoize.dart';
+import 'package:hacki/utils/link_util.dart';
 
 class LinkView extends StatelessWidget {
   LinkView({
@@ -17,10 +23,9 @@ class LinkView extends StatelessWidget {
     required this.showMetadata,
     required bool showUrl,
     required this.bodyMaxLines,
+    required this.titleTextStyle,
     this.imageUri,
     this.imagePath,
-    this.titleTextStyle,
-    this.bodyTextStyle,
     this.showMultiMedia = true,
     this.bodyTextOverflow,
     this.isIcon = false,
@@ -40,9 +45,8 @@ class LinkView extends StatelessWidget {
   final String description;
   final String? imageUri;
   final String? imagePath;
-  final void Function(String) onTap;
-  final TextStyle? titleTextStyle;
-  final TextStyle? bodyTextStyle;
+  final VoidCallback onTap;
+  final TextStyle titleTextStyle;
   final bool showMultiMedia;
   final TextOverflow? bodyTextOverflow;
   final int bodyMaxLines;
@@ -52,70 +56,154 @@ class LinkView extends StatelessWidget {
   final bool showMetadata;
   final bool showUrl;
 
-  static final double Function(double) _getTitleFontSize =
-      memo1(_computeTitleFontSize);
+  static const double _bottomPadding = 6;
+  static late TextStyle _urlStyle;
+  static late TextStyle _metadataStyle;
+  static late TextStyle _descriptionStyle;
 
-  static double _computeTitleFontSize(double width) {
-    double size = width * 0.13;
-    if (size > 15) {
-      size = 15;
-    }
-    return size;
-  }
+  static final Map<MaxLineComputationParams, int> _computationCache =
+      <MaxLineComputationParams, int>{};
 
-  static final int Function(double) _getTitleLines = memo1(_computeTitleLines);
-
-  static int _computeTitleLines(double layoutHeight) {
-    return layoutHeight >= 100 ? 2 : 1;
-  }
-
-  static final int Function(int, bool, bool, String?) _getBodyLines =
-      memo4(_computeBodyLines);
-
-  static int _computeBodyLines(
-    int bodyMaxLines,
-    bool showMetadata,
-    bool showUrl,
-    String? fontFamily,
+  static int getDescriptionMaxLines(
+    MaxLineComputationParams params,
+    TextStyle titleStyle,
   ) {
-    final int maxLines = bodyMaxLines -
-        (showMetadata ? 1 : 0) -
-        (showUrl ? 1 : 0) +
-        (fontFamily == Font.ubuntuMono.name ? 1 : 0);
+    if (_computationCache.containsKey(params)) {
+      return _computationCache[params]!;
+    }
+
+    _urlStyle = titleStyle.copyWith(
+      color: Palette.grey,
+      fontSize: TextDimens.pt12,
+      fontWeight: FontWeight.w400,
+      fontFamily: params.fontFamily,
+    );
+    _descriptionStyle = TextStyle(
+      color: Palette.grey,
+      fontFamily: params.fontFamily,
+      fontSize: TextDimens.pt14,
+    );
+    _metadataStyle = _descriptionStyle.copyWith(
+      fontSize: TextDimens.pt12,
+      fontFamily: params.fontFamily,
+    );
+
+    final double urlHeight = (TextPainter(
+      text: TextSpan(
+        text: '(url)',
+        style: _urlStyle,
+      ),
+      maxLines: 1,
+      textScaleFactor: params.textScaleFactor,
+      textDirection: TextDirection.ltr,
+    )..layout())
+        .size
+        .height;
+    final double metadataHeight = (TextPainter(
+      text: TextSpan(
+        text: '123metadata',
+        style: _metadataStyle,
+      ),
+      maxLines: 1,
+      textScaleFactor: params.textScaleFactor,
+      textDirection: TextDirection.ltr,
+    )..layout())
+        .size
+        .height;
+    final double descriptionHeight = (TextPainter(
+      text: TextSpan(
+        text: 'DESCRIPTION',
+        style: _descriptionStyle,
+      ),
+      maxLines: 1,
+      textScaleFactor: params.textScaleFactor,
+      textDirection: TextDirection.ltr,
+    )..layout())
+        .size
+        .height;
+
+    final double allPaddings =
+        params.fontFamily == Font.robotoSlab.name ? Dimens.pt2 : Dimens.pt4;
+
+    final double height = <double>[
+      params.titleHeight,
+      if (params.showUrl) urlHeight,
+      if (params.showMetadata) metadataHeight,
+      allPaddings,
+      _bottomPadding,
+    ].reduce((double a, double b) => a + b);
+
+    final double descriptionAllowedHeight = params.layoutHeight - height;
+
+    final int maxLines =
+        max(1, (descriptionAllowedHeight / descriptionHeight).floor());
+
+    _computationCache[params] = maxLines;
+
     return maxLines;
   }
 
+  static bool? isUsingSerifFont;
+
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (BuildContext context, BoxConstraints constraints) {
         final double layoutWidth = constraints.biggest.width;
         final double layoutHeight = constraints.biggest.height;
+        final double bodyWidth = layoutWidth - layoutHeight - 8;
+        final String? fontFamily =
+            Theme.of(context).primaryTextTheme.bodyMedium?.fontFamily;
+        final double textScaleFactor = MediaQuery.of(context).textScaleFactor;
+        final TextStyle titleStyle = titleTextStyle;
+        final double titleHeight = (TextPainter(
+          text: TextSpan(
+            text: title,
+            style: titleStyle,
+          ),
+          maxLines: 2,
+          textScaleFactor: textScaleFactor,
+          textDirection: TextDirection.ltr,
+        )..layout(maxWidth: bodyWidth))
+            .size
+            .height;
+        final int descriptionMaxLines = getDescriptionMaxLines(
+          MaxLineComputationParams(
+            fontFamily ?? Font.roboto.name,
+            bodyWidth,
+            layoutHeight,
+            titleHeight,
+            textScaleFactor,
+            showUrl,
+            showMetadata,
+          ),
+          titleStyle,
+        );
 
-        final TextStyle titleFontStyle = titleTextStyle ??
-            TextStyle(
-              fontSize: _getTitleFontSize(layoutWidth),
-              color: Palette.black,
-              fontWeight: FontWeight.bold,
-            );
-        final TextStyle bodyFontStyle = bodyTextStyle ??
-            TextStyle(
-              fontSize: _getTitleFontSize(layoutWidth) - 1,
-              color: Palette.grey,
-              fontWeight: FontWeight.w400,
-            );
+        isUsingSerifFont ??= Font.fromString(fontFamily).isSerif;
 
-        return InkWell(
-          onTap: () => onTap(url),
-          child: Row(
-            children: <Widget>[
-              if (showMultiMedia)
-                Padding(
-                  padding: const EdgeInsets.only(
-                    right: 8,
-                    top: 5,
-                    bottom: 5,
-                  ),
+        return Row(
+          children: <Widget>[
+            if (showMultiMedia)
+              Padding(
+                padding: const EdgeInsets.only(
+                  right: 8,
+                  top: 5,
+                  bottom: 5,
+                ),
+                child: TapDownWrapper(
+                  onTap: () {
+                    if (url.isNotEmpty) {
+                      LinkUtil.launch(
+                        url,
+                        useHackiForHnLink: false,
+                        offlineReading:
+                            context.read<StoriesBloc>().state.isOfflineReading,
+                      );
+                    } else {
+                      onTap();
+                    }
+                  },
                   child: SizedBox(
                     height: layoutHeight,
                     width: layoutHeight,
@@ -136,93 +224,58 @@ class LinkView extends StatelessWidget {
                             },
                           ),
                   ),
-                )
-              else
-                const SizedBox(width: 5),
-              Expanded(
+                ),
+              )
+            else
+              const SizedBox(width: Dimens.pt5),
+            TapDownWrapper(
+              onTap: onTap,
+              child: SizedBox(
+                height: layoutHeight,
+                width: layoutWidth - layoutHeight - 8,
                 child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    Padding(
-                      padding: EdgeInsets.only(
-                        top: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium
-                                    ?.fontFamily ==
-                                Font.robotoSlab.name
-                            ? 2
-                            : 4,
-                      ),
-                      child: Column(
-                        children: <Widget>[
-                          Container(
-                            alignment: Alignment.topLeft,
-                            child: Text(
-                              title,
-                              style: titleFontStyle,
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: _getTitleLines(layoutHeight),
-                            ),
-                          ),
-                          if (showUrl && url.isNotEmpty)
-                            Container(
-                              alignment: Alignment.topLeft,
-                              child: Text(
-                                '($readableUrl)',
-                                textAlign: TextAlign.left,
-                                style: titleFontStyle.copyWith(
-                                  color: Palette.grey,
-                                  fontSize: titleFontStyle.fontSize == null
-                                      ? 12
-                                      : titleFontStyle.fontSize! - 4,
-                                  fontWeight: FontWeight.w400,
-                                ),
-                                overflow:
-                                    bodyTextOverflow ?? TextOverflow.ellipsis,
-                                maxLines: 1,
-                              ),
-                            ),
-                        ],
-                      ),
+                    SizedBox(
+                      height: isUsingSerifFont! ? Dimens.pt2 : Dimens.pt4,
                     ),
+                    Text(
+                      title,
+                      style: titleStyle,
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 2,
+                    ),
+                    if (showUrl)
+                      Text(
+                        '($readableUrl)',
+                        textAlign: TextAlign.left,
+                        style: _urlStyle,
+                        overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
                     if (showMetadata)
-                      Container(
-                        alignment: Alignment.topLeft,
-                        margin: const EdgeInsets.only(top: 2),
-                        child: Text(
-                          metadata,
-                          textAlign: TextAlign.left,
-                          style: bodyFontStyle.copyWith(
-                            fontSize: bodyFontStyle.fontSize == null
-                                ? 12
-                                : bodyFontStyle.fontSize! - 2,
-                          ),
-                          overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
-                          maxLines: 1,
-                        ),
-                      ),
-                    Expanded(
-                      child: Container(
-                        alignment: Alignment.topLeft,
-                        child: Text(
-                          description,
-                          textAlign: TextAlign.left,
-                          style: bodyFontStyle,
-                          overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
-                          maxLines: _getBodyLines(
-                            bodyMaxLines,
-                            showMetadata,
-                            showUrl,
-                            Theme.of(context).textTheme.bodyMedium?.fontFamily,
-                          ),
-                        ),
+                      Text(
+                        metadata,
+                        textAlign: TextAlign.left,
+                        style: _metadataStyle,
+                        overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
+                        maxLines: 1,
                       ),
+                    Text(
+                      description,
+                      textAlign: TextAlign.left,
+                      style: _descriptionStyle,
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: descriptionMaxLines,
+                    ),
+                    const SizedBox(
+                      height: _bottomPadding,
                     ),
                   ],
                 ),
               ),
-            ],
-          ),
+            ),
+          ],
         );
       },
     );

lib/screens/widgets/link_preview/models/max_line_computation_params.dart

@@ -0,0 +1,33 @@
+import 'package:equatable/equatable.dart';
+
+class MaxLineComputationParams extends Equatable {
+  const MaxLineComputationParams(
+    this.fontFamily,
+    this.layoutWidth,
+    this.layoutHeight,
+    this.titleHeight,
+    this.textScaleFactor,
+    // ignore: avoid_positional_boolean_parameters
+    this.showUrl,
+    this.showMetadata,
+  );
+
+  final String fontFamily;
+  final double layoutWidth;
+  final double layoutHeight;
+  final double titleHeight;
+  final double textScaleFactor;
+  final bool showUrl;
+  final bool showMetadata;
+
+  @override
+  List<Object?> get props => <Object>[
+        fontFamily,
+        layoutWidth,
+        layoutHeight,
+        titleHeight,
+        textScaleFactor,
+        showUrl,
+        showMetadata,
+      ];
+}

lib/screens/widgets/link_preview/models/models.dart

@@ -0,0 +1 @@
+export 'max_line_computation_params.dart';

lib/screens/widgets/offline_banner.dart

@@ -17,9 +17,9 @@ class OfflineBanner extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<StoriesBloc, StoriesState>(
       buildWhen: (StoriesState previous, StoriesState current) =>
-          previous.offlineReading != current.offlineReading,
+          previous.isOfflineReading != current.isOfflineReading,
       builder: (BuildContext context, StoriesState state) {
-        if (state.offlineReading) {
+        if (state.isOfflineReading) {
           return MaterialBanner(
             content: Text(
               'You are currently in offline mode. '

lib/screens/widgets/onboarding_view.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
 import 'package:hacki/styles/styles.dart';
@@ -52,15 +51,18 @@ class _OnboardingViewState extends State<OnboardingView> {
                 children: const <Widget>[
                   _PageViewChild(
                     path: Constants.commentTileRightSlidePath,
-                    description: 'Swipe right to leave a comment or vote.',
+                    description:
+                        '''Swipe right to leave a comment, vote, and more.''',
                   ),
                   _PageViewChild(
                     path: Constants.commentTileLeftSlidePath,
-                    description: 'Swipe left to view all the parent comments.',
+                    description:
+                        '''Swipe left to view all the ancestor comments.''',
                   ),
                   _PageViewChild(
                     path: Constants.commentTileTopTapPath,
-                    description: 'Tap on the top of comment tile to collapse.',
+                    description:
+                        '''Tap on anywhere inside a comment tile to collapse.''',
                   ),
                 ],
               ),
@@ -72,7 +74,7 @@ class _OnboardingViewState extends State<OnboardingView> {
             right: Dimens.zero,
             child: ElevatedButton(
               onPressed: () {
-                HapticFeedback.lightImpact();
+                HapticFeedbackUtil.light();
                 if (pageController.page! >= 2) {
                   Navigator.pop(context);
                 } else {

lib/screens/widgets/stories_list_view.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
+import 'package:hacki/utils/utils.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class StoriesListView extends StatefulWidget {
@@ -73,7 +73,7 @@ class _StoriesListViewState extends State<StoriesListView> {
               refreshController: refreshController,
               items: state.storiesByType[storyType]!,
               onRefresh: () {
-                HapticFeedback.lightImpact();
+                HapticFeedbackUtil.light();
                 context
                     .read<StoriesBloc>()
                     .add(StoriesRefresh(type: storyType));
@@ -86,7 +86,7 @@ class _StoriesListViewState extends State<StoriesListView> {
               },
               onTap: onStoryTapped,
               onPinned: context.read<PinCubit>().pinStory,
-              header: state.offlineReading ? null : header,
+              header: state.isOfflineReading ? null : header,
               onMoreTapped: onMoreTapped,
             );
           },

lib/screens/widgets/story_tile.dart

@@ -31,103 +31,109 @@ class StoryTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (story.hidden) return const SizedBox.shrink();
     if (showWebPreview) {
       final double height = context.storyTileHeight;
-      return TapDownWrapper(
-        onTap: onTap,
+      return Semantics(
+        label: story.screenReaderLabel,
+        excludeSemantics: true,
         child: Padding(
           padding: const EdgeInsets.symmetric(
             horizontal: Dimens.pt12,
           ),
-          child: AbsorbPointer(
-            child: LinkPreview(
-              story: story,
-              link: story.url,
-              offlineReading: context.read<StoriesBloc>().state.offlineReading,
-              placeholderWidget: _LinkPreviewPlaceholder(
-                height: height,
-              ),
-              errorImage: Constants.hackerNewsLogoLink,
-              backgroundColor: Palette.transparent,
-              borderRadius: Dimens.zero,
-              removeElevation: true,
-              bodyMaxLines: context.storyTileMaxLines,
-              errorTitle: story.title,
-              titleStyle: TextStyle(
-                color: hasRead
-                    ? Palette.grey[500]
-                    : Theme.of(context).textTheme.bodyLarge?.color,
-                fontWeight: FontWeight.bold,
-              ),
-              showMetadata: showMetadata,
-              showUrl: showUrl,
+          child: LinkPreview(
+            story: story,
+            link: story.url,
+            isOfflineReading:
+                context.read<StoriesBloc>().state.isOfflineReading,
+            placeholderWidget: _LinkPreviewPlaceholder(
+              height: height,
             ),
+            errorImage: Constants.hackerNewsLogoLink,
+            backgroundColor: Palette.transparent,
+            borderRadius: Dimens.zero,
+            removeElevation: true,
+            bodyMaxLines: context.storyTileMaxLines,
+            errorTitle: story.title,
+            titleStyle: TextStyle(
+              color: hasRead
+                  ? Palette.grey[500]
+                  : Theme.of(context).textTheme.bodyLarge?.color,
+              fontWeight: FontWeight.bold,
+            ),
+            showMetadata: showMetadata,
+            showUrl: showUrl,
+            onTap: onTap,
           ),
         ),
       );
     } else {
-      return InkWell(
-        onTap: onTap,
-        child: Padding(
-          padding: const EdgeInsets.only(left: Dimens.pt12),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              const SizedBox(
-                height: Dimens.pt8,
-              ),
-              Row(
-                children: <Widget>[
-                  Expanded(
-                    child: Text.rich(
-                      TextSpan(
-                        children: <TextSpan>[
-                          TextSpan(
-                            text: story.title,
-                            style: TextStyle(
-                              color: hasRead
-                                  ? Palette.grey[500]
-                                  : Theme.of(context)
-                                      .textTheme
-                                      .bodyLarge
-                                      ?.color,
-                              fontSize: simpleTileFontSize,
-                            ),
-                          ),
-                          if (showUrl && story.url.isNotEmpty)
-                            TextSpan(
-                              text: ' (${story.readableUrl})',
-                              style: TextStyle(
-                                color: Palette.grey[500],
-                                fontSize: simpleTileFontSize - 4,
-                              ),
-                            ),
-                        ],
-                      ),
-                      textScaleFactor: MediaQuery.of(context).textScaleFactor,
-                    ),
-                  ),
-                ],
-              ),
-              if (showMetadata)
+      return Semantics(
+        label: story.screenReaderLabel,
+        excludeSemantics: true,
+        child: InkWell(
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.only(left: Dimens.pt12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                const SizedBox(
+                  height: Dimens.pt8,
+                ),
                 Row(
                   children: <Widget>[
                     Expanded(
-                      child: Text(
-                        story.metadata,
-                        style: TextStyle(
-                          color: Palette.grey,
-                          fontSize: simpleTileFontSize - 2,
+                      child: Text.rich(
+                        TextSpan(
+                          children: <TextSpan>[
+                            TextSpan(
+                              text: story.title,
+                              style: TextStyle(
+                                color: hasRead
+                                    ? Palette.grey[500]
+                                    : Theme.of(context)
+                                        .textTheme
+                                        .bodyLarge
+                                        ?.color,
+                                fontSize: simpleTileFontSize,
+                              ),
+                            ),
+                            if (showUrl && story.url.isNotEmpty)
+                              TextSpan(
+                                text: ' (${story.readableUrl})',
+                                style: TextStyle(
+                                  color: Palette.grey[500],
+                                  fontSize: simpleTileFontSize - 4,
+                                ),
+                              ),
+                          ],
                         ),
-                        maxLines: 1,
+                        textScaleFactor: MediaQuery.of(context).textScaleFactor,
                       ),
                     ),
                   ],
                 ),
-              const SizedBox(
-                height: Dimens.pt8,
-              ),
-            ],
+                if (showMetadata)
+                  Row(
+                    children: <Widget>[
+                      Expanded(
+                        child: Text(
+                          story.metadata,
+                          style: TextStyle(
+                            color: Palette.grey,
+                            fontSize: simpleTileFontSize - 2,
+                          ),
+                          maxLines: 1,
+                        ),
+                      ),
+                    ],
+                  ),
+                const SizedBox(
+                  height: Dimens.pt8,
+                ),
+              ],
+            ),
           ),
         ),
       );

lib/services/app_review_service.dart

@@ -0,0 +1,52 @@
+import 'dart:io';
+
+import 'package:hacki/config/locator.dart';
+import 'package:hacki/repositories/repositories.dart';
+import 'package:in_app_review/in_app_review.dart';
+
+class AppReviewService {
+  AppReviewService({PreferenceRepository? preferenceRepository})
+      : _preferenceRepository =
+            preferenceRepository ?? locator.get<PreferenceRepository>();
+
+  final PreferenceRepository _preferenceRepository;
+
+  static const String _lastRequestTimestampKey = 'lastRequestTimestamp';
+  static const int _differenceInDays = 3;
+
+  void requestReview() {
+    if (Platform.isIOS) {
+      _shouldDisplay().then((bool val) {
+        if (val) InAppReview.instance.requestReview();
+      });
+    }
+  }
+
+  Future<bool> _shouldDisplay() async {
+    final DateTime now = DateTime.now();
+    final int? timestamp =
+        await _preferenceRepository.getInt(_lastRequestTimestampKey);
+
+    if (timestamp == null) {
+      _preferenceRepository.setInt(
+        _lastRequestTimestampKey,
+        now.millisecondsSinceEpoch,
+      );
+      return true;
+    }
+
+    final DateTime lastReviewRequest =
+        DateTime.fromMillisecondsSinceEpoch(timestamp, isUtc: true);
+    final int difference = now.difference(lastReviewRequest).inDays;
+
+    if (difference >= _differenceInDays) {
+      _preferenceRepository.setInt(
+        _lastRequestTimestampKey,
+        now.millisecondsSinceEpoch,
+      );
+      return true;
+    }
+
+    return false;
+  }
+}

lib/services/local_notification_service.dart

@@ -4,7 +4,7 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/models.dart';
 
-class LocalNotification {
+class LocalNotificationService {
   Future<void> pushForNewReply(Comment newReply, int storyId) async {
     final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
         FlutterLocalNotificationsPlugin();

lib/services/services.dart

@@ -1,6 +1,7 @@
+export 'app_review_service.dart';
 export 'caches/caches.dart';
 export 'custom_bloc_observer.dart';
 export 'fetcher.dart';
 export 'firebase_client.dart';
-export 'local_notification.dart';
+export 'local_notification_service.dart';
 export 'web_analyzer.dart';