fix status bar for android. (#200)

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,
   );
 
+  // ignore: prefer_asserts_with_message
+  assert(() {
     Bloc.observer = CustomBlocObserver();
+    return true;
+  }());
 
   HydratedBloc.storage = storage;
 
@@ -276,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/screens/item/widgets/main_view.dart

@@ -48,7 +48,8 @@ class MainView extends StatelessWidget {
         Positioned.fill(
           child: BlocBuilder<CommentsCubit, CommentsState>(
             builder: (BuildContext context, CommentsState state) {
-              return SmartRefresher(
+              return Scrollbar(
+                child: SmartRefresher(
                   scrollController: scrollController,
                   enablePullUp: !state.onlyShowTargetComment,
                   enablePullDown: !state.onlyShowTargetComment,
@@ -152,7 +153,11 @@ class MainView extends StatelessWidget {
                             }
 
                             if (cmt.id !=
-                              context.read<EditCubit>().state.replyingTo?.id) {
+                                context
+                                    .read<EditCubit>()
+                                    .state
+                                    .replyingTo
+                                    ?.id) {
                               commentEditingController.clear();
                             }
 
@@ -174,6 +179,7 @@ class MainView extends StatelessWidget {
                       );
                     },
                   ),
+                ),
               );
             },
           ),

lib/screens/profile/widgets/settings.dart

@@ -372,22 +372,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'),
               ),
             ],
@@ -397,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,

lib/screens/widgets/comment_tile.dart

@@ -183,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/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.10"
+  flutter: ">=3.7.9"

pubspec.yaml

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