diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart index 7968bbad7..816870984 100644 --- a/flutter/lib/main.dart +++ b/flutter/lib/main.dart @@ -24,9 +24,9 @@ import 'models/platform_model.dart'; int? windowId; -Future main(List args) async { +Future main(List args) async { WidgetsFlutterBinding.ensureInitialized(); - print("launch args: $args"); + debugPrint("launch args: $args"); if (!isDesktop) { runMobileApp(); @@ -37,7 +37,7 @@ Future main(List args) async { windowId = int.parse(args[1]); WindowController.fromWindowId(windowId!).showTitleBar(false); final argument = args[2].isEmpty - ? Map() + ? {} : jsonDecode(args[2]) as Map; int type = argument['type'] ?? -1; argument['windowId'] = windowId; @@ -60,7 +60,7 @@ Future main(List args) async { break; } } else if (args.isNotEmpty && args.first == '--cm') { - print("--cm started"); + debugPrint("--cm started"); desktopType = DesktopType.cm; await windowManager.ensureInitialized(); runConnectionManagerScreen(); @@ -123,7 +123,7 @@ void runRemoteScreen(Map argument) async { home: DesktopRemoteScreen( params: argument, ), - navigatorObservers: [ + navigatorObservers: const [ // FirebaseAnalyticsObserver(analytics: analytics), ], builder: _keepScaleBuilder(), @@ -141,7 +141,7 @@ void runFileTransferScreen(Map argument) async { darkTheme: MyTheme.darkTheme, themeMode: MyTheme.initialThemeMode(), home: DesktopFileTransferScreen(params: argument), - navigatorObservers: [ + navigatorObservers: const [ // FirebaseAnalyticsObserver(analytics: analytics), ], builder: _keepScaleBuilder(), @@ -160,7 +160,7 @@ void runPortForwardScreen(Map argument) async { darkTheme: MyTheme.darkTheme, themeMode: MyTheme.initialThemeMode(), home: DesktopPortForwardScreen(params: argument), - navigatorObservers: [ + navigatorObservers: const [ // FirebaseAnalyticsObserver(analytics: analytics), ], builder: _keepScaleBuilder(), @@ -186,7 +186,7 @@ void runConnectionManagerScreen() async { theme: MyTheme.lightTheme, darkTheme: MyTheme.darkTheme, themeMode: MyTheme.initialThemeMode(), - home: DesktopServerPage(), + home: const DesktopServerPage(), builder: _keepScaleBuilder())); } @@ -246,7 +246,7 @@ class _AppState extends State { : !isAndroid ? WebHomePage() : HomePage(), - navigatorObservers: [ + navigatorObservers: const [ // FirebaseAnalyticsObserver(analytics: analytics), ], builder: isAndroid diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index a871bb928..b012f0435 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -57,13 +57,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.0.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" build: dependency: transitive description: @@ -126,28 +119,28 @@ packages: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "3.2.2" + version: "3.2.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.1" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "1.2.0" charcode: dependency: transitive description: @@ -318,13 +311,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.3" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" ffi: dependency: "direct main" description: @@ -381,13 +367,6 @@ packages: url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor" source: git version: "0.0.1" - flutter_launcher_icons: - dependency: "direct dev" - description: - name: flutter_launcher_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.9.3" flutter_lints: dependency: "direct dev" description: @@ -418,11 +397,6 @@ packages: url: "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge" source: git version: "1.32.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" flutter_web_plugins: dependency: transitive description: flutter @@ -498,6 +472,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.0.1" + icons_launcher: + dependency: "direct dev" + description: + name: icons_launcher + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.5" image: dependency: "direct main" description: @@ -595,7 +576,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.5" + version: "0.1.4" menu_base: dependency: transitive description: @@ -609,7 +590,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.7.0" mime: dependency: transitive description: @@ -763,7 +744,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" pool: dependency: transitive description: @@ -938,7 +919,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.9.1" sqflite: dependency: transitive description: @@ -995,13 +976,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.12" timing: dependency: transitive description: @@ -1039,6 +1013,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.1" + universal_io: + dependency: transitive + description: + name: universal_io + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" url_launcher: dependency: "direct main" description: @@ -1245,5 +1226,5 @@ packages: source: hosted version: "0.1.0" sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=3.3.0" + dart: ">=2.17.1 <3.0.0" + flutter: ">=3.0.0" diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index a05cd779a..1cb72677c 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -81,8 +81,8 @@ dependencies: dev_dependencies: icons_launcher: ^2.0.5 - flutter_test: - sdk: flutter + #flutter_test: + #sdk: flutter build_runner: ^2.1.11 freezed: ^2.0.3 flutter_lints: ^2.0.0