Fixes

Excel-MEC · Jan 14, 2021 · cf263bb · cf263bb
1 parent 6c0a67a
commit cf263bb
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 78 deletions.
diff --git a/lib/UI/Screens/EventPage/Widgets/eventDescription.dart b/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),
         ],
       ),
     ),

diff --git a/lib/UI/Screens/EventPage/Widgets/eventPageBody.dart b/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(),

diff --git a/lib/UI/Screens/EventPage/Widgets/moreDetailsPage.dart b/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),
 

diff --git a/lib/UI/Screens/HomePage/Widgets/Categories/data.dart b/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"
   },
 ];
diff --git a/lib/UI/Screens/HomePage/Widgets/Drawer/DevCredits/devCredits.dart b/lib/UI/Screens/HomePage/Widgets/Drawer/DevCredits/devCredits.dart
@@ -87,8 +87,14 @@ class DevCreditsState extends State<DevCredits>
                           margin: EdgeInsets.only(top: 5, left: 5),
                           // color: Colors.red,
                           child: ListTile(
-                            title: Text(developers[index]["name"]),
-                            subtitle: Text(developers[index]["email"]),
+                            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(

diff --git a/lib/UI/Screens/HomePage/Widgets/Drawer/drawer.dart b/lib/UI/Screens/HomePage/Widgets/Drawer/drawer.dart
@@ -192,9 +192,5 @@ class DrawerOption extends StatelessWidget {
 
 launchURL(url) async {
   url = url.trim();
-  if (await canLaunch(url) && url != '') {
-    await launch(url);
-  } else {
-    throw 'Could not launch $url';
-  }
+  await launch(url);
 }
diff --git a/lib/UI/Screens/HomePage/Widgets/aboutExcel.dart b/lib/UI/Screens/HomePage/Widgets/aboutExcel.dart
@@ -48,7 +48,7 @@ class AboutExcelPopUpState extends State<AboutExcelPopUp>
                 SizedBox(height: 10),
                 Center(
                   child: Text(
-                    "Excel, the nation’s second and South India’s first ever fest of its kind, was started in 2001 by the students of Govt. Model Engineering College. Over the years, Excel has grown exponentially, consistently playing host to some of the most talented students, the most illustrious speakers and the most reputed companies. Now gearing towards the landmark 21st edition, Excel continues to excite the participants with its wide array of technical and non-technical events and with a promise to live up to its motto. Excel 2020 incorporates a wide variety of technical, managerial and general events which includes competitions, workshops, summits, hackathons, exhibitions and so on.\n\n Join us on 29th, 30th and 31st Janduary 2021 to experience the magic of Excel.",
+                    "Excel, the nation’s second and South India’s first ever fest of its kind, was started in 2001 by the students of Govt. Model Engineering College. Over the years, Excel has grown exponentially, consistently playing host to some of the most talented students, the most illustrious speakers and the most reputed companies. Now gearing towards the landmark 21st edition, Excel continues to excite the participants with its wide array of technical and non-technical events and with a promise to live up to its motto. Excel 2020 incorporates a wide variety of technical, managerial and general events which includes competitions, workshops, summits, hackathons, exhibitions and so on.\n\n Join us on 29th, 30th and 31st January 2021 to experience the magic of Excel.",
                     style: TextStyle(
                       color: Color(0xff555566),
                       fontSize: 13,

diff --git a/lib/UI/Screens/HomePage/Widgets/socialIcons.dart b/lib/UI/Screens/HomePage/Widgets/socialIcons.dart
@@ -3,60 +3,58 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-
 class SocialIcons extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-    padding: const EdgeInsets.only(top: 50.0),
-    child: Column(
-      children: <Widget>[
-        Text(
-          'Stay in Touch !',
-          style: TextStyle(
-            // fontFamily: pfontFamily,
-            fontSize: 18.0,
-            color: primaryColor,
-            fontWeight: FontWeight.bold,
-          ),
-        ),
-        SizedBox(
-          height: 15.0,
-        ),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            InkWell(
-              onTap: () {
-                print('object');
-              },
-              child: _buildIconCard(FontAwesomeIcons.facebookF,
-                  'https://www.facebook.com/excelmec/'),
-            ),
-            SizedBox(
-              width: 10.0,
-            ),
-            _buildIconCard(
-                FontAwesomeIcons.twitter, 'https://twitter.com/excelmec'),
-            SizedBox(
-              width: 10.0,
-            ),
-            _buildIconCard(FontAwesomeIcons.instagram,
-                'https://www.instagram.com/excelmec'),
-            SizedBox(
-              width: 10.0,
+      padding: const EdgeInsets.only(top: 50.0),
+      child: Column(
+        children: <Widget>[
+          Text(
+            'Stay in Touch !',
+            style: TextStyle(
+              // fontFamily: pfontFamily,
+              fontSize: 18.0,
+              color: primaryColor,
+              fontWeight: FontWeight.bold,
             ),
-            _buildIconCard(FontAwesomeIcons.linkedinIn,
-                'https://www.linkedin.com/company/excelmec'),
-          ],
-        )
-      ],
-    ),
-  );
+          ),
+          SizedBox(
+            height: 15.0,
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              InkWell(
+                onTap: () {
+                  print('object');
+                },
+                child: _buildIconCard(FontAwesomeIcons.facebookF,
+                    'https://www.facebook.com/excelmec/'),
+              ),
+              SizedBox(
+                width: 10.0,
+              ),
+              _buildIconCard(
+                  FontAwesomeIcons.twitter, 'https://twitter.com/excelmec'),
+              SizedBox(
+                width: 10.0,
+              ),
+              _buildIconCard(FontAwesomeIcons.instagram,
+                  'https://www.instagram.com/excelmec'),
+              SizedBox(
+                width: 10.0,
+              ),
+              _buildIconCard(FontAwesomeIcons.linkedinIn,
+                  'https://www.linkedin.com/company/excelmec'),
+            ],
+          )
+        ],
+      ),
+    );
   }
 }
 
-
 Widget _buildIconCard(IconData icon, String url) {
   return InkWell(
     onTap: () {
@@ -79,9 +77,5 @@ Widget _buildIconCard(IconData icon, String url) {
 }
 
 launchURL(url) async {
-  if (await canLaunch(url) && url != '') {
-    await launch(url);
-  } else {
-    throw 'Could not launch $url';
-  }
+  await launch(url);
 }
diff --git a/lib/UI/Screens/LandingPage/Widgets/pages.dart b/lib/UI/Screens/LandingPage/Widgets/pages.dart
@@ -28,9 +28,13 @@ Widget introPage() {
       Padding(
         padding: const EdgeInsets.symmetric(horizontal: 15.0),
         child: Text(
-          "Excel is the annual techno-managerial fest of Govt. Model Engineering College. It is the nations second and south India's first ever of its kind !",
+          "Excel is the annual techno-managerial fest of Govt. Model Engineering College. It is the Nation's second and South India's first-ever fest of it's kind!",
           style: TextStyle(
-              fontSize: 15, color: lightTextColor, fontFamily: pfontFamily),
+            fontSize: 15,
+            color: lightTextColor,
+            fontFamily: pfontFamily,
+          ),
+          textAlign: TextAlign.center,
         ),
       ),
     ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: excelapp
 description: The Official App of the tech fest of Govt. Model Engineering College.
-version: 0.1.6+8
+version: 1.0.0+15
 
 environment:
   sdk: ">=2.2.0 <3.0.0"
@@ -25,7 +25,7 @@ dependencies:
   shimmer: ^1.1.1
   flutter_spinkit: ^4.1.2
   searchable_dropdown: ^1.1.3
-  url_launcher: ^5.4.2
+  url_launcher: ^5.7.10
   carousel_slider: ^1.4.1
   introduction_screen: ^1.0.8
   font_awesome_flutter: ^8.4.0