remove scroll bar. (#202)

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

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';

lib/cubits/comments/comments_cubit.dart

@@ -6,6 +6,7 @@ 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';
@@ -20,6 +21,7 @@ part 'comments_state.dart';
 
 class CommentsCubit extends Cubit<CommentsState> {
   CommentsCubit({
+    required FilterCubit filterCubit,
     required CollapseCache collapseCache,
     CommentCache? commentCache,
     OfflineRepository? offlineRepository,
@@ -30,7 +32,8 @@ class CommentsCubit extends Cubit<CommentsState> {
     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>(),
@@ -48,6 +51,7 @@ class CommentsCubit extends Cubit<CommentsState> {
           ),
         );
 
+  final FilterCubit _filterCubit;
   final CollapseCache _collapseCache;
   final CommentCache _commentCache;
   final OfflineRepository _offlineRepository;
@@ -348,9 +352,12 @@ 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));

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) {
+    _storiesRepository.fetchUser(id: userId).then((User? user) {
-      emit(state.copyWith(user: user, status: UserStatus.loaded));
+      emit(
+        state.copyWith(
+          user: user ?? User.emptyWithId(userId),
+          status: UserStatus.loaded,
+        ),
+      );
     }).onError((_, __) {
       emit(state.copyWith(status: UserStatus.failure));
       return;

lib/extensions/state_extension.dart

@@ -108,24 +108,26 @@ extension StateExtension on State {
       linkToShare = await showModalBottomSheet<String>(
         context: context,
         builder: (BuildContext context) {
-          return Container(
+          return SafeArea(
-            height: 140,
+            child: ColoredBox(
-            color: Theme.of(context).canvasColor,
+              color: Theme.of(context).canvasColor,
-            child: Material(
+              child: Material(
-              child: Column(
+                child: Column(
-                children: <Widget>[
+                  mainAxisSize: MainAxisSize.min,
-                  ListTile(
+                  children: <Widget>[
-                    onTap: () => Navigator.pop(context, item.url),
+                    ListTile(
-                    title: const Text('Link to article'),
+                      onTap: () => Navigator.pop(context, item.url),
-                  ),
+                      title: const Text('Link to article'),
-                  ListTile(
-                    onTap: () => Navigator.pop(
-                      context,
-                      'https://news.ycombinator.com/item?id=${item.id}',
                     ),
-                    title: const Text('Link to HN'),
+                    ListTile(
-                  ),
+                      onTap: () => Navigator.pop(
-                ],
+                        context,
+                        'https://news.ycombinator.com/item?id=${item.id}',
+                      ),
+                      title: const Text('Link to HN'),
+                    ),
+                  ],
+                ),
               ),
             ),
           );

lib/main.dart

@@ -21,6 +21,7 @@ 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';
@@ -123,14 +124,6 @@ Future<void> main({bool testing = false}) async {
           systemNavigationBarDividerColor: Palette.transparent,
         ),
       );
-    } else {
-      SystemChrome.setSystemUIOverlayStyle(
-        const SystemUiOverlayStyle(
-          statusBarBrightness: Brightness.light,
-          statusBarIconBrightness: Brightness.dark,
-          statusBarColor: Colors.transparent,
-        ),
-      );
     }
 
     await SystemChrome.setEnabledSystemUIMode(
@@ -147,7 +140,11 @@ Future<void> main({bool testing = false}) async {
     prefs.getInt(FontPreference().key) ?? Font.roboto.index,
   );
 
-  Bloc.observer = CustomBlocObserver();
+  // ignore: prefer_asserts_with_message
+  assert(() {
+    Bloc.observer = CustomBlocObserver();
+    return true;
+  }());
 
   HydratedBloc.storage = storage;
 
@@ -183,9 +180,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>(
@@ -271,6 +273,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/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,
@@ -26,7 +27,10 @@ class Comment extends Item {
 
   String get metadata => '''by $by $timeAgo''';
 
-  Comment copyWith({int? level}) {
+  Comment copyWith({
+    int? level,
+    bool? hidden,
+  }) {
     return Comment(
       id: id,
       time: time,
@@ -37,6 +41,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;
@@ -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,10 +39,28 @@ 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 $timeAgo | $descendants comment${descendants > 1 ? 's' : ''}''';
 

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 {
+  Future<User?> fetchUser({required String id}) async {
-    final User user = await _firebaseClient
+    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.isOfflineReading;
-    final bool hasRead = isPin || context.read<StoriesBloc>().hasRead(story);
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
 
     // If a story is a job story and it has a link to the job posting,
@@ -245,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/item/item_screen.dart

@@ -64,6 +64,7 @@ class ItemScreen extends StatefulWidget {
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
               create: (BuildContext context) => CommentsCubit(
+                filterCubit: context.read<FilterCubit>(),
                 isOfflineReading:
                     context.read<StoriesBloc>().state.isOfflineReading,
                 item: args.item,
@@ -106,6 +107,7 @@ class ItemScreen extends StatefulWidget {
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
               create: (BuildContext context) => CommentsCubit(
+                filterCubit: context.read<FilterCubit>(),
                 isOfflineReading:
                     context.read<StoriesBloc>().state.isOfflineReading,
                 item: args.item,
@@ -434,45 +436,45 @@ class _ItemScreenState extends State<ItemScreen> with RouteAware {
   }
 
   void onRightMoreTapped(Comment comment) {
-    const double bottomSheetHeight = 140;
-
     HapticFeedback.lightImpact();
     showModalBottomSheet<void>(
       context: context,
       builder: (BuildContext context) {
-        return Container(
+        return SafeArea(
-          height: bottomSheetHeight,
+          child: ColoredBox(
-          color: Theme.of(context).canvasColor,
+            color: Theme.of(context).canvasColor,
-          child: Material(
+            child: Material(
-            color: Palette.transparent,
+              color: Palette.transparent,
-            child: Column(
+              child: Column(
-              children: <Widget>[
+                mainAxisSize: MainAxisSize.min,
-                ListTile(
+                children: <Widget>[
-                  leading: const Icon(Icons.av_timer),
+                  ListTile(
-                  title: const Text('View ancestors'),
+                    leading: const Icon(Icons.av_timer),
-                  onTap: () {
+                    title: const Text('View ancestors'),
-                    Navigator.pop(context);
+                    onTap: () {
-                    onTimeMachineActivated(comment);
+                      Navigator.pop(context);
-                  },
+                      onTimeMachineActivated(comment);
-                  enabled:
+                    },
-                      comment.level > 0 && !(comment.dead || comment.deleted),
+                    enabled:
-                ),
+                        comment.level > 0 && !(comment.dead || comment.deleted),
-                ListTile(
+                  ),
-                  leading: const Icon(Icons.list),
+                  ListTile(
-                  title: const Text('View in separate thread'),
+                    leading: const Icon(Icons.list),
-                  onTap: () {
+                    title: const Text('View in separate thread'),
-                    Navigator.pop(context);
+                    onTap: () {
-                    goToItemScreen(
+                      Navigator.pop(context);
-                      args: ItemScreenArgs(
+                      goToItemScreen(
-                        item: comment,
+                        args: ItemScreenArgs(
-                        useCommentCache: true,
+                          item: comment,
-                      ),
+                          useCommentCache: true,
-                      forceNewScreen: true,
+                        ),
-                    );
+                        forceNewScreen: true,
-                  },
+                      );
-                  enabled: !(comment.dead || comment.deleted),
+                    },
-                ),
+                    enabled: !(comment.dead || comment.deleted),
-              ],
+                  ),
+                ],
+              ),
             ),
           ),
         );

lib/screens/item/widgets/more_popup_menu.dart

@@ -23,9 +23,6 @@ class MorePopupMenu extends StatelessWidget {
   final bool isBlocked;
   final VoidCallback onLoginTapped;
 
-  static const double _storySheetHeight = 485;
-  static const double _commentSheetHeight = 470;
-
   @override
   Widget build(BuildContext context) {
     return BlocProvider<VoteCubit>(
@@ -69,12 +66,12 @@ 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(
+          return ColoredBox(
-            height: item is Comment ? _commentSheetHeight : _storySheetHeight,
             color: Theme.of(context).canvasColor,
             child: Material(
               color: Palette.transparent,
               child: Column(
+                mainAxisSize: MainAxisSize.min,
                 children: <Widget>[
                   BlocProvider<UserCubit>(
                     create: (BuildContext context) =>

lib/screens/profile/widgets/settings.dart

@@ -232,6 +232,12 @@ class _SettingsState extends State<Settings> {
                     onTap: showThemeSettingDialog,
                   ),
                   const Divider(),
+                  ListTile(
+                    title: const Text(
+                      'Filter Keywords',
+                    ),
+                    onTap: onFilterKeywordsTapped,
+                  ),
                   ListTile(
                     title: const Text(
                       'Export Favorites',
@@ -366,22 +372,19 @@ class _SettingsState extends State<Settings> {
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.light,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
+                onChanged: updateThemeSetting,
-                    AdaptiveTheme.of(context).setLight(),
                 title: const Text('Light'),
               ),
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.dark,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
+                onChanged: updateThemeSetting,
-                    AdaptiveTheme.of(context).setDark(),
                 title: const Text('Dark'),
               ),
               RadioListTile<AdaptiveThemeMode>(
                 value: AdaptiveThemeMode.system,
                 groupValue: themeMode,
-                onChanged: (AdaptiveThemeMode? val) =>
+                onChanged: updateThemeSetting,
-                    AdaptiveTheme.of(context).setSystem(),
                 title: const Text('System'),
               ),
             ],
@@ -391,6 +394,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 +661,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;
 

lib/screens/widgets/comment_tile.dart

@@ -43,6 +43,7 @@ class CommentTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (comment.hidden) return const SizedBox.shrink();
     return BlocProvider<CollapseCubit>(
       key: ValueKey<String>('${comment.id}-BlocProvider'),
       lazy: false,
@@ -182,7 +183,7 @@ class CommentTile extends StatelessWidget {
                                 Padding(
                                   padding: const EdgeInsets.only(
                                     left: Dimens.pt8,
-                                    right: Dimens.pt8,
+                                    right: Dimens.pt2,
                                     top: Dimens.pt6,
                                     bottom: Dimens.pt12,
                                   ),

lib/screens/widgets/link_preview/link_preview.dart

@@ -7,13 +7,13 @@ 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.isOfflineReading,
@@ -34,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
@@ -141,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 = '',
@@ -184,7 +172,7 @@ class _LinkPreviewState extends State<LinkPreview> {
         description: desc ?? title ?? 'no comment yet.',
         imageUri: imageUri,
         imagePath: Constants.hackerNewsLogoPath,
-        onTap: _launchURL,
+        onTap: widget.onTap,
         titleTextStyle: widget.titleStyle,
         bodyTextOverflow: widget.bodyTextOverflow,
         bodyMaxLines: widget.bodyMaxLines,

lib/screens/widgets/link_preview/link_view.dart

@@ -5,7 +5,9 @@ import 'package:flutter/material.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:hacki/utils/link_util.dart';
 
 class LinkView extends StatelessWidget {
   LinkView({
@@ -41,7 +43,7 @@ class LinkView extends StatelessWidget {
   final String description;
   final String? imageUri;
   final String? imagePath;
-  final void Function(String) onTap;
+  final VoidCallback onTap;
   final TextStyle titleTextStyle;
   final bool showMultiMedia;
   final TextOverflow? bodyTextOverflow;
@@ -176,17 +178,26 @@ class LinkView extends StatelessWidget {
           titleStyle,
         );
 
-        return InkWell(
+        return Row(
-          onTap: () => onTap(url),
+          children: <Widget>[
-          child: Row(
+            if (showMultiMedia)
-            children: <Widget>[
+              Padding(
-              if (showMultiMedia)
+                padding: const EdgeInsets.only(
-                Padding(
+                  right: 8,
-                  padding: const EdgeInsets.only(
+                  top: 5,
-                    right: 8,
+                  bottom: 5,
-                    top: 5,
+                ),
-                    bottom: 5,
+                child: TapDownWrapper(
-                  ),
+                  onTap: () {
+                    if (url.isNotEmpty) {
+                      LinkUtil.launch(
+                        url,
+                        useHackiForHnLink: false,
+                      );
+                    } else {
+                      onTap();
+                    }
+                  },
                   child: SizedBox(
                     height: layoutHeight,
                     width: layoutHeight,
@@ -207,10 +218,13 @@ class LinkView extends StatelessWidget {
                             },
                           ),
                   ),
-                )
+                ),
-              else
+              )
-                const SizedBox(width: Dimens.pt5),
+            else
-              SizedBox(
+              const SizedBox(width: Dimens.pt5),
+            TapDownWrapper(
+              onTap: onTap,
+              child: SizedBox(
                 height: layoutHeight,
                 width: layoutWidth - layoutHeight - 8,
                 child: Column(
@@ -258,8 +272,8 @@ class LinkView extends StatelessWidget {
                   ],
                 ),
               ),
-            ],
+            ),
-          ),
+          ],
         );
       },
     );

lib/screens/widgets/story_tile.dart

@@ -31,42 +31,39 @@ class StoryTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    if (story.hidden) return const SizedBox.shrink();
     if (showWebPreview) {
       final double height = context.storyTileHeight;
       return Semantics(
         label: story.screenReaderLabel,
         excludeSemantics: true,
-        child: TapDownWrapper(
+        child: Padding(
-          onTap: onTap,
+          padding: const EdgeInsets.symmetric(
-          child: Padding(
+            horizontal: Dimens.pt12,
-            padding: const EdgeInsets.symmetric(
+          ),
-              horizontal: Dimens.pt12,
+          child: LinkPreview(
+            story: story,
+            link: story.url,
+            isOfflineReading:
+                context.read<StoriesBloc>().state.isOfflineReading,
+            placeholderWidget: _LinkPreviewPlaceholder(
+              height: height,
             ),
-            child: AbsorbPointer(
+            errorImage: Constants.hackerNewsLogoLink,
-              child: LinkPreview(
+            backgroundColor: Palette.transparent,
-                story: story,
+            borderRadius: Dimens.zero,
-                link: story.url,
+            removeElevation: true,
-                isOfflineReading:
+            bodyMaxLines: context.storyTileMaxLines,
-                    context.read<StoriesBloc>().state.isOfflineReading,
+            errorTitle: story.title,
-                placeholderWidget: _LinkPreviewPlaceholder(
+            titleStyle: TextStyle(
-                  height: height,
+              color: hasRead
-                ),
+                  ? Palette.grey[500]
-                errorImage: Constants.hackerNewsLogoLink,
+                  : Theme.of(context).textTheme.bodyLarge?.color,
-                backgroundColor: Palette.transparent,
+              fontWeight: FontWeight.bold,
-                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,
-              ),
             ),
+            showMetadata: showMetadata,
+            showUrl: showUrl,
+            onTap: onTap,
           ),
         ),
       );

lib/utils/theme_util.dart

@@ -0,0 +1,66 @@
+import 'dart:io';
+
+import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/services.dart';
+import 'package:hacki/styles/styles.dart';
+
+abstract class ThemeUtil {
+  /// Temp fix for the issue:
+  /// https://github.com/flutter/flutter/issues/119465
+  static Future<void> updateAndroidStatusBarSetting(
+    Brightness brightness,
+    AdaptiveThemeMode? mode,
+  ) async {
+    if (Platform.isAndroid == false) return;
+
+    final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+    final AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
+    final int sdk = androidInfo.version.sdkInt;
+
+    if (sdk > 28) return;
+    switch (mode) {
+      case AdaptiveThemeMode.light:
+        SystemChrome.setSystemUIOverlayStyle(
+          const SystemUiOverlayStyle(
+            statusBarBrightness: Brightness.dark,
+            statusBarIconBrightness: Brightness.dark,
+            statusBarColor: Palette.transparent,
+          ),
+        );
+        break;
+      case AdaptiveThemeMode.dark:
+        SystemChrome.setSystemUIOverlayStyle(
+          const SystemUiOverlayStyle(
+            statusBarBrightness: Brightness.light,
+            statusBarIconBrightness: Brightness.light,
+            statusBarColor: Palette.transparent,
+          ),
+        );
+        break;
+      case AdaptiveThemeMode.system:
+      case null:
+        switch (brightness) {
+          case Brightness.light:
+            SystemChrome.setSystemUIOverlayStyle(
+              const SystemUiOverlayStyle(
+                statusBarBrightness: Brightness.dark,
+                statusBarIconBrightness: Brightness.dark,
+                statusBarColor: Palette.transparent,
+              ),
+            );
+            break;
+          case Brightness.dark:
+            SystemChrome.setSystemUIOverlayStyle(
+              const SystemUiOverlayStyle(
+                statusBarBrightness: Brightness.light,
+                statusBarIconBrightness: Brightness.light,
+                statusBarColor: Palette.transparent,
+              ),
+            );
+            break;
+        }
+        break;
+    }
+  }
+}

lib/utils/utils.dart

@@ -4,4 +4,5 @@ export 'link_util.dart';
 export 'linkifier_util.dart';
 export 'log_util.dart';
 export 'service_exception.dart';
+export 'theme_util.dart';
 export 'throttle.dart';

pubspec.lock

@@ -1375,4 +1375,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=2.19.0 <3.0.0"
-  flutter: ">=3.7.8"
+  flutter: ">=3.7.9"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 1.3.4+103
+version: 1.4.3+107
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
-  flutter: "3.7.8"
+  flutter: "3.7.9"
 
 dependencies:
   adaptive_theme: ^3.2.0