Merge pull request #97 from praveenkrishna0512/bugs

fixed some bugs
summerthia02 · Jul 25, 2022 · b3cfeb7 · b3cfeb7
2 parents c4d9e80 + 69727a5
commit b3cfeb7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '14.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/lib/firebase/firestore_keys.dart b/lib/firebase/firestore_keys.dart
@@ -26,7 +26,7 @@ class FirestoreUserKeys {
   static const String shareCredits = "share_credits";
   static const String listings = "listings";
   static const String reviews = "reviews";
-  static const String chattingWith = "chatting_with";
+  static const String chats = "chats";
 }
 
 class FirestoreGeneralKeys {

diff --git a/lib/firebase/firestore_methods.dart b/lib/firebase/firestore_methods.dart
@@ -107,12 +107,21 @@ class FireStoreMethods {
         await listingsCollection.doc(listingId).update({
           'usersLiked': FieldValue.arrayRemove([uid])
         });
+
+        listingsCollection
+            .doc(listingId)
+            .update({'likeCount': FieldValue.increment(-1)});
       } else {
         // else we need to add uid to the likes array
         await listingsCollection.doc(listingId).update({
           'usersLiked': FieldValue.arrayUnion([uid])
         });
+
+        listingsCollection
+            .doc(listingId)
+            .update({'likeCount': FieldValue.increment(1)});
       }
+
       res = 'success';
     } catch (err) {
       res = err.toString();

diff --git a/lib/firebase/user_data_service.dart b/lib/firebase/user_data_service.dart
@@ -29,7 +29,7 @@ class UserDataService {
       'listings': [],
       'reviews': [],
       'share_credits': "500",
-      'chatting_with': []
+      'chats': []
     });
   }
 

diff --git a/lib/models/reviews_card.dart b/lib/models/reviews_card.dart
@@ -218,7 +218,8 @@ class _ReviewCardState extends State<ReviewCard> {
                         ),
                       ],
                     ),
-                    Container(
+                    SizedBox(
+                      width: 150,
                       child: Text(widget.snap["description"]),
                     ),
                     SizedBox(

diff --git a/lib/pages/addListing.dart b/lib/pages/addListing.dart
@@ -342,7 +342,7 @@ class _AddListingPageState extends State<AddListingPage> {
     return Container(
       padding: const EdgeInsets.only(top: 20, right: 20),
       child: SizedBox(
-        width: 230,
+        width: 225,
         height: height,
         child: TextField(
           minLines: numLines,
@@ -505,13 +505,9 @@ class _AddListingPageState extends State<AddListingPage> {
             const SizedBox(height: 10.0),
             Row(children: <Widget>[
               buildFormTitle("ShareCredits"),
-              const Expanded(
-                  child: SizedBox(
-                width: 5,
-              )),
               Container(
                 child: buildFormField(
-                    "ShareCredits (lending) ", _shareCreditsController),
+                    "ShareCreds(lending) ", _shareCreditsController),
               ),
             ]),
             const SizedBox(height: 10.0),

diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
@@ -105,7 +105,6 @@ class _LoginPageState extends State<LoginPage> {
                 key: Key("Email"),
                 keyboardType: TextInputType.emailAddress,
                 validator: (value) => EmailFieldValidation.validate(value!),
-
                 textAlign: TextAlign.center,
                 controller: _emailController,
                 decoration: kTextFormFieldDecoration.copyWith(
@@ -118,7 +117,6 @@ class _LoginPageState extends State<LoginPage> {
                 key: Key("Password"),
                 obscureText: true,
                 validator: (value) => PasswordFieldValidation.validate(value!),
-
                 textAlign: TextAlign.center,
                 controller: _passwordController,
                 decoration: kTextFormFieldDecoration.copyWith(
@@ -135,8 +133,8 @@ class _LoginPageState extends State<LoginPage> {
                       onPressed: _isLoading
                           ? null
                           : () async {
-
                               _signIn();
+                              Navigator.pushReplacementNamed(context, "/feed");
                             },
                       child: _isLoading
                           ? const Center(