Immersive mode option

.gitpod.Dockerfile

@@ -7,12 +7,12 @@ ENV PATH="$HOME/flutter/bin:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_
 
 # Install Open JDK for android and other dependencies
 USER root
-RUN install-packages openjdk-18-jdk -y \
+RUN install-packages openjdk-17-jdk -y \
         libgtk-3-dev \
         libnss3-dev \
         fonts-noto \
         fonts-noto-cjk \
-    && update-java-alternatives --set java-1.18.0-openjdk-amd64
+    && update-java-alternatives --set java-1.17.0-openjdk-amd64
 
 # Insall flutter and dependencies
 USER gitpod

android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <application
         android:label="Oblique Strategies"

lib/info_cards.dart

@@ -29,8 +29,8 @@ class InfoCards extends StatelessWidget {
       cards.insert(2, const AboutCard2());
     }
 
-    KeyEventResult handleKeyPress(FocusNode node, RawKeyEvent event) {
-      if (event is RawKeyDownEvent) {
+    KeyEventResult handleKeyPress(FocusNode node, KeyEvent event) {
+      if (event is KeyDownEvent) {
         if (
           event.logicalKey == LogicalKeyboardKey.space || 
           event.logicalKey == LogicalKeyboardKey.enter
@@ -56,7 +56,7 @@ class InfoCards extends StatelessWidget {
       autofocus: true,
       canRequestFocus: appState.cardFace == 'about',
       skipTraversal: false,
-      onKey: handleKeyPress,
+      onKeyEvent: handleKeyPress,
       child: Semantics(
         label: 'Title and about cards. To go to the next card, you can press enter, space, or the arrow keys while the card has focus. Press backspace to return to the previous card.',
         child: CardSwiper(

lib/main.dart

@@ -40,7 +40,6 @@ class StrategiesApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     const Color backgroundColor = Color.fromRGBO(15, 15, 15, 1);
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
       statusBarColor: backgroundColor,
       systemNavigationBarColor: backgroundColor
@@ -200,6 +199,12 @@ class MainPage extends StatelessWidget {
     AppState appState = context.watch<AppState>();
     Widget frontCard = const StrategyCard();
 
+    if (storage.read('immersiveMode') ?? false) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    } else {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    }
+
     if (appState.cardFace == 'about') {
       frontCard = const InfoCards();
     } else if (appState.cardFace == 'notifications') {
@@ -208,7 +213,7 @@ class MainPage extends StatelessWidget {
       frontCard = Container();
     }
 
-    bool onWillPop() {
+    bool canPop() {
       if (kIsWeb) {
         return true;
       } else if (appState.cardFace == 'strategies') {
@@ -231,12 +236,12 @@ class MainPage extends StatelessWidget {
       }
     }
 
-    KeyEventResult handleKeyPress(FocusNode node, RawKeyEvent event) {
+    KeyEventResult handleKeyPress(FocusNode node, KeyEvent event) {
       if (appState.cardFace != 'strategies' && appState.cardFace != 'about') {
         return KeyEventResult.ignored;
       }
 
-      if (event is RawKeyDownEvent) {
+      if (event is KeyDownEvent) {
         if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
           appState.swipeController.swipeLeft();
           return KeyEventResult.handled;
@@ -266,9 +271,9 @@ class MainPage extends StatelessWidget {
       autofocus: false,
       canRequestFocus: false,
       skipTraversal: false,
-      onKey: handleKeyPress,
+      onKeyEvent: handleKeyPress,
       child: WillPopScope(
-        onWillPop: () async => onWillPop(),
+        onWillPop: () async => canPop(),
         child: MouseRegion(
           onHover: (pointerHoverEventListener) => kIsWeb ? appState.setIconsVisible() : null,
           child: GestureDetector(
@@ -299,8 +304,8 @@ class MainPage extends StatelessWidget {
                     ),
                   ),
                 ),
-                const FavoriteIcon(),
-                const SettingsIcon(),
+                const SafeArea(child: FavoriteIcon()),
+                const SafeArea(child: SettingsIcon()),
               ]
             ),
           ),

lib/settings_card.dart

@@ -125,6 +125,27 @@ class SettingsCard extends StatelessWidget {
         )
       ),
       const Spacer(),
+      Visibility(
+        visible: !kIsWeb,
+        child: settingsItem(
+          tooltip: 'Hides the navigation and status bars',
+          text: 'Immersive mode',
+          child: Transform.scale(
+            scale: 1.2,
+            child: Checkbox(
+              value: storage.read('immersiveMode') ?? false,
+              semanticLabel: 'Immersive mode',
+              onChanged: (val) {
+                if (val is bool) {
+                  storage.write('immersiveMode', val);
+                  appState.rebuildApp();
+                }
+              }
+            ),
+          )
+        ),
+      ),
+      const Visibility(visible: !kIsWeb, child: Spacer()),
       settingsItem(
         tooltip: 'Allows favorited cards to be redrawn anytime. It usually takes a while before a card can be redrawn.',
         text: 'Keep favorites in the deck',

lib/strategy_card.dart

@@ -123,8 +123,8 @@ class StrategyCard extends StatelessWidget {
     AppState appState = context.watch<AppState>();
     final storage = GetStorage();
 
-    KeyEventResult handleKeyPress(FocusNode node, RawKeyEvent event) {
-      if (event is RawKeyDownEvent) {
+    KeyEventResult handleKeyPress(FocusNode node, KeyEvent event) {
+      if (event is KeyDownEvent) {
         if (
           event.logicalKey == LogicalKeyboardKey.space || 
           event.logicalKey == LogicalKeyboardKey.enter
@@ -184,7 +184,7 @@ class StrategyCard extends StatelessWidget {
       autofocus: true,
       canRequestFocus: appState.cardFace == 'strategies',
       skipTraversal: false,
-      onKey: handleKeyPress,
+      onKeyEvent: handleKeyPress,
       child: Semantics(
         label: 'The current strategy card. Press enter, space, or the arrow keys to go to the next strategy. Press backspace to return to the previous strategy.',
         child: CardSwiper(

pubspec.lock

@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -227,6 +227,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -239,26 +263,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.11.0"
   nested:
     dependency: transitive
     description:
@@ -271,10 +295,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: transitive
     description:
@@ -380,18 +404,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -412,10 +436,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   timezone:
     dependency: "direct main"
     description:
@@ -440,14 +464,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "13.0.0"
   win32:
     dependency: transitive
     description:
@@ -489,5 +513,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.2 <4.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=3.2.0-0 <4.0.0"
+  flutter: ">=3.16.9"

pubspec.yaml

@@ -2,7 +2,7 @@ name: oblique_strategies
 description: Over one hundred worthwhile dilemmas
 publish_to: 'none'
 
-version: 0.1.0+1
+version: 0.1.1+2
 
 environment:
   sdk: '>=3.1.0 <4.0.0'