File structure refactoring, fixed AppUser streaming via Provider

lib/authentication/user.dart → lib/data/app_user.dart

@@ -1,34 +1,36 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 
-class MyUser {
+class AppUser {
+  static final AppUser defaultUser = AppUser(uid: "");
+
   final String uid;
   final String? email;
   final String? firstName;
   final String? lastName;
   final GeoPoint? location;
 
-  MyUser({required this.uid, this.email, this.firstName, this.lastName, this.location});
+  AppUser(
+      {required this.uid,
+      this.email,
+      this.firstName,
+      this.lastName,
+      this.location});
 
-factory MyUser.fromFirestore(
-    QueryDocumentSnapshot snapshot,
+  factory AppUser.fromFirestore(
+    DocumentSnapshot snapshot,
     SnapshotOptions? options,
   ) {
     Map<String, dynamic> data = snapshot.data() as Map<String, dynamic>;
 
     try {
-      return MyUser(
+      return AppUser(
           uid: data['uid'],
           email: data['email'],
           firstName: data['firstName'],
           lastName: data['lastName'],
           location: data['location']);
     } catch (e) {
-      return MyUser(
-          uid: 'UserID',
-          email: '[email protected]',
-          firstName: "First",
-          lastName: "Last",
-          location: GeoPoint(0, 0));
+      return defaultUser;
     }
   }
 
@@ -41,6 +43,4 @@ factory MyUser.fromFirestore(
       "location": location,
     };
   }
-
 }
-

lib/main.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
-import 'package:lost_found_steelhacks/authentication/auth.dart';
-import 'package:lost_found_steelhacks/authentication/user.dart';
-import 'package:lost_found_steelhacks/authentication/wrapper.dart';
+import 'package:lost_found_steelhacks/services/auth_service.dart';
+import 'package:lost_found_steelhacks/data/app_user.dart';
+import 'package:lost_found_steelhacks/routing/wrapper.dart';
 import 'package:lost_found_steelhacks/services/firestore_service.dart';
 import 'package:lost_found_steelhacks/data/item.dart';
 import 'package:lost_found_steelhacks/themes/app_theme.dart';
@@ -60,14 +60,14 @@ class _MyAppState extends State<MyApp> {
     FlutterNativeSplash.remove();
     return MultiProvider(
         providers: [
-          StreamProvider<MyUser?>.value(value: AuthService().user, initialData: null),
+          StreamProvider<AppUser?>.value(
+              value: AuthService.appUserStream,
+              initialData: AppUser.defaultUser,
+              catchError: (context, error) => null),
           StreamProvider<List<Item>>.value(
-            value: FirestoreService().getFoundItems(),
-            initialData: [],
-            catchError: (context, error) {
-              return [];
-            },
-          ),
+              value: FirestoreService.getFoundItemsStream(),
+              initialData: const [],
+              catchError: (context, error) => []),
         ],
         child: MaterialApp(
             title: 'Lost@Pitt | For Students By Students',

lib/pages/list_page.dart

@@ -1,6 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter/material.dart';
-import 'package:lost_found_steelhacks/cards/post_card.dart';
+import 'package:lost_found_steelhacks/widgets/post_card.dart';
 import 'package:lost_found_steelhacks/data/item.dart';
 import 'package:lost_found_steelhacks/themes/app_theme.dart';
 import 'package:provider/provider.dart';

lib/pages/login_page.dart

@@ -2,9 +2,9 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:ionicons/ionicons.dart';
-import 'package:lost_found_steelhacks/authentication/auth.dart';
-import 'package:lost_found_steelhacks/authentication/loading_animation.dart';
-import 'package:lost_found_steelhacks/authentication/user.dart';
+import 'package:lost_found_steelhacks/services/auth_service.dart';
+import 'package:lost_found_steelhacks/widgets/loading_animation.dart';
+import 'package:lost_found_steelhacks/data/app_user.dart';
 import 'package:lost_found_steelhacks/themes/app_theme.dart';
 
 class LoginPage extends StatefulWidget {
@@ -108,9 +108,9 @@ class _LoginPageState extends State<LoginPage> {
     );
   }
 
-  Widget _buildLoginBtn(AppTheme theme, bool loading, AuthService authService) {
+  Widget _buildLoginBtn(AppTheme theme, bool loading) {
     return loading
-        ? const Loading()
+        ? const LoadingAnimation()
         : Container(
             padding: const EdgeInsets.symmetric(vertical: 25.0),
             child: Container(
@@ -120,18 +120,18 @@ class _LoginPageState extends State<LoginPage> {
                   if (_formKey.currentState!.validate()) {
                     setState(() => loading = true);
                     try {
-                      MyUser? result = await authService
-                          .signInWithEmailAndPassword(_email, _password);
+                      await AuthService.signInWithEmailAndPassword(
+                          _email, _password);
 
-                      if (result == null) {
+                      if (!AuthService.isSignedIn()) {
                         throw FirebaseAuthException(code: "Sign in failed");
                       }
 
                       setState(() {
                         loading = false;
                       });
                       //no need to route page as provider handles it
-                    } on FirebaseAuthException catch (e) {
+                    } on FirebaseAuthException {
                       setState(() {
                         _error =
                             'The email or password is incorrect. Please try again.';
@@ -146,15 +146,15 @@ class _LoginPageState extends State<LoginPage> {
           );
   }
 
-  Widget _buildSocialBtnRow(AppTheme theme, AuthService authService) {
+  Widget _buildSocialBtnRow(AppTheme theme) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 15.0),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: <Widget>[
           IconButton(
               onPressed: () async {
-                Future result = authService.signInWithGoogle();
+                Future result = AuthService.signInWithGoogle();
                 result.then((value) {
                   if (value == null) {
                     setState(() {
@@ -200,7 +200,6 @@ class _LoginPageState extends State<LoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    final AuthService authService = AuthService();
     final AppTheme theme = Theme.of(context).extension<AppTheme>()!;
     //const Widget spacing = SizedBox(height: 30);
 
@@ -234,8 +233,8 @@ class _LoginPageState extends State<LoginPage> {
                           _buildPasswordTF(theme),
                           _buildForgotPasswordBtn(theme),
                           _buildErrorMsg(theme),
-                          _buildLoginBtn(theme, loading, authService),
-                          _buildSocialBtnRow(theme, authService),
+                          _buildLoginBtn(theme, loading),
+                          _buildSocialBtnRow(theme),
                           _buildSignupBtn(theme),
                         ],
                       ),

lib/pages/profile_page.dart

@@ -1,7 +1,9 @@
 // ignore_for_file: slash_for_doc_comments
 
 import 'package:flutter/material.dart';
-import 'package:lost_found_steelhacks/authentication/auth.dart';
+import 'package:lost_found_steelhacks/data/app_user.dart';
+import 'package:lost_found_steelhacks/services/auth_service.dart';
+import 'package:provider/provider.dart';
 
 /**
  * UI to display the user's profile. 
@@ -15,17 +17,14 @@ class ProfilePage extends StatefulWidget {
 }
 
 class ProfilePageState extends State<ProfilePage> {
-  final authService = AuthService();
-
   @override
   Widget build(BuildContext context) {
+    AppUser user = context.watch<AppUser>();
     return Center(
         child: Column(children: [
-      Text("Signed in: ${authService.isSignedIn().toString()}"),
+      Text("Signed in: ${user.firstName}"),
       OutlinedButton(
-          onPressed: () async {
-            await authService.signOut();
-          },
+          onPressed: () async => await AuthService.signOut(),
           child: const Icon(Icons.logout))
     ]));
   }

lib/pages/signup_page.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:ionicons/ionicons.dart';
-import 'package:lost_found_steelhacks/authentication/auth.dart';
-import 'package:lost_found_steelhacks/authentication/loading_animation.dart';
+import 'package:lost_found_steelhacks/services/auth_service.dart';
+import 'package:lost_found_steelhacks/widgets/loading_animation.dart';
 import 'package:lost_found_steelhacks/themes/app_theme.dart';
 
 class SignUpPage extends StatefulWidget {
@@ -38,6 +38,7 @@ class _SignUpPageState extends State<SignUpPage> {
           decoration: theme.textFieldDecoration,
           height: 60.0,
           child: TextFormField(
+            onChanged: (value) => firstName = value,
             controller: _firstNameController,
             validator: (val) => val == null || val.isEmpty
                 ? 'First name cannot be empty.'
@@ -69,7 +70,7 @@ class _SignUpPageState extends State<SignUpPage> {
           decoration: theme.textFieldDecoration,
           height: 60.0,
           child: TextFormField(
-            onChanged: (value) => firstName = value,
+            onChanged: (value) => lastName = value,
             controller: _lastNameController,
             validator: (val) => val == null || val.isEmpty
                 ? 'Last name cannot be empty.'
@@ -147,10 +148,9 @@ class _SignUpPageState extends State<SignUpPage> {
     );
   }
 
-  Widget _buildSignUpBtn(
-      AppTheme theme, bool loading, AuthService authService) {
+  Widget _buildSignUpBtn(AppTheme theme, bool loading) {
     return loading
-        ? const Loading()
+        ? const LoadingAnimation()
         : Container(
             padding: EdgeInsets.symmetric(vertical: 25.0),
             child: Container(
@@ -162,10 +162,10 @@ class _SignUpPageState extends State<SignUpPage> {
                       loading = true;
                     });
 
-                    dynamic result =
-                        await authService.registerWithEmailAndPassword(
+                    bool success =
+                        await AuthService.registerWithEmailAndPassword(
                             firstName, lastName, _email, _password);
-                    if (result == null) {
+                    if (success) {
                       setState(() {
                         _error =
                             'Failed to register with your email and password. Please try again.';
@@ -184,15 +184,15 @@ class _SignUpPageState extends State<SignUpPage> {
           );
   }
 
-  Widget _buildSocialBtnRow(AppTheme theme, AuthService authService) {
+  Widget _buildSocialBtnRow(AppTheme theme) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 15.0),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: <Widget>[
           IconButton(
               onPressed: () async {
-                Future result = authService.signInWithGoogle();
+                Future result = AuthService.signInWithGoogle();
                 result.then((value) {
                   if (value == null) {
                     setState(() {
@@ -275,8 +275,8 @@ class _SignUpPageState extends State<SignUpPage> {
                         _buildEmailTF(theme),
                         _buildSpacing(),
                         _buildPasswordTF(theme),
-                        _buildSignUpBtn(theme, loading, authService),
-                        _buildSocialBtnRow(theme, authService),
+                        _buildSignUpBtn(theme, loading),
+                        _buildSocialBtnRow(theme),
                         _buildSignInBtn(theme),
                       ],
                     ),

lib/pages/submission_page.dart

@@ -4,8 +4,8 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_fast_forms/flutter_fast_forms.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:lost_found_steelhacks/authentication/loading_animation.dart';
-import 'package:lost_found_steelhacks/authentication/user.dart';
+import 'package:lost_found_steelhacks/widgets/loading_animation.dart';
+import 'package:lost_found_steelhacks/data/app_user.dart';
 import 'package:lost_found_steelhacks/data/item.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_storage/firebase_storage.dart';
@@ -80,7 +80,7 @@ class _SubmissionPageState extends State<SubmissionPage> {
   Future<void> addFound() {
     Item item = Item(
         id: "",
-        userId: context.read<MyUser?>()!.uid,
+        userId: context.read<AppUser?>()!.uid,
         timeCreated: Timestamp.now(),
         description: description,
         itemName: itemName,
@@ -89,7 +89,7 @@ class _SubmissionPageState extends State<SubmissionPage> {
         picture: imageName);
 
     // Calling the collection to add a new user
-    return FirestoreService().addItemToFirestore(item, false);
+    return FirestoreService.addItemToFirestore(item, false);
   }
 
   void submitItem() async {
@@ -220,7 +220,7 @@ class _SubmissionPageState extends State<SubmissionPage> {
         : const SizedBox(height: 1);
 
     Widget buildSubmitButton() => loading
-        ? const Loading()
+        ? const LoadingAnimation()
         : TextButton.icon(
             label: Text("Submit", style: theme.darkSubtitleStyle),
             icon: Icon(Icons.add_box_rounded, color: theme.dark),

lib/authentication/wrapper.dart → lib/routing/wrapper.dart

@@ -1,21 +1,22 @@
 import 'package:flutter/material.dart';
-import 'package:lost_found_steelhacks/authentication/user.dart';
+import 'package:lost_found_steelhacks/data/app_user.dart';
 import 'package:lost_found_steelhacks/pages/authenticate_page.dart';
 import 'package:lost_found_steelhacks/pages/home_page.dart';
-import 'package:lost_found_steelhacks/pages/login_page.dart';
+import 'package:lost_found_steelhacks/widgets/loading_animation.dart';
 import 'package:provider/provider.dart';
 
 class Wrapper extends StatelessWidget {
   const Wrapper({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final user = Provider.of<MyUser?>(context);
-
-    if (user == null) {
-      return AuthenticatePage();
+    final user = Provider.of<AppUser?>(context);
+    if (user == AppUser.defaultUser) {
+      return const LoadingAnimation();
+    } else if (user == null) {
+      return const AuthenticatePage();
     } else {
-      return HomePage();
+      return const HomePage();
     }
   }
 }