From 72ca4cece428b13533cbf49319d21116a6ec127e Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Wed, 21 Jun 2023 21:39:31 +0600 Subject: [PATCH] feat: connectivity adapter package for connectivity_plus --- .../fl_query/.flutter-plugins-dependencies | 2 +- packages/fl_query/example/lib/main.dart | 6 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + packages/fl_query/example/pubspec.lock | 63 ++++++ packages/fl_query/example/pubspec.yaml | 1 + .../fl_query/example/pubspec_overrides.yaml | 4 +- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 1 + packages/fl_query/lib/fl_query.dart | 1 + .../src/collections/connectivity_adapter.dart | 5 + packages/fl_query/lib/src/core/client.dart | 5 + .../.flutter-plugins | 7 + .../.flutter-plugins-dependencies | 1 + .../.gitignore | 30 +++ .../.metadata | 10 + .../CHANGELOG.md | 3 + .../LICENSE | 201 ++++++++++++++++++ .../README.md | 3 + .../analysis_options.yaml | 4 + .../fl_query_connectivity_plus_adapter.dart | 32 +++ .../pubspec.yaml | 19 ++ .../pubspec_overrides.yaml | 4 + .../.flutter-plugins-dependencies | 2 +- packages/fl_query_hooks/example/lib/main.dart | 6 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + packages/fl_query_hooks/example/pubspec.lock | 63 ++++++ packages/fl_query_hooks/example/pubspec.yaml | 1 + .../example/pubspec_overrides.yaml | 4 +- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 1 + 30 files changed, 483 insertions(+), 6 deletions(-) create mode 100644 packages/fl_query/lib/src/collections/connectivity_adapter.dart create mode 100644 packages/fl_query_connectivity_plus_adapter/.flutter-plugins create mode 100644 packages/fl_query_connectivity_plus_adapter/.flutter-plugins-dependencies create mode 100644 packages/fl_query_connectivity_plus_adapter/.gitignore create mode 100644 packages/fl_query_connectivity_plus_adapter/.metadata create mode 100644 packages/fl_query_connectivity_plus_adapter/CHANGELOG.md create mode 100644 packages/fl_query_connectivity_plus_adapter/LICENSE create mode 100644 packages/fl_query_connectivity_plus_adapter/README.md create mode 100644 packages/fl_query_connectivity_plus_adapter/analysis_options.yaml create mode 100644 packages/fl_query_connectivity_plus_adapter/lib/fl_query_connectivity_plus_adapter.dart create mode 100644 packages/fl_query_connectivity_plus_adapter/pubspec.yaml create mode 100644 packages/fl_query_connectivity_plus_adapter/pubspec_overrides.yaml diff --git a/packages/fl_query/.flutter-plugins-dependencies b/packages/fl_query/.flutter-plugins-dependencies index 5c11588..717fa21 100644 --- a/packages/fl_query/.flutter-plugins-dependencies +++ b/packages/fl_query/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-05-29 12:06:55.360188","version":"3.10.2"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-06-21 09:53:37.599190","version":"3.10.2"} \ No newline at end of file diff --git a/packages/fl_query/example/lib/main.dart b/packages/fl_query/example/lib/main.dart index d40c1a2..408ee41 100644 --- a/packages/fl_query/example/lib/main.dart +++ b/packages/fl_query/example/lib/main.dart @@ -1,10 +1,14 @@ +import 'package:fl_query_connectivity_plus_adapter/fl_query_connectivity_plus_adapter.dart'; import 'package:fl_query_example/router.dart'; import 'package:fl_query/fl_query.dart'; import 'package:flutter/material.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await QueryClient.initialize(cachePrefix: 'fl_query_example'); + await QueryClient.initialize( + cachePrefix: 'fl_query_example', + connectivity: FlQueryConnectivityPlusAdapter(), + ); runApp( QueryClientProvider( child: const MainApp(), diff --git a/packages/fl_query/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/fl_query/example/macos/Flutter/GeneratedPluginRegistrant.swift index e777c67..ec592a9 100644 --- a/packages/fl_query/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/fl_query/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,10 @@ import FlutterMacOS import Foundation +import connectivity_plus import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/fl_query/example/pubspec.lock b/packages/fl_query/example/pubspec.lock index f86b080..c9f5e6e 100644 --- a/packages/fl_query/example/pubspec.lock +++ b/packages/fl_query/example/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: @@ -41,6 +49,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.1" + connectivity_plus: + dependency: transitive + description: + name: connectivity_plus + sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34" + url: "https://pub.dev" + source: hosted + version: "4.0.1" + connectivity_plus_platform_interface: + dependency: transitive + description: + name: connectivity_plus_platform_interface + sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + url: "https://pub.dev" + source: hosted + version: "1.2.4" crypto: dependency: transitive description: @@ -49,6 +73,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + dbus: + dependency: transitive + description: + name: dbus + sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + url: "https://pub.dev" + source: hosted + version: "0.7.8" fake_async: dependency: transitive description: @@ -80,6 +112,13 @@ packages: relative: true source: path version: "1.0.0-alpha.2" + fl_query_connectivity_plus_adapter: + dependency: "direct main" + description: + path: "../../fl_query_connectivity_plus_adapter" + relative: true + source: path + version: "0.1.0" flutter: dependency: "direct main" description: flutter @@ -207,6 +246,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + nm: + dependency: transitive + description: + name: nm + sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" + url: "https://pub.dev" + source: hosted + version: "0.5.0" path: dependency: transitive description: @@ -263,6 +310,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" platform: dependency: transitive description: @@ -380,6 +435,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" sdks: dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.3.0" diff --git a/packages/fl_query/example/pubspec.yaml b/packages/fl_query/example/pubspec.yaml index 36fe021..ca06168 100644 --- a/packages/fl_query/example/pubspec.yaml +++ b/packages/fl_query/example/pubspec.yaml @@ -10,6 +10,7 @@ dependencies: flutter: sdk: flutter fl_query: ^1.0.0-alpha.2 + fl_query_connectivity_plus_adapter: ^0.1.0 go_router: ^6.0.9 http: ^0.13.5 diff --git a/packages/fl_query/example/pubspec_overrides.yaml b/packages/fl_query/example/pubspec_overrides.yaml index 5e1605f..3777108 100644 --- a/packages/fl_query/example/pubspec_overrides.yaml +++ b/packages/fl_query/example/pubspec_overrides.yaml @@ -1,4 +1,6 @@ -# melos_managed_dependency_overrides: fl_query +# melos_managed_dependency_overrides: fl_query,fl_query_connectivity_plus_adapter dependency_overrides: fl_query: path: .. + fl_query_connectivity_plus_adapter: + path: ../../fl_query_connectivity_plus_adapter diff --git a/packages/fl_query/example/windows/flutter/generated_plugin_registrant.cc b/packages/fl_query/example/windows/flutter/generated_plugin_registrant.cc index 8b6d468..8777c93 100644 --- a/packages/fl_query/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/fl_query/example/windows/flutter/generated_plugin_registrant.cc @@ -6,6 +6,9 @@ #include "generated_plugin_registrant.h" +#include void RegisterPlugins(flutter::PluginRegistry* registry) { + ConnectivityPlusWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); } diff --git a/packages/fl_query/example/windows/flutter/generated_plugins.cmake b/packages/fl_query/example/windows/flutter/generated_plugins.cmake index b93c4c3..cc1361d 100644 --- a/packages/fl_query/example/windows/flutter/generated_plugins.cmake +++ b/packages/fl_query/example/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + connectivity_plus ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/packages/fl_query/lib/fl_query.dart b/packages/fl_query/lib/fl_query.dart index d6d0045..0f88c16 100644 --- a/packages/fl_query/lib/fl_query.dart +++ b/packages/fl_query/lib/fl_query.dart @@ -4,6 +4,7 @@ export 'src/collections/default_configs.dart'; export 'src/collections/json_config.dart'; export 'src/collections/refresh_config.dart'; export 'src/collections/retry_config.dart'; +export 'src/collections/connectivity_adapter.dart'; export 'src/core/cache.dart'; export 'src/core/client.dart'; diff --git a/packages/fl_query/lib/src/collections/connectivity_adapter.dart b/packages/fl_query/lib/src/collections/connectivity_adapter.dart new file mode 100644 index 0000000..77e1738 --- /dev/null +++ b/packages/fl_query/lib/src/collections/connectivity_adapter.dart @@ -0,0 +1,5 @@ +abstract class ConnectivityAdapter { + Future get isConnected; + + Stream get onConnectivityChanged; +} diff --git a/packages/fl_query/lib/src/core/client.dart b/packages/fl_query/lib/src/core/client.dart index 9b068fa..96ba804 100644 --- a/packages/fl_query/lib/src/core/client.dart +++ b/packages/fl_query/lib/src/core/client.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:collection/collection.dart'; +import 'package:fl_query/src/collections/connectivity_adapter.dart'; import 'package:fl_query/src/collections/default_configs.dart'; import 'package:fl_query/src/collections/json_config.dart'; import 'package:fl_query/src/collections/refresh_config.dart'; @@ -512,13 +513,17 @@ class QueryClient { static String get infiniteQueryCachePrefix => '$_cachePrefix.cache.infinite_queries'; + static late final ConnectivityAdapter connectivity; + /// Initializes the [QueryClient] /// /// This sets up all [Hive] boxes and cache directories static Future initialize({ required String cachePrefix, + required ConnectivityAdapter connectivity, String? cacheDir, }) async { + connectivity = connectivity; await Hive.initFlutter(cacheDir); _cachePrefix = cachePrefix; await Hive.openLazyBox(queryCachePrefix); diff --git a/packages/fl_query_connectivity_plus_adapter/.flutter-plugins b/packages/fl_query_connectivity_plus_adapter/.flutter-plugins new file mode 100644 index 0000000..35fab5e --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/.flutter-plugins @@ -0,0 +1,7 @@ +# This is a generated file; do not edit or check into version control. +connectivity_plus=/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/ +path_provider=/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider-2.0.15/ +path_provider_android=/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/ +path_provider_foundation=/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/ +path_provider_linux=/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/ +path_provider_windows=/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/ diff --git a/packages/fl_query_connectivity_plus_adapter/.flutter-plugins-dependencies b/packages/fl_query_connectivity_plus_adapter/.flutter-plugins-dependencies new file mode 100644 index 0000000..10d3b3f --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","native_build":true,"dependencies":[]},{"name":"path_provider_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/","native_build":false,"dependencies":[]}],"web":[{"name":"connectivity_plus","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-06-21 09:53:35.090135","version":"3.10.2"} \ No newline at end of file diff --git a/packages/fl_query_connectivity_plus_adapter/.gitignore b/packages/fl_query_connectivity_plus_adapter/.gitignore new file mode 100644 index 0000000..96486fd --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/packages/fl_query_connectivity_plus_adapter/.metadata b/packages/fl_query_connectivity_plus_adapter/.metadata new file mode 100644 index 0000000..10542d2 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff + channel: stable + +project_type: package diff --git a/packages/fl_query_connectivity_plus_adapter/CHANGELOG.md b/packages/fl_query_connectivity_plus_adapter/CHANGELOG.md new file mode 100644 index 0000000..41cc7d8 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/fl_query_connectivity_plus_adapter/LICENSE b/packages/fl_query_connectivity_plus_adapter/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/fl_query_connectivity_plus_adapter/README.md b/packages/fl_query_connectivity_plus_adapter/README.md new file mode 100644 index 0000000..5d80987 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/README.md @@ -0,0 +1,3 @@ +# Fl-Query Connectivity Plus Adapter + +Connectivity Plus Adapter for Fl-Query \ No newline at end of file diff --git a/packages/fl_query_connectivity_plus_adapter/analysis_options.yaml b/packages/fl_query_connectivity_plus_adapter/analysis_options.yaml new file mode 100644 index 0000000..a5744c1 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/fl_query_connectivity_plus_adapter/lib/fl_query_connectivity_plus_adapter.dart b/packages/fl_query_connectivity_plus_adapter/lib/fl_query_connectivity_plus_adapter.dart new file mode 100644 index 0000000..31022d0 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/lib/fl_query_connectivity_plus_adapter.dart @@ -0,0 +1,32 @@ +library fl_query_connectivity_plus_adapter; + +import 'package:fl_query/fl_query.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; + +/// A [ConnectivityAdapter] that uses the `connectivity_plus` package. +class FlQueryConnectivityPlusAdapter extends ConnectivityAdapter { + @override + Future get isConnected async { + final connection = await Connectivity().checkConnectivity(); + + switch (connection) { + case ConnectivityResult.bluetooth: + case ConnectivityResult.none: + return false; + default: + return true; + } + } + + @override + Stream get onConnectivityChanged => + Connectivity().onConnectivityChanged.map((event) { + switch (event) { + case ConnectivityResult.bluetooth: + case ConnectivityResult.none: + return false; + default: + return true; + } + }); +} diff --git a/packages/fl_query_connectivity_plus_adapter/pubspec.yaml b/packages/fl_query_connectivity_plus_adapter/pubspec.yaml new file mode 100644 index 0000000..1db929a --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/pubspec.yaml @@ -0,0 +1,19 @@ +name: fl_query_connectivity_plus_adapter +description: Connectivity Plus adapter for FlQuery Connectivity +version: 0.1.0 +homepage: https://github.com/KRTirtho/blob/main/packages/fl_query_connectivity_plus_adapter + +environment: + sdk: '>=3.0.2 <4.0.0' + flutter: ">=1.17.0" + +dependencies: + flutter: + sdk: flutter + fl_query: ^1.0.0-alpha.2 + connectivity_plus: ^4.0.1 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^2.0.0 \ No newline at end of file diff --git a/packages/fl_query_connectivity_plus_adapter/pubspec_overrides.yaml b/packages/fl_query_connectivity_plus_adapter/pubspec_overrides.yaml new file mode 100644 index 0000000..07a1730 --- /dev/null +++ b/packages/fl_query_connectivity_plus_adapter/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides: fl_query +dependency_overrides: + fl_query: + path: ../fl_query diff --git a/packages/fl_query_hooks/.flutter-plugins-dependencies b/packages/fl_query_hooks/.flutter-plugins-dependencies index 6256f32..9ed3ffd 100644 --- a/packages/fl_query_hooks/.flutter-plugins-dependencies +++ b/packages/fl_query_hooks/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-05-29 12:06:55.423206","version":"3.10.2"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/krtirtho/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-06-21 09:53:37.518326","version":"3.10.2"} \ No newline at end of file diff --git a/packages/fl_query_hooks/example/lib/main.dart b/packages/fl_query_hooks/example/lib/main.dart index daedbcc..75b16c6 100644 --- a/packages/fl_query_hooks/example/lib/main.dart +++ b/packages/fl_query_hooks/example/lib/main.dart @@ -1,10 +1,14 @@ +import 'package:fl_query_connectivity_plus_adapter/fl_query_connectivity_plus_adapter.dart'; import 'package:fl_query_hooks_example/router.dart'; import 'package:fl_query/fl_query.dart'; import 'package:flutter/material.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await QueryClient.initialize(cachePrefix: 'fl_query_hooks_example'); + await QueryClient.initialize( + cachePrefix: 'fl_query_hooks_example', + connectivity: FlQueryConnectivityPlusAdapter(), + ); runApp( QueryClientProvider( child: const MainApp(), diff --git a/packages/fl_query_hooks/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/fl_query_hooks/example/macos/Flutter/GeneratedPluginRegistrant.swift index e777c67..ec592a9 100644 --- a/packages/fl_query_hooks/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/fl_query_hooks/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,8 +5,10 @@ import FlutterMacOS import Foundation +import connectivity_plus import path_provider_foundation func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/fl_query_hooks/example/pubspec.lock b/packages/fl_query_hooks/example/pubspec.lock index 8d0658c..d24eb82 100644 --- a/packages/fl_query_hooks/example/pubspec.lock +++ b/packages/fl_query_hooks/example/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: @@ -41,6 +49,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.1" + connectivity_plus: + dependency: transitive + description: + name: connectivity_plus + sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34" + url: "https://pub.dev" + source: hosted + version: "4.0.1" + connectivity_plus_platform_interface: + dependency: transitive + description: + name: connectivity_plus_platform_interface + sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + url: "https://pub.dev" + source: hosted + version: "1.2.4" crypto: dependency: transitive description: @@ -57,6 +81,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" + dbus: + dependency: transitive + description: + name: dbus + sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + url: "https://pub.dev" + source: hosted + version: "0.7.8" fake_async: dependency: transitive description: @@ -88,6 +120,13 @@ packages: relative: true source: path version: "1.0.0-alpha.2" + fl_query_connectivity_plus_adapter: + dependency: "direct main" + description: + path: "../../fl_query_connectivity_plus_adapter" + relative: true + source: path + version: "0.1.0" fl_query_hooks: dependency: "direct main" description: @@ -230,6 +269,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + nm: + dependency: transitive + description: + name: nm + sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" + url: "https://pub.dev" + source: hosted + version: "0.5.0" path: dependency: transitive description: @@ -286,6 +333,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" platform: dependency: transitive description: @@ -403,6 +458,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" sdks: dart: ">=3.0.0-0 <4.0.0" flutter: ">=3.3.0" diff --git a/packages/fl_query_hooks/example/pubspec.yaml b/packages/fl_query_hooks/example/pubspec.yaml index c57a7be..0e268d0 100644 --- a/packages/fl_query_hooks/example/pubspec.yaml +++ b/packages/fl_query_hooks/example/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: cupertino_icons: ^1.0.2 fl_query: ^1.0.0-alpha.2 + fl_query_connectivity_plus_adapter: ^0.1.0 fl_query_hooks: ^1.0.0-alpha.2 go_router: ^6.0.9 http: ^0.13.5 diff --git a/packages/fl_query_hooks/example/pubspec_overrides.yaml b/packages/fl_query_hooks/example/pubspec_overrides.yaml index c339db5..f31a131 100644 --- a/packages/fl_query_hooks/example/pubspec_overrides.yaml +++ b/packages/fl_query_hooks/example/pubspec_overrides.yaml @@ -1,6 +1,8 @@ -# melos_managed_dependency_overrides: fl_query,fl_query_hooks +# melos_managed_dependency_overrides: fl_query,fl_query_hooks,fl_query_connectivity_plus_adapter dependency_overrides: fl_query: path: ../../fl_query + fl_query_connectivity_plus_adapter: + path: ../../fl_query_connectivity_plus_adapter fl_query_hooks: path: .. diff --git a/packages/fl_query_hooks/example/windows/flutter/generated_plugin_registrant.cc b/packages/fl_query_hooks/example/windows/flutter/generated_plugin_registrant.cc index 8b6d468..8777c93 100644 --- a/packages/fl_query_hooks/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/fl_query_hooks/example/windows/flutter/generated_plugin_registrant.cc @@ -6,6 +6,9 @@ #include "generated_plugin_registrant.h" +#include void RegisterPlugins(flutter::PluginRegistry* registry) { + ConnectivityPlusWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); } diff --git a/packages/fl_query_hooks/example/windows/flutter/generated_plugins.cmake b/packages/fl_query_hooks/example/windows/flutter/generated_plugins.cmake index b93c4c3..cc1361d 100644 --- a/packages/fl_query_hooks/example/windows/flutter/generated_plugins.cmake +++ b/packages/fl_query_hooks/example/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + connectivity_plus ) list(APPEND FLUTTER_FFI_PLUGIN_LIST