Fix Bugs & Improve Security

Author: priteshchitrode

android/app/src/main/kotlin/com/example/flutter_mvvm_provider/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.flutter_mvvm_provider
+package com.app.flutter_mvvm_provider
 
 import io.flutter.embedding.android.FlutterActivity
 

assets/env/.env.firebase_options_android

@@ -0,0 +1,5 @@
+API_KEY=AIzaSyB33Du5FMWYRNbc8KSUasm2xuzBnt9In40
+APP_ID=1:505721379717:android:7cc49127018365eee742ec
+MESSAGING_SENDER_ID=
+PROJECT_ID=flutter-mvvm-provider-f4b7f
+STORAGE_BUCKET=flutter-mvvm-provider-f4b7f.firebasestorage.app

assets/env/.env.firebase_options_ios

@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_mvvm_provider/dependency_injection/locator.dart';
+import 'package:flutter_mvvm_provider/utils/app_global_variables.dart';
 
 
 ///  App Initialization Function
@@ -25,6 +26,7 @@ Future<void> initializeApp() async {
 
   // Load Environment Variables
   await dotenv.load(fileName: kDebugMode ? "./assets/env/.env.dev" : "./assets/env/.env.dev");
+  await dotenv.load(fileName: isAndroid ? "./assets/env/.env.firebase_options_android" : "./assets/env/.env.firebase_options_ios");
 
   // Dependency Injection
   initLocator();

lib/core/app_initializer.dart

@@ -2,8 +2,10 @@
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
 import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 class DefaultFirebaseOptions {
+
   static FirebaseOptions get currentPlatform {
     if (kIsWeb) {
       throw UnsupportedError(
@@ -13,7 +15,6 @@ class DefaultFirebaseOptions {
     }
     switch (defaultTargetPlatform) {
       case TargetPlatform.android:
-        return android;
       case TargetPlatform.iOS:
         return ios;
       case TargetPlatform.macOS:
@@ -38,20 +39,25 @@ class DefaultFirebaseOptions {
     }
   }
 
-  static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyB33Du5FMWYRNbc8KSUasm2xuzBnt9In40',
-    appId: '1:505721379717:android:7cc49127018365eee742ec',
-    messagingSenderId: '',
-    projectId: 'flutter-mvvm-provider-f4b7f',
-    storageBucket: 'flutter-mvvm-provider-f4b7f.firebasestorage.app',
-  );
+  static FirebaseOptions get android {
+    return FirebaseOptions(
+      apiKey: dotenv.env["API_KEY"] ?? "",
+      appId: dotenv.env["APP_ID"] ?? "",
+      messagingSenderId: dotenv.env["MESSAGING_SENDER_ID"] ?? "",
+      projectId: dotenv.env["PROJECT_ID"] ?? "",
+      storageBucket: dotenv.env["STORAGE_BUCKET"] ?? "",
+    );
+  }
+
+  static FirebaseOptions get ios {
+    return FirebaseOptions(
+      apiKey: dotenv.env["API_KEY"] ?? "",
+      appId: dotenv.env["APP_ID"] ?? "",
+      messagingSenderId: dotenv.env["MESSAGING_SENDER_ID"] ?? "",
+      projectId: dotenv.env["PROJECT_ID"] ?? "",
+      storageBucket: dotenv.env["STORAGE_BUCKET"] ?? "",
+      iosBundleId: dotenv.env["IOS_BUNDLE_ID"] ?? "",
+    );
+  }
 
-  static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: '',
-    appId: '',
-    messagingSenderId: '',
-    projectId: '',
-    storageBucket: '',
-    iosBundleId: '',
-  );
 }