From 5e005797904e05e082c4959adcd76fc6eac0855b Mon Sep 17 00:00:00 2001 From: Manas Hejmadi Date: Thu, 19 Jun 2025 18:03:11 +0530 Subject: [PATCH] export better_networking from apidash_core & fix imports --- lib/codegen/c/curl.dart | 2 +- lib/codegen/codegen.dart | 2 +- lib/codegen/csharp/http_client.dart | 2 +- lib/codegen/csharp/rest_sharp.dart | 2 +- lib/codegen/dart/dio.dart | 2 +- lib/codegen/dart/http.dart | 2 +- lib/codegen/go/http.dart | 2 +- lib/codegen/java/async_http_client.dart | 2 +- lib/codegen/java/httpclient.dart | 2 +- lib/codegen/java/okhttp.dart | 2 +- lib/codegen/java/unirest.dart | 2 +- lib/codegen/js/axios.dart | 2 +- lib/codegen/js/fetch.dart | 2 +- lib/codegen/julia/http.dart | 2 +- lib/codegen/kotlin/okhttp.dart | 2 +- lib/codegen/others/curl.dart | 2 +- lib/codegen/others/har.dart | 2 +- lib/codegen/php/curl.dart | 2 +- lib/codegen/php/guzzle.dart | 2 +- lib/codegen/php/http_plug.dart | 2 +- lib/codegen/python/http_client.dart | 2 +- lib/codegen/python/requests.dart | 2 +- lib/codegen/ruby/faraday.dart | 2 +- lib/codegen/ruby/net_http.dart | 2 +- lib/codegen/rust/actix.dart | 2 +- lib/codegen/rust/curl_rust.dart | 2 +- lib/codegen/rust/hyper.dart | 2 +- lib/codegen/rust/reqwest.dart | 2 +- lib/codegen/rust/ureq.dart | 2 +- lib/codegen/swift/alamofire.dart | 2 +- lib/codegen/swift/urlsession.dart | 2 +- lib/consts.dart | 2 +- lib/importer/importer.dart | 2 +- lib/models/history_meta_model.dart | 2 +- lib/models/history_request_model.dart | 2 +- lib/models/request_model.dart | 2 +- lib/models/settings_model.dart | 2 +- lib/providers/collection_providers.dart | 2 +- lib/providers/settings_providers.dart | 2 +- lib/screens/common_widgets/code_pane.dart | 2 +- lib/screens/history/history_widgets/his_request_pane.dart | 2 +- lib/screens/history/history_widgets/his_url_card.dart | 2 +- .../editor_pane/details_card/request_pane/request_body.dart | 2 +- .../details_card/request_pane/request_form_data.dart | 2 +- .../editor_pane/details_card/request_pane/request_headers.dart | 2 +- .../editor_pane/details_card/request_pane/request_pane.dart | 2 +- .../editor_pane/details_card/request_pane/request_params.dart | 2 +- .../home_page/editor_pane/details_card/response_pane.dart | 2 +- lib/screens/home_page/editor_pane/url_card.dart | 2 +- lib/services/shared_preferences_services.dart | 2 +- lib/utils/convert_utils.dart | 2 +- lib/utils/envvar_utils.dart | 2 +- lib/utils/har_utils.dart | 2 +- lib/utils/http_utils.dart | 2 +- lib/utils/ui_utils.dart | 2 +- lib/widgets/card_sidebar_history.dart | 2 +- lib/widgets/card_sidebar_request.dart | 2 +- lib/widgets/dropdown_content_type.dart | 2 +- lib/widgets/dropdown_formdata.dart | 2 +- lib/widgets/dropdown_http_method.dart | 2 +- lib/widgets/popup_menu_api_type.dart | 2 +- lib/widgets/popup_menu_uri.dart | 2 +- lib/widgets/previewer.dart | 2 +- lib/widgets/previewer_code.dart | 2 +- lib/widgets/previewer_json.dart | 2 +- lib/widgets/response_body.dart | 2 +- lib/widgets/response_body_success.dart | 2 +- lib/widgets/response_headers.dart | 2 +- lib/widgets/table_request_form.dart | 2 +- lib/widgets/texts.dart | 2 +- packages/apidash_core/lib/apidash_core.dart | 1 + packages/better_networking/lib/utils/utils.dart | 2 +- pubspec.lock | 2 +- pubspec.yaml | 2 -- 74 files changed, 73 insertions(+), 74 deletions(-) diff --git a/lib/codegen/c/curl.dart b/lib/codegen/c/curl.dart index 5bae29f1..8077a301 100644 --- a/lib/codegen/c/curl.dart +++ b/lib/codegen/c/curl.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class CCurlCodeGen { diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart index 3278a2f5..89557064 100644 --- a/lib/codegen/codegen.dart +++ b/lib/codegen/codegen.dart @@ -1,7 +1,7 @@ import 'package:apidash/consts.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/utils/utils.dart' show getNewUuid; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'c/curl.dart'; import 'csharp/http_client.dart'; import 'csharp/rest_sharp.dart'; diff --git a/lib/codegen/csharp/http_client.dart b/lib/codegen/csharp/http_client.dart index 7b32da4f..6d086db8 100644 --- a/lib/codegen/csharp/http_client.dart +++ b/lib/codegen/csharp/http_client.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class CSharpHttpClientCodeGen { diff --git a/lib/codegen/csharp/rest_sharp.dart b/lib/codegen/csharp/rest_sharp.dart index c036b86c..34e0f324 100644 --- a/lib/codegen/csharp/rest_sharp.dart +++ b/lib/codegen/csharp/rest_sharp.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'package:apidash_core/apidash_core.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class CSharpRestSharp { diff --git a/lib/codegen/dart/dio.dart b/lib/codegen/dart/dio.dart index 16f7c3b5..488d3cc7 100644 --- a/lib/codegen/dart/dio.dart +++ b/lib/codegen/dart/dio.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:code_builder/code_builder.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:dart_style/dart_style.dart'; diff --git a/lib/codegen/dart/http.dart b/lib/codegen/dart/http.dart index 15fa1186..2c7e66a5 100644 --- a/lib/codegen/dart/http.dart +++ b/lib/codegen/dart/http.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'dart:io'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:code_builder/code_builder.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:dart_style/dart_style.dart'; diff --git a/lib/codegen/go/http.dart b/lib/codegen/go/http.dart index ef477918..28fd805a 100644 --- a/lib/codegen/go/http.dart +++ b/lib/codegen/go/http.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class GoHttpCodeGen { diff --git a/lib/codegen/java/async_http_client.dart b/lib/codegen/java/async_http_client.dart index 684a938d..4b195738 100644 --- a/lib/codegen/java/async_http_client.dart +++ b/lib/codegen/java/async_http_client.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class JavaAsyncHttpClientGen { diff --git a/lib/codegen/java/httpclient.dart b/lib/codegen/java/httpclient.dart index 2406d4f4..e929b7b5 100644 --- a/lib/codegen/java/httpclient.dart +++ b/lib/codegen/java/httpclient.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/har_utils.dart'; diff --git a/lib/codegen/java/okhttp.dart b/lib/codegen/java/okhttp.dart index a051d958..e9b849a7 100644 --- a/lib/codegen/java/okhttp.dart +++ b/lib/codegen/java/okhttp.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class JavaOkHttpCodeGen { diff --git a/lib/codegen/java/unirest.dart b/lib/codegen/java/unirest.dart index 9a4d93c3..ad3a3e99 100644 --- a/lib/codegen/java/unirest.dart +++ b/lib/codegen/java/unirest.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class JavaUnirestGen { diff --git a/lib/codegen/js/axios.dart b/lib/codegen/js/axios.dart index a031b2c8..e6651976 100644 --- a/lib/codegen/js/axios.dart +++ b/lib/codegen/js/axios.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/js/fetch.dart b/lib/codegen/js/fetch.dart index 171f64fd..5f610738 100644 --- a/lib/codegen/js/fetch.dart +++ b/lib/codegen/js/fetch.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/julia/http.dart b/lib/codegen/julia/http.dart index e6637b1b..3425dc09 100644 --- a/lib/codegen/julia/http.dart +++ b/lib/codegen/julia/http.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class JuliaHttpClientCodeGen { diff --git a/lib/codegen/kotlin/okhttp.dart b/lib/codegen/kotlin/okhttp.dart index 139bf672..418c0ba9 100644 --- a/lib/codegen/kotlin/okhttp.dart +++ b/lib/codegen/kotlin/okhttp.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class KotlinOkHttpCodeGen { diff --git a/lib/codegen/others/curl.dart b/lib/codegen/others/curl.dart index 1d7a68c0..7ddeb1b2 100644 --- a/lib/codegen/others/curl.dart +++ b/lib/codegen/others/curl.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/others/har.dart b/lib/codegen/others/har.dart index f3cacfdc..932c9c84 100644 --- a/lib/codegen/others/har.dart +++ b/lib/codegen/others/har.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import '../../utils/utils.dart'; class HARCodeGen { diff --git a/lib/codegen/php/curl.dart b/lib/codegen/php/curl.dart index d77eb431..24ff2579 100644 --- a/lib/codegen/php/curl.dart +++ b/lib/codegen/php/curl.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class PHPcURLCodeGen { diff --git a/lib/codegen/php/guzzle.dart b/lib/codegen/php/guzzle.dart index fc226f21..d6fe79f6 100644 --- a/lib/codegen/php/guzzle.dart +++ b/lib/codegen/php/guzzle.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class PhpGuzzleCodeGen { diff --git a/lib/codegen/php/http_plug.dart b/lib/codegen/php/http_plug.dart index 28743b5e..299c1a93 100644 --- a/lib/codegen/php/http_plug.dart +++ b/lib/codegen/php/http_plug.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class PhpHttpPlugCodeGen { diff --git a/lib/codegen/python/http_client.dart b/lib/codegen/python/http_client.dart index 365f0734..a2c01808 100644 --- a/lib/codegen/python/http_client.dart +++ b/lib/codegen/python/http_client.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class PythonHttpClientCodeGen { diff --git a/lib/codegen/python/requests.dart b/lib/codegen/python/requests.dart index 6f3ede89..ef2a19fa 100644 --- a/lib/codegen/python/requests.dart +++ b/lib/codegen/python/requests.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; import '../codegen_utils.dart'; diff --git a/lib/codegen/ruby/faraday.dart b/lib/codegen/ruby/faraday.dart index 5eb312d1..11d73946 100644 --- a/lib/codegen/ruby/faraday.dart +++ b/lib/codegen/ruby/faraday.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; // Note that delete is a special case in Faraday as API Dash supports request diff --git a/lib/codegen/ruby/net_http.dart b/lib/codegen/ruby/net_http.dart index f08fde19..300fe570 100644 --- a/lib/codegen/ruby/net_http.dart +++ b/lib/codegen/ruby/net_http.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; diff --git a/lib/codegen/rust/actix.dart b/lib/codegen/rust/actix.dart index 73b2bcf8..acc752ea 100644 --- a/lib/codegen/rust/actix.dart +++ b/lib/codegen/rust/actix.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/rust/curl_rust.dart b/lib/codegen/rust/curl_rust.dart index 99964104..727f0b2c 100644 --- a/lib/codegen/rust/curl_rust.dart +++ b/lib/codegen/rust/curl_rust.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/rust/hyper.dart b/lib/codegen/rust/hyper.dart index 8103c327..1acaab55 100644 --- a/lib/codegen/rust/hyper.dart +++ b/lib/codegen/rust/hyper.dart @@ -1,5 +1,5 @@ import 'dart:core'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class RustHyperCodeGen { diff --git a/lib/codegen/rust/reqwest.dart b/lib/codegen/rust/reqwest.dart index ce2a514f..1e72807b 100644 --- a/lib/codegen/rust/reqwest.dart +++ b/lib/codegen/rust/reqwest.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; class RustReqwestCodeGen { diff --git a/lib/codegen/rust/ureq.dart b/lib/codegen/rust/ureq.dart index a3ded694..b9b70e23 100644 --- a/lib/codegen/rust/ureq.dart +++ b/lib/codegen/rust/ureq.dart @@ -1,6 +1,6 @@ import 'dart:io'; import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import '../../utils/utils.dart'; diff --git a/lib/codegen/swift/alamofire.dart b/lib/codegen/swift/alamofire.dart index f48a290d..b128a727 100644 --- a/lib/codegen/swift/alamofire.dart +++ b/lib/codegen/swift/alamofire.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import 'package:path/path.dart' as path; diff --git a/lib/codegen/swift/urlsession.dart b/lib/codegen/swift/urlsession.dart index fdc4618a..864706fd 100644 --- a/lib/codegen/swift/urlsession.dart +++ b/lib/codegen/swift/urlsession.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:jinja/jinja.dart' as jj; import 'package:path/path.dart' as path; diff --git a/lib/consts.dart b/lib/consts.dart index ee6cf41d..12084c2f 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -1,6 +1,6 @@ import 'dart:io'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; -import 'package:better_networking/better_networking.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/importer/importer.dart b/lib/importer/importer.dart index 5f2fd2d8..3fefb742 100644 --- a/lib/importer/importer.dart +++ b/lib/importer/importer.dart @@ -1,6 +1,6 @@ import 'package:apidash/consts.dart'; import 'package:apidash_core/apidash_core.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; class Importer { Future?> getHttpRequestModelList( diff --git a/lib/models/history_meta_model.dart b/lib/models/history_meta_model.dart index 9fd3f14e..d5f9be08 100644 --- a/lib/models/history_meta_model.dart +++ b/lib/models/history_meta_model.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_core/apidash_core.dart'; part 'history_meta_model.freezed.dart'; part 'history_meta_model.g.dart'; diff --git a/lib/models/history_request_model.dart b/lib/models/history_request_model.dart index 4d606580..ace0ece7 100644 --- a/lib/models/history_request_model.dart +++ b/lib/models/history_request_model.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'models.dart'; import 'package:apidash_core/apidash_core.dart'; part 'history_request_model.freezed.dart'; diff --git a/lib/models/request_model.dart b/lib/models/request_model.dart index 9adc0607..99612e1e 100644 --- a/lib/models/request_model.dart +++ b/lib/models/request_model.dart @@ -1,5 +1,5 @@ import 'package:apidash_core/apidash_core.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; part 'request_model.freezed.dart'; part 'request_model.g.dart'; diff --git a/lib/models/settings_model.dart b/lib/models/settings_model.dart index 3677958c..a06b1e59 100644 --- a/lib/models/settings_model.dart +++ b/lib/models/settings_model.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/providers/collection_providers.dart b/lib/providers/collection_providers.dart index 076e5ee5..35bc4aa0 100644 --- a/lib/providers/collection_providers.dart +++ b/lib/providers/collection_providers.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/providers/settings_providers.dart b/lib/providers/settings_providers.dart index b469144a..d3cb9f2f 100644 --- a/lib/providers/settings_providers.dart +++ b/lib/providers/settings_providers.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../models/models.dart'; diff --git a/lib/screens/common_widgets/code_pane.dart b/lib/screens/common_widgets/code_pane.dart index 977dcf6f..654b9440 100644 --- a/lib/screens/common_widgets/code_pane.dart +++ b/lib/screens/common_widgets/code_pane.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; diff --git a/lib/screens/history/history_widgets/his_request_pane.dart b/lib/screens/history/history_widgets/his_request_pane.dart index fd2793a8..f1435063 100644 --- a/lib/screens/history/history_widgets/his_request_pane.dart +++ b/lib/screens/history/history_widgets/his_request_pane.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/history/history_widgets/his_url_card.dart b/lib/screens/history/history_widgets/his_url_card.dart index 8baca3ad..7a6153b4 100644 --- a/lib/screens/history/history_widgets/his_url_card.dart +++ b/lib/screens/history/history_widgets/his_url_card.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/widgets/widgets.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart index dc8b1810..e192f26e 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart index 85a2e52a..c007cc73 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_form_data.dart @@ -1,5 +1,5 @@ import 'dart:math'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart index 9e9bd07a..435346de 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_headers.dart @@ -1,5 +1,5 @@ import 'dart:math'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart index 7f65c66d..9c852c71 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_pane.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart index 492d745a..be752217 100644 --- a/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart +++ b/lib/screens/home_page/editor_pane/details_card/request_pane/request_params.dart @@ -1,5 +1,5 @@ import 'dart:math'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/screens/home_page/editor_pane/details_card/response_pane.dart b/lib/screens/home_page/editor_pane/details_card/response_pane.dart index 64b47687..367bb412 100644 --- a/lib/screens/home_page/editor_pane/details_card/response_pane.dart +++ b/lib/screens/home_page/editor_pane/details_card/response_pane.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; diff --git a/lib/screens/home_page/editor_pane/url_card.dart b/lib/screens/home_page/editor_pane/url_card.dart index 99dc4c75..829bc5c9 100644 --- a/lib/screens/home_page/editor_pane/url_card.dart +++ b/lib/screens/home_page/editor_pane/url_card.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/services/shared_preferences_services.dart b/lib/services/shared_preferences_services.dart index df76c74b..dae5b6c6 100644 --- a/lib/services/shared_preferences_services.dart +++ b/lib/services/shared_preferences_services.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../models/models.dart'; diff --git a/lib/utils/convert_utils.dart b/lib/utils/convert_utils.dart index 67a451f1..2dcb38be 100644 --- a/lib/utils/convert_utils.dart +++ b/lib/utils/convert_utils.dart @@ -1,7 +1,7 @@ import 'dart:typed_data'; import 'dart:convert'; import 'package:apidash_core/apidash_core.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:intl/intl.dart'; String humanizeDate(DateTime? date) { diff --git a/lib/utils/envvar_utils.dart b/lib/utils/envvar_utils.dart index 92f1da8b..9aed23dc 100644 --- a/lib/utils/envvar_utils.dart +++ b/lib/utils/envvar_utils.dart @@ -1,5 +1,5 @@ import 'package:apidash_core/apidash_core.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash/consts.dart'; String getEnvironmentTitle(String? name) { diff --git a/lib/utils/har_utils.dart b/lib/utils/har_utils.dart index 90e2e9aa..31c466ce 100644 --- a/lib/utils/har_utils.dart +++ b/lib/utils/har_utils.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'package:apidash/consts.dart'; import 'package:apidash/utils/utils.dart' show getNewUuid, getFilenameFromPath; import 'package:apidash/models/models.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:package_info_plus/package_info_plus.dart'; Future> collectionToHAR( diff --git a/lib/utils/http_utils.dart b/lib/utils/http_utils.dart index 4a42c709..379a3bf9 100644 --- a/lib/utils/http_utils.dart +++ b/lib/utils/http_utils.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import '../consts.dart'; String getRequestTitleFromUrl(String? url) { diff --git a/lib/utils/ui_utils.dart b/lib/utils/ui_utils.dart index 7e09a8b7..68eaa82c 100644 --- a/lib/utils/ui_utils.dart +++ b/lib/utils/ui_utils.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import '../consts.dart'; diff --git a/lib/widgets/card_sidebar_history.dart b/lib/widgets/card_sidebar_history.dart index ef4835a3..36f5d5bb 100644 --- a/lib/widgets/card_sidebar_history.dart +++ b/lib/widgets/card_sidebar_history.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/models/models.dart'; diff --git a/lib/widgets/card_sidebar_request.dart b/lib/widgets/card_sidebar_request.dart index 977fe131..87dab9e4 100644 --- a/lib/widgets/card_sidebar_request.dart +++ b/lib/widgets/card_sidebar_request.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/widgets/dropdown_content_type.dart b/lib/widgets/dropdown_content_type.dart index f3197e17..0fbd0f38 100644 --- a/lib/widgets/dropdown_content_type.dart +++ b/lib/widgets/dropdown_content_type.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/dropdown_formdata.dart b/lib/widgets/dropdown_formdata.dart index eb4132dc..cbb7176e 100644 --- a/lib/widgets/dropdown_formdata.dart +++ b/lib/widgets/dropdown_formdata.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/dropdown_http_method.dart b/lib/widgets/dropdown_http_method.dart index d216d802..a97938fe 100644 --- a/lib/widgets/dropdown_http_method.dart +++ b/lib/widgets/dropdown_http_method.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/utils/utils.dart'; diff --git a/lib/widgets/popup_menu_api_type.dart b/lib/widgets/popup_menu_api_type.dart index 1fc3f346..656c73fe 100644 --- a/lib/widgets/popup_menu_api_type.dart +++ b/lib/widgets/popup_menu_api_type.dart @@ -1,5 +1,5 @@ import 'package:apidash/consts.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/popup_menu_uri.dart b/lib/widgets/popup_menu_uri.dart index 0b2b8f29..898bd7d4 100644 --- a/lib/widgets/popup_menu_uri.dart +++ b/lib/widgets/popup_menu_uri.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/previewer.dart b/lib/widgets/previewer.dart index cba053e2..7c5766c0 100644 --- a/lib/widgets/previewer.dart +++ b/lib/widgets/previewer.dart @@ -1,5 +1,5 @@ import 'dart:convert'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:jinja/jinja.dart' as jj; diff --git a/lib/widgets/previewer_code.dart b/lib/widgets/previewer_code.dart index 5f4a1829..f805d7f6 100644 --- a/lib/widgets/previewer_code.dart +++ b/lib/widgets/previewer_code.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:highlighter/highlighter.dart' show highlight, Node; import 'package:apidash/consts.dart'; diff --git a/lib/widgets/previewer_json.dart b/lib/widgets/previewer_json.dart index 409273ad..811cbbc8 100644 --- a/lib/widgets/previewer_json.dart +++ b/lib/widgets/previewer_json.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/widgets/response_body.dart b/lib/widgets/response_body.dart index f61e082d..561d9271 100644 --- a/lib/widgets/response_body.dart +++ b/lib/widgets/response_body.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/utils/utils.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/widgets/response_body_success.dart b/lib/widgets/response_body_success.dart index 01d665ef..3774b606 100644 --- a/lib/widgets/response_body_success.dart +++ b/lib/widgets/response_body_success.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/response_headers.dart b/lib/widgets/response_headers.dart index d7f8a6f4..98c1fb53 100644 --- a/lib/widgets/response_headers.dart +++ b/lib/widgets/response_headers.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:apidash/consts.dart'; import 'button_copy.dart'; diff --git a/lib/widgets/table_request_form.dart b/lib/widgets/table_request_form.dart index 4e2d3a25..b5791445 100644 --- a/lib/widgets/table_request_form.dart +++ b/lib/widgets/table_request_form.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:data_table_2/data_table_2.dart'; diff --git a/lib/widgets/texts.dart b/lib/widgets/texts.dart index de71b2d5..c64a71b2 100644 --- a/lib/widgets/texts.dart +++ b/lib/widgets/texts.dart @@ -1,4 +1,4 @@ -import 'package:better_networking/better_networking.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/utils/utils.dart'; diff --git a/packages/apidash_core/lib/apidash_core.dart b/packages/apidash_core/lib/apidash_core.dart index f864077a..a78177c8 100644 --- a/packages/apidash_core/lib/apidash_core.dart +++ b/packages/apidash_core/lib/apidash_core.dart @@ -9,3 +9,4 @@ export 'utils/utils.dart'; // Export 3rd party packages export 'package:collection/collection.dart'; export 'package:freezed_annotation/freezed_annotation.dart'; +export 'package:better_networking/better_networking.dart'; diff --git a/packages/better_networking/lib/utils/utils.dart b/packages/better_networking/lib/utils/utils.dart index f39e563d..d334a022 100644 --- a/packages/better_networking/lib/utils/utils.dart +++ b/packages/better_networking/lib/utils/utils.dart @@ -2,5 +2,5 @@ export 'content_type_utils.dart'; export 'graphql_utils.dart'; export 'http_request_utils.dart'; export 'http_response_utils.dart'; -export 'string_utils.dart'; +export 'string_utils.dart' hide RandomStringGenerator; export 'uri_utils.dart'; diff --git a/pubspec.lock b/pubspec.lock index a4e99bea..bcbfa61d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -88,7 +88,7 @@ packages: source: hosted version: "2.2.9" better_networking: - dependency: "direct main" + dependency: transitive description: path: "packages/better_networking" relative: true diff --git a/pubspec.yaml b/pubspec.yaml index db2380f2..fef25a17 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,8 +14,6 @@ dependencies: path: packages/apidash_core apidash_design_system: path: packages/apidash_design_system - better_networking: - path: packages/better_networking carousel_slider: ^5.0.0 code_builder: ^4.10.0 csv: ^6.0.0