Skip to content

Commit f57385e

Browse files
committed
Updated main entry files
1 parent 6359876 commit f57385e

File tree

2 files changed

+11
-28
lines changed

2 files changed

+11
-28
lines changed

lib/main.firebase.dart

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import 'package:flutter/material.dart';
32
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
43
import 'package:firebase_analytics/firebase_analytics.dart';
@@ -36,16 +35,15 @@ Future<void> main() async {
3635
await Hive.openBox('app');
3736
UIUtils.setLightStatusBar();
3837

39-
final List<NavigatorObserver> observers = [];
40-
41-
if (Utils.isMobile() || (!Utils.isMobile() && !Utils.isDesktop())) {
42-
observers.add(FirebaseAnalyticsObserver(
38+
final List<NavigatorObserver> observers = [
39+
FirebaseAnalyticsObserver(
4340
analytics: FirebaseAnalytics.instance,
44-
));
45-
}
41+
)
42+
];
4643

4744
FlutterError.onError = (FlutterErrorDetails err) {
4845
FirebaseCrashlytics.instance.recordFlutterError(err);
4946
};
47+
5048
runApp(ProviderScope(child: AppNavigator(observers)));
5149
}

lib/main.web.dart

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ import 'package:firebase_analytics/firebase_analytics.dart';
44
import 'package:firebase_core/firebase_core.dart';
55
import 'package:flutter_riverpod/flutter_riverpod.dart';
66
import 'package:flutter_uis/firebase_options.dart';
7-
import 'package:google_mobile_ads/google_mobile_ads.dart';
87
import 'package:hive_flutter/hive_flutter.dart';
98

10-
import 'package:flutter_uis/io/io.dart';
119
import 'utils/UIUtils.dart';
12-
import 'utils/Utils.dart';
1310
import 'configs/App.dart';
1411
import 'Navigator.dart';
1512

@@ -19,29 +16,17 @@ Future<void> main() async {
1916
options: DefaultFirebaseOptions.currentPlatform,
2017
);
2118

22-
App.showAds = Utils.isMobile();
23-
if (App.showAds) {
24-
await MobileAds.instance.initialize();
25-
if (Platform.isIOS) {
26-
// await MobileAds.instance.req;
27-
// await Admob.requestTrackingAuthorization();
28-
}
29-
}
30-
await Firebase.initializeApp();
19+
App.showAds = false;
20+
3121
await Hive.initFlutter();
3222
await Hive.openBox('app');
3323
UIUtils.setLightStatusBar();
3424

35-
final List<NavigatorObserver> observers = [];
36-
37-
if (Utils.isMobile() || (!Utils.isMobile() && !Utils.isDesktop())) {
38-
observers.add(FirebaseAnalyticsObserver(
25+
final List<NavigatorObserver> observers = [
26+
FirebaseAnalyticsObserver(
3927
analytics: FirebaseAnalytics.instance,
40-
));
41-
}
28+
)
29+
];
4230

43-
FlutterError.onError = (FlutterErrorDetails err) {
44-
FirebaseCrashlytics.instance.recordFlutterError(err);
45-
};
4631
runApp(ProviderScope(child: AppNavigator(observers)));
4732
}

0 commit comments

Comments
 (0)