Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove alwaysShowSidebar

This commit is contained in:
Hillel Coren 2020-07-16 22:21:51 +03:00
parent 9a41424d94
commit fe85637609
8 changed files with 20 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redux/app/app_state.dart
View File

@ -592,7 +592,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
bool get isMenuCollapsed => bool get isMenuCollapsed =>
(prefState.isNotMobile && (prefState.isNotMobile &&
prefState.isFilterSidebarShown && prefState.showFilterSidebar &&
prefState.showMenu && prefState.showMenu &&
uiState.filterEntityType != null) || uiState.filterEntityType != null) ||
prefState.isMenuCollapsed; prefState.isMenuCollapsed;

8
lib/redux/ui/pref_reducer.dart
View File

@ -52,8 +52,6 @@ PrefState prefReducer(
..enableDarkMode = darkModeReducer(state.enableDarkMode, action) ..enableDarkMode = darkModeReducer(state.enableDarkMode, action)
..showFilterSidebar = ..showFilterSidebar =
showFilterSidebarReducer(state.showFilterSidebar, action) showFilterSidebarReducer(state.showFilterSidebar, action)
..alwaysShowFilterSidebar =
alwaysShowFilterSidebarReducer(state.alwaysShowFilterSidebar, action)
..longPressSelectionIsDefault = ..longPressSelectionIsDefault =
longPressReducer(state.longPressSelectionIsDefault, action) longPressReducer(state.longPressSelectionIsDefault, action)
..autoStartTasks = autoStartTasksReducer(state.autoStartTasks, action) ..autoStartTasks = autoStartTasksReducer(state.autoStartTasks, action)
@ -146,12 +144,6 @@ Reducer<bool> darkModeReducer = combineReducers([
}), }),
]); ]);
Reducer<bool> alwaysShowFilterSidebarReducer = combineReducers([
TypedReducer<bool, UserPreferencesChanged>((value, action) {
return action.alwaysShowFilterSidebar ?? value;
}),
]);
Reducer<bool> showFilterSidebarReducer = combineReducers([ Reducer<bool> showFilterSidebarReducer = combineReducers([
TypedReducer<bool, UserPreferencesChanged>((value, action) { TypedReducer<bool, UserPreferencesChanged>((value, action) {
return action.showFilterSidebar ?? value; return action.showFilterSidebar ?? value;

5
lib/redux/ui/pref_state.dart
View File

@ -22,7 +22,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
emailPayment: false, emailPayment: false,
autoStartTasks: false, autoStartTasks: false,
showFilterSidebar: false, showFilterSidebar: false,
alwaysShowFilterSidebar: false,
longPressSelectionIsDefault: false, longPressSelectionIsDefault: false,
addDocumentsToInvoice: false, addDocumentsToInvoice: false,
companyPrefs: BuiltList( companyPrefs: BuiltList(
@ -57,8 +56,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
bool get showFilterSidebar; bool get showFilterSidebar;
bool get alwaysShowFilterSidebar;
bool get longPressSelectionIsDefault; bool get longPressSelectionIsDefault;
bool get requireAuthentication; bool get requireAuthentication;
@ -102,8 +99,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
menuSidebarMode == AppSidebarMode.collapse && menuSidebarMode == AppSidebarMode.collapse &&
!isMenuVisible; !isMenuVisible;
bool get isFilterSidebarShown => alwaysShowFilterSidebar || showFilterSidebar;
static Serializer<PrefState> get serializer => _$prefStateSerializer; static Serializer<PrefState> get serializer => _$prefStateSerializer;
} }

47
lib/redux/ui/pref_state.g.dart
View File

@ -138,9 +138,6 @@ class _$PrefStateSerializer implements StructuredSerializer<PrefState> {
'showFilterSidebar', 'showFilterSidebar',
serializers.serialize(object.showFilterSidebar, serializers.serialize(object.showFilterSidebar,
specifiedType: const FullType(bool)), specifiedType: const FullType(bool)),
'alwaysShowFilterSidebar',
serializers.serialize(object.alwaysShowFilterSidebar,
specifiedType: const FullType(bool)),
'longPressSelectionIsDefault', 'longPressSelectionIsDefault',
serializers.serialize(object.longPressSelectionIsDefault, serializers.serialize(object.longPressSelectionIsDefault,
specifiedType: const FullType(bool)), specifiedType: const FullType(bool)),
@ -212,10 +209,6 @@ class _$PrefStateSerializer implements StructuredSerializer<PrefState> {
result.showFilterSidebar = serializers.deserialize(value, result.showFilterSidebar = serializers.deserialize(value,
specifiedType: const FullType(bool)) as bool; specifiedType: const FullType(bool)) as bool;
break; break;
case 'alwaysShowFilterSidebar':
result.alwaysShowFilterSidebar = serializers.deserialize(value,
specifiedType: const FullType(bool)) as bool;
break;
case 'longPressSelectionIsDefault': case 'longPressSelectionIsDefault':
result.longPressSelectionIsDefault = serializers.deserialize(value, result.longPressSelectionIsDefault = serializers.deserialize(value,
specifiedType: const FullType(bool)) as bool; specifiedType: const FullType(bool)) as bool;
@ -440,8 +433,6 @@ class _$PrefState extends PrefState {
@override @override
final bool showFilterSidebar; final bool showFilterSidebar;
@override @override
final bool alwaysShowFilterSidebar;
@override
final bool longPressSelectionIsDefault; final bool longPressSelectionIsDefault;
@override @override
final bool requireAuthentication; final bool requireAuthentication;
@ -467,7 +458,6 @@ class _$PrefState extends PrefState {
this.isHistoryVisible, this.isHistoryVisible,
this.enableDarkMode, this.enableDarkMode,
this.showFilterSidebar, this.showFilterSidebar,
this.alwaysShowFilterSidebar,
this.longPressSelectionIsDefault, this.longPressSelectionIsDefault,
this.requireAuthentication, this.requireAuthentication,
this.emailPayment, this.emailPayment,
@ -502,10 +492,6 @@ class _$PrefState extends PrefState {
if (showFilterSidebar == null) { if (showFilterSidebar == null) {
throw new BuiltValueNullFieldError('PrefState', 'showFilterSidebar'); throw new BuiltValueNullFieldError('PrefState', 'showFilterSidebar');
} }
if (alwaysShowFilterSidebar == null) {
throw new BuiltValueNullFieldError(
'PrefState', 'alwaysShowFilterSidebar');
}
if (longPressSelectionIsDefault == null) { if (longPressSelectionIsDefault == null) {
throw new BuiltValueNullFieldError( throw new BuiltValueNullFieldError(
'PrefState', 'longPressSelectionIsDefault'); 'PrefState', 'longPressSelectionIsDefault');
@ -547,7 +533,6 @@ class _$PrefState extends PrefState {
isHistoryVisible == other.isHistoryVisible && isHistoryVisible == other.isHistoryVisible &&
enableDarkMode == other.enableDarkMode && enableDarkMode == other.enableDarkMode &&
showFilterSidebar == other.showFilterSidebar && showFilterSidebar == other.showFilterSidebar &&
alwaysShowFilterSidebar == other.alwaysShowFilterSidebar &&
longPressSelectionIsDefault == other.longPressSelectionIsDefault && longPressSelectionIsDefault == other.longPressSelectionIsDefault &&
requireAuthentication == other.requireAuthentication && requireAuthentication == other.requireAuthentication &&
emailPayment == other.emailPayment && emailPayment == other.emailPayment &&
@ -574,22 +559,20 @@ class _$PrefState extends PrefState {
$jc( $jc(
$jc( $jc(
$jc( $jc(
$jc( 0,
0, appLayout
appLayout
.hashCode),
moduleLayout
.hashCode), .hashCode),
menuSidebarMode moduleLayout
.hashCode), .hashCode),
historySidebarMode menuSidebarMode
.hashCode), .hashCode),
isPreviewVisible.hashCode), historySidebarMode
isMenuVisible.hashCode), .hashCode),
isHistoryVisible.hashCode), isPreviewVisible.hashCode),
enableDarkMode.hashCode), isMenuVisible.hashCode),
showFilterSidebar.hashCode), isHistoryVisible.hashCode),
alwaysShowFilterSidebar.hashCode), enableDarkMode.hashCode),
showFilterSidebar.hashCode),
longPressSelectionIsDefault.hashCode), longPressSelectionIsDefault.hashCode),
requireAuthentication.hashCode), requireAuthentication.hashCode),
emailPayment.hashCode), emailPayment.hashCode),
@ -610,7 +593,6 @@ class _$PrefState extends PrefState {
..add('isHistoryVisible', isHistoryVisible) ..add('isHistoryVisible', isHistoryVisible)
..add('enableDarkMode', enableDarkMode) ..add('enableDarkMode', enableDarkMode)
..add('showFilterSidebar', showFilterSidebar) ..add('showFilterSidebar', showFilterSidebar)
..add('alwaysShowFilterSidebar', alwaysShowFilterSidebar)
..add('longPressSelectionIsDefault', longPressSelectionIsDefault) ..add('longPressSelectionIsDefault', longPressSelectionIsDefault)
..add('requireAuthentication', requireAuthentication) ..add('requireAuthentication', requireAuthentication)
..add('emailPayment', emailPayment) ..add('emailPayment', emailPayment)
@ -668,11 +650,6 @@ class PrefStateBuilder implements Builder<PrefState, PrefStateBuilder> {
set showFilterSidebar(bool showFilterSidebar) => set showFilterSidebar(bool showFilterSidebar) =>
_$this._showFilterSidebar = showFilterSidebar; _$this._showFilterSidebar = showFilterSidebar;
bool _alwaysShowFilterSidebar;
bool get alwaysShowFilterSidebar => _$this._alwaysShowFilterSidebar;
set alwaysShowFilterSidebar(bool alwaysShowFilterSidebar) =>
_$this._alwaysShowFilterSidebar = alwaysShowFilterSidebar;
bool _longPressSelectionIsDefault; bool _longPressSelectionIsDefault;
bool get longPressSelectionIsDefault => _$this._longPressSelectionIsDefault; bool get longPressSelectionIsDefault => _$this._longPressSelectionIsDefault;
set longPressSelectionIsDefault(bool longPressSelectionIsDefault) => set longPressSelectionIsDefault(bool longPressSelectionIsDefault) =>
@ -716,7 +693,6 @@ class PrefStateBuilder implements Builder<PrefState, PrefStateBuilder> {
_isHistoryVisible = _$v.isHistoryVisible; _isHistoryVisible = _$v.isHistoryVisible;
_enableDarkMode = _$v.enableDarkMode; _enableDarkMode = _$v.enableDarkMode;
_showFilterSidebar = _$v.showFilterSidebar; _showFilterSidebar = _$v.showFilterSidebar;
_alwaysShowFilterSidebar = _$v.alwaysShowFilterSidebar;
_longPressSelectionIsDefault = _$v.longPressSelectionIsDefault; _longPressSelectionIsDefault = _$v.longPressSelectionIsDefault;
_requireAuthentication = _$v.requireAuthentication; _requireAuthentication = _$v.requireAuthentication;
_emailPayment = _$v.emailPayment; _emailPayment = _$v.emailPayment;
@ -756,7 +732,6 @@ class PrefStateBuilder implements Builder<PrefState, PrefStateBuilder> {
isHistoryVisible: isHistoryVisible, isHistoryVisible: isHistoryVisible,
enableDarkMode: enableDarkMode, enableDarkMode: enableDarkMode,
showFilterSidebar: showFilterSidebar, showFilterSidebar: showFilterSidebar,
alwaysShowFilterSidebar: alwaysShowFilterSidebar,
longPressSelectionIsDefault: longPressSelectionIsDefault, longPressSelectionIsDefault: longPressSelectionIsDefault,
requireAuthentication: requireAuthentication, requireAuthentication: requireAuthentication,
emailPayment: emailPayment, emailPayment: emailPayment,

10
lib/ui/app/main_screen.dart
View File

@ -90,7 +90,7 @@ class MainScreen extends StatelessWidget {
} }
} else { } else {
bool editingFilterEntity = false; bool editingFilterEntity = false;
if (prefState.isFilterSidebarShown && if (prefState.showFilterSidebar &&
uiState.filterEntityId != null && uiState.filterEntityId != null &&
subRoute == '/edit') { subRoute == '/edit') {
if (mainRoute == '/${uiState.filterEntityType}') { if (mainRoute == '/${uiState.filterEntityType}') {
@ -535,7 +535,7 @@ class EntityScreens extends StatelessWidget {
Widget topFilterChild; Widget topFilterChild;
if (uiState.filterEntityType != null) { if (uiState.filterEntityType != null) {
if (prefState.isFilterSidebarShown) { if (prefState.showFilterSidebar) {
switch (uiState.filterEntityType) { switch (uiState.filterEntityType) {
case EntityType.client: case EntityType.client:
leftFilterChild = editingFIlterEntity leftFilterChild = editingFIlterEntity
@ -569,7 +569,7 @@ class EntityScreens extends StatelessWidget {
topFilterChild = _EntityFilter( topFilterChild = _EntityFilter(
show: uiState.filterEntityType != null, show: uiState.filterEntityType != null,
); );
return Row( return Row(
children: <Widget>[ children: <Widget>[
if (leftFilterChild != null) if (leftFilterChild != null)
@ -671,7 +671,7 @@ class _EntityFilter extends StatelessWidget {
color: Theme.of(context).cardColor, color: Theme.of(context).cardColor,
) )
: AppBar( : AppBar(
leading: state.prefState.isFilterSidebarShown leading: state.prefState.showFilterSidebar
? null ? null
: IconButton( : IconButton(
tooltip: localization.showSidebar, tooltip: localization.showSidebar,
@ -684,7 +684,7 @@ class _EntityFilter extends StatelessWidget {
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: FlatButton( child: FlatButton(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: state.prefState.isFilterSidebarShown ? 4 : 0), left: state.prefState.showFilterSidebar ? 4 : 0),
child: Text( child: Text(
'${localization.lookup('$filterEntityType')} › ${filterEntity.listDisplayName}', '${localization.lookup('$filterEntityType')} › ${filterEntity.listDisplayName}',
style: TextStyle(fontSize: 17), style: TextStyle(fontSize: 17),

4
lib/ui/app/menu_drawer.dart
View File

@ -363,7 +363,7 @@ class _DrawerTileState extends State<DrawerTile> {
final isSelected = uiState.currentRoute.startsWith('/$route') && final isSelected = uiState.currentRoute.startsWith('/$route') &&
(state.uiState.filterEntityType == null || (state.uiState.filterEntityType == null ||
!state.prefState.isFilterSidebarShown); !state.prefState.showFilterSidebar);
final textColor = Theme.of(context) final textColor = Theme.of(context)
.textTheme .textTheme
@ -630,7 +630,7 @@ class SidebarFooterCollapsed extends StatelessWidget {
width: double.infinity, width: double.infinity,
color: Theme.of(context).cardColor, color: Theme.of(context).cardColor,
child: state.uiState.filterEntityType != null && child: state.uiState.filterEntityType != null &&
state.prefState.isFilterSidebarShown state.prefState.showFilterSidebar
? PopupMenuButton<String>( ? PopupMenuButton<String>(
icon: isUpdateAvailable icon: isUpdateAvailable
? Icon(Icons.warning, color: Theme.of(context).accentColor) ? Icon(Icons.warning, color: Theme.of(context).accentColor)

9
lib/ui/app/view_scaffold.dart
View File

@ -52,14 +52,7 @@ class ViewScaffold extends StatelessWidget {
leading = IconButton( leading = IconButton(
icon: Icon(Icons.clear), icon: Icon(Icons.clear),
onPressed: () { onPressed: () {
if (state.prefState.alwaysShowFilterSidebar) { store.dispatch(UserPreferencesChanged(showFilterSidebar: false));
store.dispatch(FilterByEntity(
entityType: state.uiState.filterEntityType,
entityId: state.uiState.filterEntityId,
));
} else {
store.dispatch(UserPreferencesChanged(showFilterSidebar: false));
}
}, },
); );
} else if (isSettings) { } else if (isSettings) {

4
lib/utils/i18n.dart
View File

@ -15,7 +15,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = { static final Map<String, Map<String, String>> _localizedValues = {
'en': { 'en': {
// STARTER: lang key - do not remove comment // STARTER: lang key - do not remove comment
'always_show_sidebar': 'Always Show Sidebar',
'show_sidebar': 'Show Sidebar', 'show_sidebar': 'Show Sidebar',
'hide_sidebar': 'Hide Sidebar', 'hide_sidebar': 'Hide Sidebar',
'event_type': 'Event Type', 'event_type': 'Event Type',
@ -38772,9 +38771,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
String get hideSidebar => _localizedValues[localeCode]['hide_sidebar'] ?? ''; String get hideSidebar => _localizedValues[localeCode]['hide_sidebar'] ?? '';
String get alwaysShowSidebar =>
_localizedValues[localeCode]['always_show_sidebar'] ?? '';
String lookup(String key) { String lookup(String key) {
final lookupKey = toSnakeCase(key); final lookupKey = toSnakeCase(key);
return _localizedValues[localeCode][lookupKey] ?? return _localizedValues[localeCode][lookupKey] ??