Unify settings dialog with other linwood apps

Author: CodeDoctorDE

app/lib/api/settings.dart

@@ -0,0 +1,33 @@
+import 'dart:ui';
+
+import 'package:flow/pages/settings/home.dart';
+import 'package:flutter/material.dart';
+
+Future<void> openSettings(BuildContext context) => showGeneralDialog<void>(
+      context: context,
+      pageBuilder: (context, animation, secondaryAnimation) =>
+          ScaffoldMessenger(
+        child: BackdropFilter(
+          filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
+          child: Dialog(
+              clipBehavior: Clip.antiAlias,
+              child: ConstrainedBox(
+                  constraints:
+                      const BoxConstraints(maxHeight: 800, maxWidth: 1000),
+                  child: const SettingsPage(isDialog: true))),
+        ),
+      ),
+      barrierDismissible: true,
+      barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
+      transitionDuration: const Duration(milliseconds: 200),
+      transitionBuilder: (context, animation, secondaryAnimation, child) {
+        // Animate the dialog from bottom to center
+        return SlideTransition(
+          position: Tween<Offset>(
+            begin: const Offset(0, 1),
+            end: Offset.zero,
+          ).chain(CurveTween(curve: Curves.easeOutQuart)).animate(animation),
+          child: child,
+        );
+      },
+    );

app/lib/cubits/settings.dart

@@ -4,6 +4,7 @@ import 'package:collection/collection.dart';
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:material_leap/material_leap.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../api/storage/remote/model.dart';
@@ -25,9 +26,10 @@ enum ThemeDensity {
 }
 
 @MappableClass()
-class FlowSettings with FlowSettingsMappable {
+class FlowSettings with FlowSettingsMappable, LeapSettings {
   final String locale;
   final ThemeMode themeMode;
+  @override
   final bool nativeTitleBar;
   final String design;
   final SyncMode syncMode;
@@ -86,7 +88,8 @@ enum SyncMode { always, noMobile, manual }
 
 enum SyncStatus { synced, syncing, error }
 
-class SettingsCubit extends Cubit<FlowSettings> {
+class SettingsCubit extends Cubit<FlowSettings>
+    with LeapSettingsBlocBaseMixin<FlowSettings> {
   SettingsCubit(SharedPreferences prefs) : super(FlowSettings.fromPrefs(prefs));
 
   Future<void> changeThemeMode(ThemeMode mode) {

app/lib/l10n/app_en.arb

@@ -299,5 +299,15 @@
   "systemLocale": "System locale",
   "notebooks": "Notebooks",
   "createNotebook": "Create notebook",
-  "editNotebook": "Edit notebook"
+  "editNotebook": "Edit notebook",
+  "update": "Update",
+  "currentVersion": "Current version",
+  "checkForUpdates": "Check for updates",
+  "checkForUpdatesWarning": "Performing a check for updates will connect to the Butterfly website to get the information.",
+  "usingLatestStable": "You are using the latest stable version",
+  "usingLatestNightly": "You are using the latest nightly version",
+  "updateNow": "Update now",
+  "stable": "Stable",
+  "nightly": "Nightly",
+  "updateAvailable": "Update available"
 }

app/lib/main.dart

@@ -5,6 +5,7 @@ import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flow/cubits/flow.dart';
 import 'package:flow/api/storage/sources.dart';
 import 'package:flow/pages/calendar/filter.dart';
+import 'package:flow/pages/settings/home.dart';
 import 'package:flow/theme.dart';
 import 'package:flow/widgets/navigation.dart';
 import 'package:flow_api/helpers/setup.dart';
@@ -17,6 +18,7 @@ import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:material_leap/l10n/leap_localizations.dart';
 import 'package:flow_api/models/model.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:window_manager/window_manager.dart';
@@ -28,7 +30,6 @@ import 'pages/dashboard/page.dart';
 import 'pages/sources/page.dart';
 import 'pages/resources/page.dart';
 import 'pages/groups/page.dart';
-import 'pages/settings/page.dart';
 import 'pages/users/filter.dart';
 import 'pages/users/page.dart';
 
@@ -199,3 +200,10 @@ const isNightly =
     flavor == 'nightly' || flavor == 'dev' || flavor == 'development';
 const shortApplicationName = isNightly ? 'Flow Nightly' : 'Flow';
 const applicationName = 'Linwood $shortApplicationName';
+
+Future<String> getCurrentVersion() async {
+  const envVersion = String.fromEnvironment('version');
+  if (envVersion.isNotEmpty) return envVersion;
+  final info = await PackageInfo.fromPlatform();
+  return info.version;
+}

app/lib/pages/settings/content.dart

@@ -1,7 +1,7 @@
-import 'package:flow/pages/settings/contents/information.dart';
-import 'package:flow/pages/settings/contents/legal.dart';
-import 'package:flow/pages/settings/contents/personalization.dart';
-import 'package:flow/pages/settings/contents/data.dart';
+import 'package:flow/pages/settings/general.dart';
+import 'package:flow/pages/settings/legal.dart';
+import 'package:flow/pages/settings/personalization.dart';
+import 'package:flow/pages/settings/data.dart';
 import 'package:flutter/material.dart';
 
 class SettingsContent extends StatelessWidget {
@@ -13,9 +13,9 @@ class SettingsContent extends StatelessWidget {
     return Column(
       children: [
         ...[
-          const DataSettingsView(),
-          const PersonalizationSettingsView(),
-          const InformationSettingsView(),
+          const DataSettingsPage(),
+          const PersonalizationSettingsPage(),
+          const GeneralSettingsPage(),
           const LegalSettingsView()
         ].asMap().entries.map((e) => Container(
               key: itemKeys[e.key],