Merge branch 'master' into fix/issue-228-unwrap-path

jhomlala · Sep 29, 2024 · 555e914 · 555e914
2 parents db14e24 + 8a55c09
commit 555e914
Show file tree

Hide file tree

Showing 12 changed files with 618 additions and 4 deletions.
diff --git a/packages/alice/lib/ui/calls_list/page/alice_calls_list_page.dart b/packages/alice/lib/ui/calls_list/page/alice_calls_list_page.dart
@@ -255,8 +255,10 @@ class _AliceCallsListPageState extends State<AliceCallsListPage>
 
   /// Called when save to file has been pressed. It saves data to file.
   void _saveToFile() async {
+        if (!mounted) return;
     final result = await aliceCore.saveCallsToFile(context);
-    if (result.success && result.path != null) {
+
+  if (result.success && result.path != null) {
       AliceGeneralDialog.show(
         context: context,
         title: context.i18n(AliceTranslationKey.saveSuccessTitle),
@@ -309,7 +311,7 @@ class _AliceCallsListPageState extends State<AliceCallsListPage>
   Future<void> _onSortPressed() async {
     AliceSortDialogResult? result = await showDialog<AliceSortDialogResult>(
       context: context,
-      builder: (BuildContext buildContext) => AliceSortDialog(
+      builder: (_) => AliceSortDialog(
         sortOption: _sortOption,
         sortAscending: _sortAscending,
       ),

diff --git a/packages/alice/lib/ui/common/alice_dialog.dart b/packages/alice/lib/ui/common/alice_dialog.dart
@@ -17,7 +17,7 @@ class AliceGeneralDialog {
   }) =>
       showDialog<void>(
         context: context,
-        builder: (BuildContext buildContext) {
+        builder: (BuildContext context) {
           return Theme(
             data: AliceTheme.getTheme(),
             child: AlertDialog(

diff --git a/packages/alice/lib/ui/common/alice_navigation.dart b/packages/alice/lib/ui/common/alice_navigation.dart
@@ -49,7 +49,7 @@ class AliceNavigation {
     return Navigator.push<void>(
       context,
       MaterialPageRoute(
-        builder: (context) => child,
+        builder: (_) => child,
       ),
     );
   }

diff --git a/packages/alice_chopper/CHANGELOG.md b/packages/alice_chopper/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 * Added lint for trailing commas.
 * General refactor of code base.
+* Added support for form data. 
+* Added tests.
 
 # 1.0.5
 

diff --git a/packages/alice_chopper/lib/alice_chopper_adapter.dart b/packages/alice_chopper/lib/alice_chopper_adapter.dart
@@ -2,6 +2,8 @@ import 'dart:async' show FutureOr;
 import 'dart:convert' show utf8;
 import 'dart:io' show HttpHeaders;
 
+import 'package:alice/model/alice_form_data_file.dart';
+import 'package:alice/model/alice_from_data_field.dart';
 import 'package:flutter/foundation.dart';
 import 'package:alice/core/alice_adapter.dart';
 import 'package:alice/core/alice_utils.dart';
@@ -65,6 +67,14 @@ class AliceChopperAdapter with AliceAdapter implements Interceptor {
           ..headers = chain.request.headers
           ..contentType =
               chain.request.headers[HttpHeaders.contentTypeHeader] ?? 'unknown'
+          ..formDataFields = chain.request.parts
+              .whereType<PartValue>()
+              .map((field) => AliceFormDataField(field.name, field.value))
+              .toList()
+          ..formDataFiles = chain.request.parts
+              .whereType<PartValueFile>()
+              .map((file) => AliceFormDataFile(file.value, "", 0))
+              .toList()
           ..queryParameters = chain.request.parameters)
         ..response = AliceHttpResponse(),
     );

diff --git a/packages/alice_chopper/pubspec.yaml b/packages/alice_chopper/pubspec.yaml
@@ -24,3 +24,11 @@ dependencies:
 
 dev_dependencies:
   flutter_lints: ^4.0.0
+  test: ^1.25.2
+  alice_test: ^1.0.0
+  mocktail: ^1.0.4
+  build_runner: ^2.4.9
+  chopper_generator: ^8.0.0
+  json_serializable: ^6.8.0
+  json_annotation: ^4.9.0
+  equatable: ^2.0.5