TomBursch · TomBursch · Dec 8, 2022 · Dec 8, 2022
diff --git a/lib/cubits/settings_cubit.dart b/lib/cubits/settings_cubit.dart
@@ -5,6 +5,7 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:kitchenowl/config.dart';
+import 'package:kitchenowl/enums/views_enum.dart';
 import 'package:kitchenowl/models/server_settings.dart';
 import 'package:kitchenowl/services/api/api_service.dart';
 import 'package:kitchenowl/services/storage/storage.dart';
@@ -45,7 +46,8 @@ class SettingsCubit extends Cubit<SettingsState> {
     ));
 
     if (ApiService.getInstance().serverSettings.featureExpenses != null ||
-        ApiService.getInstance().serverSettings.featurePlanner != null) {
+        ApiService.getInstance().serverSettings.featurePlanner != null ||
+        ApiService.getInstance().serverSettings.viewOrdering != null) {
       serverSettings = ApiService.getInstance().serverSettings;
     }
 
@@ -68,18 +70,44 @@ class SettingsCubit extends Cubit<SettingsState> {
     emit(state.copyWith(dynamicAccentColor: dynamicAccentColor));
   }
 
-  void setFeaturePlanner(bool featurePlanner) {
+  void setView(ViewsEnum view, bool value) {
+    if (view == ViewsEnum.mealPlanner) {
+      final settings = state.serverSettings.copyWith(featurePlanner: value);
+      emit(state.copyWith(serverSettings: settings));
+      PreferenceStorage.getInstance()
+          .write(key: 'serverSettings', value: jsonEncode(settings.toJson()));
+      ApiService.getInstance()
+          .setSettings(ServerSettings(featurePlanner: value));
+    }
+    if (view == ViewsEnum.balances) {
+      final settings = state.serverSettings.copyWith(featureExpenses: value);
+      emit(state.copyWith(serverSettings: settings));
+      PreferenceStorage.getInstance()
+          .write(key: 'serverSettings', value: jsonEncode(settings.toJson()));
+      ApiService.getInstance()
+          .setSettings(ServerSettings(featureExpenses: value));
+    }
+  }
+
+  void reorderView(int oldIndex, int newIndex) {
+    final l = List.of(state.serverSettings.viewOrdering!);
+    l.insert(newIndex, l.removeAt(oldIndex));
+    final settings = state.serverSettings.copyWith(viewOrdering: l);
+    emit(state.copyWith(serverSettings: settings));
     PreferenceStorage.getInstance()
-        .writeBool(key: 'featurePlanner', value: featurePlanner);
-    ApiService.getInstance()
-        .setSettings(ServerSettings(featurePlanner: featurePlanner));
+        .write(key: 'serverSettings', value: jsonEncode(settings.toJson()));
+    ApiService.getInstance().setSettings(ServerSettings(viewOrdering: l));
   }
 
-  void setFeatureExpenses(bool featureExpenses) {
+  void resetViewOrder() {
+    final settings =
+        state.serverSettings.copyWith(viewOrdering: ViewsEnum.values);
+    emit(state.copyWith(serverSettings: settings));
     PreferenceStorage.getInstance()
-        .writeBool(key: 'featureExpenses', value: featureExpenses);
-    ApiService.getInstance()
-        .setSettings(ServerSettings(featureExpenses: featureExpenses));
+        .write(key: 'serverSettings', value: jsonEncode(settings.toJson()));
+    ApiService.getInstance().setSettings(const ServerSettings(
+      viewOrdering: ViewsEnum.values,
+    ));
   }
 }
 
@@ -108,4 +136,15 @@ class SettingsState extends Equatable {
 
   @override
   List<Object?> get props => [themeMode, serverSettings, dynamicAccentColor];
+
+  bool isViewActive(ViewsEnum view) {
+    if (view == ViewsEnum.mealPlanner) {
+      return serverSettings.featurePlanner ?? true;
+    }
+    if (view == ViewsEnum.balances) {
+      return serverSettings.featureExpenses ?? true;
+    }
+
+    return true;
+  }
 }
diff --git a/lib/enums/views_enum.dart b/lib/enums/views_enum.dart
@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'package:kitchenowl/kitchenowl.dart';
+
+enum ViewsEnum {
+  shoppingList,
+  recipes,
+  mealPlanner,
+  balances,
+  profile;
+
+  String toLocalizedString(BuildContext context) {
+    final loc = AppLocalizations.of(context)!;
+
+    return [
+      loc.shoppingList,
+      loc.recipes,
+      loc.mealPlanner,
+      loc.balances,
+      loc.profile,
+    ][index];
+  }
+
+  IconData toIcon() {
+    return const [
+      Icons.shopping_bag_outlined,
+      Icons.receipt,
+      Icons.calendar_today_rounded,
+      Icons.account_balance_rounded,
+      Icons.person,
+    ][index];
+  }
+
+  bool isOptional() {
+    return const [
+      false,
+      false,
+      true,
+      true,
+      false,
+    ][index];
+  }
+
+  /// Adds all missing views
+  static List<ViewsEnum> addMissing(Iterable<ViewsEnum> iterable) {
+    final l = iterable.toList();
+    l.addAll(ViewsEnum.values.where((e) => !iterable.contains(e)));
+
+    return l;
+  }
+
+  static ViewsEnum? parse(String str) {
+    switch (str) {
+      case 'shoppingList':
+        return ViewsEnum.shoppingList;
+      case 'recipes':
+        return ViewsEnum.recipes;
+      case 'mealPlanner':
+        return ViewsEnum.mealPlanner;
+      case 'balances':
+        return ViewsEnum.balances;
+      case 'profile':
+        return ViewsEnum.profile;
+      default:
+        return null;
+    }
+  }
+
+  @override
+  String toString() {
+    return name;
+  }
+}
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -179,6 +179,8 @@
   "@mealPlanner": {},
   "minutesAbbrev": "Min",
   "@minutesAbbrev": {},
+  "more": "Mehr",
+  "@more": {},
   "name": "Name",
   "@name": {},
   "next": "Weiter",

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -185,6 +185,8 @@
   "@mealPlanner": {},
   "minutesAbbrev": "min",
   "@minutesAbbrev": {},
+  "more": "More",
+  "@more": {},
   "name": "Name",
   "@name": {},
   "next": "Next",

diff --git a/lib/models/server_settings.dart b/lib/models/server_settings.dart
@@ -1,18 +1,35 @@
+import 'package:kitchenowl/enums/views_enum.dart';
+
 import 'model.dart';
 
 class ServerSettings extends Model {
   final bool? featurePlanner;
   final bool? featureExpenses;
+  final List<ViewsEnum>? viewOrdering;
 
-  const ServerSettings({this.featurePlanner, this.featureExpenses});
+  const ServerSettings({
+    this.featurePlanner,
+    this.featureExpenses,
+    this.viewOrdering,
+  });
 
-  factory ServerSettings.fromJson(Map<String, dynamic> map) => ServerSettings(
-        featurePlanner: map['planner_feature'] ?? false,
-        featureExpenses: map['expenses_feature'] ?? false,
-      );
+  factory ServerSettings.fromJson(Map<String, dynamic> map) {
+    List<ViewsEnum> viewOrdering = ViewsEnum.values;
+    if (map.containsKey('view_ordering')) {
+      viewOrdering = ViewsEnum.addMissing(List.from(map['view_ordering']
+          .map((e) => ViewsEnum.parse(e))
+          .where((e) => e != null)));
+    }
+
+    return ServerSettings(
+      featurePlanner: map['planner_feature'] ?? false,
+      featureExpenses: map['expenses_feature'] ?? false,
+      viewOrdering: viewOrdering,
+    );
+  }
 
   @override
-  List<Object?> get props => [featurePlanner, featureExpenses];
+  List<Object?> get props => [featurePlanner, featureExpenses, viewOrdering];
 
   @override
   Map<String, dynamic> toJson() {
@@ -23,21 +40,27 @@ class ServerSettings extends Model {
     if (featureExpenses != null) {
       data['expenses_feature'] = featureExpenses;
     }
+    if (viewOrdering != null) {
+      data['view_ordering'] = viewOrdering!.map((e) => e.toString()).toList();
+    }
 
     return data;
   }
 
   ServerSettings copyWith({
     bool? featurePlanner,
     bool? featureExpenses,
+    List<ViewsEnum>? viewOrdering,
   }) =>
       ServerSettings(
         featurePlanner: featurePlanner ?? this.featurePlanner,
         featureExpenses: featureExpenses ?? this.featureExpenses,
+        viewOrdering: viewOrdering ?? this.viewOrdering,
       );
 
   ServerSettings copyFrom(ServerSettings serverSettings) => ServerSettings(
         featurePlanner: serverSettings.featurePlanner ?? featurePlanner,
         featureExpenses: serverSettings.featureExpenses ?? featureExpenses,
+        viewOrdering: serverSettings.viewOrdering ?? viewOrdering,
       );
 }
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -7,6 +7,7 @@ import 'package:kitchenowl/cubits/planner_cubit.dart';
 import 'package:kitchenowl/cubits/recipe_list_cubit.dart';
 import 'package:kitchenowl/cubits/settings_cubit.dart';
 import 'package:kitchenowl/cubits/shoppinglist_cubit.dart';
+import 'package:kitchenowl/enums/views_enum.dart';
 import 'package:kitchenowl/pages/home_page/_export.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 
@@ -18,14 +19,15 @@ class HomePage extends StatefulWidget {
 }
 
 class _HomePageState extends State<HomePage> {
+  static const int _bottomAppBarSize = 5;
+
   final ShoppinglistCubit shoppingListCubit = ShoppinglistCubit();
   final RecipeListCubit recipeListCubit = RecipeListCubit();
   final PlannerCubit plannerCubit = PlannerCubit();
   final ExpenseListCubit expenseCubit = ExpenseListCubit();
 
   late List<HomePageItem> pages;
   int _selectedIndex = 0;
-  int offset = 0;
 
   @override
   void initState() {
@@ -73,16 +75,40 @@ class _HomePageState extends State<HomePage> {
               final _offset =
                   (state.serverSettings.featurePlanner ?? false ? 0 : 1) +
                       (state.serverSettings.featureExpenses ?? false ? 0 : 1);
-              _selectedIndex = (_selectedIndex *
-                      (pages.length - _offset) /
-                      (pages.length - offset))
-                  .clamp(0, pages.length - _offset)
-                  .round();
-
-              offset = _offset;
+              _selectedIndex =
+                  _selectedIndex.clamp(0, pages.length - 1 - _offset);
             },
             builder: (context, state) {
-              final _pages = pages.where((e) => e.isActive(context)).toList();
+              List<HomePageItem> _pages =
+                  (state.serverSettings.viewOrdering ?? ViewsEnum.values)
+                      .map<HomePageItem?>((e) {
+                        final i = pages.indexWhere(
+                          (page) => page.type() == e,
+                        );
+
+                        return i >= 0 ? pages[i] : null;
+                      })
+                      .where((e) => e != null && e.isActive(context))
+                      .cast<HomePageItem>()
+                      .toList();
+
+              final bool useBottomNavigationBar = getValueForScreenType<bool>(
+                context: context,
+                mobile: true,
+                tablet: false,
+                desktop: false,
+              );
+
+              if (useBottomNavigationBar && _bottomAppBarSize < _pages.length) {
+                _selectedIndex = _selectedIndex.clamp(0, _bottomAppBarSize - 1);
+                _pages.insert(
+                  _bottomAppBarSize - 1,
+                  OverflowPage(
+                    pages: _pages.sublist(_bottomAppBarSize - 1, _pages.length),
+                  ),
+                );
+                _pages = _pages.sublist(0, _bottomAppBarSize);
+              }
 
               Widget body = PageTransitionSwitcher(
                 transitionBuilder: (
@@ -106,13 +132,6 @@ class _HomePageState extends State<HomePage> {
                 ),
               );
 
-              final bool useBottomNavigationBar = getValueForScreenType<bool>(
-                context: context,
-                mobile: true,
-                tablet: false,
-                desktop: false,
-              );
-
               if (!useBottomNavigationBar) {
                 final bool extendedRail = getValueForScreenType<bool>(
                   context: context,
@@ -151,7 +170,6 @@ class _HomePageState extends State<HomePage> {
                         labelBehavior:
                             NavigationDestinationLabelBehavior.onlyShowSelected,
                         destinations: _pages
-                            .where((e) => e.isActive(context))
                             .map((e) => NavigationDestination(
                                   icon: Icon(e.icon(context)),
                                   label: e.label(context),

diff --git a/lib/pages/home_page/_export.dart b/lib/pages/home_page/_export.dart
@@ -4,3 +4,4 @@ export 'shoppinglist.dart';
 export 'planner.dart';
 export 'expense_list.dart';
 export 'home_page_item.dart';
+export 'overflow.dart';
diff --git a/lib/pages/home_page/expense_list.dart b/lib/pages/home_page/expense_list.dart
@@ -8,6 +8,7 @@ import 'package:kitchenowl/cubits/expense_list_cubit.dart';
 import 'package:kitchenowl/cubits/settings_cubit.dart';
 import 'package:kitchenowl/enums/expenselist_sorting.dart';
 import 'package:kitchenowl/enums/update_enum.dart';
+import 'package:kitchenowl/enums/views_enum.dart';
 import 'package:kitchenowl/kitchenowl.dart';
 import 'package:kitchenowl/models/user.dart';
 import 'package:kitchenowl/pages/expense_add_update_page.dart';
@@ -26,10 +27,7 @@ class ExpenseListPage extends StatefulWidget with HomePageItem {
   _ExpensePageState createState() => _ExpensePageState();
 
   @override
-  IconData icon(BuildContext context) => Icons.account_balance_rounded;
-
-  @override
-  String label(BuildContext context) => AppLocalizations.of(context)!.balances;
+  ViewsEnum type() => ViewsEnum.balances;
 
   @override
   void onSelected(BuildContext context, bool alreadySelected) {

diff --git a/lib/pages/home_page/home_page_item.dart b/lib/pages/home_page/home_page_item.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:kitchenowl/enums/views_enum.dart';
 
 mixin HomePageItem on Widget {
   // ignore: no-empty-block
   void onSelected(BuildContext context, bool alreadySelected) {}
-  IconData icon(BuildContext context);
-  String label(BuildContext context);
+  ViewsEnum type();
+  String label(BuildContext context) => type().toLocalizedString(context);
+  IconData icon(BuildContext context) => type().toIcon();
   Widget? floatingActionButton(BuildContext context) => null;
   bool isActive(BuildContext context) => true;
 }