From fd7793a20de3d5683d56b5ed7024228d7a843322 Mon Sep 17 00:00:00 2001 From: 55nknown <55922348+55nknown@users.noreply.github.com> Date: Thu, 8 Sep 2022 22:35:25 +0200 Subject: [PATCH] desktop login --- filcnaplo/lib/app.dart | 6 +++++- filcnaplo/pubspec.yaml | 1 + filcnaplo_desktop_ui | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/filcnaplo/lib/app.dart b/filcnaplo/lib/app.dart index 6865e93..bab4dda 100644 --- a/filcnaplo/lib/app.dart +++ b/filcnaplo/lib/app.dart @@ -27,7 +27,8 @@ import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.dart' as mo // Desktop UI import 'package:filcnaplo_desktop_ui/screens/navigation/navigation_screen.dart' as desktop; -import 'package:filcnaplo_desktop_ui/screens/settings/settings_screen.dart' as desktop; +import 'package:filcnaplo_desktop_ui/screens/login/login_screen.dart' as desktop; +import 'package:filcnaplo_desktop_ui/screens/login/login_route.dart' as desktop; // Providers import 'package:filcnaplo/models/settings.dart'; @@ -165,10 +166,13 @@ class App extends StatelessWidget { } else if (Platform.isWindows || Platform.isMacOS || Platform.isLinux) { switch (route.name) { case "login_back": + return CupertinoPageRoute(builder: (context) => const desktop.LoginScreen(back: true)); case "login": + return _rootRoute(const desktop.LoginScreen()); case "navigation": return _rootRoute(const desktop.NavigationScreen()); case "login_to_navigation": + return desktop.loginRoute(const desktop.NavigationScreen()); } } return null; diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 96529be..94e811c 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -44,6 +44,7 @@ dependencies: dynamic_color: ^1.2.2 material_color_utilities: ^0.1.3 crypto: ^3.0.2 + elegant_notification: ^1.6.1 dev_dependencies: flutter_test: diff --git a/filcnaplo_desktop_ui b/filcnaplo_desktop_ui index f8c591d..351c241 160000 --- a/filcnaplo_desktop_ui +++ b/filcnaplo_desktop_ui @@ -1 +1 @@ -Subproject commit f8c591d543187dd5de48680e7b01dbce1f743d9a +Subproject commit 351c241efb3aad1ba4f7384ee63475ab74399f5d