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 =>
(prefState.isNotMobile &&
prefState.isFilterSidebarShown &&
prefState.showFilterSidebar &&
prefState.showMenu &&
uiState.filterEntityType != null) ||
prefState.isMenuCollapsed;

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

@ -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<bool> darkModeReducer = combineReducers([
}),
]);
Reducer<bool> alwaysShowFilterSidebarReducer = combineReducers([
TypedReducer<bool, UserPreferencesChanged>((value, action) {
return action.alwaysShowFilterSidebar ?? value;
}),
]);
Reducer<bool> showFilterSidebarReducer = combineReducers([
TypedReducer<bool, UserPreferencesChanged>((value, action) {
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,
autoStartTasks: false,
showFilterSidebar: false,
alwaysShowFilterSidebar: false,
longPressSelectionIsDefault: false,
addDocumentsToInvoice: false,
companyPrefs: BuiltList(
@ -57,8 +56,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
bool get showFilterSidebar;
bool get alwaysShowFilterSidebar;
bool get longPressSelectionIsDefault;
bool get requireAuthentication;
@ -102,8 +99,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
menuSidebarMode == AppSidebarMode.collapse &&
!isMenuVisible;
bool get isFilterSidebarShown => alwaysShowFilterSidebar || showFilterSidebar;
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',
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<PrefState> {
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<PrefState, PrefStateBuilder> {
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<PrefState, PrefStateBuilder> {
_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<PrefState, PrefStateBuilder> {
isHistoryVisible: isHistoryVisible,
enableDarkMode: enableDarkMode,
showFilterSidebar: showFilterSidebar,
alwaysShowFilterSidebar: alwaysShowFilterSidebar,
longPressSelectionIsDefault: longPressSelectionIsDefault,
requireAuthentication: requireAuthentication,
emailPayment: emailPayment,

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

@ -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: <Widget>[
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),

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

@ -363,7 +363,7 @@ class _DrawerTileState extends State<DrawerTile> {
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<String>(
icon: isUpdateAvailable
? 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(
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) {

4
lib/utils/i18n.dart
View File

@ -15,7 +15,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _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] ??