diff --git a/.vscode/launch.json b/.vscode/launch.json index 7472f60..4763c30 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,8 +7,8 @@ "type": "dart" }, { - "name": "sdk gphone64 x86 64 (mobile)", - "deviceId": "emulator-5554", + "name": "macOS (desktop)", + "deviceId": "macos", "type": "dart", "request": "launch", "args": [ @@ -17,14 +17,8 @@ ] }, { - "name": "Windows (desktop)", - "deviceId": "windows", - "type": "dart", - "request": "launch" - }, - { - "name": "Chrome (web)", - "deviceId": "chrome", + "name": "Mac Designed for iPad (desktop)", + "deviceId": "mac-designed-for-ipad", "type": "dart", "request": "launch", "args": [ @@ -33,8 +27,8 @@ ] }, { - "name": "Edge (web)", - "deviceId": "edge", + "name": "Chrome (web)", + "deviceId": "chrome", "type": "dart", "request": "launch", "args": [ @@ -47,10 +41,9 @@ { "name": "current", "configurations": [ - "sdk gphone64 x86 64 (mobile)", - "Windows (desktop)", - "Chrome (web)", - "Edge (web)" + "macOS (desktop)", + "Mac Designed for iPad (desktop)", + "Chrome (web)" ] } ] diff --git a/lib/main.firebase.dart b/lib/main.firebase.dart index 2f985d7..9423651 100644 --- a/lib/main.firebase.dart +++ b/lib/main.firebase.dart @@ -6,6 +6,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:gandalf/Utils.dart'; import 'package:gandalf/configs/app.dart'; +import 'package:gandalf/firebase_options.dart'; import 'package:google_mobile_ads/google_mobile_ads.dart'; import 'package:video_player_media_kit/video_player_media_kit.dart'; @@ -13,7 +14,9 @@ import 'Navigator.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await Firebase.initializeApp(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); VideoPlayerMediaKit.ensureInitialized( web: false, diff --git a/lib/main.web.dart b/lib/main.web.dart index ad9c5b6..21f722b 100644 --- a/lib/main.web.dart +++ b/lib/main.web.dart @@ -3,13 +3,16 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:gandalf/configs/app.dart'; +import 'package:gandalf/firebase_options.dart'; import 'package:video_player_media_kit/video_player_media_kit.dart'; import 'Navigator.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await Firebase.initializeApp(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); VideoPlayerMediaKit.ensureInitialized( web: true, linux: false,