Merge pull request #84 from praveenkrishna0512/sharecredits

share credits for lending listings
summerthia02 · Jul 20, 2022 · 19c00e1 · 19c00e1
2 parents 23378e9 + 40ca676
commit 19c00e1
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 15 deletions.
diff --git a/images/sharecredits.png b/images/sharecredits.png
diff --git a/lib/firebase/firestore_methods.dart b/lib/firebase/firestore_methods.dart
@@ -21,6 +21,7 @@ class FireStoreMethods {
     String profImageUrl,
     bool forRent,
     String price,
+    String shareCredits,
     double longitude,
     double latitude,
     String location,
@@ -56,6 +57,7 @@ class FireStoreMethods {
           uid: listingId,
           available: true,
           price: price,
+          shareCredits: shareCredits,
           forRent: forRent,
           createdByEmail: createdByEmail,
           usersLiked: [],

diff --git a/lib/main.dart b/lib/main.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:justsharelah_v1/firebase/auth_service.dart';
 import 'package:justsharelah_v1/pages/favourites.dart';
 import 'package:justsharelah_v1/pages/review_page.dart';
+import 'package:justsharelah_v1/pages/sharecredits.dart';
 import 'package:justsharelah_v1/utils/apptheme.dart';
 import 'package:justsharelah_v1/pages/activity.dart';
 import 'package:justsharelah_v1/pages/addListing.dart';
@@ -53,6 +54,7 @@ class MyApp extends StatelessWidget {
               ),
           '/favourites': (_) => Favourites(),
           '/reviews': (_) => const MakeReviewPage(),
+          '/sharecredits': (_) => const ShareCreditsScreen(),
         },
       ),
     );

diff --git a/lib/models/ListingCard.dart b/lib/models/ListingCard.dart
@@ -17,8 +17,11 @@ import '../pages/profile_page.dart';
 import '../utils/const_templates.dart';
 
 class ListingCard extends StatefulWidget {
-  const ListingCard({Key? key, this.snap, required this.press})
-      : super(key: key);
+  ListingCard({
+    Key? key,
+    this.snap,
+    required this.press,
+  }) : super(key: key);
 
   final snap;
 
@@ -236,13 +239,14 @@ class _ListingCardState extends State<ListingCard> {
                   SizedBox(
                     width: 20,
                   ),
+                  widget.snap["forRent"] == true ? Text("\$") : Container(),
                   Text(
-                    '\$' + widget.snap['price'].toString(),
+                    widget.snap["forRent"] == true
+                        ? widget.snap['price'].toString()
+                        : widget.snap["shareCredits"],
                     style: TextStyle(fontWeight: FontWeight.bold),
                   ),
-                  // Text(snap['usersLiked'] == null
-                  //     ? '${snap['usersLiked'].length!} likes'
-                  //     : "0 Likes"),
+                  widget.snap["forRent"] == false ? Text(" SC") : Container(),
                 ]),
                 Row(
                   children: [

diff --git a/lib/models/enlarged_listing.dart b/lib/models/enlarged_listing.dart
@@ -328,10 +328,14 @@ class ListingCardDetails extends StatelessWidget {
                 style: kHeadingText,
               ),
             ),
+            snap["forRent"] == true ? Text("\$") : Container(),
             Text(
-              "\$${snap["price"]}",
-              style: Theme.of(context).textTheme.headline6,
+              snap["forRent"] == true
+                  ? snap['price'].toString()
+                  : snap["shareCredits"],
+              style: TextStyle(fontWeight: FontWeight.bold),
             ),
+            snap["forRent"] == false ? Text(" SC") : Container(),
           ],
         ),
         Text(

diff --git a/lib/models/listings.dart b/lib/models/listings.dart
@@ -8,6 +8,7 @@ class Listing {
   final String imageUrl;
   final String title;
   final String price;
+  final String shareCredits;
   final bool forRent;
   final String description;
   final bool available;
@@ -26,6 +27,7 @@ class Listing {
     required this.imageUrl,
     required this.title,
     required this.price,
+    required this.shareCredits,
     required this.forRent,
     required this.description,
     required this.available,
@@ -57,6 +59,7 @@ class Listing {
       'imageUrl': imageUrl,
       'title': title,
       'price': price,
+      'shareCredits': shareCredits,
       'forRent': forRent,
       'description': description,
       'available': available,

diff --git a/lib/pages/addListing.dart b/lib/pages/addListing.dart
@@ -33,6 +33,7 @@ class _AddListingPageState extends State<AddListingPage> {
   final TextEditingController _brandController = TextEditingController();
   final TextEditingController _descriptionController = TextEditingController();
   final TextEditingController _locationController = TextEditingController();
+  final TextEditingController _shareCreditsController = TextEditingController();
 
   //listing image
   Uint8List? _image;
@@ -268,6 +269,7 @@ class _AddListingPageState extends State<AddListingPage> {
         userData.imageUrl!,
         forRent,
         _priceController.text,
+        _shareCreditsController.text,
         longitude,
         latitude,
         _currentAddress,
@@ -486,7 +488,19 @@ class _AddListingPageState extends State<AddListingPage> {
                   child: SizedBox(
                 width: 5,
               )),
-              buildFormField("Enter Price of Listing ", _priceController),
+              buildFormField("Price (renting) ", _priceController),
+            ]),
+            const SizedBox(height: 10.0),
+            Row(children: <Widget>[
+              buildFormTitle("ShareCredits"),
+              const Expanded(
+                  child: SizedBox(
+                width: 5,
+              )),
+              Container(
+                child: buildFormField(
+                    "ShareCredits (lending) ", _shareCreditsController),
+              ),
             ]),
             const SizedBox(height: 10.0),
             Row(children: <Widget>[

diff --git a/lib/pages/favourites.dart b/lib/pages/favourites.dart
@@ -101,9 +101,7 @@ class _FavouritesState extends State<Favourites> {
                           child: ListingCard(
                             // collect the data for each indiviudal document at the index
                             snap: snapshot.data!.docs[index].data(),
-                            // image: listingData[index].imageUrl,
-                            // title: listingData[index].title,
-                            // price: listingData[index].price,
+
                             press: () {
                               Navigator.push(
                                   context,

diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart
@@ -16,6 +16,7 @@ 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);
@@ -178,9 +179,14 @@ class _ProfilePageState extends State<ProfilePage> {
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        Text(
-          "ShareCredits: ",
-          style: kBodyTextSmall.copyWith(fontWeight: FontWeight.bold),
+        TextButton(
+          onPressed: () {
+            Navigator.pushReplacementNamed(context, "/sharecredits");
+          },
+          child: Text(
+            "ShareCredits: ",
+            style: kBodyTextSmall.copyWith(fontWeight: FontWeight.bold),
+          ),
         ),
         Text(
           numShareCreds.toString(),

diff --git a/lib/pages/sharecredits.dart b/lib/pages/sharecredits.dart
@@ -0,0 +1,60 @@
+// share credits rewards page
+// only for lending / borrowing listings
+
+import 'package:flutter/material.dart';
+import 'package:flutter/src/foundation/key.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:justsharelah_v1/utils/appbar.dart';
+import 'package:justsharelah_v1/utils/const_templates.dart';
+
+class ShareCreditsScreen extends StatefulWidget {
+  const ShareCreditsScreen({Key? key}) : super(key: key);
+
+  @override
+  State<ShareCreditsScreen> createState() => ShareCreditsScreenState();
+}
+
+class ShareCreditsScreenState extends State<ShareCreditsScreen> {
+  ElevatedButton buildButtonField(
+      String text, Color color, double length, void Function()? onPressed) {
+    return ElevatedButton(
+      onPressed: onPressed,
+      style: ElevatedButton.styleFrom(
+          padding: EdgeInsets.symmetric(horizontal: length),
+          primary: color,
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(30))),
+      child: Text(
+        text,
+        style: const TextStyle(
+            fontSize: 15, letterSpacing: 2.5, color: Colors.black),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        body: Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Image.asset("images/sharecredits.png"),
+        Container(
+          alignment: Alignment.center,
+          padding: const EdgeInsets.only(left: 15, right: 20, top: 15),
+          child: Text(
+            "Congratulations! You have earned 20 ShareCredits !",
+            style: kHeadingText.copyWith(backgroundColor: Colors.greenAccent),
+            textAlign: TextAlign.center,
+          ),
+        ),
+        const SizedBox(
+          height: 50,
+        ),
+        buildButtonField("Yay, Thanks!", Colors.green, 20, () {
+          Navigator.pushReplacementNamed(context, "/profile");
+        })
+      ],
+    ));
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -106,6 +106,7 @@ flutter:
     - images/gallery.png
     - images/def_dp.png
     - images/wallpaper.png
+    - images/sharecredits.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware