Nov upgrade (#26)

* Nov upgrade

* Nov upgrade

Author: akaiser

.github/actions/setup-flutter/action.yaml

@@ -6,6 +6,6 @@ runs:
   steps:
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: "3.13.8"
+        flutter-version: "3.16.0"
         channel: "stable"
         cache: true

.github/workflows/pull_request.yaml

@@ -9,7 +9,7 @@ jobs:
   analyze:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-flutter
       - run: flutter analyze
       - run: dart format -o none --set-exit-if-changed .
@@ -18,6 +18,6 @@ jobs:
     needs: analyze
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-flutter
       - run: flutter test

.github/workflows/release_android.yaml

@@ -9,7 +9,7 @@ jobs:
   release-android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-flutter
       - name: Build
         run: flutter build apk --split-per-abi --release

.github/workflows/release_desktop.yaml

@@ -22,7 +22,7 @@ jobs:
           #  build-dir: build/windows/runner/Release
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-flutter
       - if: ${{ matrix.before-build }}
         run: ${{ matrix.before-build }}

.github/workflows/release_web.yml

@@ -9,7 +9,7 @@ jobs:
   release-web:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-flutter
       - name: Build
         run: flutter build web --no-web-resources-cdn --base-href /mdi/

lib/_data.dart

@@ -5,6 +5,7 @@ import 'package:mdi/apps/manual_count.dart';
 import 'package:mdi/apps/some_grid_view.dart';
 import 'package:mdi/apps/some_split_view.dart';
 import 'package:mdi/apps/tik_tak_toe.dart';
+import 'package:mdi/apps/use_keyboard.dart';
 import 'package:mdi/desktop/desktop_app.dart';
 
 const groupedApps = <String, List<DesktopApp>>{
@@ -14,6 +15,11 @@ const groupedApps = <String, List<DesktopApp>>{
       Icons.insert_drive_file,
       TikTakToe(),
     ),
+    DesktopApp(
+      'Use Keyboard',
+      Icons.keyboard,
+      UseKeyboard(),
+    ),
   ],
   'Misc': [
     DesktopApp(

lib/_extensions/build_context_ext.dart

@@ -2,4 +2,6 @@ import 'package:flutter/material.dart';
 
 extension BuildContextExt on BuildContext {
   TextTheme get tt => Theme.of(this).textTheme;
+
+  Size get screenSize => MediaQuery.sizeOf(this);
 }

lib/apps/tik_tak_toe.dart

@@ -100,7 +100,7 @@ class _TikTakToeState extends State<TikTakToe> {
         }
       }
       if (foundType != null) {
-        return _showDialog('The Winner is: ${describeEnum(foundType)}');
+        return _showDialog('The Winner is: ${foundType.name}');
       }
     }
 

lib/apps/use_keyboard.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:mdi/apps/widgets/simple_grid_view.dart';
+
+const xCount = 41;
+const yCount = 31;
+
+class UseKeyboard extends StatefulWidget {
+  const UseKeyboard();
+
+  @override
+  State<UseKeyboard> createState() => _UseKeyboardState();
+}
+
+class _UseKeyboardState extends State<UseKeyboard> {
+  late final _focus = FocusNode()..requestFocus();
+
+  int xCurrent = xCount ~/ 2;
+  int yCurrent = yCount ~/ 2;
+
+  @override
+  void dispose() {
+    _focus.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) => RawKeyboardListener(
+        focusNode: _focus,
+        onKey: (event) {
+          if (event.runtimeType == RawKeyDownEvent) {
+            if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
+              if (yCurrent != 0) {
+                setState(() => yCurrent -= 1);
+              }
+            } else if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
+              if (yCurrent != yCount - 1) {
+                setState(() => yCurrent += 1);
+              }
+            } else if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
+              if (xCurrent != 0) {
+                setState(() => xCurrent -= 1);
+              }
+            } else if (event.logicalKey == LogicalKeyboardKey.arrowRight) {
+              if (xCurrent != xCount - 1) {
+                setState(() => xCurrent += 1);
+              }
+            }
+          }
+        },
+        child: SimpleGridView(
+          columnCount: xCount,
+          rowCount: yCount,
+          cellPadding: 0.2,
+          cellBackgroundColor: Colors.blueAccent,
+          cellBuilder: (context, xIndex, yIndex) =>
+              xIndex == xCurrent && yIndex == yCurrent
+                  ? const ColoredBox(color: Colors.red)
+                  : const SizedBox(),
+        ),
+      );
+}

lib/desktop/desktop.dart

@@ -65,11 +65,7 @@ class _DesktopState extends State<Desktop> {
     }
   }
 
-  void _addWindow(
-    DesktopApp desktopApp,
-    double screenWidth,
-    double screenHeight,
-  ) {
+  void _addWindow(DesktopApp desktopApp) {
     final key = UniqueKey();
     final window = Window(
       key: key,
@@ -90,8 +86,6 @@ class _DesktopState extends State<Desktop> {
       width: desktopApp.width,
       height: desktopApp.height,
       isFixedSize: desktopApp.isFixedSize,
-      screenWidth: screenWidth,
-      screenHeight: screenHeight,
     );
     setState(() {
       _windowKeys.add(key);
@@ -103,23 +97,19 @@ class _DesktopState extends State<Desktop> {
   Widget build(BuildContext context) {
     final groupedApps = widget.groupedApps;
     final standaloneApps = widget.standaloneApps;
-    return LayoutBuilder(
-      builder: (context, constraints) => Stack(
-        fit: StackFit.expand,
-        children: [
-          if (groupedApps.isNotEmpty || standaloneApps.isNotEmpty)
-            DesktopItems(
-              groupedApps: groupedApps,
-              standaloneApps: standaloneApps,
-              onItemTap: (desktopApp) => _addWindow(
-                desktopApp,
-                constraints.maxWidth,
-                constraints.maxHeight,
-              ),
-            ),
-          ..._windows.values,
-          if (_windows.isNotEmpty)
-            Dock(
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        if (groupedApps.isNotEmpty || standaloneApps.isNotEmpty)
+          DesktopItems(
+            groupedApps: groupedApps,
+            standaloneApps: standaloneApps,
+            onItemTap: _addWindow,
+          ),
+        ..._windows.values,
+        if (_windows.isNotEmpty)
+          ExcludeFocus(
+            child: Dock(
               windowKeys: _windowKeys,
               minimizedWindowKeys: _minimizedWindowKeys,
               windows: _windows,
@@ -128,8 +118,8 @@ class _DesktopState extends State<Desktop> {
                 _rebuildOnChange();
               },
             ),
-        ],
-      ),
+          ),
+      ],
     );
   }
 }

lib/window/window.dart

@@ -1,9 +1,9 @@
-// ignore_for_file: avoid_multiple_declarations_per_line
 import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/widgets.dart';
+import 'package:mdi/_extensions/build_context_ext.dart';
 import 'package:mdi/_prefs.dart';
 import 'package:mdi/window/title_bar.dart';
 
@@ -19,11 +19,7 @@ class Window extends StatefulWidget {
     required this.width,
     required this.height,
     required this.isFixedSize,
-    required double screenWidth,
-    required double screenHeight,
-  })  : availableWidth = screenWidth + windowOuterPaddingTimes2,
-        availableHeight = screenHeight - dockHeight + windowOuterPaddingTimes2,
-        super(key: key);
+  }) : super(key: key);
 
   final String title;
   final Widget app;
@@ -35,8 +31,6 @@ class Window extends StatefulWidget {
   final double? width;
   final double? height;
   final bool isFixedSize;
-  final double availableWidth;
-  final double availableHeight;
 
   @override
   State<Window> createState() => _WindowState();
@@ -53,6 +47,14 @@ class _WindowState extends State<Window> {
 
   late final StreamSubscription<void> _unHideWindowSubscription;
 
+  (double, double) get _availableSize {
+    final screenSize = context.screenSize;
+    return (
+      screenSize.width + windowOuterPaddingTimes2,
+      screenSize.height - dockHeight + windowOuterPaddingTimes2,
+    );
+  }
+
   @override
   void initState() {
     super.initState();
@@ -62,13 +64,14 @@ class _WindowState extends State<Window> {
         .listen((_) => _toggleMinimize());
 
     SchedulerBinding.instance.addPostFrameCallback((_) {
+      final (availableWidth, availableHeight) = _availableSize;
       setState(() {
-        _width = widget.width ?? widget.availableWidth * 0.6;
-        _height = widget.height ?? widget.availableHeight * 0.6;
+        _width = widget.width ?? availableWidth * 0.6;
+        _height = widget.height ?? availableHeight * 0.6;
         _checkMinSize();
 
-        _dx = _random.nextDouble() * (widget.availableWidth - _width);
-        _dy = _random.nextDouble() * (widget.availableHeight - _height);
+        _dx = _random.nextDouble() * (availableWidth - _width);
+        _dy = _random.nextDouble() * (availableHeight - _height);
       });
     });
   }
@@ -133,8 +136,9 @@ class _WindowState extends State<Window> {
         _dxLast = _dx;
         _dyLast = _dy;
 
-        _width = widget.availableWidth;
-        _height = widget.availableHeight;
+        final (availableWidth, availableHeight) = _availableSize;
+        _width = availableWidth;
+        _height = availableHeight;
         _dx = _dy = -windowOuterPadding;
       }
     });

pubspec.lock

@@ -37,10 +37,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"
   fake_async:
     dependency: transitive
     description:
@@ -79,10 +79,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
@@ -108,18 +108,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:
@@ -140,10 +140,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"
   vector_math:
     dependency: transitive
     description:
@@ -164,10 +164,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
 sdks:
-  dart: ">=3.1.4 <4.0.0"
-  flutter: ">=3.13.8"
+  dart: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"

pubspec.yaml

@@ -3,8 +3,8 @@ description: Some widgets playground based on a desktop like UI.
 version: 0.0.10
 
 environment:
-  sdk: ">=3.1.4 <4.0.0"
-  flutter: ">=3.13.8"
+  sdk: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
 
 dependencies:
   flutter: