Merge branch 'main' into maintenance/docs-and-testing

app/assets/l10n/intl_en.arb

@@ -1,5 +1,7 @@
 {
   "@@locale": "en",
+  "deviceUnpluggedSnackBar": "Device unplugged. Power delivery reduced.",
+  "devicePluggedInSnackBar": "Device plugged in. Power delivery increased.",
   "abortModelRemovalSnackBar": "Abort model removal",
   "abortSessionRemovalSnackBar": "Abort session removal",
   "aboutPageContributorsTitle": "Contributors",

app/lib/backend/providers/model.dart

@@ -12,7 +12,7 @@ import 'package:open_local_ui/backend/providers/model_settings.dart';
 import 'package:open_local_ui/constants/flutter.dart';
 import 'package:open_local_ui/core/http.dart';
 import 'package:open_local_ui/core/logger.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:windows_taskbar/windows_taskbar.dart';
 
 enum ModelProviderStatus {

app/lib/core/update.dart

@@ -7,7 +7,7 @@ import 'package:open_local_ui/core/github.dart';
 import 'package:open_local_ui/core/logger.dart';
 import 'package:open_local_ui/core/process.dart';
 import 'package:open_local_ui/env.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

app/lib/frontend/widgets/window_management_bar.dart → app/lib/frontend/components/window_management_bar.dart

@@ -1,10 +1,10 @@
+import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter/material.dart';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
-import 'package:system_theme/system_theme.dart';
 
-class WindowManagementBar extends StatelessWidget {
-  const WindowManagementBar({super.key});
+class WindowManagementBarComponent extends StatelessWidget {
+  const WindowManagementBarComponent({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -18,19 +18,22 @@ class WindowManagementBar extends StatelessWidget {
             children: [
               MinimizeWindowButton(
                 colors: WindowButtonColors(
-                  iconNormal: SystemTheme.accentColor.accent,
+                  iconNormal:
+                      AdaptiveTheme.of(context).theme.colorScheme.secondary,
                   iconMouseOver: Colors.green,
                 ),
               ),
               MaximizeWindowButton(
                 colors: WindowButtonColors(
-                  iconNormal: SystemTheme.accentColor.accent,
+                  iconNormal:
+                      AdaptiveTheme.of(context).theme.colorScheme.secondary,
                   iconMouseOver: Colors.orange,
                 ),
               ),
               CloseWindowButton(
                 colors: WindowButtonColors(
-                  iconNormal: SystemTheme.accentColor.accent,
+                  iconNormal:
+                      AdaptiveTheme.of(context).theme.colorScheme.secondary,
                   iconMouseOver: Colors.red,
                 ),
               ),

app/lib/frontend/pages/dashboard/models.dart

@@ -15,7 +15,7 @@ import 'package:open_local_ui/frontend/dialogs/model_details.dart';
 import 'package:open_local_ui/frontend/dialogs/model_settings.dart';
 import 'package:open_local_ui/frontend/dialogs/pull_model.dart';
 import 'package:open_local_ui/frontend/dialogs/push_model.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/screens/dashboard.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';

app/lib/frontend/pages/dashboard/sessions.dart

@@ -9,7 +9,7 @@ import 'package:open_local_ui/backend/models/chat_session.dart';
 import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/core/format.dart';
 import 'package:open_local_ui/frontend/dialogs/confirmation.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/screens/dashboard.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';

app/lib/frontend/pages/dashboard/settings.dart

@@ -9,7 +9,7 @@ import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/backend/providers/locale.dart';
 import 'package:open_local_ui/core/color.dart';
 import 'package:open_local_ui/frontend/dialogs/color_picker.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:system_theme/system_theme.dart';

app/lib/frontend/screens/dashboard.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:battery_plus/battery_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -14,13 +15,13 @@ import 'package:open_local_ui/core/github.dart';
 import 'package:open_local_ui/core/logger.dart';
 import 'package:open_local_ui/core/update.dart';
 import 'package:open_local_ui/frontend/dialogs/update.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/pages/dashboard/about.dart';
 import 'package:open_local_ui/frontend/pages/dashboard/chat.dart';
 import 'package:open_local_ui/frontend/pages/dashboard/models.dart';
 import 'package:open_local_ui/frontend/pages/dashboard/sessions.dart';
 import 'package:open_local_ui/frontend/pages/dashboard/settings.dart';
-import 'package:open_local_ui/frontend/widgets/window_management_bar.dart';
+import 'package:open_local_ui/frontend/components/window_management_bar.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:system_info2/system_info2.dart';
@@ -47,6 +48,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       _checkForUpdates();
+      _registerBatteryCallback();
     });
   }
 
@@ -57,6 +59,34 @@ class _DashboardScreenState extends State<DashboardScreen> {
     super.dispose();
   }
 
+  void _registerBatteryCallback() {
+    final battery = Battery();
+
+    battery.onBatteryStateChanged.listen((BatteryState state) {
+      switch (state) {
+        case BatteryState.discharging:
+          SnackBarHelpers.showSnackBar(
+            AppLocalizations.of(context).snackBarWarningTitle,
+            AppLocalizations.of(context).deviceUnpluggedSnackBar,
+            SnackbarContentType.warning,
+          );
+          logger.i('Battery charging');
+          break;
+        case BatteryState.charging:
+          SnackBarHelpers.showSnackBar(
+            AppLocalizations.of(context).snackBarSuccessTitle,
+            AppLocalizations.of(context).devicePluggedInSnackBar,
+            SnackbarContentType.success,
+          );
+          logger.i('Battery discharging');
+          break;
+        default:
+          logger.i('Battery state: $state');
+          break;
+      }
+    });
+  }
+
   void _checkForUpdates() {
     UpdateHelper.isAppUpdateAvailable().then(
       (updateAvailable) {
@@ -107,7 +137,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
           right: 0.0,
           width: MediaQuery.of(context).size.width,
           height: 32.0,
-          child: const WindowManagementBar(),
+          child: const WindowManagementBarComponent(),
         ),
       ],
     );

app/lib/frontend/screens/onboarding.dart

@@ -11,15 +11,15 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:gap/gap.dart';
 import 'package:gpu_info/gpu_info.dart';
 import 'package:introduction_screen/introduction_screen.dart';
-import 'package:open_local_ui/components/rive_animation.dart';
-import 'package:open_local_ui/components/typewriter_text.dart';
+import 'package:open_local_ui/frontend/components/rive_animation.dart';
+import 'package:open_local_ui/frontend/components/typewriter_text.dart';
 import 'package:open_local_ui/core/color.dart';
 import 'package:open_local_ui/core/process.dart';
 import 'package:open_local_ui/frontend/dialogs/color_picker.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/screens/dashboard.dart';
 import 'package:open_local_ui/frontend/widgets/preference_selector.dart';
-import 'package:open_local_ui/frontend/widgets/window_management_bar.dart';
+import 'package:open_local_ui/frontend/components/window_management_bar.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:system_info2/system_info2.dart';
 import 'package:system_theme/system_theme.dart';
@@ -54,7 +54,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
               title: AppLocalizations.of(context).setupPageWelcomeSlideTitle,
               bodyWidget: TypewriterTextComponent(
                 text: AppLocalizations.of(context).setupPageWelcomeSlideText,
-                duration: 1500.ms,
+                duration: 3000.ms,
               ),
               decoration: const PageDecoration(
                 titleTextStyle: TextStyle(
@@ -265,7 +265,7 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
           right: 0.0,
           width: MediaQuery.of(context).size.width,
           height: 32.0,
-          child: const WindowManagementBar(),
+          child: const WindowManagementBarComponent(),
         ),
       ],
     );

app/lib/frontend/screens/splash.dart

@@ -0,0 +1,33 @@
+import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:flutter/material.dart';
+
+import 'package:animated_splash_screen/animated_splash_screen.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:open_local_ui/frontend/screens/dashboard.dart';
+import 'package:open_local_ui/frontend/screens/onboarding.dart';
+import 'package:page_transition/page_transition.dart';
+
+class SplashScreen extends StatelessWidget {
+  final bool userOnboarded;
+
+  const SplashScreen({Key? key, required this.userOnboarded}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedSplashScreen(
+      splash: SvgPicture.asset(
+        'assets/graphics/logos/open_local_ui.svg',
+        width: 512,
+        // ignore: deprecated_member_use
+        color:
+            AdaptiveTheme.of(context).mode.isDark ? Colors.white : Colors.black,
+      ),
+      nextScreen:
+          userOnboarded ? const DashboardScreen() : const OnboardingScreen(),
+      backgroundColor: AdaptiveTheme.of(context).theme.primaryColor,
+      splashTransition: SplashTransition.fadeTransition,
+      pageTransitionType: PageTransitionType.theme,
+      duration: 1500,
+    );
+  }
+}

app/lib/frontend/screens/update_in_progress.dart

@@ -5,7 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:gap/gap.dart';
 import 'package:open_local_ui/core/update.dart';
-import 'package:open_local_ui/frontend/widgets/window_management_bar.dart';
+import 'package:open_local_ui/frontend/components/window_management_bar.dart';
 
 class UpdateInProgressScreen extends StatefulWidget {
   const UpdateInProgressScreen({super.key});
@@ -57,7 +57,7 @@ class _UpdateInProgressScreenState extends State<UpdateInProgressScreen> {
           right: 0.0,
           width: MediaQuery.of(context).size.width,
           height: 32.0,
-          child: const WindowManagementBar(),
+          child: const WindowManagementBarComponent(),
         ),
       ],
     );

app/lib/frontend/widgets/chat_example_questions.dart

@@ -2,14 +2,13 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 
-
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:gap/gap.dart';
 import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/backend/providers/model.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:provider/provider.dart';
 import 'package:unicons/unicons.dart';
 

app/lib/frontend/widgets/chat_input_field.dart

@@ -8,7 +8,7 @@ import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/backend/providers/model.dart';
 import 'package:open_local_ui/core/image.dart';
 import 'package:open_local_ui/frontend/dialogs/attachments_dropzone.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:provider/provider.dart';
 import 'package:unicons/unicons.dart';
 

app/lib/frontend/widgets/chat_message.dart

@@ -12,7 +12,7 @@ import 'package:gap/gap.dart';
 import 'package:open_local_ui/backend/models/chat_message.dart';
 import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/core/format.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/widgets/markdown_body.dart';
 import 'package:open_local_ui/frontend/widgets/tts_player.dart';
 import 'package:provider/provider.dart';

app/lib/frontend/widgets/chat_toolbar.dart

@@ -1,12 +1,11 @@
 import 'package:flutter/material.dart';
 
-
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:gap/gap.dart';
 import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/backend/providers/model.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:provider/provider.dart';
 import 'package:unicons/unicons.dart';
 

app/lib/frontend/widgets/markdown_body.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 // ignore: depend_on_referenced_packages
@@ -9,7 +8,7 @@ import 'package:flutter_highlight/themes/atom-one-dark.dart';
 import 'package:flutter_highlight/themes/atom-one-light.dart';
 import 'package:markdown_widget/markdown_widget.dart';
 import 'package:open_local_ui/constants/style.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:open_local_ui/frontend/widgets/markdown_code_wrapper.dart';
 import 'package:url_launcher/url_launcher.dart';
 

app/lib/frontend/widgets/markdown_code_wrapper.dart

@@ -9,7 +9,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:gap/gap.dart';
 import 'package:open_local_ui/core/asset.dart';
-import 'package:open_local_ui/frontend/helpers/snackbar.dart';
+import 'package:open_local_ui/core/snackbar.dart';
 import 'package:unicons/unicons.dart';
 
 Map<String, String> languageToAsset = {

app/lib/main.dart

@@ -7,7 +7,6 @@ import 'package:feedback/feedback.dart';
 import 'package:flex_color_picker/flex_color_picker.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:open_local_ui/backend/databases/chat_sessions.dart';
 import 'package:open_local_ui/backend/providers/chat.dart';
 import 'package:open_local_ui/backend/providers/locale.dart';
@@ -19,8 +18,7 @@ import 'package:open_local_ui/core/asset.dart';
 import 'package:open_local_ui/core/color.dart';
 import 'package:open_local_ui/core/logger.dart';
 import 'package:open_local_ui/env.dart';
-import 'package:open_local_ui/frontend/screens/dashboard.dart';
-import 'package:open_local_ui/frontend/screens/onboarding.dart';
+import 'package:open_local_ui/frontend/screens/splash.dart';
 import 'package:provider/provider.dart';
 import 'package:rive/rive.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -145,8 +143,7 @@ void _preloadAssets() async {
 }
 
 void main() async {
-  WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
-  FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
+  WidgetsFlutterBinding.ensureInitialized();
 
   // Internal services
 
@@ -198,8 +195,6 @@ void main() async {
     prefs.setBool('userOnboarded', true);
   }
 
-  FlutterNativeSplash.remove();
-
   // Run app
 
   runApp(
@@ -297,9 +292,7 @@ class _MyAppState extends State<MyApp> {
           GlobalWidgetsLocalizations.delegate,
           GlobalCupertinoLocalizations.delegate,
         ],
-        home: widget.userOnboarded
-            ? const DashboardScreen()
-            : const OnboardingScreen(),
+        home: SplashScreen(userOnboarded: widget.userOnboarded),
         debugShowCheckedModeBanner: kDebugMode,
       ),
     );

app/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,6 +7,7 @@ import Foundation
 
 import app_links
 import audioplayers_darwin
+import battery_plus
 import bitsdojo_window_macos
 import device_info_plus
 import irondash_engine_context
@@ -23,6 +24,7 @@ import url_launcher_macos
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
+  BatteryPlusMacosPlugin.register(with: registry.registrar(forPlugin: "BatteryPlusMacosPlugin"))
   BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   IrondashEngineContextPlugin.register(with: registry.registrar(forPlugin: "IrondashEngineContextPlugin"))