Merge branch 'main' into improve-ds-interop-performance

Author: Gold872

.github/CopyRuntime.ps1

@@ -0,0 +1,30 @@
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$OutputPath,
+
+    [ValidateSet('arm64','x64')]
+    [string]
+    $Arch = "x64"
+) 
+
+$VsInstances = Get-VSSetupInstance
+
+$VsDirectory = $VsInstances[0].InstallationPath
+
+$DefaultRedistFile = Join-Path $VsDirectory "VC" "Auxiliary" "Build" "Microsoft.VCRedistVersion.default.txt"
+
+$ExpectedVersion = (Get-Content -Path $DefaultRedistFile).Trim()
+
+$RuntimeLocation = Join-Path $VsDirectory "VC" "Redist" "MSVC" $ExpectedVersion $Arch
+
+$CrtLocation = Join-Path $RuntimeLocation "*.CRT" -Resolve
+
+if ($CrtLocation.Length -eq 0) {
+    throw [System.IO.FileNotFoundException] "$RuntimeLocation CRT folder not resolved"
+}
+
+$Copied = Copy-Item -Path "$CrtLocation\*.dll" -Destination $OutputPath -PassThru
+
+if ($Copied.Length -eq 0) {
+    throw [System.IO.FileNotFoundException] "$CrtLocation No files copied"
+}

.github/labeler.yml

@@ -0,0 +1,15 @@
+GUI:
+- changed-files:
+  - any-glob-to-any-file: ['lib/**', 'test/**', 'pubspec.yaml']
+
+ElasticLib:
+- changed-files:
+  - any-glob-to-any-file: ['elasticlib/**']
+
+dependencies:
+- changed-files:
+  - any-glob-to-any-file: ['pubspec.yaml']
+
+workflows:
+- changed-files:
+  - any-glob-to-any-file: ['.github/workflows/**']

.github/workflows/elastic-ci.yml

@@ -79,6 +79,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Generate junit report xml
+        if: ${{ !cancelled() }}
         run: dart pub global run junitreport:tojunit --input reports/test-report.json --output reports/junit-report.xml
 
       - name: Upload test reports to Codecov
@@ -134,6 +135,10 @@ jobs:
 
       - name: Build app
         run: flutter build ${{ matrix.build-option }}
+      
+      - name: Copy runtime files
+        if: ${{ matrix.build-option == 'windows' }}
+        run: ./.github/CopyRuntime.ps1 -OutputPath ${{ matrix.artifact-path }}
 
       - name: Zip release
         if: ${{ matrix.build-option == 'macos' }}
@@ -161,15 +166,15 @@ jobs:
         if: ${{ matrix.build-option == 'macos' }}
         uses: L-Super/[email protected]
         with:
-          dmg_name: build/macos/Build/Products/Release/elastic-setup
+          dmg_name: build/macos/Build/Products/Release/elastic-setup-macos
           src_dir: build/macos/Build/Products/Release/elastic_dashboard.app
 
       - name: Upload macOS installer
         if: ${{ matrix.build-option == 'macos' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact-name }}_installer
-          path: build/macos/Build/Products/Release/elastic-setup.dmg
+          path: build/macos/Build/Products/Release/elastic-setup-macos.dmg
           if-no-files-found: error
 
       - name: Create windows installer
@@ -235,6 +240,10 @@ jobs:
       - name: Build app
         run: flutter build ${{ matrix.build-option }} --dart-define=ELASTIC_WPILIB=true
 
+      - name: Copy runtime files
+        if: ${{ matrix.build-option == 'windows' }}
+        run: ./.github/CopyRuntime.ps1 -OutputPath ${{ matrix.artifact-path }}
+
       - name: Zip release
         if: ${{ matrix.build-option == 'macos' }}
         run: |

.github/workflows/pr-labeler.yml

@@ -0,0 +1,17 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v4
+
+    - uses: actions/labeler@v5
+      with:
+        sync-labels: true

assets/fields/2025-field.png

@@ -0,0 +1,19 @@
+{
+  "game": "Reefscape",
+  "source-url": "https://www.chiefdelphi.com/t/4k-field-image-2025-reefscape/478797",
+  "field-image": "assets/fields/2025-field.png",
+  "field-corners": {
+    "top-left": [
+      421,
+      91
+    ],
+    "bottom-right": [
+      3352,
+      1437
+    ]
+  },
+  "field-size": [
+    17.548,
+    8.052
+  ]
+}

assets/fields/2025-reefscape.json

@@ -32,7 +32,7 @@ LicenseFile=LICENSE
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir=build\windows\x64\installer
-OutputBaseFilename=elastic-setup
+OutputBaseFilename=elastic-setup-windows
 SetupIconFile=assets\icon.ico
 Compression=lzma
 SolidCompression=yes
@@ -46,11 +46,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "build\windows\x64\runner\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build\windows\x64\runner\Release\file_selector_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build\windows\x64\runner\Release\flutter_windows.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build\windows\x64\runner\Release\screen_retriever_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build\windows\x64\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "build\windows\x64\runner\Release\window_manager_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "build\windows\x64\runner\Release\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "build\windows\x64\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

installer_setup_script.iss

@@ -1,12 +1,12 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:math';
 
 import 'package:flutter/material.dart';
 
 import 'package:collection/collection.dart';
 import 'package:dot_cast/dot_cast.dart';
 import 'package:flex_seed_scheme/flex_seed_scheme.dart';
+import 'package:logger/logger.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:screen_retriever/screen_retriever.dart';
@@ -54,6 +54,11 @@ void main() async {
     preferences = await SharedPreferences.getInstance();
   }
 
+  Level logLevel = Settings.logLevels.firstWhereOrNull((level) =>
+          level.levelName == preferences.getString(PrefKeys.logLevel)) ??
+      Defaults.logLevel;
+  Logger.level = logLevel;
+
   await windowManager.ensureInitialized();
 
   NTWidgetBuilder.ensureInitialized();
@@ -66,18 +71,26 @@ void main() async {
   await FieldImages.loadFields('assets/fields/');
 
   Display primaryDisplay = await screenRetriever.getPrimaryDisplay();
-  double scaleFactor = (primaryDisplay.scaleFactor?.toDouble() ?? 1.0);
-  Size screenSize =
-      (primaryDisplay.visibleSize ?? primaryDisplay.size) * scaleFactor;
+  Size screenSize = primaryDisplay.visibleSize ?? primaryDisplay.size;
+
+  logger.debug('Display Information: - Screen Size: $screenSize');
 
-  double minimumWidth = min(screenSize.width * 0.77 / scaleFactor, 1280.0);
-  double minimumHeight = min(screenSize.height * 0.7 / scaleFactor, 720.0);
+  late final double platformWidthAdjust;
+  if (Platform.isMacOS) {
+    platformWidthAdjust = 30;
+  } else if (Platform.isLinux) {
+    platformWidthAdjust = 10;
+  } else {
+    platformWidthAdjust = 0;
+  }
 
-  Size minimumSize = Size(minimumWidth, minimumHeight);
+  final Size minimumSize = Size(436.5 + platformWidthAdjust, 320.0);
 
   await windowManager.setMinimumSize(minimumSize);
-  await windowManager.setTitleBarStyle(TitleBarStyle.hidden,
-      windowButtonVisibility: false);
+  await windowManager.setTitleBarStyle(
+    TitleBarStyle.hidden,
+    windowButtonVisibility: false,
+  );
 
   if (preferences.getBool(PrefKeys.rememberWindowPosition) ?? false) {
     await _restoreWindowPosition(preferences, primaryDisplay, minimumSize);
@@ -145,7 +158,7 @@ Future<void> _backupPreferences(String appFolderPath) async {
     if (await File(backup).exists()) await File(backup).delete(recursive: true);
     await File(original).copy(backup);
 
-    logger.info('Backup up shared_preferences.json to $backup');
+    logger.info('Backed up shared_preferences.json to $backup');
   } catch (_) {
     /* Do nothing */
   }