Merge branch 'main' into mobileDashboardFeature

This commit is contained in:
Ankit Mahato
2023-12-10 07:24:08 +05:30
committed by GitHub
94 changed files with 7842 additions and 1360 deletions

View File

@ -4,7 +4,7 @@ import 'package:window_manager/window_manager.dart';
import 'providers/providers.dart';
import 'screens/screens.dart';
import 'consts.dart'
show kFontFamily, kFontFamilyFallback, kColorSchemeSeed, kIsMobile;
show kIsLinux, kIsMobile, kFontFamily, kFontFamilyFallback, kColorSchemeSeed;
class App extends ConsumerStatefulWidget {
const App({super.key});
@ -39,7 +39,7 @@ class _AppState extends ConsumerState<App> with WindowListener {
@override
Widget build(BuildContext context) {
return const DashApp();
return const Dashboard();
}
@override
@ -84,7 +84,7 @@ class _DashAppState extends ConsumerState<DashApp> {
title: 'Requests',
scaffoldBody: CollectionPane(),
)
: const Dashboard(),
: kIsLinux ? const Dashboard() : const App(),
);
}
}