feat(filters): Added job offer list filter modal

loromagnoni · May 1, 2023 · 56bced5 · 56bced5
1 parent afd46b6
commit 56bced5
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 105 deletions.
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "LaunchImage.png",
+      "filename" : "iPhone 1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "LaunchImage 1.png",
+      "filename" : "iPhone 2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "LaunchImage 3x.png",
+      "filename" : "iPhone 3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage 1.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage 1.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage 3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage 3x.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 1x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 1x.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 2x.png
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/iPhone 3x.png
diff --git a/lib/job_offer_list/bloc/job_offer_list_bloc.dart b/lib/job_offer_list/bloc/job_offer_list_bloc.dart
@@ -31,6 +31,7 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
             [],
             OpportunityType.jobOffer,
             OpportunityFilter(),
+            OpportunityFilter(),
           ),
         ) {
     on<JobOfferListChange>(_handleJobOfferListChange);
@@ -69,12 +70,8 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
     Emitter<JobOfferListState> emit,
   ) {
     emit(
-      JobOfferListFilled(
-        state.jobOfferList,
-        event.freelanceList,
-        state.selectedType,
-        state.filter,
-      ),
+      JobOfferListFilled(state.jobOfferList, event.freelanceList,
+          state.selectedType, state.filter, state.filterToApply),
     );
   }
 
@@ -87,6 +84,7 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
       state.freelanceList,
       state.selectedType,
       state.filter,
+      state.filterToApply,
     ));
   }
 
@@ -102,6 +100,7 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
             ? OpportunityType.freelanceProject
             : OpportunityType.jobOffer,
         state.filter,
+        state.filterToApply,
       ),
     );
   }
@@ -112,11 +111,11 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
   ) {
     emit(
       JobOfferListFilled(
-        state.jobOfferList,
-        state.freelanceList,
-        state.selectedType,
-        state.filter.copyWith(title: event.searchText),
-      ),
+          state.jobOfferList,
+          state.freelanceList,
+          state.selectedType,
+          state.filter.copyWith(title: event.searchText),
+          state.filterToApply),
     );
   }
 
@@ -137,24 +136,8 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
     OpportunityFilterTap event,
     Emitter<JobOfferListState> emit,
   ) async {
-    emit(
-      state is JobOfferListFilled
-          ? OpportunityFilterEditing(
-              state.jobOfferList,
-              state.freelanceList,
-              state.selectedType,
-              state.filter,
-              filterToApply: state.filter,
-            )
-          : state is OpportunityFilterEditing
-              ? JobOfferListFilled(
-                  state.jobOfferList,
-                  state.freelanceList,
-                  state.selectedType,
-                  state.filter,
-                )
-              : state,
-    );
+    emit(JobOfferListFilled(state.jobOfferList, state.freelanceList,
+        state.selectedType, state.filter, state.filterToApply));
     await _openFilterDialogCallback(
       this,
     );
@@ -164,67 +147,58 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
     CancelFilterTap event,
     Emitter<JobOfferListState> emit,
   ) {
-    emit(
-      state is OpportunityFilterEditing
-          ? JobOfferListFilled(
-              state.jobOfferList,
-              state.freelanceList,
-              state.selectedType,
-              state.filter,
-            )
-          : state,
-    );
+    emit(JobOfferListFilled(
+      state.jobOfferList,
+      state.freelanceList,
+      state.selectedType,
+      state.filter,
+      const OpportunityFilter(),
+    ));
   }
 
   void _handleApplyFilterTap(
     ApplyFilterTap event,
     Emitter<JobOfferListState> emit,
   ) {
-    emit(
-      state is OpportunityFilterEditing
-          ? JobOfferListFilled(
-              state.jobOfferList,
-              state.freelanceList,
-              state.selectedType,
-              (state as OpportunityFilterEditing).filterToApply,
-            )
-          : state,
-    );
+    emit(JobOfferListFilled(
+      state.jobOfferList,
+      state.freelanceList,
+      state.selectedType,
+      state.filterToApply,
+      state.filterToApply,
+    ));
   }
 
   void _handleFilterTap(
     FilterTap event,
     Emitter<JobOfferListState> emit,
   ) {
     emit(
-      state is OpportunityFilterEditing
-          ? OpportunityFilterEditing(
-              state.jobOfferList,
-              state.freelanceList,
-              state.selectedType,
-              state.filter,
-              filterToApply: (state as OpportunityFilterEditing)
-                  .filterToApply
-                  .toggleFilter(
-                    event.filter,
-                  ),
-            )
-          : state,
+      JobOfferListFilled(
+        state.jobOfferList,
+        state.freelanceList,
+        state.selectedType,
+        state.filter,
+        state.filterToApply.toggleFilter(
+          event.filter,
+        ),
+      ),
     );
   }
 
   void _handleFilterChipTap(
     FilterChipTap event,
     Emitter<JobOfferListState> emit,
   ) {
+    final newFilter = state.filter.copyWith(
+        filters: state.filter.filters.where((f) => f != event.filter).toList());
     emit(
       JobOfferListFilled(
         state.jobOfferList,
         state.freelanceList,
         state.selectedType,
-        state.filter.copyWith(
-            filters:
-                state.filter.filters.where((f) => f != event.filter).toList()),
+        newFilter,
+        newFilter,
       ),
     );
   }
@@ -239,6 +213,7 @@ class JobOfferListBloc extends Bloc<JobOfferListEvent, JobOfferListState> {
         state.freelanceList,
         state.selectedType,
         const OpportunityFilter(),
+        const OpportunityFilter(),
       ),
     );
   }

diff --git a/lib/job_offer_list/bloc/job_offer_list_state.dart b/lib/job_offer_list/bloc/job_offer_list_state.dart
@@ -15,6 +15,7 @@ enum Filter {
 
 class OpportunityFilter extends Equatable {
   const OpportunityFilter({this.title, this.filters = const []});
+
   final String? title;
   final List<Filter> filters;
 
@@ -45,11 +46,14 @@ abstract class JobOfferListState extends Equatable {
     this.freelanceList,
     this.selectedType,
     this.filter,
+    this.filterToApply,
   );
+
   final List<JobOffer> jobOfferList;
   final List<Freelance> freelanceList;
   final OpportunityType selectedType;
   final OpportunityFilter filter;
+  final OpportunityFilter filterToApply;
 
   List<Opportunity> get filteredOpportunities {
     final opportunities = selectedType == OpportunityType.jobOffer
@@ -72,7 +76,7 @@ abstract class JobOfferListState extends Equatable {
 
   @override
   List<Object?> get props =>
-      [jobOfferList, freelanceList, selectedType, filter];
+      [jobOfferList, freelanceList, selectedType, filter, filterToApply];
 }
 
 class JobOfferListInitial extends JobOfferListState {
@@ -81,6 +85,7 @@ class JobOfferListInitial extends JobOfferListState {
     super.freelanceList,
     super.selectedType,
     super.filter,
+    super.filterToApply,
   );
 }
 
@@ -90,21 +95,6 @@ class JobOfferListFilled extends JobOfferListState {
     super.freelanceList,
     super.selectedType,
     super.filter,
+    super.filterToApply,
   );
 }
-
-class OpportunityFilterEditing extends JobOfferListState {
-  const OpportunityFilterEditing(
-    super.jobOfferList,
-    super.freelanceList,
-    super.selectedType,
-    super.searchText, {
-    required this.filterToApply,
-  });
-
-  final OpportunityFilter filterToApply;
-
-  @override
-  List<Object> get props =>
-      [jobOfferList, freelanceList, selectedType, filter, filterToApply];
-}
diff --git a/lib/job_offer_list/dialog/job_offer_list_filter_dialog.dart b/lib/job_offer_list/dialog/job_offer_list_filter_dialog.dart
@@ -12,14 +12,6 @@ class JobOfferListFilterDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<JobOfferListBloc, JobOfferListState>(
       builder: (context, state) {
-        if (state is! OpportunityFilterEditing) {
-          return const ColoredBox(
-            color: AppColors.accentLight,
-            child: Center(
-              child: CircularProgressIndicator(),
-            ),
-          );
-        }
         return ColoredBox(
           color: AppColors.accentLight,
           child: Padding(

diff --git a/lib/job_offer_list/widget/filters/dialog/FilterItem.dart b/lib/job_offer_list/widget/filters/dialog/FilterItem.dart
@@ -26,10 +26,7 @@ class FilterItem extends StatelessWidget {
                 width: 24,
                 height: 24,
                 child: Checkbox(
-                  value: (state as OpportunityFilterEditing)
-                      .filterToApply
-                      .filters
-                      .contains(_filter),
+                  value: state.filterToApply.filters.contains(_filter),
                   onChanged: (_) => BlocProvider.of<JobOfferListBloc>(context)
                       .add(FilterTap(_filter)),
                 ),

diff --git a/lib/job_offer_list/widget/filters/filters.dart b/lib/job_offer_list/widget/filters/filters.dart
@@ -31,9 +31,7 @@ class Filters extends StatelessWidget {
                       children: [
                         Container(
                           decoration: BoxDecoration(
-                            color: state is OpportunityFilterEditing
-                                ? AppColors.sky
-                                : AppColors.ultraLightGrey,
+                            color: AppColors.ultraLightGrey,
                             borderRadius: BorderRadius.circular(16),
                           ),
                           child: IconButton(
@@ -42,15 +40,12 @@ class Filters extends StatelessWidget {
                                     .add(OpportunityFilterTap()),
                             icon: Icon(
                               PhosphorIcons.regular.slidersHorizontal,
-                              color: state is OpportunityFilterEditing
-                                  ? AppColors.white
-                                  : AppColors.black,
+                              color: AppColors.black,
                             ),
                           ),
                         ),
                         Visibility(
-                          visible: state is! OpportunityFilterEditing &&
-                              state.filter.filters.isNotEmpty,
+                          visible: state.filter.filters.isNotEmpty,
                           child: Positioned(
                             right: 0,
                             top: 0,