Adjust UI

lib/ui/app/app_bottom_bar.dart

@@ -399,35 +399,6 @@ class _AppBottomBarState extends State<AppBottomBar> {
                       icon: Icon(Icons.check_box),
                       onPressed: () => widget.onCheckboxPressed(),
                     ),
-                  /*
-                  if (isDesktop(context))
-                    IconButton(
-                      tooltip: localization.preview,
-                      icon: Icon(Icons.chrome_reader_mode),
-                      onPressed: () {
-                        store.dispatch(UpdateUserPreferences(
-                            isPreviewEnabled:
-                                !state.prefState.isPreviewEnabled));
-                      },
-                    ),
-                    */
-                  if (!widget.entityType.isSetting &&
-                      prefState.isPreviewVisible)
-                    IconButton(
-                      tooltip: isList
-                          ? localization.showTable
-                          : localization.showList,
-                      icon: Icon(isList ? Icons.table_chart : Icons.view_list),
-                      onPressed: () {
-                        store.dispatch(SwitchListTableLayout());
-                      },
-                    ),
-                  if (isList && widget.sortFields.isNotEmpty)
-                    IconButton(
-                      tooltip: localization.sort,
-                      icon: Icon(Icons.sort_by_alpha),
-                      onPressed: _showSortSheet,
-                    ),
                 ],
                 IconButton(
                   tooltip: localization.filter,
@@ -494,6 +465,23 @@ class _AppBottomBarState extends State<AppBottomBar> {
                         ? Theme.of(context).accentColor
                         : null,
                   ),
+                if (!widget.entityType.isSetting && prefState.isPreviewVisible)
+                  IconButton(
+                    tooltip:
+                        isList ? localization.showTable : localization.showList,
+                    icon: Icon(isList ? Icons.table_chart : Icons.view_list),
+                    onPressed: () {
+                      store.dispatch(SwitchListTableLayout());
+                    },
+                  ),
+                if (!widget.hideListOptions) ...[
+                  if (isList && widget.sortFields.isNotEmpty)
+                    IconButton(
+                      tooltip: localization.sort,
+                      icon: Icon(Icons.sort_by_alpha),
+                      onPressed: _showSortSheet,
+                    ),
+                ],
                 if (!state.prefState.isMenuFloated) Spacer(),
                 if (!widget.entityType.isSetting &&
                     !isList &&

lib/ui/app/main_screen.dart

@@ -609,7 +609,7 @@ class EntityScreens extends StatelessWidget {
     }
 
     topFilterChild = EntityTopFilter(
-      show: uiState.filterEntityType != null && !prefState.isFilterVisible,
+      show: uiState.filterEntityType != null,
     );
 
     Widget listWidget;