Small code and UI fixes and improvements

Fixing many errors caused in the last commit. I must have been really confused, apologies for the mess
WilliamKarolDiCioccio · Jun 7, 2024 · 575243e · 575243e
1 parent 7ef7d2a
commit 575243e
Show file tree

Hide file tree

Showing 19 changed files with 394 additions and 235 deletions.
diff --git a/app/lib/dialogs/create_model.dart b/app/lib/dialogs/create_model.dart
@@ -2,10 +2,9 @@ import 'package:flutter/material.dart';
 
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:provider/provider.dart';
-
 import 'package:open_local_ui/models/ollama_responses.dart';
 import 'package:open_local_ui/providers/model.dart';
+import 'package:provider/provider.dart';
 
 class CreateModelDialog extends StatefulWidget {
   const CreateModelDialog({super.key});
@@ -24,6 +23,14 @@ class _CreateModelDialogState extends State<CreateModelDialog> {
   double _progressValue = 0.0;
   String _progressBarText = '';
 
+  @override
+  void dispose() {
+    _nameEditingController.dispose();
+    _fileEditingController.dispose();
+    _modelSelectionController.dispose();
+    super.dispose();
+  }
+
   void _updateProgress(OllamaCreateResponse response) {
     setState(() {
       _stepsCount += 1;
@@ -39,12 +46,39 @@ class _CreateModelDialogState extends State<CreateModelDialog> {
     });
   }
 
-  @override
-  void dispose() {
-    _nameEditingController.dispose();
-    _fileEditingController.dispose();
-    _modelSelectionController.dispose();
-    super.dispose();
+  void _createModel() async {
+    setState(() => _isCreating = true);
+
+    final splitIndex = _modelSelectionController.text.indexOf(':');
+    String modelBaseName;
+
+    if (splitIndex != -1) {
+      modelBaseName = _modelSelectionController.text.substring(
+        0,
+        splitIndex,
+      );
+    } else {
+      modelBaseName = _modelSelectionController.text;
+    }
+
+    final stream = context.read<ModelProvider>().create(
+          _nameEditingController.text.toLowerCase(),
+          "FROM $modelBaseName\nSYSTEM ${_fileEditingController.text}",
+        );
+
+    await for (final data in stream) {
+      if (context.mounted) _updateProgress(data);
+    }
+
+    if (context.mounted) {
+      setState(() {
+        _isCreating = false;
+        _progressValue = 0.0;
+        _progressBarText = '';
+        _nameEditingController.clear();
+        _fileEditingController.clear();
+      });
+    }
   }
 
   @override
@@ -76,6 +110,17 @@ class _CreateModelDialogState extends State<CreateModelDialog> {
                   AppLocalizations.of(context)!.createModelDialogGuideText1,
                 ),
                 DropdownMenu(
+                  menuHeight: 128,
+                  menuStyle: MenuStyle(
+                    elevation: WidgetStateProperty.all(
+                      8.0,
+                    ),
+                    shape: WidgetStateProperty.all(
+                      const RoundedRectangleBorder(
+                        borderRadius: BorderRadius.all(Radius.circular(16.0)),
+                      ),
+                    ),
+                  ),
                   controller: _modelSelectionController,
                   inputDecorationTheme: const InputDecorationTheme(
                     border: OutlineInputBorder(
@@ -134,7 +179,7 @@ class _CreateModelDialogState extends State<CreateModelDialog> {
                 LinearProgressIndicator(
                   value: _progressValue,
                   minHeight: 20.0,
-                  borderRadius: BorderRadius.circular(10.0),
+                  borderRadius: BorderRadius.circular(16.0),
                 ),
               ],
             ),
@@ -153,40 +198,7 @@ class _CreateModelDialogState extends State<CreateModelDialog> {
         ),
         if (!_isCreating)
           TextButton(
-            onPressed: () async {
-              setState(() => _isCreating = true);
-
-              final splitIndex = _modelSelectionController.text.indexOf(':');
-              String modelBaseName;
-
-              if (splitIndex != -1) {
-                modelBaseName = _modelSelectionController.text.substring(
-                  0,
-                  splitIndex,
-                );
-              } else {
-                modelBaseName = _modelSelectionController.text;
-              }
-
-              final stream = context.read<ModelProvider>().create(
-                    _nameEditingController.text.toLowerCase(),
-                    "FROM $modelBaseName\nSYSTEM ${_fileEditingController.text}",
-                  );
-
-              await for (final data in stream) {
-                if (context.mounted) _updateProgress(data);
-              }
-
-              if (context.mounted) {
-                setState(() {
-                  _isCreating = false;
-                  _progressValue = 0.0;
-                  _progressBarText = '';
-                  _nameEditingController.clear();
-                  _fileEditingController.clear();
-                });
-              }
-            },
+            onPressed: () => _createModel(),
             child: Text(
               AppLocalizations.of(context)!.dialogCreateButtonShared,
             ),

diff --git a/app/lib/dialogs/pull_model.dart b/app/lib/dialogs/pull_model.dart
@@ -22,6 +22,12 @@ class _PullModelDialogState extends State<PullModelDialog> {
   double _progressValue = 0.0;
   String _progressBarText = '';
 
+  @override
+  void dispose() {
+    _textEditingController.dispose();
+    super.dispose();
+  }
+
   void _updateProgress(OllamaPullResponse response) {
     setState(() {
       _progressValue = response.completed / response.total;
@@ -40,10 +46,25 @@ class _PullModelDialogState extends State<PullModelDialog> {
     });
   }
 
-  @override
-  void dispose() {
-    _textEditingController.dispose();
-    super.dispose();
+  void _pullModel() async {
+    setState(() => _isPulling = true);
+
+    final stream = context
+        .read<ModelProvider>()
+        .pull(_textEditingController.text.toLowerCase());
+
+    await for (final response in stream) {
+      if (context.mounted) _updateProgress(response);
+    }
+
+    if (context.mounted) {
+      setState(() {
+        _isPulling = false;
+        _progressValue = 0.0;
+        _progressBarText = '';
+        _textEditingController.clear();
+      });
+    }
   }
 
   @override
@@ -86,7 +107,7 @@ class _PullModelDialogState extends State<PullModelDialog> {
                 LinearProgressIndicator(
                   value: _progressValue,
                   minHeight: 20.0,
-                  borderRadius: BorderRadius.circular(10.0),
+                  borderRadius: BorderRadius.circular(16.0),
                 ),
               ],
             ),
@@ -105,26 +126,7 @@ class _PullModelDialogState extends State<PullModelDialog> {
         ),
         if (!_isPulling)
           TextButton(
-            onPressed: () async {
-              setState(() => _isPulling = true);
-
-              final stream = context
-                  .read<ModelProvider>()
-                  .pull(_textEditingController.text.toLowerCase());
-
-              await for (final response in stream) {
-                if (context.mounted) _updateProgress(response);
-              }
-
-              if (context.mounted) {
-                setState(() {
-                  _isPulling = false;
-                  _progressValue = 0.0;
-                  _progressBarText = '';
-                  _textEditingController.clear();
-                });
-              }
-            },
+            onPressed: () => _pullModel(),
             child: Text(
               AppLocalizations.of(context)!.dialogStartButtonShared,
             ),

diff --git a/app/lib/dialogs/push_model.dart b/app/lib/dialogs/push_model.dart
@@ -22,6 +22,12 @@ class _PushModelDialogState extends State<PushModelDialog> {
   double _progressValue = 0.0;
   String _progressBarText = '';
 
+  @override
+  void dispose() {
+    _modelSelectionController.dispose();
+    super.dispose();
+  }
+
   void _updateProgress(OllamaPushResponse response) {
     setState(() {
       _progressValue = response.completed / response.total;
@@ -38,10 +44,25 @@ class _PushModelDialogState extends State<PushModelDialog> {
     });
   }
 
-  @override
-  void dispose() {
-    _modelSelectionController.dispose();
-    super.dispose();
+  void _pushModel() async {
+    setState(() => _isPushing = true);
+
+    final stream = context
+        .read<ModelProvider>()
+        .push(_modelSelectionController.text.toLowerCase());
+
+    await for (final data in stream) {
+      if (context.mounted) _updateProgress(data);
+    }
+
+    if (context.mounted) {
+      setState(() {
+        _isPushing = false;
+        _progressValue = 0.0;
+        _progressBarText = '';
+        _modelSelectionController.clear();
+      });
+    }
   }
 
   @override
@@ -74,6 +95,17 @@ class _PushModelDialogState extends State<PushModelDialog> {
                 ),
                 const SizedBox(width: 8.0),
                 DropdownMenu(
+                  menuHeight: 128,
+                  menuStyle: MenuStyle(
+                    elevation: WidgetStateProperty.all(
+                      8.0,
+                    ),
+                    shape: WidgetStateProperty.all(
+                      const RoundedRectangleBorder(
+                        borderRadius: BorderRadius.all(Radius.circular(16.0)),
+                      ),
+                    ),
+                  ),
                   controller: _modelSelectionController,
                   inputDecorationTheme: const InputDecorationTheme(
                     border: OutlineInputBorder(
@@ -101,7 +133,7 @@ class _PushModelDialogState extends State<PushModelDialog> {
                 LinearProgressIndicator(
                   value: _progressValue,
                   minHeight: 20.0,
-                  borderRadius: BorderRadius.circular(10.0),
+                  borderRadius: BorderRadius.circular(16.0),
                 ),
               ],
             ),
@@ -120,26 +152,7 @@ class _PushModelDialogState extends State<PushModelDialog> {
         ),
         if (!_isPushing)
           TextButton(
-            onPressed: () async {
-              setState(() => _isPushing = true);
-
-              final stream = context
-                  .read<ModelProvider>()
-                  .push(_modelSelectionController.text.toLowerCase());
-
-              await for (final data in stream) {
-                if (context.mounted) _updateProgress(data);
-              }
-
-              if (context.mounted) {
-                setState(() {
-                  _isPushing = false;
-                  _progressValue = 0.0;
-                  _progressBarText = '';
-                  _modelSelectionController.clear();
-                });
-              }
-            },
+            onPressed: () => _pushModel(),
             child: Text(
               AppLocalizations.of(context)!.dialogStartButtonShared,
             ),

diff --git a/app/lib/helpers/github.dart b/app/lib/helpers/github.dart
@@ -55,7 +55,7 @@ class GitHubRESTHelpers {
       logger.e(
         'Failed to list Contributors. Status code: ${response.statusCode}',
       );
-      
+
       return [];
     }
 

diff --git a/app/lib/helpers/snackbar.dart b/app/lib/helpers/snackbar.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:open_local_ui/scaffold_messenger_key.dart';
 
 enum SnackBarType {
@@ -8,25 +9,21 @@ enum SnackBarType {
   error,
 }
 
-class SnackBarHelper {
-  static void showSnackBar(String message, SnackBarType type) {
-    late Color backgroundColor;
-
+class SnackBarHelpers {
+  static Color _getColor(SnackBarType type) {
     switch (type) {
       case SnackBarType.success:
-        backgroundColor = Colors.green;
-        break;
+        return Colors.green;
       case SnackBarType.info:
-        backgroundColor = Colors.blue;
-        break;
+        return Colors.blue;
       case SnackBarType.warning:
-        backgroundColor = Colors.orange;
-        break;
+        return Colors.orange;
       case SnackBarType.error:
-        backgroundColor = Colors.red;
-        break;
+        return Colors.red;
     }
+  }
 
+  static void showSnackBar(String message, SnackBarType type) async {
     final snackBar = SnackBar(
       content: Text(
         message,
@@ -36,8 +33,12 @@ class SnackBarHelper {
           fontWeight: FontWeight.bold,
         ),
       ),
+      showCloseIcon: true,
       duration: const Duration(seconds: 3),
-      backgroundColor: backgroundColor,
+      backgroundColor: _getColor(type),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16.0),
+      ),
       behavior: SnackBarBehavior.floating,
     );