From fccbf7440cb37459ab6b5854a23a39f8cce09e89 Mon Sep 17 00:00:00 2001 From: misakajimmy Date: Sun, 26 Mar 2023 19:28:48 +0800 Subject: [PATCH] DEV UPDATE:Dev rollback main.dart --- lib/main-new.dart | 20 ++++++++++++++ lib/main-old.dart | 63 ------------------------------------------- lib/main.dart | 61 ++++++++++++++++++++++++++++++++++------- test/widget_test.dart | 2 +- 4 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 lib/main-new.dart delete mode 100644 lib/main-old.dart diff --git a/lib/main-new.dart b/lib/main-new.dart new file mode 100644 index 0000000..b7bee45 --- /dev/null +++ b/lib/main-new.dart @@ -0,0 +1,20 @@ + +import 'package:EOEFANS/navigation/app.dart'; +import 'package:flutter/material.dart'; +import 'package:overlay_support/overlay_support.dart'; + +Future main() async { + +} + + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + @override + Widget build(BuildContext context) { + return const OverlaySupport( + child: FansApp(), + ); + } +} diff --git a/lib/main-old.dart b/lib/main-old.dart deleted file mode 100644 index 04415ad..0000000 --- a/lib/main-old.dart +++ /dev/null @@ -1,63 +0,0 @@ -import 'dart:io'; - -import 'package:EOEFANS/models/videoPageTab.dart'; -import 'package:EOEFANS/routes/mainPage.dart'; -import 'package:EOEFANS/routes/setting/aboutUs.dart'; -import 'package:EOEFANS/routes/setting/settingPage.dart'; -import 'package:EOEFANS/routes/setting/settingTheme.dart'; -import 'package:EOEFANS/routes/splashPage.dart'; -import 'package:flutter/material.dart'; -import 'package:EOEFANS/states/ProfileChangeNotifier.dart'; -import 'package:flutter/services.dart'; -import 'package:provider/provider.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; -import 'package:EOEFANS/common/Api.dart'; -import 'package:EOEFANS/models/videoPageTab.dart'; -import 'package:EOEFANS/common/Global.dart'; - - -Future main() async { - WidgetsFlutterBinding.ensureInitialized(); - if (Platform.isAndroid) { - // 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。 - SystemUiOverlayStyle systemUiOverlayStyle = - SystemUiOverlayStyle(statusBarColor: Colors.transparent); - SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle); - } - await SentryFlutter.init( - (options) { - options.dsn = - 'https://af432d5302db4e71801cf78e91fd5b78@sentry.vtb.link/4'; - // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring. - // We recommend adjusting this value in production. - options.tracesSampleRate = 1.0; - }, - appRunner: () => Global.init().then((e) => runApp(MyApp())), - ); -} - -class MyApp extends StatelessWidget { - @override - Widget build(BuildContext context) { - return MultiProvider( - providers: [ - ChangeNotifierProvider.value(value: ThemeModel()), - ], - child: Consumer( - builder: (BuildContext context, themeModel, Widget? child) { - return MaterialApp( - initialRoute: '/splash', - theme: ThemeData( - primarySwatch: Colors.blue, - ), - routes: { - '/main': (BuildContext context) => MainPage(), - '/splash': (BuildContext context) => SplashScreen(), - '/setting': (BuildContext context) => const SettingPage(), - '/theme': (BuildContext context) => const SettingTheme(), - '/about': (BuildContext context) => const AboutUs(), - }, - ); - })); - } -} diff --git a/lib/main.dart b/lib/main.dart index b7bee45..04415ad 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,20 +1,63 @@ +import 'dart:io'; -import 'package:EOEFANS/navigation/app.dart'; +import 'package:EOEFANS/models/videoPageTab.dart'; +import 'package:EOEFANS/routes/mainPage.dart'; +import 'package:EOEFANS/routes/setting/aboutUs.dart'; +import 'package:EOEFANS/routes/setting/settingPage.dart'; +import 'package:EOEFANS/routes/setting/settingTheme.dart'; +import 'package:EOEFANS/routes/splashPage.dart'; import 'package:flutter/material.dart'; -import 'package:overlay_support/overlay_support.dart'; +import 'package:EOEFANS/states/ProfileChangeNotifier.dart'; +import 'package:flutter/services.dart'; +import 'package:provider/provider.dart'; +import 'package:sentry_flutter/sentry_flutter.dart'; +import 'package:EOEFANS/common/Api.dart'; +import 'package:EOEFANS/models/videoPageTab.dart'; +import 'package:EOEFANS/common/Global.dart'; -Future main() async { +Future main() async { + WidgetsFlutterBinding.ensureInitialized(); + if (Platform.isAndroid) { + // 以下两行 设置android状态栏为透明的沉浸。写在组件渲染之后，是为了在渲染后进行set赋值，覆盖状态栏，写在渲染之前MaterialApp组件会覆盖掉这个值。 + SystemUiOverlayStyle systemUiOverlayStyle = + SystemUiOverlayStyle(statusBarColor: Colors.transparent); + SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle); + } + await SentryFlutter.init( + (options) { + options.dsn = + 'https://af432d5302db4e71801cf78e91fd5b78@sentry.vtb.link/4'; + // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring. + // We recommend adjusting this value in production. + options.tracesSampleRate = 1.0; + }, + appRunner: () => Global.init().then((e) => runApp(MyApp())), + ); } - class MyApp extends StatelessWidget { - const MyApp({super.key}); - @override Widget build(BuildContext context) { - return const OverlaySupport( - child: FansApp(), - ); + return MultiProvider( + providers: [ + ChangeNotifierProvider.value(value: ThemeModel()), + ], + child: Consumer( + builder: (BuildContext context, themeModel, Widget? child) { + return MaterialApp( + initialRoute: '/splash', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + routes: { + '/main': (BuildContext context) => MainPage(), + '/splash': (BuildContext context) => SplashScreen(), + '/setting': (BuildContext context) => const SettingPage(), + '/theme': (BuildContext context) => const SettingTheme(), + '/about': (BuildContext context) => const AboutUs(), + }, + ); + })); } } diff --git a/test/widget_test.dart b/test/widget_test.dart index 163b9f4..6ec2c46 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:EOEFANS/main-old.dart'; +import 'package:EOEFANS/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {