Save current calendar view, closes #97

Author: CodeDoctorDE

api/pubspec.lock

@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "6439a9c71a4e6eca8d9490c1b380a25b02675aa688137dfbe66d2062884a23ac"
+      sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
   build_config:
     dependency: transitive
     description:
@@ -77,26 +77,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "2b21a125d66a86b9511cc3fb6c668c42e9a1185083922bf60e46d483a81a9712"
+      sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: fd3c09f4bbff7fa6e8d8ef688a0b2e8a6384e6483a25af0dac75fef362bcfe6f
+      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.7.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: ab27e46c8aa233e610cf6084ee6d8a22c6f873a0a9929241d8855b7a72978ae7
+      sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.0"
+    version: "9.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb
+      sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
       url: "https://pub.dev"
     source: hosted
-    version: "8.11.1"
+    version: "8.12.0"
   checked_yaml:
     dependency: transitive
     description:

app/android/Gemfile.lock

@@ -11,8 +11,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1152.0)
-    aws-sdk-core (3.231.0)
+    aws-partitions (1.1156.0)
+    aws-sdk-core (3.232.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -23,15 +23,15 @@ GEM
     aws-sdk-kms (1.112.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.198.0)
+    aws-sdk-s3 (1.199.0)
       aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
@@ -182,7 +182,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.2)
+    rexml (3.4.3)
     rouge (3.28.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
@@ -233,4 +233,4 @@ DEPENDENCIES
   screengrab
 
 BUNDLED WITH
-   2.7.1
+   2.6.9

app/lib/cubits/settings.dart

@@ -2,9 +2,11 @@ import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:dart_mappable/dart_mappable.dart';
+import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:material_leap/material_leap.dart';
+import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timezone/timezone.dart' as tz;
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@@ -61,6 +63,35 @@ final class ThemeModeMapper extends SimpleMapper<ThemeMode> {
   }
 }
 
+@MappableEnum()
+enum CalendarView {
+  list,
+  day,
+  week,
+  month,
+  pending;
+
+  String getLocalizedName(BuildContext context) {
+    return switch (this) {
+      CalendarView.list => AppLocalizations.of(context).list,
+      CalendarView.day => AppLocalizations.of(context).day,
+      CalendarView.week => AppLocalizations.of(context).week,
+      CalendarView.month => AppLocalizations.of(context).month,
+      CalendarView.pending => AppLocalizations.of(context).pending,
+    };
+  }
+
+  IconGetter get icon {
+    return switch (this) {
+      CalendarView.list => PhosphorIcons.list,
+      CalendarView.day => PhosphorIcons.calendar,
+      CalendarView.week => PhosphorIcons.columns,
+      CalendarView.month => PhosphorIcons.gridNine,
+      CalendarView.pending => PhosphorIcons.clock,
+    };
+  }
+}
+
 @MappableClass(includeCustomMappers: [ThemeModeMapper()])
 class FlowSettings with FlowSettingsMappable, LeapSettings {
   static const String localeKey = 'locale';
@@ -84,6 +115,8 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
   final bool highContrast;
   static const String alarmsKey = 'alarms';
   final List<Alarm> alarms;
+  static const String calendarViewKey = 'calendarView';
+  final CalendarView calendarView;
 
   const FlowSettings({
     this.locale = '',
@@ -96,6 +129,7 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
     this.density = ThemeDensity.system,
     this.highContrast = false,
     this.alarms = const [],
+    this.calendarView = CalendarView.list,
   });
 
   factory FlowSettings.fromPrefs(SharedPreferences prefs) => FlowSettings(
@@ -125,6 +159,9 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
             ?.map((e) => AlarmMapper.fromJson(e))
             .toList() ??
         [],
+    calendarView: CalendarView.values.byName(
+      prefs.getString(calendarViewKey) ?? 'list',
+    ),
   );
   Future<void> saveThemeMode(SharedPreferences prefs) =>
       prefs.setString(themeModeKey, themeMode.name);
@@ -148,6 +185,8 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
       prefs.setBool(highContrastKey, highContrast);
   Future<void> saveAlarms(SharedPreferences prefs) =>
       prefs.setStringList(alarmsKey, alarms.map((e) => e.toJson()).toList());
+  Future<void> saveCalendarView(SharedPreferences prefs) =>
+      prefs.setString(calendarViewKey, calendarView.name);
 
   Future<void> save(SharedPreferences prefs) async {
     await saveThemeMode(prefs);
@@ -160,6 +199,7 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
     await saveDensity(prefs);
     await saveHighContrast(prefs);
     await saveAlarms(prefs);
+    await saveCalendarView(prefs);
   }
 }
 
@@ -271,6 +311,12 @@ class SettingsCubit extends Cubit<FlowSettings>
     return _runSave(newState.saveAlarms);
   }
 
+  Future<void> changeCalendarView(CalendarView view) {
+    final newState = state.copyWith(calendarView: view);
+    emit(newState);
+    return _runSave(newState.saveCalendarView);
+  }
+
   Future<void> importSettings(String data) {
     final settings = FlowSettingsMapper.fromJson(
       data,