Merge pull request #103 from steevjames/branch

Improvements & Fixes

lib/UI/Components/Navigation/customNavigation.dart

@@ -1,3 +1,4 @@
+import 'package:excelapp/UI/Screens/HomePage/Widgets/aboutExcel.dart';
 import 'package:excelapp/UI/constants.dart';
 import 'package:flutter/material.dart';
 import './bottom_navigation.dart';
@@ -111,7 +112,14 @@ Widget _buildFab(BuildContext context, bottonNavHidden) {
       showOverlay: false,
       child: FloatingActionButton(
         backgroundColor: primaryColor,
-        onPressed: () {},
+        onPressed: () {
+          showDialog(
+            context: context,
+            builder: (BuildContext context) {
+              return AboutExcelPopUp();
+            },
+          );
+        },
         child: Image.asset(
           'assets/excel logo.png',
           height: 37,

lib/UI/Screens/EventPage/Widgets/eventDescription.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:excelapp/Models/event_details.dart';
 import 'package:excelapp/UI/constants.dart';
 
-Widget getEventDetails(EventDetails eventDetails) {
+Widget getEventDetails({EventDetails eventDetails, bool detailed}) {
   return Hero(
     tag: 'EventDescription',
     child: Padding(
@@ -17,24 +17,38 @@ Widget getEventDetails(EventDetails eventDetails) {
               DateTimeConversion.dateTimeToString(
                   eventDetails.datetime.toString())),
           SizedBox(height: 7.0),
+          // Entry fee
+          detailed
+              ? detailRow(
+                  Icons.monetization_on,
+                  (eventDetails.entryFee == null || eventDetails.entryFee == 0)
+                      ? "No entry fee"
+                      : "Entree fee: Rs " + eventDetails.entryFee.toString())
+              : SizedBox(),
+
+          SizedBox(height: detailed ? 7.0 : 0),
           // Prize money
-          detailRow(
-              Icons.attach_money,
-              eventDetails.prizeMoney == null
-                  ? "N.A"
-                  : "Rs " + eventDetails.prizeMoney.toString()),
-          SizedBox(height: 7.0),
+          detailed
+              ? detailRow(
+                  Icons.attach_money,
+                  "Prize pool: " +
+                      (eventDetails.prizeMoney == null
+                          ? "N.A"
+                          : "Rs " + eventDetails.prizeMoney.toString()))
+              : SizedBox(),
+          SizedBox(height: detailed ? 7.0 : 0),
           // Team or not
           detailRow(
               Icons.people_outline,
               eventDetails.isTeam == 1
                   ? "Team size: " +
                       (eventDetails.teamSize ?? "Not Specified").toString()
-                  : 'Induvidual Event'),
+                  : 'Individual Event'),
           SizedBox(height: 7.0),
           // Venue
           detailRow(Icons.location_on, eventDetails.venue.toString()),
-          SizedBox(height: 7.0),
+
+          SizedBox(height: detailed ? 7 : 12),
         ],
       ),
     ),

lib/UI/Screens/EventPage/Widgets/eventPageBody.dart

@@ -118,7 +118,7 @@ class EventPageBody extends StatelessWidget {
               ),
 
               //Event Details
-              getEventDetails(eventDetails),
+              getEventDetails(eventDetails: eventDetails, detailed: true),
               Expanded(
                 flex: 1,
                 child: Center(),

lib/UI/Screens/EventPage/Widgets/moreDetailsPage.dart

@@ -102,7 +102,7 @@ class MoreDetails extends StatelessWidget {
               ),
 
               //EventDetails
-              getEventDetails(eventDetails),
+              getEventDetails(eventDetails: eventDetails, detailed: false),
 
               SizedBox(height: 7.0),
 

lib/UI/Screens/HomePage/Widgets/Categories/data.dart

@@ -6,22 +6,23 @@ var categoriesMap = [
   },
   {
     "name": "Talks",
-    "info": "Get inspired from the words of those, ready to spread it",
+    "info": "Get inspired from the words of those, ready to spread it.",
     "imageUrl": "assets/categories/talks.jpg"
   },
   {
     "name": "General",
-    "info": "Dance to the songs, tap to the beats. Cause you gotta let it go.",
+    "info":
+        "Experience the latest innovations, become a part of novel ideas and learn the world around you.",
     "imageUrl": "assets/categories/general.jpg"
   },
   {
     "name": "Workshops",
-    "info": "End up expertising in a skill by attending our workshops",
+    "info": "End up expertising in a skill by attending our workshops.",
     "imageUrl": "assets/categories/workshops.jpg"
   },
   {
     "name": "Conferences",
-    "info": "Get inspired from the words of those, ready to spread it",
+    "info": "Learn, explore, network and make it worth your while.",
     "imageUrl": "assets/categories/conferences.jpg"
   },
 ];

lib/UI/Screens/HomePage/Widgets/Drawer/DevCredits/devCredits.dart

@@ -0,0 +1,116 @@
+import 'package:excelapp/UI/constants.dart';
+import 'package:flutter/material.dart';
+
+class DevCredits extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => DevCreditsState();
+}
+
+class DevCreditsState extends State<DevCredits>
+    with SingleTickerProviderStateMixin {
+  AnimationController controller;
+  Animation<double> scaleAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    controller =
+        AnimationController(vsync: this, duration: Duration(milliseconds: 200));
+    scaleAnimation = CurvedAnimation(parent: controller, curve: Curves.easeIn);
+
+    controller.addListener(() {
+      setState(() {});
+    });
+
+    controller.forward();
+  }
+
+  var developers = [
+    {
+      "name": "Steev James",
+      "email": "[email protected]",
+      "image": "assets/devs/steev.jpg"
+    },
+    {
+      "name": "Joyal A Johney",
+      "email": "[email protected]",
+      "image": "assets/devs/joyal.jpg"
+    },
+    {
+      "name": "Ajesh Kumar",
+      "email": "[email protected]",
+      "image": "assets/devs/ajesh.jpg"
+    },
+    {
+      "name": "Priyanga P Kini",
+      "email": "[email protected]",
+      "image": "assets/devs/priyanka.jpg"
+    }
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaleTransition(
+      scale: scaleAnimation,
+      child: Dialog(
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
+        insetPadding: EdgeInsets.all(13),
+        child: Container(
+          padding: EdgeInsets.all(20),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(20),
+          ),
+          child: SingleChildScrollView(
+            child: Column(
+              children: [
+                Text(
+                  "Core Developers",
+                  style: TextStyle(
+                    fontSize: 20,
+                    color: primaryColor,
+                    fontFamily: pfontFamily,
+                  ),
+                ),
+                SizedBox(height: 20),
+                Image.asset(
+                  "assets/divider.png",
+                  width: MediaQuery.of(context).size.width / 2,
+                ),
+                SizedBox(height: 10),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: <Widget>[] +
+                      List.generate(
+                        developers.length,
+                        (index) => Container(
+                          margin: EdgeInsets.only(top: 5, left: 5),
+                          // color: Colors.red,
+                          child: ListTile(
+                            title: Text(
+                              developers[index]["name"],
+                              style: TextStyle(fontSize: 14.5),
+                            ),
+                            subtitle: Text(
+                              developers[index]["email"],
+                              style: TextStyle(fontSize: 13),
+                            ),
+                            dense: true,
+                            leading: CircleAvatar(
+                              backgroundImage: AssetImage(
+                                developers[index]["image"],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ) +
+                      [SizedBox(height: 10)],
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/UI/Screens/HomePage/Widgets/Drawer/drawer.dart

@@ -1,11 +1,12 @@
 // import 'package:excelapp/UI/Components/AlertDialog/alertDialog.dart';
 // import 'package:excelapp/UI/Screens/CampusAmbassador/campusAmbassadorMain.dart';
 // import 'package:excelapp/UI/Components/DeleteRegistrations/deleteRegistrations.dart';
+import 'package:excelapp/UI/Screens/HomePage/Widgets/Drawer/DevCredits/devCredits.dart';
 import 'package:excelapp/UI/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:social_share/social_share.dart';
-import 'package:excelapp/UI/Screens/Results/results.dart';
+// import 'package:excelapp/UI/Screens/Results/results.dart';
 
 class CustomDrawer extends StatelessWidget {
   @override
@@ -77,18 +78,19 @@ class CustomDrawer extends StatelessWidget {
                 //   },
                 // ),
 
-                DrawerOption(
-                  text: "Results",
-                  icon: Icons.emoji_flags,
-                  onPressed: () {
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                        builder: (context) => ResultsPage(),
-                      ),
-                    );
-                  },
-                ),
+                // DrawerOption(
+                //   text: "Results",
+                //   icon: Icons.emoji_flags,
+                //   onPressed: () {
+                //     Navigator.pop(context);
+                //     Navigator.push(
+                //       context,
+                //       MaterialPageRoute(
+                //         builder: (context) => ResultsPage(),
+                //       ),
+                //     );
+                //   },
+                // ),
 
                 DrawerOption(
                   text: "Excel Website",
@@ -118,6 +120,19 @@ class CustomDrawer extends StatelessWidget {
                     launch("https://linktr.ee/excelmec");
                   },
                 ),
+                DrawerOption(
+                  text: "Developer Credits",
+                  icon: Icons.code,
+                  onPressed: () {
+                    Navigator.pop(context);
+                    showDialog(
+                      context: context,
+                      builder: (BuildContext context) {
+                        return DevCredits();
+                      },
+                    );
+                  },
+                ),
                 DrawerOption(
                   text: "Share",
                   icon: Icons.share,
@@ -176,9 +191,6 @@ class DrawerOption extends StatelessWidget {
 }
 
 launchURL(url) async {
-  if (await canLaunch(url) && url != '') {
-    await launch(url);
-  } else {
-    throw 'Could not launch $url';
-  }
+  url = url.trim();
+  await launch(url);
 }