Switched to sinum

2026-01-13 19:22:22 +01:00 · 2024-10-21 20:32:23 +02:00
parent bfe15e43d9
commit dfebe74518
45 changed files with 2185 additions and 193 deletions
--- a/gui/lib/src/page/abstract/page.dart
+++ b/gui/lib/src/page/abstract/page.dart
@@ -1,6 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/src/rx_flutter/rx_obx_widget.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
 import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
 import 'package:reboot_launcher/src/page/abstract/page_type.dart';
@@ -35,7 +34,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          _buildFirstLaunchInfo(),
-          _buildDebugInfo(),
          Expanded(
            child: _listView
          )
@@ -47,7 +45,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        _buildFirstLaunchInfo(),
-        _buildDebugInfo(),
        Expanded(
          child: Column(
            children: [
@@ -99,35 +96,6 @@ abstract class RebootPageState<T extends RebootPage> extends State<T> with Autom
    );
  });

-  Widget _buildDebugInfo() => Obx(() {
-    if(!_settingsController.debug.value) {
-      return const SizedBox.shrink();
-    }
-
-    return Padding(
-        padding: const EdgeInsets.only(
-            bottom: 8.0
-        ),
-        child: SizedBox(
-          width: double.infinity,
-          child: InfoBar(
-            title: Text("Debug mode is enabled"),
-            severity: InfoBarSeverity.warning,
-            isLong: true,
-            content: SizedBox(
-                width: double.infinity,
-                child: Text( "• Automatic dll injection is disabled\n"
-                    "• The game server cannot start automatically\n"
-                    "• The game server runs in a normal window")
-            ),
-            onClose: () {
-              _settingsController.debug.value = false;
-            },
-          ),
-        )
-    );
-  });
-
  ListView get _listView => ListView.builder(
    itemCount: settings.length,
    itemBuilder: (context, index) => settings[index],
--- a/gui/lib/src/page/implementation/backend_page.dart
+++ b/gui/lib/src/page/implementation/backend_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/backend_controller.dart';
-import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/messenger/abstract/info_bar.dart';
 import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
 import 'package:reboot_launcher/src/messenger/implementation/data.dart';
--- a/gui/lib/src/page/implementation/browser_page.dart
+++ b/gui/lib/src/page/implementation/browser_page.dart
@@ -276,8 +276,8 @@ class _BrowsePageState extends RebootPageState<BrowsePage> {
        _filterControllerStream.add("");
      },
      style: ButtonStyle(
-          backgroundColor: ButtonState.all(Colors.transparent),
-          shape: ButtonState.all(Border())
+          backgroundColor: WidgetStateProperty.all(Colors.transparent),
+          shape: WidgetStateProperty.all(Border())
      ),
      child: _searchBarIconData
  );
--- a/gui/lib/src/page/implementation/home_page.dart
+++ b/gui/lib/src/page/implementation/home_page.dart
@@ -498,7 +498,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
          decoration: BoxDecoration(
              color: ButtonThemeData.uncheckedInputColor(
                FluentTheme.of(context),
-                pageIndex.value == index ? {ButtonStates.hovering} : states,
+                pageIndex.value == index ? {WidgetState.hovered} : states,
                transparentWhenNone: true,
              ),
              borderRadius: BorderRadius.all(Radius.circular(6.0))
@@ -527,12 +527,12 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
      stream: pagesController.stream,
      builder: (context, _) => Button(
        style: ButtonStyle(
-            padding: ButtonState.all(const EdgeInsets.symmetric(
+            padding: WidgetStateProperty.all(const EdgeInsets.symmetric(
              vertical: 12.0,
              horizontal: 16.0
            )),
-            backgroundColor: ButtonState.all(Colors.transparent),
-            shape: ButtonState.all(Border())
+            backgroundColor: WidgetStateProperty.all(Colors.transparent),
+            shape: WidgetStateProperty.all(Border())
        ),
        onPressed: appStack.isEmpty && !inDialog ? null : () {
          if(inDialog) {
--- a/gui/lib/src/page/implementation/host_page.dart
+++ b/gui/lib/src/page/implementation/host_page.dart
@@ -155,8 +155,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
                  suffix: Button(
                    onPressed: () => _hostingController.showPassword.value = !_hostingController.showPassword.value,
                    style: ButtonStyle(
-                        shape: ButtonState.all(const CircleBorder()),
-                        backgroundColor: ButtonState.all(Colors.transparent)
+                        shape: WidgetStateProperty.all(const CircleBorder()),
+                        backgroundColor: WidgetStateProperty.all(Colors.transparent)
                    ),
                    child: Icon(
                        _hostingController.showPassword.value ? FluentIcons.eye_off_24_filled : FluentIcons.eye_24_filled,
@@ -221,12 +221,11 @@ class _HostingPageState extends RebootPageState<HostPage> {
        content: Obx(() => DropDownButton(
            onOpen: () => inDialog = true,
            onClose: () => inDialog = false,
-            leading: Text(_settingsController.debug.value ? GameServerType.window.translatedName : _hostingController.type.value.translatedName),
+            leading: Text(_hostingController.type.value.translatedName),
            items: GameServerType.values.map((entry) => MenuFlyoutItem(
                text: Text(entry.translatedName),
                onPressed: () => _hostingController.type.value = entry
-            )).toList(),
-            disabled: _settingsController.debug.value
+            )).toList()
        )),
      ),
      SettingTile(
@@ -280,7 +279,8 @@ class _HostingPageState extends RebootPageState<HostPage> {
    children: [
      _internalFilesServerType,
      _internalFilesUpdateTimer,
-      _internalFilesServerSource
+      _internalFilesOldServerSource,
+      _internalFilesNewServerSource,
    ],
  );

@@ -318,13 +318,13 @@ class _HostingPageState extends RebootPageState<HostPage> {
      ))
  );

-  Widget get _internalFilesServerSource => Obx(() {
+  Widget get _internalFilesOldServerSource => Obx(() {
    if(!_dllController.customGameServer.value) {
      return SettingTile(
          icon: Icon(
              FluentIcons.globe_24_regular
          ),
-          title: Text(translations.settingsServerMirrorName),
+          title: Text(translations.settingsServerOldMirrorName),
          subtitle: Text(translations.settingsServerMirrorDescription),
          contentWidth: SettingTile.kDefaultContentWidth + 30,
          content: Row(
@@ -332,7 +332,7 @@ class _HostingPageState extends RebootPageState<HostPage> {
              Expanded(
                child: TextFormBox(
                  placeholder:  translations.settingsServerMirrorPlaceholder,
-                  controller: _dllController.url,
+                  controller: _dllController.beforeS20Mirror,
                  onChanged: (value) {
                    if(Uri.tryParse(value) != null) {
                      _dllController.updateGameServerDll(force: true);
@@ -343,7 +343,7 @@ class _HostingPageState extends RebootPageState<HostPage> {
              const SizedBox(width: 8.0),
              Button(
                  style: ButtonStyle(
-                      padding: ButtonState.all(EdgeInsets.zero)
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
                  ),
                  onPressed: () => _dllController.updateGameServerDll(force: true),
                  child: SizedBox.square(
@@ -356,10 +356,10 @@ class _HostingPageState extends RebootPageState<HostPage> {
              const SizedBox(width: 8.0),
              Button(
                  style: ButtonStyle(
-                      padding: ButtonState.all(EdgeInsets.zero)
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
                  ),
                  onPressed: () {
-                    _dllController.url.text = kRebootDownloadUrl;
+                    _dllController.beforeS20Mirror.text = kRebootBelowS20DownloadUrl;
                    _dllController.updateGameServerDll(force: true);
                  },
                  child: SizedBox.square(
@@ -374,7 +374,75 @@ class _HostingPageState extends RebootPageState<HostPage> {
      );
    }else {
      return createFileSetting(
-          title: translations.settingsServerFileName,
+          title: translations.settingsOldServerFileName,
+          description: translations.settingsServerFileDescription,
+          controller: _dllController.gameServerDll,
+          onReset: () {
+            final path = _dllController.getDefaultDllPath(InjectableDll.reboot);
+            _dllController.gameServerDll.text = path;
+            _dllController.downloadCriticalDllInteractive(path);
+          }
+      );
+    }
+  });
+
+  Widget get _internalFilesNewServerSource => Obx(() {
+    if(!_dllController.customGameServer.value) {
+      return SettingTile(
+          icon: Icon(
+              FluentIcons.globe_24_regular
+          ),
+          title: Text(translations.settingsServerNewMirrorName),
+          subtitle: Text(translations.settingsServerMirrorDescription),
+          contentWidth: SettingTile.kDefaultContentWidth + 30,
+          content: Row(
+            children: [
+              Expanded(
+                child: TextFormBox(
+                  placeholder: translations.settingsServerMirrorPlaceholder,
+                  controller: _dllController.aboveS20Mirror,
+                  onChanged: (value) {
+                    if(Uri.tryParse(value) != null) {
+                      _dllController.updateGameServerDll(force: true);
+                    }
+                  },
+                ),
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () => _dllController.updateGameServerDll(force: true),
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_download_24_regular
+                    ),
+                  )
+              ),
+              const SizedBox(width: 8.0),
+              Button(
+                  style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero)
+                  ),
+                  onPressed: () {
+                    _dllController.aboveS20Mirror.text = kRebootBelowS20DownloadUrl;
+                    _dllController.updateGameServerDll(force: true);
+                  },
+                  child: SizedBox.square(
+                    dimension: 30,
+                    child: Icon(
+                        FluentIcons.arrow_reset_24_regular
+                    ),
+                  )
+              )
+            ],
+          )
+      );
+    }else {
+      return createFileSetting(
+          title: translations.settingsNewServerFileName,
          description: translations.settingsServerFileDescription,
          controller: _dllController.gameServerDll,
          onReset: () {
--- a/gui/lib/src/page/implementation/play_page.dart
+++ b/gui/lib/src/page/implementation/play_page.dart
@@ -7,7 +7,6 @@ import 'package:reboot_launcher/src/controller/game_controller.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
 import 'package:reboot_launcher/src/messenger/abstract/overlay.dart';
 import 'package:reboot_launcher/src/messenger/implementation/data.dart';
-import 'package:reboot_launcher/src/messenger/implementation/onboard.dart';
 import 'package:reboot_launcher/src/page/abstract/page.dart';
 import 'package:reboot_launcher/src/page/abstract/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
@@ -38,7 +37,6 @@ class PlayPage extends RebootPage {
 }

 class _PlayPageState extends RebootPageState<PlayPage> {
-  final SettingsController _settingsController = Get.find<SettingsController>();
  final GameController _gameController = Get.find<GameController>();
  final DllController _dllController = Get.find<DllController>();

--- a/gui/lib/src/page/implementation/settings_page.dart
+++ b/gui/lib/src/page/implementation/settings_page.dart
@@ -6,7 +6,6 @@ import 'package:get/get.dart';
 import 'package:reboot_common/common.dart';
 import 'package:reboot_launcher/src/controller/settings_controller.dart';
 import 'package:reboot_launcher/src/messenger/abstract/dialog.dart';
-import 'package:reboot_launcher/src/messenger/implementation/data.dart';
 import 'package:reboot_launcher/src/page/abstract/page.dart';
 import 'package:reboot_launcher/src/page/abstract/page_type.dart';
 import 'package:reboot_launcher/src/util/translations.dart';
@@ -42,7 +41,6 @@ class _SettingsPageState extends RebootPageState<SettingsPage> {
  List<Widget> get settings => [
    _language,
    _theme,
-    _debugMode,
    _installationDirectory,
  ];

@@ -100,29 +98,6 @@ class _SettingsPageState extends RebootPageState<SettingsPage> {
        child: Text(translations.settingsUtilsInstallationDirectoryContent),
      )
  );
-
-  SettingTile get _debugMode => SettingTile(
-      icon: Icon(
-          FluentIcons.developer_board_24_regular
-      ),
-      title: Text("Debug mode"),
-      subtitle: Text("Whether the launcher should disable automatic features for troubleshooting"),
-      contentWidth: null,
-      content: Row(
-        children: [
-          Obx(() => Text(
-              _settingsController.debug.value ? translations.on : translations.off
-          )),
-          const SizedBox(
-              width: 16.0
-          ),
-          Obx(() => ToggleSwitch(
-              checked: _settingsController.debug.value,
-              onChanged: (value) => _settingsController.debug.value = value
-          ))
-        ],
-      )
-  );
 }

 extension _ThemeModeExtension on ThemeMode {