yindo/Reboot-Launcher
1
0
Fork 0
mirror of https://github.com/Auties00/Reboot-Launcher.git synced 2026-01-13 19:22:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

<feat: New release>

Browse Source
This commit is contained in:
Alessandro Autiero
2023-09-09 19:37:05 +02:00
parent 485e757e83
commit 64b85e4f6e
32 changed files with 586 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gui/lib/src/page/authenticator_page.dart
View File

@@ -3,15 +3,13 @@ import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/authenticator_controller.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/widget/server/start_button.dart';
import 'package:reboot_launcher/src/widget/server/type_selector.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
class AuthenticatorPage extends StatefulWidget {
const AuthenticatorPage({Key? key}) : super(key: key);
@@ -70,9 +68,19 @@ class _AuthenticatorPageState extends State<AuthenticatorPage> with AutomaticKee
subtitle: "Whether the embedded authenticator should be started as a separate process, useful for debugging",
contentWidth: null,
isChild: true,
content: Obx(() => ToggleSwitch(
checked: _authenticatorController.detached(),
onChanged: (value) => _authenticatorController.detached.value = value
content: Obx(() => Row(
children: [
Text(
_authenticatorController.detached.value ? "On" : "Off"
),
const SizedBox(
width: 16.0
),
ToggleSwitch(
checked: _authenticatorController.detached(),
onChanged: (value) => _authenticatorController.detached.value = value
),
],
))
),
],

16
gui/lib/src/page/browse_page.dart
View File

@@ -4,15 +4,12 @@ import 'dart:async';
import 'package:fluent_ui/fluent_ui.dart';
import 'package:get/get.dart';
import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
import 'package:reboot_launcher/src/controller/matchmaker_controller.dart';
import 'package:reboot_launcher/src/dialog/implementation/server.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:skeletons/skeletons.dart';
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
class BrowsePage extends StatefulWidget {
const BrowsePage({Key? key}) : super(key: key);
@@ -21,7 +18,7 @@ class BrowsePage extends StatefulWidget {
}
class _BrowsePageState extends State<BrowsePage> with AutomaticKeepAliveClientMixin {
final GameController _gameController = Get.find<GameController>();
final HostingController _hostingController = Get.find<HostingController>();
final MatchmakerController _matchmakerController = Get.find<MatchmakerController>();
final TextEditingController _filterController = TextEditingController();
final StreamController<String> _filterControllerStream = StreamController();
@@ -33,7 +30,10 @@ class _BrowsePageState extends State<BrowsePage> with AutomaticKeepAliveClientMi
future: Future.delayed(const Duration(seconds: 1)), // Fake delay to show loading
builder: (context, futureSnapshot) => Obx(() {
var ready = futureSnapshot.connectionState == ConnectionState.done;
var data = _gameController.servers.value;
var data = _hostingController.servers
.value
?.where((entry) => entry["discoverable"] ?? false)
.toSet();
if(ready && data?.isEmpty == true) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -108,7 +108,7 @@ class _BrowsePageState extends State<BrowsePage> with AutomaticKeepAliveClientMi
title: "${_formatName(entry)} • ${entry["author"]}",
subtitle: "${_formatDescription(entry)} • ${_formatVersion(entry)}",
content: Button(
onPressed: () => _matchmakerController.joinServer(entry),
onPressed: () => _matchmakerController.joinServer(_hostingController.uuid, entry),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
@@ -146,7 +146,7 @@ class _BrowsePageState extends State<BrowsePage> with AutomaticKeepAliveClientMi
}
bool _isValidItem(Map<String, dynamic> entry, String? filter) =>
(entry["discoverable"] ?? false) && (filter == null || _filterServer(entry, filter));
filter == null || _filterServer(entry, filter);
bool _filterServer(Map<String, dynamic> element, String filter) {
String? id = element["id"];

21
gui/lib/src/page/home_page.dart
View File

@@ -4,18 +4,17 @@ import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/material.dart' show MaterialPage;
import 'package:get/get.dart';
import 'package:reboot_launcher/src/page/browse_page.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/page/authenticator_page.dart';
import 'package:reboot_launcher/src/page/browse_page.dart';
import 'package:reboot_launcher/src/page/hosting_page.dart';
import 'package:reboot_launcher/src/page/info_page.dart';
import 'package:reboot_launcher/src/page/matchmaker_page.dart';
import 'package:reboot_launcher/src/page/play_page.dart';
import 'package:reboot_launcher/src/page/settings_page.dart';
import 'package:reboot_launcher/src/widget/home/pane.dart';
import 'package:reboot_launcher/src/widget/home/profile.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/widget/os/title_bar.dart';
import 'package:reboot_launcher/src/page/hosting_page.dart';
import 'package:reboot_launcher/src/page/info_page.dart';
import 'package:window_manager/window_manager.dart';
GlobalKey appKey = GlobalKey();
@@ -48,6 +47,13 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
void initState() {
windowManager.addListener(this);
_searchController.addListener(_onSearch);
var lastValue = pageIndex.value;
pageIndex.listen((value) {
if(value != lastValue) {
_pagesStack.add(lastValue);
lastValue = value;
}
});
super.initState();
}
@@ -116,10 +122,7 @@ class _HomePageState extends State<HomePage> with WindowListener, AutomaticKeepA
pane: NavigationPane(
key: appKey,
selected: pageIndex.value,
onChanged: (index) {
_pagesStack.add(pageIndex.value);
pageIndex.value = index;
},
onChanged: (index) => pageIndex.value = index,
menuButton: const SizedBox(),
displayMode: PaneDisplayMode.open,
items: _items,

96
gui/lib/src/page/hosting_page.dart
View File

@@ -1,18 +1,19 @@
import 'package:clipboard/clipboard.dart';
import 'package:dart_ipify/dart_ipify.dart';
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/material.dart' show Icons;
import 'package:get/get.dart';
import 'package:reboot_launcher/main.dart';
import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
import 'package:reboot_launcher/src/controller/update_controller.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
import 'package:reboot_launcher/src/dialog/abstract/info_bar.dart';
import 'package:reboot_launcher/src/dialog/implementation/server.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:flutter/material.dart' show Icons;
import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/widget/game/start_button.dart';
import 'package:reboot_launcher/src/widget/version/version_selector.dart';
import 'package:sync/semaphore.dart';
class HostingPage extends StatefulWidget {
const HostingPage({Key? key}) : super(key: key);
@@ -24,7 +25,7 @@ class HostingPage extends StatefulWidget {
class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClientMixin {
final GameController _gameController = Get.find<GameController>();
final HostingController _hostingController = Get.find<HostingController>();
final UpdateController _updateController = Get.find<UpdateController>();
final Semaphore _semaphore = Semaphore();
late final RxBool _showPasswordTrailing = RxBool(_hostingController.password.text.isNotEmpty);
@override
@@ -48,7 +49,8 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
isChild: true,
content: TextFormBox(
placeholder: "Name",
controller: _hostingController.name
controller: _hostingController.name,
onChanged: (_) => _updateServer()
)
),
SettingTile(
@@ -56,8 +58,9 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
subtitle: "The description of your game server",
isChild: true,
content: TextFormBox(
placeholder: "Description",
controller: _hostingController.description
placeholder: "Description",
controller: _hostingController.description,
onChanged: (_) => _updateServer()
)
),
SettingTile(
@@ -71,7 +74,10 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
obscureText: !_hostingController.showPassword.value,
enableSuggestions: false,
autocorrect: false,
onChanged: (text) => _showPasswordTrailing.value = text.isNotEmpty,
onChanged: (text) {
_showPasswordTrailing.value = text.isNotEmpty;
_updateServer();
},
suffix: Button(
onPressed: () => _hostingController.showPassword.value = !_hostingController.showPassword.value,
style: ButtonStyle(
@@ -90,9 +96,22 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
subtitle: "Make your server available to other players on the server browser",
isChild: true,
contentWidth: null,
content: Obx(() => ToggleSwitch(
checked: _hostingController.discoverable(),
onChanged: (value) => _hostingController.discoverable.value = value
content: Obx(() => Row(
children: [
Text(
_hostingController.discoverable.value ? "On" : "Off"
),
const SizedBox(
width: 16.0
),
ToggleSwitch(
checked: _hostingController.discoverable(),
onChanged: (value) async {
_hostingController.discoverable.value = value;
await _updateServer();
}
),
],
))
)
],
@@ -138,7 +157,7 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
isChild: true,
content: Button(
onPressed: () async {
FlutterClipboard.controlC("$kCustomUrlSchema://${_gameController.uuid}");
FlutterClipboard.controlC("$kCustomUrlSchema://${_hostingController.uuid}");
showInfoBar(
"Copied your link to the clipboard",
severity: InfoBarSeverity.success
@@ -177,6 +196,35 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
)
)
],
),
const SizedBox(
height: 8.0,
),
SettingTile(
title: "Reset game server",
subtitle: "Resets the game server's settings to their default values",
content: Button(
onPressed: () => showAppDialog(
builder: (context) => InfoDialog(
text: "Do you want to reset all the setting in this tab to their default values? This action is irreversible",
buttons: [
DialogButton(
type: ButtonType.secondary,
text: "Close",
),
DialogButton(
type: ButtonType.primary,
text: "Reset",
onTap: () {
_hostingController.reset();
Navigator.of(context).pop();
},
)
],
)
),
child: const Text("Reset"),
)
)
],
),
@@ -190,4 +238,26 @@ class _HostingPageState extends State<HostingPage> with AutomaticKeepAliveClient
],
);
}
Future<void> _updateServer() async {
if(!_hostingController.published()) {
return;
}
try {
_semaphore.acquire();
_hostingController.publishServer(
_gameController.username.text,
_hostingController.instance.value!.versionName
);
} catch(error) {
showInfoBar(
"An error occurred while updating the game server: $error",
severity: InfoBarSeverity.success,
duration: snackbarLongDuration
);
} finally {
_semaphore.release();
}
}
}

32
gui/lib/src/page/info_page.dart
View File

@@ -1,8 +1,9 @@
import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/gestures.dart';
import 'package:get/get.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/util/tutorial.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
class InfoPage extends StatefulWidget {
const InfoPage({Key? key}) : super(key: key);
@@ -123,6 +124,33 @@ class _InfoPageState extends State<InfoPage> with AutomaticKeepAliveClientMixin
.typography
.title,
contentWidth: null,
),
const SizedBox(
height: 8.0,
),
SettingTile(
title: 'How can I make my game server accessible for other players?',
subtitle: Text.rich(
TextSpan(
children: [
TextSpan(
text: 'Follow ',
style: FluentTheme.of(context).typography.body
),
TextSpan(
text: 'this tutorial',
mouseCursor: SystemMouseCursors.click,
style: FluentTheme.of(context).typography.body?.copyWith(color: FluentTheme.of(context).accentColor),
recognizer: TapGestureRecognizer()..onTap = openPortTutorial
)
]
)
),
titleStyle: FluentTheme
.of(context)
.typography
.title,
contentWidth: null,
)
],
),

27
gui/lib/src/page/matchmaker_page.dart
View File

@@ -3,14 +3,12 @@ import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/matchmaker_controller.dart';
import 'package:reboot_launcher/src/widget/server/type_selector.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/widget/server/start_button.dart';
import 'package:reboot_launcher/src/widget/server/type_selector.dart';
import 'package:url_launcher/url_launcher.dart';
class MatchmakerPage extends StatefulWidget {
const MatchmakerPage({Key? key}) : super(key: key);
@@ -71,7 +69,8 @@ class _MatchmakerPageState extends State<MatchmakerPage> with AutomaticKeepAlive
isChild: true,
content: TextFormBox(
placeholder: "Address",
controller: _matchmakerController.gameServerAddress
controller: _matchmakerController.gameServerAddress,
focusNode: _matchmakerController.gameServerAddressFocusNode
)
),
if(_matchmakerController.type.value == ServerType.embedded)
@@ -80,9 +79,19 @@ class _MatchmakerPageState extends State<MatchmakerPage> with AutomaticKeepAlive
subtitle: "Whether the embedded matchmaker should be started as a separate process, useful for debugging",
contentWidth: null,
isChild: true,
content: Obx(() => ToggleSwitch(
checked: _matchmakerController.detached.value,
onChanged: (value) => _matchmakerController.detached.value = value
content: Obx(() => Row(
children: [
Text(
_matchmakerController.detached.value ? "On" : "Off"
),
const SizedBox(
width: 16.0
),
ToggleSwitch(
checked: _matchmakerController.detached.value,
onChanged: (value) => _matchmakerController.detached.value = value
),
],
)),
)
]

36
gui/lib/src/page/play_page.dart
View File

@@ -5,8 +5,8 @@ import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
import 'package:reboot_launcher/src/controller/matchmaker_controller.dart';
import 'package:reboot_launcher/src/page/home_page.dart';
import 'package:reboot_launcher/src/widget/game/start_button.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:reboot_launcher/src/widget/game/start_button.dart';
import 'package:reboot_launcher/src/widget/version/version_selector.dart';
@@ -71,10 +71,26 @@ class _PlayPageState extends State<PlayPage> {
SettingTile(
title: "Game Server",
subtitle: "Helpful shortcuts to find the server where you want to play",
content: IgnorePointer(
child: Button(
style: ButtonStyle(
backgroundColor: ButtonState.all(FluentTheme.of(context).resources.controlFillColorDefault)
),
onPressed: () {},
child: Obx(() {
var address = _matchmakerController.gameServerAddress.text;
var owner = _matchmakerController.gameServerOwner.value;
return Text(
isLocalHost(address) ? "Your server" : owner != null ? "$owner's server" : address,
textAlign: TextAlign.start
);
})
),
),
expandedContent: [
SettingTile(
title: "Host a server",
subtitle: "Do you want to play with your friends? Host a server for them!",
subtitle: "Do you want to create a game server for yourself or your friends? Host one!",
content: Button(
onPressed: () => pageIndex.value = 1,
child: const Text("Host")
@@ -82,13 +98,25 @@ class _PlayPageState extends State<PlayPage> {
isChild: true
),
SettingTile(
title: "Join a server",
subtitle: "Find a server where you can play on the launcher's server browser",
title: "Join a Reboot server",
subtitle: "Find a discoverable server hosted on the Reboot Launcher in the server browser",
content: Button(
onPressed: () => pageIndex.value = 2,
child: const Text("Browse")
),
isChild: true
),
SettingTile(
title: "Join a custom server",
subtitle: "Type the address of any server, whether it was hosted on the Reboot Launcher or not",
content: Button(
onPressed: () {
pageIndex.value = 4;
WidgetsBinding.instance.addPostFrameCallback((_) => _matchmakerController.gameServerAddressFocusNode.requestFocus());
},
child: const Text("Join")
),
isChild: true
)
]
),

24
gui/lib/src/page/settings_page.dart
View File

@@ -2,19 +2,16 @@ import 'package:fluent_ui/fluent_ui.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:reboot_common/common.dart';
import 'package:reboot_launcher/src/controller/build_controller.dart';
import 'package:reboot_launcher/src/controller/game_controller.dart';
import 'package:reboot_launcher/src/controller/hosting_controller.dart';
import 'package:reboot_launcher/src/controller/authenticator_controller.dart';
import 'package:reboot_launcher/src/controller/settings_controller.dart';
import 'package:reboot_launcher/src/controller/update_controller.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
import 'package:reboot_launcher/src/widget/common/file_selector.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:reboot_launcher/src/util/checks.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog.dart';
import 'package:reboot_launcher/src/dialog/abstract/dialog_button.dart';
import 'package:reboot_launcher/src/dialog/abstract/info_bar.dart';
import 'package:reboot_launcher/src/util/checks.dart';
import 'package:reboot_launcher/src/widget/common/file_selector.dart';
import 'package:reboot_launcher/src/widget/common/setting_tile.dart';
import 'package:url_launcher/url_launcher.dart';
class SettingsPage extends StatefulWidget {
const SettingsPage({Key? key}) : super(key: key);
@@ -24,10 +21,7 @@ class SettingsPage extends StatefulWidget {
}
class _SettingsPageState extends State<SettingsPage> with AutomaticKeepAliveClientMixin {
final BuildController _buildController = Get.find<BuildController>();
final GameController _gameController = Get.find<GameController>();
final HostingController _hostingController = Get.find<HostingController>();
final AuthenticatorController _authenticatorController = Get.find<AuthenticatorController>();
final SettingsController _settingsController = Get.find<SettingsController>();
final UpdateController _updateController = Get.find<UpdateController>();
@@ -108,6 +102,7 @@ class _SettingsPageState extends State<SettingsPage> with AutomaticKeepAliveClie
text: Text(entry.text),
onPressed: () {
_updateController.timer.value = entry;
removeMessage(6);
_updateController.update(true);
}
)).toList()
@@ -148,7 +143,7 @@ class _SettingsPageState extends State<SettingsPage> with AutomaticKeepAliveClie
content: Button(
onPressed: () => showAppDialog(
builder: (context) => InfoDialog(
text: "Do you want to reset all the launcher's settings to their default values? This action is irreversible",
text: "Do you want to reset all the setting in this tab to their default values? This action is irreversible",
buttons: [
DialogButton(
type: ButtonType.secondary,
@@ -158,12 +153,7 @@ class _SettingsPageState extends State<SettingsPage> with AutomaticKeepAliveClie
type: ButtonType.primary,
text: "Reset",
onTap: () {
_buildController.reset();
_gameController.reset();
_hostingController.reset();
_authenticatorController.reset();
_settingsController.reset();
_updateController.reset();
Navigator.of(context).pop();
},
)