Implemented Multiselect for Stubs

stubs/redux/stub/stub_actions

@@ -242,11 +242,12 @@ class FilterStubsByEntity implements PersistUI {
 
 
 void handleStubAction(
-    BuildContext context, StubEntity stub, EntityAction action) {
+    BuildContext context, List<BaseEntity> stubs, EntityAction action) {
   final store = StoreProvider.of<AppState>(context);
   final state = store.state;
   final CompanyEntity company = state.selectedCompany;
   final localization = AppLocalization.of(context);
+  final stub = stubs.first as StubEntity;
 
   switch (action) {
     case EntityAction.edit:
@@ -264,5 +265,50 @@ void handleStubAction(
       store.dispatch(DeleteStubRequest(
           snackBarCompleter(context, localization.deletedStub), stub.id));
       break;
+    case EntityAction.toggleMultiselect:
+      if (!store.state.stubListState.isInMultiselect()) {
+        store.dispatch(StartStubMultiselect(context: context));
+      }
+
+      if (stubs.isEmpty) {
+        break;
+      }
+
+      for (final stub in stubs) {
+        if (!store.state.stubListState.isSelected(stub)) {
+          store.dispatch(
+              AddToStubMultiselect(context: context, entity: stub));
+        } else {
+          store.dispatch(
+              RemoveFromStubMultiselect(context: context, entity: stub));
+        }
+      }
+      break;
   }
-}
+}
+
+class StartStubMultiselect {
+  StartStubMultiselect({@required this.context});
+
+  final BuildContext context;
+}
+
+class AddToStubMultiselect {
+  AddToStubMultiselect({@required this.context, @required this.entity});
+
+  final BuildContext context;
+  final BaseEntity entity;
+}
+
+class RemoveFromStubMultiselect {
+  RemoveFromStubMultiselect({@required this.context, @required this.entity});
+
+  final BuildContext context;
+  final BaseEntity entity;
+}
+
+class ClearStubMultiselect {
+  ClearStubMultiselect({@required this.context});
+
+  final BuildContext context;
+}

stubs/redux/stub/stub_reducer

@@ -6,6 +6,7 @@ import 'package:invoiceninja_flutter/redux/ui/entity_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
 import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
 import 'package:invoiceninja_flutter/redux/stub/stub_state.dart';
+import 'package:invoiceninja_flutter/data/models/entities.dart';
 
 EntityUIState stubUIReducer(StubUIState state, dynamic action) {
   return state.rebuild((b) => b
@@ -52,6 +53,11 @@ final stubListReducer = combineReducers<ListUIState>([
   TypedReducer<ListUIState, FilterStubsByCustom1>(_filterStubsByCustom1),
   TypedReducer<ListUIState, FilterStubsByCustom2>(_filterStubsByCustom2),
   TypedReducer<ListUIState, FilterStubsByEntity>(_filterStubsByClient),
+  TypedReducer<ListUIState, StartStubMultiselect>(_startListMultiselect),
+  TypedReducer<ListUIState, AddToStubMultiselect>(_addToListMultiselect),
+  TypedReducer<ListUIState, RemoveFromStubMultiselect>(
+      _removeFromListMultiselect),
+  TypedReducer<ListUIState, ClearStubMultiselect>(_clearListMultiselect),
 ]);
 
 ListUIState _filterStubsByClient(
@@ -103,6 +109,28 @@ ListUIState _sortStubs(ListUIState stubListState, SortStubs action) {
     ..sortField = action.field);
 }
 
+ListUIState _startListMultiselect(
+    ListUIState productListState, StartProductMultiselect action) {
+  return productListState.rebuild((b) => b..selectedEntities = <BaseEntity>[]);
+}
+
+ListUIState _addToListMultiselect(
+    ListUIState productListState, AddToProductMultiselect action) {
+  return productListState
+      .rebuild((b) => b..selectedEntities.add(action.entity));
+}
+
+ListUIState _removeFromListMultiselect(
+    ListUIState productListState, RemoveFromProductMultiselect action) {
+  return productListState
+      .rebuild((b) => b..selectedEntities.remove(action.entity));
+}
+
+ListUIState _clearListMultiselect(
+    ListUIState productListState, ClearProductMultiselect action) {
+  return productListState.rebuild((b) => b..selectedEntities = null);
+}
+
 final stubsReducer = combineReducers<StubState>([
   TypedReducer<StubState, SaveStubSuccess>(_updateStub),
   TypedReducer<StubState, AddStubSuccess>(_addStub),

stubs/ui/stub/stub_list

@@ -28,6 +28,9 @@ class StubList extends StatelessWidget {
     final filteredClient =
         filteredClientId != null ? viewModel.clientMap[filteredClientId] : null;
     */
+    final store = StoreProvider.of<AppState>(context);
+    final listUIState = store.state.uiState.stubUIState.listUIState;
+    final isInMultiselect = listUIState.isInMultiselect();
 
     return Column(
       children: <Widget>[
@@ -153,8 +156,17 @@ class StubList extends StatelessWidget {
                                          context, stub, action);
                                    }
                                  },
-                                 onLongPress: () =>
+                                  onLongPress: () async {
-                                    showDialog(),
+                                    final longPressIsSelection =
+                                        store.state.uiState.longPressSelectionIsDefault ?? true;
+                                    if (longPressIsSelection && !isInMultiselect) {
+                                      viewModel.onEntityAction(
+                                          context, [stub], EntityAction.toggleMultiselect);
+                                    } else {
+                                      showDialog();
+                                    }
+                                  },
+                                  isChecked: isInMultiselect && listUIState.isSelected(stub),
                                );
                           },
                         ),

stubs/ui/stub/stub_list_item

@@ -8,16 +8,16 @@ import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/ui/app/dismissible_entity.dart';
 
-class StubListItem extends StatelessWidget {
+class StubListItem extends StatefulWidget {
-
   const StubListItem({
     @required this.user,
     @required this.onEntityAction,
     @required this.onTap,
     @required this.onLongPress,
-    //@required this.onCheckboxChanged,
     @required this.stub,
     @required this.filter,
+    this.onCheckboxChanged,
+    this.isChecked = false,
   });
 
   final UserEntity user;
@@ -27,54 +27,76 @@ class StubListItem extends StatelessWidget {
   //final ValueChanged<bool> onCheckboxChanged;
   final StubEntity stub;
   final String filter;
+  final Function(bool) onCheckboxChanged;
+  final bool isChecked;
 
   static final stubItemKey = (int id) => Key('__stub_item_${id}__');
 
+  @override
+  _StubListItemState createState() => _StubListItemState();
+}
+
+class _StubListItemState extends State<StubListItem>
+    with TickerProviderStateMixin {
   @override
   Widget build(BuildContext context) {
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
     final uiState = state.uiState;
     final stubUIState = uiState.stubUIState;
+    final listUIState = stubUIState.listUIState;
+    final isInMultiselect = listUIState.isInMultiselect();
+    final showCheckbox = widget.onCheckboxChanged != null || isInMultiselect;
 
-    final filterMatch = filter != null && filter.isNotEmpty
+    if (isInMultiselect) {
-        ? stub.matchesFilterValue(filter)
+      _multiselectCheckboxAnimController.forward();
+    } else {
+      _multiselectCheckboxAnimController.animateBack(0.0);
+    }
+
+    final filterMatch = widget.filter != null && widget.filter.isNotEmpty
+        ? widget.stub.matchesFilterValue(widget.filter)
         : null;
     final subtitle = filterMatch;
 
     return DismissibleEntity(
-       userCompany: state.userCompany,
+      userCompany: state.userCompany,
-      entity: stub,
+      entity: widget.stub,
-      isSelected: stub.id ==
+      isSelected: widget.stub.id ==
-          (uiState.isEditing
+          (uiState.isEditing ? stubUIState.editing.id : stubUIState.selectedId),
-              ? stubUIState.editing.id
+      onEntityAction: widget.onEntityAction,
-              : stubUIState.selectedId),
-      onEntityAction: onEntityAction,
       child: ListTile(
-        onTap: onTap,
+        onTap: isInMultiselect
-        onLongPress: onLongPress,
+            ? () => widget.onEntityAction(EntityAction.toggleMultiselect)
-        /*
+            : widget.onTap,
-        leading: Checkbox(
+        onLongPress: widget.onLongPress,
-          //key: NinjaKeys.stubItemCheckbox(stub.id),
+        leading: showCheckbox
-          value: true,
+            ? FadeTransition(
-          //onChanged: onCheckboxChanged,
+                opacity: _multiselectCheckboxAnim,
-          onChanged: (value) {
+                child: IgnorePointer(
-            return true;
+                  ignoring: listUIState.isInMultiselect(),
-          },
+                  child: Checkbox(
-        ),
+                    //key: NinjaKeys.stubItemCheckbox(task.id),
-        */
+                    value: widget.isChecked,
+                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    onChanged: (value) => widget.onCheckboxChanged(value),
+                    activeColor: Theme.of(context).accentColor,
+                  ),
+                ),
+              )
+            : null,
         title: Container(
           width: MediaQuery.of(context).size.width,
           child: Row(
             children: <Widget>[
               Expanded(
                 child: Text(
-                  stub.name,
+                  widget.stub.name,
                   //key: NinjaKeys.clientItemClientKey(client.id),
                   style: Theme.of(context).textTheme.title,
                 ),
               ),
-              Text(formatNumber(stub.listDisplayAmount, context),
+              Text(formatNumber(widget.stub.listDisplayAmount, context),
                   style: Theme.of(context).textTheme.title),
             ],
           ),
@@ -82,16 +104,35 @@ class StubListItem extends StatelessWidget {
         subtitle: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            subtitle != null && subtitle.isNotEmpty ?
+            subtitle != null && subtitle.isNotEmpty
-            Text(
+                ? Text(
-              subtitle,
+                    subtitle,
-              maxLines: 3,
+                    maxLines: 3,
-              overflow: TextOverflow.ellipsis,
+                    overflow: TextOverflow.ellipsis,
-            ) : Container(),
+                  )
-            EntityStateLabel(stub),
+                : Container(),
+            EntityStateLabel(widget.stub),
           ],
         ),
       ),
     );
   }
+
+  Animation _multiselectCheckboxAnim;
+  AnimationController _multiselectCheckboxAnimController;
+
+  @override
+  void initState() {
+    super.initState();
+    _multiselectCheckboxAnimController =
+        AnimationController(vsync: this, duration: Duration(milliseconds: 500));
+    _multiselectCheckboxAnim = Tween<double>(begin: 0.0, end: 1.0)
+        .animate(_multiselectCheckboxAnimController);
+  }
+
+  @override
+  void dispose() {
+    _multiselectCheckboxAnimController.dispose();
+    super.dispose();
+  }
 }

stubs/ui/stub/stub_list_vm

@@ -80,8 +80,8 @@ class StubListVM {
           store.dispatch(ViewStub(stubId: stub.id, context: context));
         },
       onEntityAction:
-          (BuildContext context, BaseEntity stub, EntityAction action) =>
+          (BuildContext context, List<BaseEntity> stubs, EntityAction action) =>
-          handleStubAction(context, stub, action),
+          handleStubAction(context, stubs, action),
         onRefreshed: (context) => _handleRefresh(context),
     );
   }
@@ -95,7 +95,7 @@ class StubListVM {
   final bool isLoaded;
   final Function(BuildContext, StubEntity) onStubTap;
   final Function(BuildContext) onRefreshed;
-  final Function(BuildContext, StubEntity, EntityAction) onEntityAction;
+  final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
   final Function onClearEntityFilterPressed;
   final Function(BuildContext) onViewEntityFilterPressed;
 

stubs/ui/stub/stub_screen

@@ -12,18 +12,40 @@ import 'package:invoiceninja_flutter/ui/stub/stub_list_vm.dart';
 import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/app_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/app_bottom_bar.dart';
+import 'package:invoiceninja_flutter/ui/app/entities/entity_actions_dialog.dart';
 
 class StubScreen extends StatelessWidget {
+  const StubScreen({
+    Key key,
+    @required this.viewModel,
+  }) : super(key: key);
+
   static const String route = '/stub';
 
+  final StubScreenVM viewModel;
+
   @override
   Widget build(BuildContext context) {
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
     final company = state.selectedCompany;
     final localization = AppLocalization.of(context);
+    final listUIState = state.uiState.stubUIState.listUIState;
+    final isInMultiselect = listUIState.isInMultiselect();
 
     return AppScaffold(
+                      isChecked: isInMultiselect &&
+                          listUIState.selectedEntities.length == viewModel.stubList.length,
+                      showCheckbox: isInMultiselect,
+                      onCheckboxChanged: (value) {
+                        final stubs = viewModel.stubList
+                            .map<StubEntity>((stubId) => viewModel.stubMap[stubId])
+                            .where((stub) => value != listUIState.isSelected(stub))
+                            .toList();
+                
+                        viewModel.onEntityAction(
+                            context, stubs, EntityAction.toggleMultiselect);
+                      },
                      appBarTitle: ListFilter(
                        key: ValueKey(state.stubListState.filterClearedAt),
                        entityType: EntityType.stub,
@@ -32,13 +54,45 @@ class StubScreen extends StatelessWidget {
                        },
                      ),
                      appBarActions: [
-                       ListFilterButton(
+                        if (!viewModel.isInMultiselect)
-                         entityType: EntityType.stub,
+                          ListFilterButton(
-                         onFilterPressed: (String value) {
+                            entityType: EntityType.stub,
-                           store.dispatch(FilterStubs(value));
+                            onFilterPressed: (String value) {
-                         },
+                              store.dispatch(FilterStubs(value));
-                       ),
+                            },
-                     ],
+                          ),
+                        if (viewModel.isInMultiselect)
+                          FlatButton(
+                            key: key,
+                            child: Text(
+                              localization.cancel,
+                              style: TextStyle(color: Colors.white),
+                            ),
+                            onPressed: () {
+                              store.dispatch(ClearStubMultiselect(context: context));
+                            },
+                          ),
+                        if (viewModel.isInMultiselect)
+                          FlatButton(
+                            key: key,
+                            textColor: Colors.white,
+                            disabledTextColor: Colors.white54,
+                            child: Text(
+                              localization.done,
+                            ),
+                            onPressed: state.stubListState.selectedEntities.isEmpty
+                                ? null
+                                : () async {
+                                    await showEntityActionsDialog(
+                                        entities: state.stubListState.selectedEntities,
+                                        userCompany: userCompany,
+                                        context: context,
+                                        onEntityAction: viewModel.onEntityAction,
+                                        multiselect: true);
+                                    store.dispatch(ClearStubMultiselect(context: context));
+                                  },
+                          ),
+                   ],
                    body: StubListBuilder(),
                    bottomNavigationBar: AppBottomBar(
                      entityType: EntityType.stub,

stubs/ui/stub/stub_screen_vm

@@ -0,0 +1,60 @@
+import 'package:built_collection/built_collection.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
+import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
+import 'package:invoiceninja_flutter/redux/stub/stub_selectors.dart';
+import 'package:redux/redux.dart';
+
+import 'stub_screen.dart';
+
+class StubScreenBuilder extends StatelessWidget {
+  const StubScreenBuilder({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return StoreConnector<AppState, StubScreenVM>(
+      //rebuildOnChange: true,
+      converter: StubScreenVM.fromStore,
+      builder: (context, vm) {
+        return StubScreen(
+          viewModel: vm,
+        );
+      },
+    );
+  }
+}
+
+class StubScreenVM {
+  StubScreenVM({
+    @required this.isInMultiselect,
+    @required this.stubList,
+    @required this.userCompany,
+    @required this.onEntityAction,
+    @required this.stubMap,
+  });
+
+  final bool isInMultiselect;
+  final UserCompanyEntity userCompany;
+  final List<String> stubList;
+  final Function(BuildContext, List<BaseEntity>, EntityAction) onEntityAction;
+  final BuiltMap<String, StubEntity> stubMap;
+
+  static StubScreenVM fromStore(Store<AppState> store) {
+    final state = store.state;
+
+    return StubScreenVM(
+      stubMap: state.stubState.map,
+      stubList: memoizedFilteredStubList(state.stubState.map,
+          state.stubState.list, state.stubListState),
+      userCompany: state.userCompany,
+      isInMultiselect: state.stubListState.isInMultiselect(),
+      onEntityAction: (BuildContext context, List<BaseEntity> stubs,
+              EntityAction action) =>
+          handleStubAction(context, stubs, action),
+    );
+  }
+}