Code Refactor and Cleanup (#48)

* Code Refactor and Cleanup * Empty page UI's * Cleanup
PICT-ACM-Student-Chapter · Apr 14, 2023 · 9ef643a · 9ef643a
1 parent e50235d
commit 9ef643a
Show file tree

Hide file tree

Showing 33 changed files with 663 additions and 480 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -46,7 +46,6 @@ dart_code_metrics:
     - avoid-unused-parameters
     - newline-before-return
     - no-boolean-literal-compare
-    - no-empty-block
     - prefer-trailing-comma
     - prefer-conditional-expressions
     - no-equal-then-else
diff --git a/assets/images/empty_spaceman.json b/assets/images/empty_spaceman.json
diff --git a/lib/config/remote_config.dart b/lib/config/remote_config.dart
@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:firebase_remote_config/firebase_remote_config.dart';
 
 import '../constants/urls.dart';
@@ -18,9 +16,7 @@ Future<void> remoteConfig() async {
   EndPoints.privacyPolicyURL = remoteConfig.getString('privacyPolicy');
   EndPoints.websiteURL = remoteConfig.getString('websiteUrl');
   EndPoints.playStoreURL = remoteConfig.getString('playstoreUrl');
-  log(EndPoints.baseUrl as String);
-  log(EndPoints.sampleToken as String);
-  log(EndPoints.appLatestStableVersion as String);
+  EndPoints.sponsorsUrl = remoteConfig.getString('sponsorsUrl');
 
   return;
 }
diff --git a/lib/constants/images.dart b/lib/constants/images.dart
@@ -15,4 +15,5 @@ class AppImages {
   static const eventDescriptionBackground =
       'assets/images/event-description-bg.gif';
   static const orangeRocket = 'assets/images/orange_rocket.json';
+  static const emptyMan = "assets/images/empty_spaceman.json";
 }
diff --git a/lib/constants/models/registered_event.dart b/lib/constants/models/registered_event.dart
@@ -13,7 +13,6 @@ class RegisteredEvent {
     this.createdAt,
     this.events,
     this.status,
-
   });
 
   RegisteredEvent.fromJson(Map<String, dynamic> json) {

diff --git a/lib/constants/urls.dart b/lib/constants/urls.dart
@@ -5,6 +5,7 @@ class EndPoints {
   static String? privacyPolicyURL;
   static String? websiteURL;
   static String? playStoreURL;
+  static String? sponsorsUrl;
 
   static String events = '${baseUrl!}/events';
   static String user = '${baseUrl!}/user/me';

diff --git a/lib/constants/utils/theme.dart b/lib/constants/utils/theme.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import '../colors.dart';
 
 class Themes {

diff --git a/lib/constants/widgets/empty_page.dart b/lib/constants/widgets/empty_page.dart
@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:lottie/lottie.dart';
+
+import '../colors.dart';
+import '../images.dart';
+import '../styles.dart';
+
+class EmptyPage extends StatelessWidget {
+  final String title;
+  final String errorMessage;
+  final VoidCallback? refreshFunction;
+
+  const EmptyPage({
+    required this.errorMessage,
+    super.key,
+    this.refreshFunction,
+    required this.title,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    var size = MediaQuery.of(context).size;
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        Container(
+          height: size.height * 0.35,
+          width: size.width * 0.6,
+          decoration: BoxDecoration(
+            color: AppColors.primary.withAlpha(150),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
+            border: const Border.fromBorderSide(
+              BorderSide(
+                color: AppColors.cardBorder,
+                width: 0.2,
+              ),
+            ),
+          ),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              SizedBox(height: size.height * 0.1),
+              Text(
+                title,
+                style: AppStyles.bodyTextStyle2().copyWith(fontSize: 20),
+                textAlign: TextAlign.center,
+              ),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                child: Text(
+                  textAlign: TextAlign.center,
+                  errorMessage,
+                  style: AppStyles.bodyTextStyle3(),
+                ),
+              ),
+              if (refreshFunction != null)
+                TextButton(
+                  onPressed: () {
+                    refreshFunction!();
+                  },
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      const Icon(
+                        Icons.refresh_rounded,
+                        color: AppColors.white,
+                      ),
+                      const SizedBox(width: 7),
+                      Text(
+                        textAlign: TextAlign.center,
+                        'Retry',
+                        style:
+                            AppStyles.bodyTextStyle3().copyWith(fontSize: 25),
+                      ),
+                    ],
+                  ),
+                ),
+            ],
+          ),
+        ),
+        Positioned(
+          bottom: size.height * 0.165,
+          child: Lottie.asset(
+            AppImages.emptyMan,
+            height: size.height * 0.35,
+            width: size.width * 0.6,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/features/cart_page/cubit/cart_page_cubit.dart b/lib/features/cart_page/cubit/cart_page_cubit.dart
@@ -1,10 +1,12 @@
-import 'package:bloc/bloc.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'dart:convert';
 import 'dart:developer';
+
+import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
+
 import '../../../constants/models/cart_model.dart';
 import '../../../constants/urls.dart';
 

diff --git a/lib/features/cart_page/ui/cart_page_final.dart b/lib/features/cart_page/ui/cart_page_final.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lottie/lottie.dart';
-import 'package:pulzion23/constants/widgets/error_dialog.dart';
-import 'package:pulzion23/features/cart_page/ui/widgets/cart_page_content.dart';
+import '../../../constants/widgets/empty_page.dart';
+import '../../../constants/widgets/error_dialog.dart';
+import 'widgets/cart_page_content.dart';
 
 import '../../../constants/images.dart';
 import '../../login_page/cubit/check_login_cubit.dart';
@@ -48,11 +49,12 @@ class CartPageFinal extends StatelessWidget {
                     );
                   } else if (state is CartEmpty) {
                     return Center(
-                      child: ErrorDialog(
-                        'Cart is Empty',
+                      child: EmptyPage(
+                        errorMessage: 'Add some events to your Cart',
                         refreshFunction: () {
                           BlocProvider.of<CartPageCubit>(context).loadCart();
                         },
+                        title: 'Your Cart is Empty',
                       ),
                     );
                   } else if (state is CartPageLoaded) {

diff --git a/lib/features/cart_page/ui/widgets/cart_list_tile.dart b/lib/features/cart_page/ui/widgets/cart_list_tile.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+
 import '../../../../constants/colors.dart';
 import '../../../../constants/models/cart_model.dart';
 import '../../../../constants/styles.dart';

diff --git a/lib/features/cart_page/ui/widgets/cart_page_content.dart b/lib/features/cart_page/ui/widgets/cart_page_content.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
-import 'package:pulzion23/constants/images.dart';
 
+import '../../../../constants/images.dart';
 import '../../../../constants/models/cart_model.dart';
 import '../../../../constants/styles.dart';
 import 'cart_list_tile.dart';

diff --git a/lib/features/compulsory_update/ui/compulsary_update.dart b/lib/features/compulsory_update/ui/compulsary_update.dart
@@ -3,12 +3,12 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:panorama/panorama.dart';
-import '../../login_page/ui/widgets/roundedbutton.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../constants/images.dart';
 import '../../../constants/styles.dart';
 import '../../../constants/urls.dart';
+import '../../login_page/ui/widgets/roundedbutton.dart';
 
 class CompulsoryUpdatePage extends StatelessWidget {
   const CompulsoryUpdatePage({super.key});

diff --git a/lib/features/event_description/ui/event_description.dart b/lib/features/event_description/ui/event_description.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import "package:share_plus/share_plus.dart";
 import '../../../constants/urls.dart';
-import 'package:pulzion23/features/cart_page/cubit/cart_page_cubit.dart';
-import 'package:pulzion23/features/event_description/ui/widgets/button.dart';
+import '../../cart_page/cubit/cart_page_cubit.dart';
+import 'widgets/button.dart';
 import '../../../config/size_config.dart';
 import '../../../constants/models/event_model.dart';
 
@@ -22,8 +22,10 @@ class EventDescription extends StatefulWidget {
   State<EventDescription> createState() => _EventDescriptionState();
 }
 
-class _EventDescriptionState extends State<EventDescription> with TickerProviderStateMixin {
-  late final TabController tabBarController = TabController(length: 3, vsync: this);
+class _EventDescriptionState extends State<EventDescription>
+    with TickerProviderStateMixin {
+  late final TabController tabBarController =
+      TabController(length: 3, vsync: this);
 
   @override
   void dispose() {
@@ -88,7 +90,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
             Expanded(
               child: BlocBuilder<CheckLoginCubit, CheckLoginState>(
                 builder: (context, state) {
-                  if (state is CheckLoginFailure || state is CheckLoginLoading) {
+                  if (state is CheckLoginFailure ||
+                      state is CheckLoginLoading) {
                     return event.price == 0
                         ? EventDescriptionPageButton(
                             'Register Now',
@@ -98,7 +101,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                               Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                  builder: (context) => const LoginSignUpIntro(),
+                                  builder: (context) =>
+                                      const LoginSignUpIntro(),
                                 ),
                               );
                             },
@@ -110,7 +114,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                               Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                  builder: (context) => const LoginSignUpIntro(),
+                                  builder: (context) =>
+                                      const LoginSignUpIntro(),
                                 ),
                               );
                             },
@@ -123,6 +128,7 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                             'Register Now',
                             Icons.edit_rounded,
                             () {
+                              // TODO: Call API for registration 0 money
                               ScaffoldMessenger.of(context).showSnackBar(
                                 const SnackBar(
                                   content: Text('Registered Successfully'),
@@ -135,7 +141,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                             'Add to Cart',
                             Icons.shopping_cart,
                             () {
-                              BlocProvider.of<CartPageCubit>(context).addCartItem(event.id!);
+                              BlocProvider.of<CartPageCubit>(context)
+                                  .addCartItem(event.id!);
                             },
                           ),
                   );
@@ -245,7 +252,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                             Share.share(
                               '${event.description}\n\nPulzion 23 App: ${EndPoints.playStoreURL}',
                               subject: 'Pulzion 2023',
-                              sharePositionOrigin: Rect.fromLTWH(0, 0, 10, 10),
+                              sharePositionOrigin:
+                                  const Rect.fromLTWH(0, 0, 10, 10),
                             );
                           }),
                           child: const Icon(
@@ -274,7 +282,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                               begin: Alignment.topLeft,
                               end: Alignment.bottomRight,
                               colors: AppColors.eventCardGradientList.elementAt(
-                                event.id! % AppColors.eventCardGradientList.length,
+                                event.id! %
+                                    AppColors.eventCardGradientList.length,
                               ),
                             ),
                           ),
@@ -322,7 +331,8 @@ class _EventDescriptionState extends State<EventDescription> with TickerProvider
                                 ),
                               ),
                             ),
-                            unselectedLabelColor: AppColors.cardSubtitleTextColor,
+                            unselectedLabelColor:
+                                AppColors.cardSubtitleTextColor,
                             labelColor: AppColors.loginPageAccent,
                             tabs: const [
                               Text(

diff --git a/lib/features/event_description/ui/widgets/button.dart b/lib/features/event_description/ui/widgets/button.dart
@@ -7,8 +7,11 @@ class EventDescriptionPageButton extends StatelessWidget {
   final IconData buttonIcon;
   final Function onPressed;
   const EventDescriptionPageButton(
-      this.buttonText, this.buttonIcon, this.onPressed,
-      {super.key,});
+    this.buttonText,
+    this.buttonIcon,
+    this.onPressed, {
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/features/event_slots/ui/booked_main.dart b/lib/features/event_slots/ui/booked_main.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../event_slots/logic/booked_slot_cubit.dart';
 
-import './booked_window.dart';
-import './not_booked_window.dart';
+import '../../event_slots/logic/booked_slot_cubit.dart';
+import 'booked_window.dart';
+import 'not_booked_window.dart';
 
 class EventBookingPage extends StatelessWidget {
   static const routeName = '/event-page';