Merge pull request #101 from praveenkrishna0512/app-icon

null error, profile page bugs
summerthia02 · Jul 26, 2022 · 6583435 · 6583435
2 parents 83bb47c + d66729b
commit 6583435
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 40 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -31,7 +31,6 @@ final navigatorKey = GlobalKey<NavigatorState>();
 
 class MyApp extends StatelessWidget {
   MyApp({Key? key}) : super(key: key);
-  final currUserEmail = FirebaseAuth.instance.currentUser?.email;
 
   @override
   Widget build(BuildContext context) {
@@ -49,9 +48,7 @@ class MyApp extends StatelessWidget {
           '/feed': (_) => const FeedPage(),
           '/chat': (_) => const ChatPage(),
           '/addlisting': (_) => const AddListingPage(),
-          '/profile': (_) => ProfilePage(
-                email: currUserEmail,
-              ),
+
           '/favourites': (_) => Favourites(),
           '/reviews': (_) => MakeReviewPage(
                 reviewForId: '',

diff --git a/lib/models/enlarged_listing.dart b/lib/models/enlarged_listing.dart
@@ -243,6 +243,7 @@ class _EnlargedScreenState extends State<EnlargedScreen> {
         listingId: listingId,
         madeOffer: madeOffer,
         acceptedOffer: acceptedOffer);
+
     ChatProvider.handleChatRequest(chatItem);
     Navigator.of(context).push(MaterialPageRoute(
         builder: (context) => ChatItemPage(

diff --git a/lib/models/like_card.dart b/lib/models/like_card.dart
@@ -3,15 +3,7 @@ import 'dart:ffi';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:justsharelah_v1/firebase/auth_provider.dart';
-import 'package:justsharelah_v1/firebase/firestore_methods.dart';
 import 'package:justsharelah_v1/models/profile_widget.dart';
-import 'package:justsharelah_v1/models/user_data.dart';
-import 'package:justsharelah_v1/pages/edit_listing.dart';
-import 'package:justsharelah_v1/provider/user_provider.dart';
-import 'package:justsharelah_v1/utils/time_helper.dart';
-import 'package:justsharelah_v1/widget/like_helper.dart';
 
 import '../pages/profile_page.dart';
 import '../utils/const_templates.dart';

diff --git a/lib/pages/edit_listing.dart b/lib/pages/edit_listing.dart
@@ -14,12 +14,9 @@ import 'package:justsharelah_v1/firebase/user_data_service.dart';
 import 'package:justsharelah_v1/models/share_creds.dart';
 
 import 'package:justsharelah_v1/models/user_data.dart';
-import 'package:justsharelah_v1/utils/const_templates.dart';
 import 'package:justsharelah_v1/pages/profile_page.dart';
+import 'package:justsharelah_v1/utils/const_templates.dart';
 import 'package:justsharelah_v1/utils/appbar.dart';
-import 'package:justsharelah_v1/utils/bottom_nav_bar.dart';
-import 'package:justsharelah_v1/utils/image_picker.dart';
-import 'package:justsharelah_v1/utils/profile_image.dart';
 
 class EditListingPage extends StatefulWidget {
   const EditListingPage({Key? key, required this.snap}) : super(key: key);
@@ -189,12 +186,16 @@ class _EditListingPageState extends State<EditListingPage> {
             ),
             Row(mainAxisAlignment: MainAxisAlignment.center, children: [
               buildButtonField("CANCEL", Colors.red, 20.0, () {
-                Navigator.pushReplacementNamed(context, "/profile");
+                Navigator.pop(context);
               }),
               const SizedBox(width: 60),
               buildButtonField("SAVE", Colors.green, 20.0, () {
                 _editListing(widget.snap["uid"]);
-                Navigator.pushReplacementNamed(context, "/profile");
+                Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => ProfilePage(email: userEmail),
+                    ));
               }),
             ]),
           ]),

diff --git a/lib/pages/edit_profile.dart b/lib/pages/edit_profile.dart
@@ -3,19 +3,14 @@ import 'dart:typed_data';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/key.dart';
-import 'package:flutter/src/widgets/framework.dart';
+
 import 'package:image_picker/image_picker.dart';
-import 'package:justsharelah_v1/firebase/storage_methods.dart';
 import 'package:justsharelah_v1/firebase/user_data_service.dart';
 
 import 'package:justsharelah_v1/models/user_data.dart';
 import 'package:justsharelah_v1/utils/const_templates.dart';
-import 'package:justsharelah_v1/pages/profile_page.dart';
 import 'package:justsharelah_v1/utils/appbar.dart';
-import 'package:justsharelah_v1/utils/bottom_nav_bar.dart';
 import 'package:justsharelah_v1/utils/image_picker.dart';
-import 'package:justsharelah_v1/utils/profile_image.dart';
 
 class EditProfilePage extends StatefulWidget {
   const EditProfilePage({Key? key}) : super(key: key);

diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
@@ -1,7 +1,10 @@
+import 'dart:io';
+
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:justsharelah_v1/firebase/auth_provider.dart';
 import 'package:justsharelah_v1/firebase/auth_service.dart';
+import 'package:justsharelah_v1/pages/profile_page.dart';
 import 'package:justsharelah_v1/utils/const_templates.dart';
 import 'package:justsharelah_v1/main.dart';
 
@@ -65,7 +68,7 @@ class _LoginPageState extends State<LoginPage> {
         Container(
           width: double.infinity,
           height: double.infinity,
-          decoration: BoxDecoration(
+          decoration: const BoxDecoration(
               image: DecorationImage(
                   image: NetworkImage(
                       'https://i.pinimg.com/564x/81/68/77/8168774f8b714d65417e7615aac3f361.jpg'),
@@ -134,7 +137,14 @@ class _LoginPageState extends State<LoginPage> {
                           ? null
                           : () async {
                               _signIn();
-                              Navigator.pushReplacementNamed(context, "/feed");
+                              sleep(const Duration(seconds: 2));
+
+                              Navigator.push(
+                                  context,
+                                  MaterialPageRoute(
+                                    builder: (context) => ProfilePage(
+                                        email: _emailController.text),
+                                  ));
                             },
                       child: _isLoading
                           ? const Center(

diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart
@@ -15,9 +15,6 @@ import 'package:justsharelah_v1/models/ForBorrowing.dart';
 import 'package:justsharelah_v1/models/ForRenting.dart';
 import 'package:justsharelah_v1/models/user_data.dart';
 import 'package:justsharelah_v1/utils/const_templates.dart';
-import 'package:justsharelah_v1/utils/image_picker.dart';
-import 'package:justsharelah_v1/utils/profile_image.dart';
-import 'sharecredits.dart';
 
 class ProfilePage extends StatefulWidget {
   ProfilePage({Key? key, required this.email}) : super(key: key);
@@ -82,7 +79,7 @@ class _ProfilePageState extends State<ProfilePage> {
     try {
       var snap = await FirebaseFirestore.instance
           .collection("Users")
-          .doc(currentUser?.uid)
+          .doc(currentUser!.uid)
           .get();
       profileData = snap.data()!;
       setState(() {});

diff --git a/lib/pages/review_page.dart b/lib/pages/review_page.dart
@@ -180,7 +180,7 @@ class _MakeReviewPageState extends State<MakeReviewPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: MyAppBar()
-          .buildAppBar(const Text("Leave A Review"), context, '/profile'),
+          .buildAppBar(const Text("Leave A Review"), context, '/feed'),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.center,

diff --git a/lib/pages/sharecredits.dart b/lib/pages/sharecredits.dart
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/src/foundation/key.dart';
 import 'package:flutter/src/widgets/framework.dart';
 import 'package:justsharelah_v1/firebase/firestore_methods.dart';
+import 'package:justsharelah_v1/pages/profile_page.dart';
 import 'package:justsharelah_v1/utils/appbar.dart';
 import 'package:justsharelah_v1/utils/const_templates.dart';
 
@@ -28,6 +29,7 @@ class ShareCreditsScreenState extends State<ShareCreditsScreen> {
   String currSC = "";
   int currIntSC = 0;
   String currUserId = FirebaseAuth.instance.currentUser!.uid;
+  String? currUserEmail = FirebaseAuth.instance.currentUser!.email;
   bool hasSCUpdated = false;
 
   // get curr users' sharecredits
@@ -164,7 +166,12 @@ class ShareCreditsScreenState extends State<ShareCreditsScreen> {
                     if (hasSCUpdated == false) {
                       await updateShareCredits();
                     }
-                    Navigator.pushReplacementNamed(context, "/profile");
+                    Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) =>
+                              ProfilePage(email: currUserEmail),
+                        ));
                   })
                 : buildButtonField(
                     "I'll EARN IT BACK, Thanks!", Colors.green, 20, () async {
@@ -174,6 +181,12 @@ class ShareCreditsScreenState extends State<ShareCreditsScreen> {
                       Navigator.pop(context);
                     } else {
                       Navigator.pushReplacementNamed(context, "/profile");
+                      Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) =>
+                                ProfilePage(email: currUserEmail),
+                          ));
                     }
                   })
             : Container(),

diff --git a/lib/utils/bottom_nav_bar.dart b/lib/utils/bottom_nav_bar.dart
@@ -1,12 +1,18 @@
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
+import 'package:justsharelah_v1/pages/addListing.dart';
+import 'package:justsharelah_v1/pages/chat_page.dart';
+import 'package:justsharelah_v1/pages/favourites.dart';
+import 'package:justsharelah_v1/pages/feed_page.dart';
+import 'package:justsharelah_v1/pages/profile_page.dart';
 
 class MyBottomNavBar {
-  List<String> widgetPages = <String>[
-    "/feed",
-    "/chat",
-    "/addlisting",
-    "/favourites",
-    "/profile",
+  List widgetPages = [
+    const FeedPage(),
+    const ChatPage(),
+    const AddListingPage(),
+    Favourites(),
+    ProfilePage(email: FirebaseAuth.instance.currentUser!.email),
   ];
 
   BottomNavigationBar buildBottomNavBar(BuildContext context) {
@@ -52,8 +58,12 @@ class MyBottomNavBar {
         ),
       ],
       onTap: (index) {
-        String selectedRoute = widgetPages.elementAt(index);
-        Navigator.of(context).pushNamed(selectedRoute);
+        dynamic selectedRoute = widgetPages.elementAt(index);
+        Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => selectedRoute,
+            ));
       },
     );
   }