diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index 6bc5a534d..4c40376a5 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -592,7 +592,7 @@ abstract class AppState implements Built { bool get isMenuCollapsed => (prefState.isNotMobile && - prefState.isFilterSidebarShown && + prefState.showFilterSidebar && prefState.showMenu && uiState.filterEntityType != null) || prefState.isMenuCollapsed; diff --git a/lib/redux/ui/pref_reducer.dart b/lib/redux/ui/pref_reducer.dart index 08486b237..917d21227 100644 --- a/lib/redux/ui/pref_reducer.dart +++ b/lib/redux/ui/pref_reducer.dart @@ -52,8 +52,6 @@ PrefState prefReducer( ..enableDarkMode = darkModeReducer(state.enableDarkMode, action) ..showFilterSidebar = showFilterSidebarReducer(state.showFilterSidebar, action) - ..alwaysShowFilterSidebar = - alwaysShowFilterSidebarReducer(state.alwaysShowFilterSidebar, action) ..longPressSelectionIsDefault = longPressReducer(state.longPressSelectionIsDefault, action) ..autoStartTasks = autoStartTasksReducer(state.autoStartTasks, action) @@ -146,12 +144,6 @@ Reducer darkModeReducer = combineReducers([ }), ]); -Reducer alwaysShowFilterSidebarReducer = combineReducers([ - TypedReducer((value, action) { - return action.alwaysShowFilterSidebar ?? value; - }), -]); - Reducer showFilterSidebarReducer = combineReducers([ TypedReducer((value, action) { return action.showFilterSidebar ?? value; diff --git a/lib/redux/ui/pref_state.dart b/lib/redux/ui/pref_state.dart index 1fc4d0290..7afa9321d 100644 --- a/lib/redux/ui/pref_state.dart +++ b/lib/redux/ui/pref_state.dart @@ -22,7 +22,6 @@ abstract class PrefState implements Built { emailPayment: false, autoStartTasks: false, showFilterSidebar: false, - alwaysShowFilterSidebar: false, longPressSelectionIsDefault: false, addDocumentsToInvoice: false, companyPrefs: BuiltList( @@ -57,8 +56,6 @@ abstract class PrefState implements Built { bool get showFilterSidebar; - bool get alwaysShowFilterSidebar; - bool get longPressSelectionIsDefault; bool get requireAuthentication; @@ -102,8 +99,6 @@ abstract class PrefState implements Built { menuSidebarMode == AppSidebarMode.collapse && !isMenuVisible; - bool get isFilterSidebarShown => alwaysShowFilterSidebar || showFilterSidebar; - static Serializer get serializer => _$prefStateSerializer; } diff --git a/lib/redux/ui/pref_state.g.dart b/lib/redux/ui/pref_state.g.dart index 77f63e9f8..584123808 100644 --- a/lib/redux/ui/pref_state.g.dart +++ b/lib/redux/ui/pref_state.g.dart @@ -138,9 +138,6 @@ class _$PrefStateSerializer implements StructuredSerializer { 'showFilterSidebar', serializers.serialize(object.showFilterSidebar, specifiedType: const FullType(bool)), - 'alwaysShowFilterSidebar', - serializers.serialize(object.alwaysShowFilterSidebar, - specifiedType: const FullType(bool)), 'longPressSelectionIsDefault', serializers.serialize(object.longPressSelectionIsDefault, specifiedType: const FullType(bool)), @@ -212,10 +209,6 @@ class _$PrefStateSerializer implements StructuredSerializer { result.showFilterSidebar = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; break; - case 'alwaysShowFilterSidebar': - result.alwaysShowFilterSidebar = serializers.deserialize(value, - specifiedType: const FullType(bool)) as bool; - break; case 'longPressSelectionIsDefault': result.longPressSelectionIsDefault = serializers.deserialize(value, specifiedType: const FullType(bool)) as bool; @@ -440,8 +433,6 @@ class _$PrefState extends PrefState { @override final bool showFilterSidebar; @override - final bool alwaysShowFilterSidebar; - @override final bool longPressSelectionIsDefault; @override final bool requireAuthentication; @@ -467,7 +458,6 @@ class _$PrefState extends PrefState { this.isHistoryVisible, this.enableDarkMode, this.showFilterSidebar, - this.alwaysShowFilterSidebar, this.longPressSelectionIsDefault, this.requireAuthentication, this.emailPayment, @@ -502,10 +492,6 @@ class _$PrefState extends PrefState { if (showFilterSidebar == null) { throw new BuiltValueNullFieldError('PrefState', 'showFilterSidebar'); } - if (alwaysShowFilterSidebar == null) { - throw new BuiltValueNullFieldError( - 'PrefState', 'alwaysShowFilterSidebar'); - } if (longPressSelectionIsDefault == null) { throw new BuiltValueNullFieldError( 'PrefState', 'longPressSelectionIsDefault'); @@ -547,7 +533,6 @@ class _$PrefState extends PrefState { isHistoryVisible == other.isHistoryVisible && enableDarkMode == other.enableDarkMode && showFilterSidebar == other.showFilterSidebar && - alwaysShowFilterSidebar == other.alwaysShowFilterSidebar && longPressSelectionIsDefault == other.longPressSelectionIsDefault && requireAuthentication == other.requireAuthentication && emailPayment == other.emailPayment && @@ -574,22 +559,20 @@ class _$PrefState extends PrefState { $jc( $jc( $jc( - $jc( - 0, - appLayout - .hashCode), - moduleLayout + 0, + appLayout .hashCode), - menuSidebarMode + moduleLayout .hashCode), - historySidebarMode + menuSidebarMode .hashCode), - isPreviewVisible.hashCode), - isMenuVisible.hashCode), - isHistoryVisible.hashCode), - enableDarkMode.hashCode), - showFilterSidebar.hashCode), - alwaysShowFilterSidebar.hashCode), + historySidebarMode + .hashCode), + isPreviewVisible.hashCode), + isMenuVisible.hashCode), + isHistoryVisible.hashCode), + enableDarkMode.hashCode), + showFilterSidebar.hashCode), longPressSelectionIsDefault.hashCode), requireAuthentication.hashCode), emailPayment.hashCode), @@ -610,7 +593,6 @@ class _$PrefState extends PrefState { ..add('isHistoryVisible', isHistoryVisible) ..add('enableDarkMode', enableDarkMode) ..add('showFilterSidebar', showFilterSidebar) - ..add('alwaysShowFilterSidebar', alwaysShowFilterSidebar) ..add('longPressSelectionIsDefault', longPressSelectionIsDefault) ..add('requireAuthentication', requireAuthentication) ..add('emailPayment', emailPayment) @@ -668,11 +650,6 @@ class PrefStateBuilder implements Builder { set showFilterSidebar(bool showFilterSidebar) => _$this._showFilterSidebar = showFilterSidebar; - bool _alwaysShowFilterSidebar; - bool get alwaysShowFilterSidebar => _$this._alwaysShowFilterSidebar; - set alwaysShowFilterSidebar(bool alwaysShowFilterSidebar) => - _$this._alwaysShowFilterSidebar = alwaysShowFilterSidebar; - bool _longPressSelectionIsDefault; bool get longPressSelectionIsDefault => _$this._longPressSelectionIsDefault; set longPressSelectionIsDefault(bool longPressSelectionIsDefault) => @@ -716,7 +693,6 @@ class PrefStateBuilder implements Builder { _isHistoryVisible = _$v.isHistoryVisible; _enableDarkMode = _$v.enableDarkMode; _showFilterSidebar = _$v.showFilterSidebar; - _alwaysShowFilterSidebar = _$v.alwaysShowFilterSidebar; _longPressSelectionIsDefault = _$v.longPressSelectionIsDefault; _requireAuthentication = _$v.requireAuthentication; _emailPayment = _$v.emailPayment; @@ -756,7 +732,6 @@ class PrefStateBuilder implements Builder { isHistoryVisible: isHistoryVisible, enableDarkMode: enableDarkMode, showFilterSidebar: showFilterSidebar, - alwaysShowFilterSidebar: alwaysShowFilterSidebar, longPressSelectionIsDefault: longPressSelectionIsDefault, requireAuthentication: requireAuthentication, emailPayment: emailPayment, diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart index 83cc23861..0417cc44a 100644 --- a/lib/ui/app/main_screen.dart +++ b/lib/ui/app/main_screen.dart @@ -90,7 +90,7 @@ class MainScreen extends StatelessWidget { } } else { bool editingFilterEntity = false; - if (prefState.isFilterSidebarShown && + if (prefState.showFilterSidebar && uiState.filterEntityId != null && subRoute == '/edit') { if (mainRoute == '/${uiState.filterEntityType}') { @@ -535,7 +535,7 @@ class EntityScreens extends StatelessWidget { Widget topFilterChild; if (uiState.filterEntityType != null) { - if (prefState.isFilterSidebarShown) { + if (prefState.showFilterSidebar) { switch (uiState.filterEntityType) { case EntityType.client: leftFilterChild = editingFIlterEntity @@ -569,7 +569,7 @@ class EntityScreens extends StatelessWidget { topFilterChild = _EntityFilter( show: uiState.filterEntityType != null, ); - + return Row( children: [ if (leftFilterChild != null) @@ -671,7 +671,7 @@ class _EntityFilter extends StatelessWidget { color: Theme.of(context).cardColor, ) : AppBar( - leading: state.prefState.isFilterSidebarShown + leading: state.prefState.showFilterSidebar ? null : IconButton( tooltip: localization.showSidebar, @@ -684,7 +684,7 @@ class _EntityFilter extends StatelessWidget { alignment: Alignment.centerLeft, child: FlatButton( padding: EdgeInsets.only( - left: state.prefState.isFilterSidebarShown ? 4 : 0), + left: state.prefState.showFilterSidebar ? 4 : 0), child: Text( '${localization.lookup('$filterEntityType')} › ${filterEntity.listDisplayName}', style: TextStyle(fontSize: 17), diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart index d7520986c..0983f92b3 100644 --- a/lib/ui/app/menu_drawer.dart +++ b/lib/ui/app/menu_drawer.dart @@ -363,7 +363,7 @@ class _DrawerTileState extends State { final isSelected = uiState.currentRoute.startsWith('/$route') && (state.uiState.filterEntityType == null || - !state.prefState.isFilterSidebarShown); + !state.prefState.showFilterSidebar); final textColor = Theme.of(context) .textTheme @@ -630,7 +630,7 @@ class SidebarFooterCollapsed extends StatelessWidget { width: double.infinity, color: Theme.of(context).cardColor, child: state.uiState.filterEntityType != null && - state.prefState.isFilterSidebarShown + state.prefState.showFilterSidebar ? PopupMenuButton( icon: isUpdateAvailable ? Icon(Icons.warning, color: Theme.of(context).accentColor) diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart index 1395c4765..283e3fcd3 100644 --- a/lib/ui/app/view_scaffold.dart +++ b/lib/ui/app/view_scaffold.dart @@ -52,14 +52,7 @@ class ViewScaffold extends StatelessWidget { leading = IconButton( icon: Icon(Icons.clear), onPressed: () { - if (state.prefState.alwaysShowFilterSidebar) { - store.dispatch(FilterByEntity( - entityType: state.uiState.filterEntityType, - entityId: state.uiState.filterEntityId, - )); - } else { - store.dispatch(UserPreferencesChanged(showFilterSidebar: false)); - } + store.dispatch(UserPreferencesChanged(showFilterSidebar: false)); }, ); } else if (isSettings) { diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 9c025e6d1..37a9f7a45 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -15,7 +15,6 @@ mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { // STARTER: lang key - do not remove comment - 'always_show_sidebar': 'Always Show Sidebar', 'show_sidebar': 'Show Sidebar', 'hide_sidebar': 'Hide Sidebar', 'event_type': 'Event Type', @@ -38772,9 +38771,6 @@ mixin LocalizationsProvider on LocaleCodeAware { String get hideSidebar => _localizedValues[localeCode]['hide_sidebar'] ?? ''; - String get alwaysShowSidebar => - _localizedValues[localeCode]['always_show_sidebar'] ?? ''; - String lookup(String key) { final lookupKey = toSnakeCase(key); return _localizedValues[localeCode][lookupKey] ??