Merge pull request #110 from a-mabe/fix-ios-statusbar-text

Fix ios statusbar text
a-mabe · Dec 2, 2023 · 0516e9a · 0516e9a
2 parents d154e07 + d813187
commit 0516e9a
Show file tree

Hide file tree

Showing 7 changed files with 280 additions and 248 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.1
+1.1.2
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -56,6 +56,6 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 </dict>
 </plist>
diff --git a/lib/main.dart b/lib/main.dart
@@ -212,46 +212,54 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      /// Pushes to [CreateWorkout()]
-      floatingActionButton: FloatingActionButton(
-        onPressed: pushSelectTimerPage,
-        tooltip: 'Create workout',
-        child: const Icon(Icons.add),
-      ),
-      appBar: AppBar(
-        toolbarHeight: 0,
-      ),
-      body: SafeArea(
-          child: Container(
-              padding: const EdgeInsets.all(8.0),
-              child: SizedBox(
-                  height: MediaQuery.of(context).size.height * 0.882,
-                  child: FutureBuilder(
-                      future: workouts,
-                      builder: (BuildContext context, AsyncSnapshot snapshot) {
-                        /// When [workouts] has successfully loaded.
-                        if (snapshot.hasData) {
-                          if (snapshot.data!.isEmpty) {
-                            return workoutEmpty();
-                          } else {
-                            reorderableWorkoutList = snapshot.data;
-                            reorderableWorkoutList.sort((a, b) =>
-                                a.workoutIndex.compareTo(b.workoutIndex));
-                            return workoutListView(snapshot);
-                          }
-                        }
+    WidgetsBinding.instance.renderViews.first.automaticSystemUiAdjustment =
+        false;
 
-                        /// When there was an error loading [workouts].
-                        else if (snapshot.hasError) {
-                          return workoutFetchError(snapshot);
-                        }
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarBrightness: Theme.of(context).brightness,
+    ));
 
-                        /// While still waiting to load [workouts].
-                        else {
-                          return workoutLoading();
-                        }
-                      })))),
-    );
+    return Container(
+        color: Theme.of(context).scaffoldBackgroundColor,
+        child: SafeArea(
+          child: Scaffold(
+
+              /// Pushes to [CreateWorkout()]
+              floatingActionButton: FloatingActionButton(
+                onPressed: pushSelectTimerPage,
+                tooltip: 'Create workout',
+                child: const Icon(Icons.add),
+              ),
+              body: Container(
+                  padding: const EdgeInsets.all(8.0),
+                  child: SizedBox(
+                      height: MediaQuery.of(context).size.height * 0.882,
+                      child: FutureBuilder(
+                          future: workouts,
+                          builder:
+                              (BuildContext context, AsyncSnapshot snapshot) {
+                            /// When [workouts] has successfully loaded.
+                            if (snapshot.hasData) {
+                              if (snapshot.data!.isEmpty) {
+                                return workoutEmpty();
+                              } else {
+                                reorderableWorkoutList = snapshot.data;
+                                reorderableWorkoutList.sort((a, b) =>
+                                    a.workoutIndex.compareTo(b.workoutIndex));
+                                return workoutListView(snapshot);
+                              }
+                            }
+
+                            /// When there was an error loading [workouts].
+                            else if (snapshot.hasError) {
+                              return workoutFetchError(snapshot);
+                            }
+
+                            /// While still waiting to load [workouts].
+                            else {
+                              return workoutLoading();
+                            }
+                          })))),
+        ));
   }
 }
diff --git a/lib/start_workout/view_workout.dart b/lib/start_workout/view_workout.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:sqflite/sqflite.dart';
 import '../create_workout/create_timer.dart';
 import '../create_workout/create_workout.dart';
@@ -132,8 +133,25 @@ class ViewWorkoutState extends State<ViewWorkout> {
     });
   }
 
+  Color iconColor() {
+    final darkMode =
+        WidgetsBinding.instance.platformDispatcher.platformBrightness;
+    if (darkMode == Brightness.dark) {
+      return Colors.white;
+    } else {
+      return Colors.black;
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
+    WidgetsBinding.instance.renderViews.first.automaticSystemUiAdjustment =
+        false;
+
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarBrightness: Theme.of(context).brightness,
+    ));
+
     Workout workoutArgument =
         ModalRoute.of(context)!.settings.arguments as Workout;
 
@@ -164,12 +182,8 @@ class ViewWorkoutState extends State<ViewWorkout> {
         backgroundColor: Color(workoutArgument.colorInt),
         actions: <Widget>[
           IconButton(
-            icon: const Icon(Icons.delete),
+            icon: Icon(Icons.delete, color: iconColor()),
             tooltip: 'Show Snackbar',
-            // onPressed: () async {
-            //   await deleteList(workoutArgument, database)
-            //       .then((value) => Navigator.pop(context));
-            // },
             onPressed: () {
               showDialog(
                 context: context,
@@ -206,7 +220,7 @@ class ViewWorkoutState extends State<ViewWorkout> {
             },
           ),
           IconButton(
-            icon: const Icon(Icons.edit),
+            icon: Icon(Icons.edit, color: iconColor()),
             onPressed: () {
               if (exercises.isEmpty) {
                 pushCreateTimer(workoutArgument);
@@ -232,7 +246,14 @@ class ViewWorkoutState extends State<ViewWorkout> {
                           arguments: workoutArgument,
                         ),
                       ),
-                    );
+                    ).then((value) {
+                      WidgetsBinding.instance.renderViews.first
+                          .automaticSystemUiAdjustment = false;
+
+                      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+                        statusBarBrightness: Theme.of(context).brightness,
+                      ));
+                    });
                   },
                   child: Ink(
                     height: 80.0,