Added proper structuring of files inside lib

lib/auth_wrapper.dart → lib/Services/auth_wrapper.dart

@@ -1,5 +1,5 @@
-import 'package:batua/home_screen.dart';
-import 'package:batua/login_screen.dart';
+import 'package:batua/UI/home_screen.dart';
+import 'package:batua/UI/login_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:firebase_auth/firebase_auth.dart';

lib/UI/auth_wrapper.dart

@@ -0,0 +1,19 @@
+import 'package:batua/UI/home_screen.dart';
+import 'package:batua/UI/login_screen.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+
+class AuthWrapper extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final user = Provider.of<User>(context);
+
+    // return either the Home or Login screen
+    if (user == null) {
+      return LoginScreen();
+    } else {
+      return HomeScreen();
+    }
+  }
+}

lib/home_screen.dart → lib/UI/home_screen.dart

@@ -1,11 +1,11 @@
 import 'package:animated_bottom_navigation_bar/animated_bottom_navigation_bar.dart';
-import 'package:batua/facebook_auth.dart';
+import 'package:batua/Services/authentication_service.dart';
+import 'package:batua/Services/facebook_auth.dart';
 import 'package:batua/utils/constants.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'authentication_service.dart';
-import 'google_signin.dart';
+import '../Services/google_signin.dart';
 import 'login_screen.dart';
 
 class HomeScreen extends StatefulWidget {

lib/login_screen.dart → lib/UI/login_screen.dart

@@ -1,12 +1,12 @@
-import 'package:batua/facebook_auth.dart';
+import 'package:batua/Services/authentication_service.dart';
+import 'package:batua/Services/facebook_auth.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'authentication_service.dart';
-import 'google_signin.dart';
+import '../Services/google_signin.dart';
 import 'home_screen.dart';
 import 'sign_up.dart';
-import 'utils/constants.dart';
+import '../utils/constants.dart';
 import 'package:modal_progress_hud/modal_progress_hud.dart';
 
 class LoginScreen extends StatefulWidget {

lib/sign_up.dart → lib/UI/sign_up.dart

@@ -1,10 +1,10 @@
-import 'package:batua/home_screen.dart';
-import 'package:batua/loading.dart';
-import 'package:batua/login_screen.dart';
+import 'package:batua/Services/authentication_service.dart';
+import 'package:batua/UI/home_screen.dart';
+import 'package:batua/UI/loading.dart';
+import 'package:batua/UI/login_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:batua/utils/constants.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'authentication_service.dart';
 
 class SignUpScreen extends StatefulWidget {
   @override

lib/main.dart

@@ -1,4 +1,4 @@
-import 'package:batua/authentication_service.dart';
+import 'package:batua/Services/authentication_service.dart';
 import 'package:batua/utils/constants.dart';
 import 'package:batua/utils/route_page.dart';
 import 'package:flutter/material.dart';

lib/utils/route_page.dart

@@ -1,8 +1,8 @@
-import 'package:batua/auth_wrapper.dart';
-import 'package:batua/home_screen.dart';
-import 'package:batua/login_screen.dart';
-import 'package:batua/sign_up.dart';
-import 'package:batua/user_details_screen.dart';
+import 'package:batua/Services/auth_wrapper.dart';
+import 'package:batua/UI/home_screen.dart';
+import 'package:batua/UI/login_screen.dart';
+import 'package:batua/UI/sign_up.dart';
+import 'package:batua/UI/user_details_screen.dart';
 import 'package:batua/utils/constants.dart';
 import 'package:flutter/cupertino.dart';
 

pubspec.lock

@@ -14,42 +14,42 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.0-nullsafety.3"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.15.0-nullsafety.5"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -63,7 +63,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   firebase_auth:
     dependency: "direct main"
     description:
@@ -117,7 +117,25 @@ packages:
       name: flutter_facebook_auth
       url: "https://pub.dartlang.org"
     source: hosted
+<<<<<<< HEAD
     version: "1.0.2+2"
+=======
+    version: "2.0.2+1"
+  flutter_facebook_auth_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_facebook_auth_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  flutter_facebook_auth_web:
+    dependency: transitive
+    description:
+      name: flutter_facebook_auth_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.6"
+>>>>>>> 8e10924bf653d54aabbb642bfe63542b683ebbae
   flutter_spinkit:
     dependency: "direct main"
     description:
@@ -183,28 +201,42 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.3-nullsafety.3"
   lint:
     dependency: "direct main"
     description:
       name: lint
       url: "https://pub.dartlang.org"
     source: hosted
+<<<<<<< HEAD
     version: "1.3.0"
+=======
+    version: "1.5.1"
+>>>>>>> 8e10924bf653d54aabbb642bfe63542b683ebbae
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.10-nullsafety.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.6"
+<<<<<<< HEAD
+  modal_progress_hud:
+    dependency: "direct main"
+    description:
+      name: modal_progress_hud
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
+=======
+>>>>>>> 8e10924bf653d54aabbb642bfe63542b683ebbae
   nested:
     dependency: transitive
     description:
@@ -218,7 +250,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.3"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -251,56 +283,60 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.4"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.0-nullsafety.6"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.2.19-nullsafety.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.5"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.5"
 sdks:
   dart: ">=2.12.0-0.0 <3.0.0"
+<<<<<<< HEAD
   flutter: ">=1.16.0"
+=======
+  flutter: ">=1.20.0"
+>>>>>>> 8e10924bf653d54aabbb642bfe63542b683ebbae