update

Author: 7wilightxdev

android/app/build.gradle

@@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -67,7 +67,6 @@ dependencies {
     // Add the dependency for the Firebase SDK for Google Analytics
     // When using the BoM, don't specify versions in Firebase dependencies
     implementation 'com.google.firebase:firebase-analytics'
-
     // Add the dependencies for any other desired Firebase products
     // https://firebase.google.com/docs/android/setup#available-libraries
 }

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="e_commerce_app"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -43,5 +42,7 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+            <meta-data android:name="com.google.android.geo.API_KEY"
+               android:value="AIzaSyCujk4bJgwEECcDYwX9e0CRiYQFlWzhFU4"/>
     </application>
 </manifest>

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.gms:google-services:4.3.5'
     }
 }
 

lib/business_logic/blocs/profile/profile_bloc.dart

@@ -32,6 +32,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
+  /// Load Profile event => states
   Stream<ProfileState> _mapLoadProfileToState(LoadProfile event) async* {
     try {
       _profileStreamSub?.cancel();
@@ -43,6 +44,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
+  /// Upload Avatar event => states
   Stream<ProfileState> _mapUploadAvatarToState(UploadAvatar event) async* {
     try {
       // Get image url from firebase storage
@@ -57,7 +59,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     } catch (e) {}
   }
 
-  ///
+  /// Address List Changed event => states
   Stream<ProfileState> _mapAddressListChangedToState(
       AddressListChanged event) async* {
     try {
@@ -72,6 +74,10 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
       // Check method
       switch (event.method) {
         case ListMethod.ADD:
+          // If current addresses is empty, so the first delivery address is always default
+          if (addresses.isEmpty) {
+            deliveryAddress = deliveryAddress.cloneWith(isDefault: true);
+          }
           addresses.add(deliveryAddress);
           break;
         case ListMethod.DELETE:
@@ -92,6 +98,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     } catch (e) {}
   }
 
+  /// Profile Updated event => states
   Stream<ProfileState> _mapProfileUpdatedToState(ProfileUpdated event) async* {
     try {
       _loggedUser = event.updatedUser;

lib/business_logic/local/pref.dart

@@ -0,0 +1,29 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+abstract class Pref {
+  Future<bool> saveString(String key, String value);
+
+  Future<String> getString(String key);
+
+  Future<bool> removeString(String key);
+}
+
+class LocalPref extends Pref {
+  @override
+  Future<bool> saveString(String key, String value) async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.setString(key, value);
+  }
+
+  @override
+  Future<String> getString(String key) async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString(key)!;
+  }
+
+  @override
+  Future<bool> removeString(String key) async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.remove(key);
+  }
+}

lib/business_logic/repository/auth_repository/auth_repo.dart

@@ -15,7 +15,7 @@ abstract class AuthRepository {
 
   /// Starts the Sign In with Google Flow.
   /// Created by NDH
-  Future<void> logInWithGoogle();
+  // Future<void> logInWithGoogle();
 
   bool isLoggedIn();
 

lib/business_logic/repository/auth_repository/firebase_auth_repo.dart

@@ -3,11 +3,11 @@ import 'package:e_commerce_app/business_logic/repository/auth_repository/auth_re
 import 'package:e_commerce_app/business_logic/repository/repository.dart';
 import 'package:e_commerce_app/business_logic/repository/user_repository/user_repo.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:google_sign_in/google_sign_in.dart';
+// import 'package:google_sign_in/google_sign_in.dart';
 
 class FirebaseAuthRepository implements AuthRepository {
   FirebaseAuth _firebaseAuth = FirebaseAuth.instance;
-  GoogleSignIn _googleSignIn = GoogleSignIn();
+  // GoogleSignIn _googleSignIn = GoogleSignIn();
   UserRepository _userRepository = FirebaseUserRepository();
   String _authException = "Authentication Failure";
   User get loggedFirebaseUser => _firebaseAuth.currentUser!;
@@ -48,30 +48,27 @@ class FirebaseAuthRepository implements AuthRepository {
 
   /// Starts the Sign In with Google Flow.
   /// Created by NDH
-  Future<void> logInWithGoogle() async {
-    try {
-      final googleUser =
-          await (_googleSignIn.signIn() as Future<GoogleSignInAccount>);
-      final googleAuth = await googleUser.authentication;
-      final credential = GoogleAuthProvider.credential(
-        accessToken: googleAuth.accessToken,
-        idToken: googleAuth.idToken,
-      );
-      await _firebaseAuth.signInWithCredential(credential);
-    } on FirebaseAuthException catch (e) {
-      _authException = e.message.toString();
-    }
-  }
+  // Future<void> logInWithGoogle() async {
+  //   try {
+  //     final googleUser =
+  //         await (_googleSignIn.signIn() as Future<GoogleSignInAccount>);
+  //     final googleAuth = await googleUser.authentication;
+  //     final credential = GoogleAuthProvider.credential(
+  //       accessToken: googleAuth.accessToken,
+  //       idToken: googleAuth.idToken,
+  //     );
+  //     await _firebaseAuth.signInWithCredential(credential);
+  //   } on FirebaseAuthException catch (e) {
+  //     _authException = e.message.toString();
+  //   }
+  // }
 
   bool isLoggedIn() => _firebaseAuth.currentUser != null;
 
   /// Signs out the current user
   /// Created by NDH
   Future<void> logOut() async {
-    await Future.wait([
-      _firebaseAuth.signOut(),
-      _googleSignIn.signOut(),
-    ]).catchError((error) {
+    await _firebaseAuth.signOut().catchError((error) {
       print(error);
     });
   }

lib/configs/router.dart

@@ -1,3 +1,4 @@
+import 'package:e_commerce_app/presentation/screens/map/map_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:e_commerce_app/business_logic/entities/entites.dart';
 import 'package:e_commerce_app/presentation/screens/delivery_address/delivery_address_screen.dart';
@@ -28,6 +29,7 @@ class AppRouter {
   static const String CART = '/cart';
   static const String PAYMENT = '/payment';
   static const String DELIVERY_ADDRESS = '/delivery_address';
+  static const String MAP = '/map';
   static const String ALL_PRODUCTS = '/all_products';
 
   static Route<dynamic> generateRoute(RouteSettings settings) {
@@ -68,6 +70,8 @@ class AppRouter {
         return MaterialPageRoute(builder: (_) => PaymentScreen());
       case DELIVERY_ADDRESS:
         return MaterialPageRoute(builder: (_) => DeliveryAddressScreen());
+      case MAP:
+        return MaterialPageRoute(builder: (_) => MapScreen());
       default:
         return MaterialPageRoute(
           builder: (_) => Scaffold(

lib/configs/themes/appbar_theme.dart

@@ -6,6 +6,7 @@ AppBarTheme appBarTheme() {
     elevation: 0,
     brightness: Brightness.light,
     iconTheme: IconThemeData(color: Colors.black),
+    centerTitle: true,
     textTheme: TextTheme(
       headline6: TextStyle(color: Color(0xFF636e72), fontSize: 20),
     ),

lib/configs/themes/theme.dart

@@ -1,4 +1,5 @@
 import 'package:e_commerce_app/configs/themes/text_theme.dart';
+import 'package:e_commerce_app/constants/color_constant.dart';
 import 'package:flutter/material.dart';
 
 import 'appbar_theme.dart';
@@ -9,6 +10,8 @@ ThemeData theme() {
     fontFamily: "Poppins",
     appBarTheme: appBarTheme(),
     textTheme: textTheme(),
+    floatingActionButtonTheme:
+        FloatingActionButtonThemeData(backgroundColor: mPrimaryColor),
     visualDensity: VisualDensity.adaptivePlatformDensity,
   );
 }