Merge branch 'main' into feat/readme-cleanup

flutter · Jan 6, 2025 · b9ebc1d · b9ebc1d
2 parents 4e3e726 + b1fbc7c
commit b9ebc1d
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.6.8-wip
 
 * Require Dart 3.5 or later.
+* Remove dependency on `package:gap`.
 
 ## 0.6.7
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,4 +1 @@
-analyzer:
-  errors:
-    library_private_types_in_public_api: ignore
 include: package:flutter_lints/flutter.yaml
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
@@ -1,4 +1 @@
-analyzer:
-  errors:
-    library_private_types_in_public_api: ignore
 include: package:flutter_lints/flutter.yaml
diff --git a/example/lib/demo/api_key_page.dart b/example/lib/demo/api_key_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:gap/gap.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class GeminiApiKeyPage extends StatefulWidget {
@@ -57,7 +56,7 @@ class _GeminiApiKeyPageState extends State<GeminiApiKeyPage> {
                     child: Text('(or copy the URL above by tapping HERE)'),
                   ),
                 ),
-                const Gap(16),
+                const SizedBox(height: 16),
                 const Text('Paste your API key here:'),
                 SizedBox(
                   width: 300,
@@ -74,7 +73,7 @@ class _GeminiApiKeyPageState extends State<GeminiApiKeyPage> {
                         : null,
                   ),
                 ),
-                const Gap(16),
+                const SizedBox(height: 16),
                 ElevatedButton(
                   onPressed: _isValidApiKey()
                       ? () => widget.onApiKey(_controller.text)

diff --git a/example/lib/recipes/pages/edit_recipe_page.dart b/example/lib/recipes/pages/edit_recipe_page.dart
@@ -6,7 +6,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_ai_toolkit/flutter_ai_toolkit.dart';
-import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_generative_ai/google_generative_ai.dart';
 import 'package:uuid/uuid.dart';
@@ -25,7 +24,7 @@ class EditRecipePage extends StatefulWidget {
   final Recipe recipe;
 
   @override
-  _EditRecipePageState createState() => _EditRecipePageState();
+  State<EditRecipePage> createState() => _EditRecipePageState();
 }
 
 class _EditRecipePageState extends State<EditRecipePage> {
@@ -150,7 +149,7 @@ When you generate a recipe, you should generate a JSON object.
                   ),
                   maxLines: null,
                 ),
-                const Gap(16),
+                const SizedBox(height: 16),
                 OverflowBar(
                   spacing: 16,
                   children: [
@@ -210,9 +209,9 @@ When you generate a recipe, you should generate a JSON object.
           title: Text(recipe.title),
           content: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
+            spacing: 16,
             children: [
               const Text('Modifications:'),
-              const Gap(16),
               Text(_wrapText(modifications)),
             ],
           ),

diff --git a/example/lib/recipes/pages/home_page.dart b/example/lib/recipes/pages/home_page.dart
@@ -16,7 +16,7 @@ class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
   @override
-  _HomePageState createState() => _HomePageState();
+  State<HomePage> createState() => _HomePageState();
 }
 
 class _HomePageState extends State<HomePage> {

diff --git a/example/lib/recipes/views/recipe_content_view.dart b/example/lib/recipes/views/recipe_content_view.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 
 import '../data/recipe_data.dart';
 
@@ -25,18 +24,18 @@ class RecipeContentView extends StatelessWidget {
                   ? SingleChildScrollView(
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
+                        spacing: 16,
                         children: [
                           _RecipeIngredientsView(recipe),
-                          const Gap(16),
                           _RecipeInstructionsView(recipe),
                         ],
                       ),
                     )
                   : Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
+                      spacing: 16,
                       children: [
                         Expanded(child: _RecipeIngredientsView(recipe)),
-                        const Gap(16),
                         Expanded(child: _RecipeInstructionsView(recipe)),
                       ],
                     ),

diff --git a/example/lib/recipes/views/recipe_list_view.dart b/example/lib/recipes/views/recipe_list_view.dart
@@ -15,7 +15,7 @@ class RecipeListView extends StatefulWidget {
   const RecipeListView({super.key, required this.searchText});
 
   @override
-  _RecipeListViewState createState() => _RecipeListViewState();
+  State<RecipeListView> createState() => _RecipeListViewState();
 }
 
 class _RecipeListViewState extends State<RecipeListView> {

diff --git a/example/lib/recipes/views/recipe_response_view.dart b/example/lib/recipes/views/recipe_response_view.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:gap/gap.dart';
 
 import '../data/recipe_data.dart';
 import '../data/recipe_repository.dart';
@@ -35,7 +34,6 @@ class RecipeResponseView extends StatelessWidget {
         // extract the recipe
         final json = recipeWithText['recipe'] as Map<String, dynamic>;
         final recipe = Recipe.fromJson(json);
-        children.add(const Gap(16));
         children.add(Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -46,12 +44,10 @@ class RecipeResponseView extends StatelessWidget {
         ));
 
         // add a button to add the recipe to the list
-        children.add(const Gap(16));
         children.add(OutlinedButton(
           onPressed: () => RecipeRepository.addNewRecipe(recipe),
           child: const Text('Add Recipe'),
         ));
-        children.add(const Gap(16));
       }
     } catch (e) {
       debugPrint('Error parsing response: $e');
@@ -74,6 +70,7 @@ class RecipeResponseView extends StatelessWidget {
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
+      spacing: 16,
       children: children,
     );
   }

diff --git a/example/lib/recipes/views/recipe_view.dart b/example/lib/recipes/views/recipe_view.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 
 import '../data/recipe_data.dart';
 import 'recipe_content_view.dart';
@@ -52,7 +51,7 @@ class RecipeView extends StatelessWidget {
                     ],
                   ),
                 ),
-                const Gap(16),
+                const SizedBox(height: 16),
               ],
             ),
           ],

diff --git a/example/lib/recipes/views/search_box.dart b/example/lib/recipes/views/search_box.dart
@@ -10,7 +10,7 @@ class SearchBox extends StatefulWidget {
   const SearchBox({super.key, required this.onSearchChanged});
 
   @override
-  _SearchBoxState createState() => _SearchBoxState();
+  State<SearchBox> createState() => _SearchBoxState();
 }
 
 class _SearchBoxState extends State<SearchBox>

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   firebase_vertexai: ^1.0.1
   shared_preferences: ^2.3.2
   url_launcher: ^6.3.0
-  gap: ^3.0.1
   go_router: ^14.2.8
   uuid: ^4.5.1
   path: ^1.9.0

diff --git a/lib/flutter_ai_toolkit.dart b/lib/flutter_ai_toolkit.dart
@@ -14,6 +14,7 @@
 /// - Chat UI: Ready-to-use widgets for displaying chat interfaces.
 library;
 
+export 'src/llm_exception.dart';
 export 'src/providers/interface/chat_message.dart';
 export 'src/providers/providers.dart';
 export 'src/styles/styles.dart';

diff --git a/lib/src/views/attachment_view/file_attatchment_view.dart b/lib/src/views/attachment_view/file_attatchment_view.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/widgets.dart';
-import 'package:gap/gap.dart';
 
 import '../../chat_view_model/chat_view_model_client.dart';
 import '../../providers/interface/attachments.dart';
@@ -37,6 +36,7 @@ class FileAttachmentView extends StatelessWidget {
             decoration: attachmentStyle.decoration,
             child: Row(
               mainAxisSize: MainAxisSize.min,
+              spacing: 8,
               children: [
                 Container(
                   height: 64,
@@ -48,7 +48,6 @@ class FileAttachmentView extends StatelessWidget {
                     size: 24,
                   ),
                 ),
-                const Gap(8),
                 Flexible(
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/lib/src/views/chat_input/chat_input.dart b/lib/src/views/chat_input/chat_input.dart
@@ -5,7 +5,6 @@
 import 'package:file_selector/file_selector.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
-import 'package:gap/gap.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:waveform_recorder/waveform_recorder.dart';
 
@@ -149,7 +148,7 @@ class _ChatInputState extends State<ChatInput> {
                   attachments: _attachments,
                   onRemove: onRemoveAttachment,
                 ),
-                if (_attachments.isNotEmpty) const Gap(6),
+                if (_attachments.isNotEmpty) const SizedBox(height: 6),
                 ValueListenableBuilder(
                   valueListenable: _textController,
                   builder: (context, value, child) => ListenableBuilder(

diff --git a/lib/src/views/chat_input/editing_indicator.dart b/lib/src/views/chat_input/editing_indicator.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/widgets.dart';
-import 'package:gap/gap.dart';
 
 import '../../styles/action_button_style.dart';
 import '../../styles/toolkit_text_styles.dart';
@@ -36,14 +35,14 @@ class EditingIndicator extends StatelessWidget {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.end,
           crossAxisAlignment: CrossAxisAlignment.end,
+          spacing: 6,
           children: [
             Text(
               'Editing',
               style: ToolkitTextStyles.label.copyWith(
                 color: invertColor(cancelButtonStyle.iconColor),
               ),
             ),
-            const Gap(6),
             ActionButton(
               onPressed: onCancelEdit,
               style: cancelButtonStyle,

diff --git a/lib/src/views/chat_message_view/hovering_buttons.dart b/lib/src/views/chat_message_view/hovering_buttons.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/widgets.dart';
-import 'package:gap/gap.dart';
 
 import '../../styles/llm_chat_view_style.dart';
 import '../../utility.dart';
@@ -66,6 +65,7 @@ class HoveringButtons extends StatelessWidget {
                           right: isUserMessage ? 0 : null,
                           left: isUserMessage ? null : 32,
                           child: Row(
+                            spacing: 6,
                             children: [
                               if (onEdit != null)
                                 GestureDetector(
@@ -78,7 +78,6 @@ class HoveringButtons extends StatelessWidget {
                                     ),
                                   ),
                                 ),
-                              const Gap(6),
                               GestureDetector(
                                 onTap: () => unawaited(
                                   copyToClipboard(context, clipboardText!),

diff --git a/lib/src/views/jumping_dots_progress_indicator/jumping_dots_progress_indicator.dart b/lib/src/views/jumping_dots_progress_indicator/jumping_dots_progress_indicator.dart
@@ -43,7 +43,7 @@ class JumpingDotsProgressIndicator extends StatefulWidget {
   final int milliseconds;
 
   @override
-  _JumpingDotsProgressIndicatorState createState() =>
+  State<JumpingDotsProgressIndicator> createState() =>
       _JumpingDotsProgressIndicatorState();
 }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -23,15 +23,14 @@ dependencies:
   flutter_context_menu: ^0.2.0
   flutter_markdown: ^0.7.4+3
   flutter_picture_taker: ^0.2.0
-  gap: ^3.0.1
   google_fonts: ^6.2.1
   google_generative_ai: ^0.4.3
   image_picker: ^1.1.2
   mime: ^2.0.0
   universal_platform: ^1.1.0
   uuid: ^4.4.2
   waveform_recorder: ^1.3.0
-  
+
 dev_dependencies:
   flutter_lints: ^5.0.0
   flutter_test: