Event expression

lib/screens/create/create_actions/widgets/choose_expression_sheet.dart

@@ -82,12 +82,11 @@ class ChooseExpressionSheet extends StatelessWidget {
                               currentExpressionType: currentExpressionType,
                               switchExpressionType: chooseExpressionType,
                             ),
-                            // Temp disable event expression
-                            // CreateExpressionIcon(
-                            //   expressionType: ExpressionType.event,
-                            //   currentExpressionType: currentExpressionType,
-                            //   switchExpressionType: chooseExpressionType,
-                            // ),
+                            CreateExpressionIcon(
+                              expressionType: ExpressionType.event,
+                              currentExpressionType: currentExpressionType,
+                              switchExpressionType: chooseExpressionType,
+                            ),
                           ],
                         ),
                       ),

lib/screens/create/create_actions/widgets/create_expression_scaffold.dart

@@ -300,7 +300,7 @@ class CreateExpressionScaffoldState extends State<CreateExpressionScaffold>
         break;
       case ExpressionType.event:
         expressionHasData = _eventKey.currentState.expressionHasData();
-        validationText = 'Make sure text fields are blank.';
+        validationText = 'Make sure name of the event & phot is not empty.';
         break;
 
       default:

lib/screens/create/create_review/event_review.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 
 class CreateEventReview extends StatelessWidget {
   const CreateEventReview({Key key, this.expression}) : super(key: key);
@@ -7,6 +8,57 @@ class CreateEventReview extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container();
+    final startDate = DateTime.parse(expression['startTime']);
+    final endDate = DateTime.parse(expression['endTime']);
+
+    final formatter = DateFormat('dd-MMM-yyyy hh:m:s');
+
+    final startTime = formatter.format(startDate);
+    final endTime = formatter.format(endDate);
+
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            expression['title'],
+            style: Theme.of(context).textTheme.headline6,
+          ),
+          const SizedBox(height: 10),
+          Container(
+            width: MediaQuery.of(context).size.width,
+            height: (MediaQuery.of(context).size.width / 3) * 2,
+            color: Theme.of(context).dividerColor,
+            child: Image.file(
+              expression['photo'],
+              fit: BoxFit.cover,
+            ),
+          ),
+          const SizedBox(height: 10),
+          Text(
+            'Start Time: $startTime',
+            style: Theme.of(context).textTheme.caption,
+          ),
+          const SizedBox(height: 10),
+          Text(
+            'End Time: $endTime',
+            style: Theme.of(context).textTheme.caption,
+          ),
+          const SizedBox(height: 10),
+          if (expression['location'].length != 0)
+            Text(
+              'Location: ${expression['location']}',
+              style: Theme.of(context).textTheme.caption,
+            ),
+          const SizedBox(height: 10),
+          if (expression['description'].length != 0)
+            Text(
+              'Details: ${expression['description']}',
+              style: Theme.of(context).textTheme.caption,
+            ),
+        ],
+      ),
+    );
   }
 }

lib/screens/create/create_templates/event.dart

@@ -71,8 +71,8 @@ class CreateEventState extends State<CreateEvent> with DateParser {
   Map<String, dynamic> createExpression() {
     return {
       'title': titleController.value.text.trim(),
-      'description': detailsController.value.text.trim(),
-      'location': locationController.value.text.trim(),
+      'description': detailsController.value.text.trim() ?? '',
+      'location': locationController.value.text.trim() ?? '',
       'photo': imageFile.value != null ? File(imageFile.value.path) : null,
       'startTime': startTime.value.toUtc().toIso8601String(),
       'endTime': endTime.value.toUtc().toIso8601String(),
@@ -84,7 +84,7 @@ class CreateEventState extends State<CreateEvent> with DateParser {
   bool expressionHasData() {
     final dynamic expression = createExpression();
 
-    if (expression['title'].isNotEmpty) {
+    if (expression['title'].isNotEmpty && expression['photo'] != null) {
       return true;
     }
 

lib/screens/expression_open/expressions/event_open.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:junto_beta_mobile/models/expression.dart';
 import 'package:junto_beta_mobile/widgets/image_wrapper.dart';
+import 'package:intl/intl.dart';
 
 class EventOpen extends StatelessWidget {
   const EventOpen(this.expression);
@@ -20,6 +21,14 @@ class EventOpen extends StatelessWidget {
     final String eventImage = eventExpression.photo;
     final String eventDescription = eventExpression.description;
 
+    final startDate = DateTime.parse(eventStartTime);
+    final endDate = DateTime.parse(eventEndTime);
+
+    final formatter = DateFormat('dd-MMM-yyyy hh:m:s');
+
+    final startTime = formatter.format(startDate);
+    final endTime = formatter.format(endDate);
+
     return Container(
       child: Column(
         children: <Widget>[
@@ -69,19 +78,31 @@ class EventOpen extends StatelessWidget {
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    // Padding(
-                    //   padding: const EdgeInsets.symmetric(
-                    //       horizontal: 10, vertical: 10),
-                    //   child: Row(
-                    //     children: <Widget>[
-                    //       Icon(Icons.timer,
-                    //           color: Theme.of(context).primaryColor, size: 20),
-                    //       const SizedBox(width: 5),
-                    //       Text(eventStartTime,
-                    //           style: Theme.of(context).textTheme.caption),
-                    //     ],
-                    //   ),
-                    // ),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 10),
+                      child: Row(
+                        children: <Widget>[
+                          Icon(Icons.timer,
+                              color: Theme.of(context).primaryColor, size: 20),
+                          const SizedBox(width: 5),
+                          Text(startTime,
+                              style: Theme.of(context).textTheme.caption),
+                        ],
+                      ),
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 10, vertical: 10),
+                      child: Row(
+                        children: <Widget>[
+                          Icon(Icons.timer,
+                              color: Theme.of(context).primaryColor, size: 20),
+                          const SizedBox(width: 5),
+                          Text(endTime,
+                              style: Theme.of(context).textTheme.caption),
+                        ],
+                      ),
+                    ),
                     eventLocation != ''
                         ? Padding(
                             padding: const EdgeInsets.only(

lib/widgets/previews/expression_preview/single_column_preview/single_column_expression_preview_types/event.dart

@@ -40,10 +40,11 @@ class EventPreview extends StatelessWidget {
                 Text(expression.expressionData.title,
                     style: Theme.of(context).textTheme.headline6),
                 const SizedBox(height: 2.5),
-                Text(
-                  expression.expressionData.location,
-                  style: Theme.of(context).textTheme.bodyText1,
-                ),
+                if (expression.expressionData.location.length > 0)
+                  Text(
+                    expression.expressionData.location,
+                    style: Theme.of(context).textTheme.bodyText1,
+                  ),
               ],
             ),
           )

lib/widgets/previews/expression_preview/two_column_preview/two_column_expression_preview.dart

@@ -71,8 +71,7 @@ class TwoColumnExpressionPreview extends StatelessWidget with MemberValidation {
                     else if (expression.type == 'PhotoForm')
                       PhotoPreview(expression: expression)
                     else if (expression.type == 'EventForm')
-                    SizedBox()
-                      // EventPreview(expression: expression)
+                      EventPreview(expression: expression)
                     else if (expression.type == 'AudioForm')
                       AudioPreview(expression: expression)
                     else if (expression.type == 'LongForm')

lib/widgets/previews/expression_preview/two_column_preview/two_column_expression_preview_types/event.dart

@@ -41,10 +41,11 @@ class EventPreview extends StatelessWidget {
                 Text(expression.expressionData.title,
                     style: Theme.of(context).textTheme.headline6),
                 const SizedBox(height: 2.5),
-                Text(
-                  expression.expressionData.location,
-                  style: Theme.of(context).textTheme.bodyText1,
-                ),
+                if (expression.expressionData.location.length > 0)
+                  Text(
+                    expression.expressionData.location,
+                    style: Theme.of(context).textTheme.bodyText1,
+                  ),
               ],
             ),
           )