feat: on continue save missing data

Pylons-tech · May 21, 2024 · f6a526d · f6a526d
1 parent f1323e8
commit f6a526d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 20 deletions.
diff --git a/evently/lib/evently_provider.dart b/evently/lib/evently_provider.dart
@@ -34,7 +34,7 @@ class EventlyProvider extends ChangeNotifier {
   ///* overview screen variable
   String _eventName = '';
   String _hostName = '';
-  String? _thumbnail;
+  String _thumbnail = '';
   bool _isOverviewEnable = false;
 
   String? get thumbnail => _thumbnail;
@@ -55,7 +55,7 @@ class EventlyProvider extends ChangeNotifier {
   }
 
   set setThumbnail(String? file) {
-    _thumbnail = file;
+    _thumbnail = file!;
     checkIsOverEnable();
     notifyListeners();
   }
@@ -66,7 +66,7 @@ class EventlyProvider extends ChangeNotifier {
   }
 
   checkIsOverEnable() {
-    setOverviewEnable = thumbnail != null && eventName.length >= kMinEventName && hostName.length >= kMinHostName;
+    setOverviewEnable = thumbnail!.isNotEmpty && eventName.isNotEmpty && hostName.isNotEmpty;
   }
 
   ///* detail screen

diff --git a/evently/lib/screens/create_event.dart b/evently/lib/screens/create_event.dart
@@ -62,11 +62,12 @@ class _CreateEventState extends State<CreateEvent> {
 
   @override
   Widget build(BuildContext context) {
-    return PopScope(
-      child: ColoredBox(
-        color: EventlyAppTheme.kWhite,
-        child: SafeArea(
-          bottom: false,
+    return ColoredBox(
+      color: EventlyAppTheme.kWhite,
+      child: SafeArea(
+        bottom: false,
+        child: PopScope(
+          canPop: false,
           child: Scaffold(
             body: ChangeNotifierProvider.value(value: createEventViewModel, child: const CreateEventContent()),
           ),

diff --git a/evently/lib/screens/detail_screen.dart b/evently/lib/screens/detail_screen.dart
@@ -56,7 +56,7 @@ class _DetailsScreenState extends State<DetailsScreen> {
                           onTap: () async {
                             _showDatePicker(onSelected: (DateTime? val) {
                               if (val == null) return;
-                              provider.setStartDate = DateFormat("dd-MM-yyyy").format(val);
+                              provider.setStartDate = _dateFormatter(val);
                             });
                           },
                           child: EventlyTextField(
@@ -73,7 +73,7 @@ class _DetailsScreenState extends State<DetailsScreen> {
                           onTap: () {
                             _showDatePicker(onSelected: (DateTime? val) {
                               if (val == null) return;
-                              provider.setEndDate = DateFormat("dd-MM-yyyy").format(val);
+                              provider.setEndDate = _dateFormatter(val);
                             });
                           },
                           child: EventlyTextField(
@@ -97,7 +97,9 @@ class _DetailsScreenState extends State<DetailsScreen> {
                           onTap: () {
                             _showTimerPicker(onSelected: (TimeOfDay? timeOfDay) {
                               if (timeOfDay == null) return;
-                              provider.setStartTime = '${timeOfDay.hour}:${timeOfDay.minute}';
+                              final currentTime = DateTime.now();
+                              final time = currentTime.copyWith(hour: timeOfDay.hour, minute: timeOfDay.minute);
+                              provider.setStartTime = _timerFormatter(time);
                             });
                           },
                           child: EventlyTextField(
@@ -117,7 +119,9 @@ class _DetailsScreenState extends State<DetailsScreen> {
                           onTap: () {
                             _showTimerPicker(onSelected: (TimeOfDay? timeOfDay) {
                               if (timeOfDay == null) return;
-                              provider.setEndTime = '${timeOfDay.hour}:${timeOfDay.minute}';
+                              final currentTime = DateTime.now();
+                              final time = currentTime.copyWith(hour: timeOfDay.hour, minute: timeOfDay.minute);
+                              provider.setEndTime = _timerFormatter(time);
                             });
                           },
                           child: EventlyTextField(
@@ -162,6 +166,10 @@ class _DetailsScreenState extends State<DetailsScreen> {
                   const VerticalSpace(80),
                   BottomButtons(
                     onPressContinue: () {
+                      provider.saveAsDraft(
+                        onCompleted: () => {},
+                        uploadStep: UploadStep.price,
+                      );
                       createEventViewModel.nextPage();
                     },
                     onPressSaveDraft: () {
@@ -198,7 +206,15 @@ class _DetailsScreenState extends State<DetailsScreen> {
     showDatePicker(
       context: context,
       firstDate: DateTime.now(),
-      lastDate: DateTime.now(),
+      lastDate: DateTime(2099, 12),
     ).then((value) => onSelected(value!));
   }
+
+  _timerFormatter(DateTime dateTime) {
+    return DateFormat('hh:mm a').format(dateTime);
+  }
+
+  _dateFormatter(DateTime dateTime) {
+    return DateFormat.yMMMMd('en_US').format(dateTime);
+  }
 }
diff --git a/evently/lib/screens/overview_screen.dart b/evently/lib/screens/overview_screen.dart
@@ -91,15 +91,15 @@ class _OverViewScreenState extends State<OverViewScreen> {
                         dashPattern: const [10, 6],
                         color: EventlyAppTheme.kTextDarkPurple,
                         strokeWidth: 3.h,
-                        child: provider.thumbnail != null
+                        child: provider.thumbnail!.isNotEmpty
                             ? SizedBox(
                                 height: 180,
                                 width: double.infinity,
                                 child: Stack(
                                   alignment: Alignment.center,
                                   children: [
                                     CachedNetworkImage(
-                                      fit: BoxFit.fill,
+                                      fit: BoxFit.contain,
                                       imageUrl: provider.thumbnail!,
                                       errorWidget: (a, b, c) => const Center(child: Icon(Icons.error_outline)),
                                       progressIndicatorBuilder: (context, _, progress) {
@@ -110,7 +110,7 @@ class _OverViewScreenState extends State<OverViewScreen> {
                                       onTap: () => provider.pickThumbnail(),
                                       child: SvgPicture.asset(
                                         SVGUtils.kSvgUpload,
-                                        color: EventlyAppTheme.kWhite,
+                                        color: Colors.white,
                                       ),
                                     ),
                                   ],
@@ -145,6 +145,10 @@ class _OverViewScreenState extends State<OverViewScreen> {
                   const VerticalSpace(80),
                   BottomButtons(
                     onPressContinue: () {
+                      provider.saveAsDraft(
+                        onCompleted: () => {},
+                        uploadStep: UploadStep.overView,
+                      );
                       createEventViewModel.nextPage();
                     },
                     onPressSaveDraft: () {

diff --git a/evently/lib/screens/perks_screen.dart b/evently/lib/screens/perks_screen.dart
@@ -114,6 +114,10 @@ class _PerksScreenState extends State<PerksScreen> {
                     padding: const EdgeInsets.symmetric(horizontal: 20),
                     child: BottomButtons(
                       onPressContinue: () {
+                        provider.saveAsDraft(
+                          onCompleted: () => {},
+                          uploadStep: UploadStep.perks,
+                        );
                         createEventViewModel.nextPage();
                       },
                       onPressSaveDraft: () {

diff --git a/evently/lib/screens/price_screen.dart b/evently/lib/screens/price_screen.dart
@@ -1,6 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:evently/evently_provider.dart';
-import 'package:evently/models/events.dart';
 import 'package:evently/screens/custom_widgets/bottom_buttons.dart';
 import 'package:evently/screens/custom_widgets/page_app_bar.dart';
 import 'package:evently/screens/custom_widgets/step_labels.dart';
@@ -207,6 +206,10 @@ class _PriceScreenState extends State<PriceScreen> {
                   padding: EdgeInsets.symmetric(horizontal: 20.w),
                   child: BottomButtons(
                     onPressContinue: () {
+                      provider.saveAsDraft(
+                        onCompleted: () => {},
+                        uploadStep: UploadStep.price,
+                      );
                       homeViewModel.nextPage();
                     },
                     onPressSaveDraft: () {

diff --git a/evently/lib/utils/constants.dart b/evently/lib/utils/constants.dart
@@ -28,9 +28,6 @@ const int kEthIntBase = 1000000000000000000;
 final List<String> imageAllowedExts = ["png", "jpg", "jpeg", "heif"];
 const kPylons = "Pylons";
 
-///number constant
-const kMinEventName = 9;
-const kMinHostName = 9;
 
 const kErrProfileNotExist = 'profileDoesNotExist';