devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed desktop ui and optimized other things

Browse Source
This commit is contained in:
Marton Kiss
2025-01-03 15:42:31 +01:00
parent 728534170c
commit 6388650c77
42 changed files with 34 additions and 5590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
refilc/lib/app.dart
View File

@@ -39,11 +39,11 @@ import 'package:refilc_mobile_ui/screens/settings/settings_route.dart'
import 'package:refilc_mobile_ui/screens/settings/settings_screen.dart'
as mobile;
// Desktop UI
import 'package:refilc_desktop_ui/screens/navigation/navigation_screen.dart'
as desktop;
import 'package:refilc_desktop_ui/screens/login/login_screen.dart' as desktop;
import 'package:refilc_desktop_ui/screens/login/login_route.dart' as desktop;
// Desktop UI (no more desktop ui)
// import 'package:refilc_desktop_ui/screens/navigation/navigation_screen.dart'
// as desktop;
// import 'package:refilc_desktop_ui/screens/login/login_screen.dart' as desktop;
// import 'package:refilc_desktop_ui/screens/login/login_route.dart' as desktop;
// Providers
import 'package:refilc/models/settings.dart';
@@ -248,17 +248,18 @@ class App extends StatelessWidget {
Route? rootNavigator(RouteSettings route) {
if (kIsWeb) {
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;
// 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());
// }
} else if (Platform.isAndroid || Platform.isIOS) {
switch (route.name) {
case "login_back":
@@ -274,17 +275,18 @@ class App extends StatelessWidget {
return mobile.settingsRoute(const mobile.SettingsScreen());
}
} 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;
// 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;
}

7
refilc/lib/ui/filter/widgets/grades.dart
View File

@@ -1,12 +1,9 @@
import 'package:refilc/ui/date_widget.dart';
import 'package:refilc/utils/platform.dart';
import 'package:refilc_kreta_api/models/grade.dart';
import 'package:refilc_mobile_ui/common/widgets/grade/grade_viewable.dart'
as mobile;
import 'package:refilc_mobile_ui/common/widgets/grade/new_grades.dart'
as mobile;
import 'package:refilc_desktop_ui/common/widgets/grade/grade_viewable.dart'
as desktop;
List<DateWidget> getWidgets(
List<Grade> providerGrades, DateTime? lastSeenDate) {
@@ -19,9 +16,7 @@ List<DateWidget> getWidgets(
items.add(DateWidget(
key: grade.id,
date: grade.date,
widget: PlatformUtils.isMobile
? mobile.GradeViewable(grade)
: desktop.GradeViewable(grade),
widget: mobile.GradeViewable(grade),
));
}
}

4
refilc/pubspec.yaml
View File

@@ -75,9 +75,7 @@ dependencies:
screenshot: ^3.0.0
flutter_staggered_grid_view: ^0.7.0
sqflite_common_ffi_web: ^0.4.0
image_crop:
git:
url: https://github.com/kimaah/image_crop.git
image_crop_plus: ^1.0.0
googleapis: ^13.2.0
google_sign_in: ^6.2.1
extension_google_sign_in_as_googleapis_auth: ^2.0.12