1runeberg · 1runeberg · Aug 20, 2024 · Aug 20, 2024
diff --git a/confichat/analysis_options.yaml b/confichat/analysis_options.yaml
@@ -7,6 +7,9 @@
 
 # The following line activates a set of recommended lints for Flutter apps,
 # packages, and plugins designed to encourage good coding practices.
+analyzer:
+  errors:
+    unused_field: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

diff --git a/confichat/lib/app_data.dart b/confichat/lib/app_data.dart
@@ -6,6 +6,7 @@
 
 import 'dart:io';
 
+import 'package:confichat/ui_widgets.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -42,9 +43,11 @@ class AppData {
   LlmApi api = LlmApiFactory.create(AiProvider.ollama.name);
   bool clearMessagesOnModelSwitch = true;
   bool filterHistoryByModel = false;
+  bool haveUnsavedMessages = false;
   int appScrollDurationInms = 100;
   double windowWidth = 1024;
   double windowHeight = 1024;
+  AiProvider defaultProvider = AiProvider.ollama;
   String rootPath = '';
 
   void defaultCallback(AiProvider? provider) {
@@ -161,7 +164,7 @@ class ShowErrorDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: Text(title),
+      title: DialogTitle(title: title),
       content: Text(content),
       actions: <Widget>[
         TextButton(

diff --git a/confichat/lib/main.dart b/confichat/lib/main.dart
@@ -4,8 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import 'dart:ui';
+
+import 'package:confichat/ui_widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:confichat/themes.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:desktop_window/desktop_window.dart';
@@ -60,9 +64,33 @@ class ConfiChat extends StatelessWidget {
         // Set theme
         if (context.mounted) {
           final themeProvider = Provider.of<ThemeProvider>(context, listen: false);
-          final selectedTheme = jsonContent['app']['selectedTheme'] ?? 'Light';
+          final selectedTheme = jsonContent['app']['selectedTheme'] ?? 'Onyx';
           themeProvider.setTheme(selectedTheme); 
         }
+
+        // Set default provider
+        if(context.mounted){
+          final defaultProvider = jsonContent['app']['selectedDefaultProvider'] ?? 'Ollama';
+
+          AiProvider selectedProvider;
+          switch (defaultProvider.toLowerCase()) {
+            case 'ollama':
+              selectedProvider = AiProvider.ollama;
+              break;
+            case 'openai':
+              selectedProvider = AiProvider.openai;
+              break;
+            case 'llamacpp':
+              selectedProvider = AiProvider.llamacpp;
+              break;
+            default:
+              selectedProvider = AiProvider.ollama; // Fallback to Ollama if the string doesn't match
+              break;
+          }
+
+          AppData.instance.defaultProvider = selectedProvider;
+        }
+
       }
     }
   }
@@ -117,21 +145,68 @@ class HomePage extends StatefulWidget {
   State<HomePage> createState() => _HomePageState();
 }
 
-class _HomePageState extends State<HomePage> {
+class _HomePageState extends State<HomePage>  {
   final ChatSessionSelectedNotifier chatSessionSelectedNotifier = ChatSessionSelectedNotifier();
   TextEditingController providerController = TextEditingController();
   AiProvider? selectedProvider;
 
   TextEditingController providerModel = TextEditingController();
   ModelItem? selectedModel;
 
+  late final AppLifecycleListener _lifecycleListener;
+  late AppLifecycleState? _lifecycleState;
+
   @override
   void initState() {
-      super.initState();
+    super.initState();
 
-      if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
-        DesktopWindow.setWindowSize(Size(widget.appData.windowWidth, widget.appData.windowHeight));
-      }
+    if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
+      DesktopWindow.setWindowSize(Size(widget.appData.windowWidth, widget.appData.windowHeight));
+    }
+
+    _lifecycleState = SchedulerBinding.instance.lifecycleState;
+    _lifecycleListener = AppLifecycleListener(
+      onExitRequested:  _checkForUnsavedChat
+    );
+  }
+
+   Future<AppExitResponse> _checkForUnsavedChat() async {
+
+    // If there are no unsaved changes, proceed to exit
+    if(!widget.appData.haveUnsavedMessages) { return AppExitResponse.exit;}
+
+    bool shouldExit = false;
+    await showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const DialogTitle(title: 'Warning', isError: true),
+          content: Text(
+            'There are unsaved messages in the current chat window - they will be lost. Proceed?',
+            style: Theme.of(context).textTheme.bodyLarge,
+          ),
+          actions: [
+            ElevatedButton(
+              child: const Text('Yes'),
+              onPressed: () {
+                shouldExit = true;
+                Navigator.of(context).pop();
+              },
+            ),
+            ElevatedButton(
+              child: const Text('Cancel'),
+              onPressed: () {
+                shouldExit = false;
+                Navigator.of(context).pop();
+              },
+            ),
+          ],
+        );
+      },
+    );
+
+    return shouldExit ? AppExitResponse.exit : AppExitResponse.cancel;
+
   }
 
   @override

diff --git a/confichat/lib/ui_advanced_options.dart b/confichat/lib/ui_advanced_options.dart
@@ -274,8 +274,8 @@ class AdvancedOptionsState extends State<AdvancedOptions> {
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Unsaved changes'),
-          content: const Text('You have unsaved changes to the advanced options. Are you sure you want to exit?'),
+          title: const DialogTitle(title: 'Unsaved changes', isError: true),
+          content: Text('You have unsaved changes to the advanced options. Are you sure you want to exit?', style: Theme.of(context).textTheme.bodyLarge,),
           actions: [
             ElevatedButton(
               onPressed: () {

diff --git a/confichat/lib/ui_app_bar.dart b/confichat/lib/ui_app_bar.dart
@@ -39,7 +39,7 @@ class CCAppBarState extends State<CCAppBar> {
   @override
   void initState() {
     super.initState();
-    _switchProvider(AiProvider.ollama);
+    _switchProvider(widget.appData.defaultProvider);
     _populateModelList(true); 
 
     widget.appData.callbackSwitchProvider = _switchProvider;
@@ -78,7 +78,7 @@ class CCAppBarState extends State<CCAppBar> {
             },
           ),
           actions: [        
-                _buildModelProviderDropdown(context, isPhone),
+                _buildModelProviderDropdown(context, isPhone, selectedProvider ?? AiProvider.ollama),
                 _buildModelDropdown(context, isPhone),
                 if (!isPhone) _buildConfigButton(context),
                 if (!isPhone) _buildAddButton(context),
@@ -88,11 +88,11 @@ class CCAppBarState extends State<CCAppBar> {
     );
   }
 
-  Widget _buildModelProviderDropdown(BuildContext context, bool isPhone) {
+  Widget _buildModelProviderDropdown(BuildContext context, bool isPhone, AiProvider selectedProvider) {
     return Container(
       margin: const EdgeInsets.all(10),
       child: DropdownMenu<AiProvider>(
-        initialSelection: AiProvider.ollama,
+        initialSelection: selectedProvider,
         controller: widget.providerController,
         requestFocusOnTap: true,
         textStyle: TextStyle(
@@ -292,26 +292,35 @@ class CCAppBarState extends State<CCAppBar> {
     } 
   }
 
-  void _showModelChangeWarning(BuildContext context, ModelItem newModel) {
-    showDialog(
+  Future<void> _showModelChangeWarning(BuildContext context, ModelItem newModel) async {
+
+    if(!widget.appData.haveUnsavedMessages) {
+      _setModelItem(newModel);
+      return;
+    }
+
+    await showDialog(
       context: context,
       builder: (BuildContext context) {
         return AlertDialog(
-          title: const Text('Warning'),
-          content: const Text(
-            'Any messages in the current chat window will be lost. Proceed?',
+          title: const DialogTitle(title: 'Warning', isError: true),
+          content: Text(
+            'There are unsaved messages in the current chat window - they will be lost. Proceed?',
+            style: Theme.of(context).textTheme.bodyLarge,
           ),
-          actions: <Widget>[
+          actions: [
             ElevatedButton(
               child: const Text('Yes'),
               onPressed: () {
+                widget.appData.haveUnsavedMessages = false;
                 _setModelItem(newModel);
                 Navigator.of(context).pop();
               },
             ),
             ElevatedButton(
               child: const Text('Cancel'),
               onPressed: () {
+                if(mounted && selectedModel != null) {_setModelItem(selectedModel!);}
                 Navigator.of(context).pop();
               },
             ),
@@ -339,9 +348,8 @@ class CCAppBarState extends State<CCAppBar> {
     if(mounted) {
       setState(() {
         selectedProvider = provider;
+        _populateModelList(true);
       });
-
-      _populateModelList(true);
     }
   }