From b419d8a91ee490405ee42a1a91ee299f2acc8da1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:12:21 +0100 Subject: [PATCH 01/13] [network_info_plus] make a copy of connectivity_plus --- packages/network_info_plus/.gitattributes | 25 + packages/network_info_plus/.gitignore | 47 ++ packages/network_info_plus/CHANGELOG.md | 232 +++++++ packages/network_info_plus/LICENSE | 27 + packages/network_info_plus/README.md | 127 ++++ .../network_info_plus/android/build.gradle | 34 + .../android/gradle.properties | 1 + .../network_info_plus/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 5 + .../plus/connectivity/Connectivity.java | 103 +++ .../ConnectivityBroadcastReceiver.java | 50 ++ .../ConnectivityMethodChannelHandler.java | 48 ++ .../plus/connectivity/ConnectivityPlugin.java | 63 ++ packages/network_info_plus/example/.gitignore | 46 ++ .../example/android/app/build.gradle | 58 ++ .../gradle/wrapper/gradle-wrapper.properties | 5 + .../android/app/src/main/AndroidManifest.xml | 28 + .../EmbeddingV1Activity.java | 18 + .../EmbeddingV1ActivityTest.java | 17 + .../FlutterActivityTest.java | 17 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../example/android/build.gradle | 29 + .../example/android/gradle.properties | 4 + .../gradle/wrapper/gradle-wrapper.properties | 5 + .../example/android/settings.gradle | 15 + .../ios/Flutter/AppFrameworkInfo.plist | 30 + .../example/ios/Flutter/Debug.xcconfig | 2 + .../example/ios/Flutter/Flutter.podspec | 18 + .../example/ios/Flutter/Release.xcconfig | 2 + .../ios/Runner.xcodeproj/project.pbxproj | 479 +++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/xcschemes/Runner.xcscheme | 87 +++ .../contents.xcworkspacedata | 10 + .../example/ios/Runner/AppDelegate.h | 10 + .../example/ios/Runner/AppDelegate.m | 17 + .../AppIcon.appiconset/Contents.json | 116 ++++ .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 564 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 1588 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 1025 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 1716 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 1920 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 1895 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 3831 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 1888 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 3294 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 3612 bytes .../Runner/Base.lproj/LaunchScreen.storyboard | 27 + .../ios/Runner/Base.lproj/Main.storyboard | 26 + .../example/ios/Runner/Info.plist | 53 ++ .../example/ios/Runner/Runner.entitlements | 8 + .../example/ios/Runner/main.m | 13 + .../network_info_plus/example/lib/main.dart | 170 +++++ .../example/linux/.gitignore | 1 + .../example/linux/CMakeLists.txt | 106 +++ .../example/linux/flutter/CMakeLists.txt | 88 +++ .../flutter/generated_plugin_registrant.cc | 9 + .../flutter/generated_plugin_registrant.h | 13 + .../linux/flutter/generated_plugins.cmake | 15 + .../network_info_plus/example/linux/main.cc | 10 + .../example/linux/my_application.cc | 46 ++ .../example/linux/my_application.h | 18 + .../macos/Flutter/Flutter-Debug.xcconfig | 2 + .../macos/Flutter/Flutter-Release.xcconfig | 2 + .../macos/Runner.xcodeproj/project.pbxproj | 654 ++++++++++++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 101 +++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../example/macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 ++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 46993 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 3276 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 1429 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 5933 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1243 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 14800 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 1874 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 339 +++++++++ .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 2 + .../macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 12 + .../example/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 15 + .../example/macos/Runner/Release.entitlements | 8 + .../network_info_plus/example/pubspec.yaml | 21 + .../test_driver/connectivity_plus_e2e.dart | 41 ++ .../connectivity_plus_e2e_test.dart | 16 + .../network_info_plus/example/web/favicon.png | Bin 0 -> 917 bytes .../example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes .../example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../network_info_plus/example/web/index.html | 33 + .../example/web/manifest.json | 23 + .../network_info_plus/ios/Assets/.gitkeep | 0 .../FLTConnectivityLocationPlusHandler.h | 22 + .../FLTConnectivityLocationPlusHandler.m | 58 ++ .../ios/Classes/FLTConnectivityPlusPlugin.h | 8 + .../ios/Classes/FLTConnectivityPlusPlugin.m | 195 ++++++ .../ios/connectivity_plus.podspec | 23 + .../lib/connectivity_plus.dart | 190 +++++ .../macos/connectivity_plus.podspec | 22 + packages/network_info_plus/pubspec.yaml | 44 ++ .../test/connectivity_test.dart | 96 +++ packages/network_info_plus_linux/.gitignore | 47 ++ packages/network_info_plus_linux/.metadata | 10 + packages/network_info_plus_linux/CHANGELOG.md | 7 + packages/network_info_plus_linux/LICENSE | 27 + packages/network_info_plus_linux/README.md | 12 + .../lib/connectivity_plus_linux.dart | 8 + .../lib/src/connectivity_real.dart | 128 ++++ .../lib/src/connectivity_stub.dart | 16 + .../lib/src/network_manager.dart | 123 ++++ packages/network_info_plus_linux/pubspec.yaml | 29 + .../test/connectivity_plus_linux_test.dart | 47 ++ .../network_info_plus_macos/.gitattributes | 25 + packages/network_info_plus_macos/.gitignore | 47 ++ packages/network_info_plus_macos/CHANGELOG.md | 49 ++ packages/network_info_plus_macos/LICENSE | 27 + packages/network_info_plus_macos/README.md | 12 + .../lib/connectivity_plus_macos.dart | 3 + .../macos/Classes/ConnectivityPlugin.swift | 104 +++ .../macos/Classes/IPHelper.h | 51 ++ .../macos/connectivity_plus_macos.podspec | 21 + packages/network_info_plus_macos/pubspec.yaml | 20 + .../.gitattributes | 25 + .../.gitignore | 46 ++ .../CHANGELOG.md | 44 ++ .../LICENSE | 27 + .../README.md | 12 + .../connectivity_plus_platform_interface.dart | 79 +++ .../lib/src/enums.dart | 32 + .../lib/src/method_channel_connectivity.dart | 81 +++ .../lib/src/utils.dart | 32 + .../pubspec.yaml | 20 + .../method_channel_connectivity_test.dart | 152 ++++ packages/network_info_plus_web/.gitattributes | 25 + packages/network_info_plus_web/.gitignore | 47 ++ packages/network_info_plus_web/.metadata | 10 + packages/network_info_plus_web/CHANGELOG.md | 36 + packages/network_info_plus_web/LICENSE | 26 + packages/network_info_plus_web/README.md | 12 + .../lib/connectivity_plus_web.dart | 63 ++ .../src/dart_html_connectivity_plugin.dart | 34 + ...k_information_api_connectivity_plugin.dart | 61 ++ .../lib/src/utils/connectivity_result.dart | 51 ++ packages/network_info_plus_web/pubspec.yaml | 33 + .../network_info_plus_web/test/.gitignore | 8 + .../network_info_plus_web/test/lib/main.dart | 76 ++ .../test/lib/src/connectivity_mocks.dart | 25 + .../network_info_plus_web/test/web/index.html | 10 + 158 files changed, 6349 insertions(+) create mode 100644 packages/network_info_plus/.gitattributes create mode 100644 packages/network_info_plus/.gitignore create mode 100644 packages/network_info_plus/CHANGELOG.md create mode 100644 packages/network_info_plus/LICENSE create mode 100644 packages/network_info_plus/README.md create mode 100644 packages/network_info_plus/android/build.gradle create mode 100644 packages/network_info_plus/android/gradle.properties create mode 100644 packages/network_info_plus/android/settings.gradle create mode 100644 packages/network_info_plus/android/src/main/AndroidManifest.xml create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java create mode 100644 packages/network_info_plus/example/.gitignore create mode 100644 packages/network_info_plus/example/android/app/build.gradle create mode 100644 packages/network_info_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml create mode 100644 packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java create mode 100644 packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java create mode 100644 packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java create mode 100644 packages/network_info_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 packages/network_info_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 packages/network_info_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 packages/network_info_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 packages/network_info_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 packages/network_info_plus/example/android/build.gradle create mode 100644 packages/network_info_plus/example/android/gradle.properties create mode 100644 packages/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/network_info_plus/example/android/settings.gradle create mode 100644 packages/network_info_plus/example/ios/Flutter/AppFrameworkInfo.plist create mode 100644 packages/network_info_plus/example/ios/Flutter/Debug.xcconfig create mode 100644 packages/network_info_plus/example/ios/Flutter/Flutter.podspec create mode 100644 packages/network_info_plus/example/ios/Flutter/Release.xcconfig create mode 100644 packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj create mode 100644 packages/network_info_plus/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 packages/network_info_plus/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/network_info_plus/example/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/network_info_plus/example/ios/Runner/AppDelegate.h create mode 100644 packages/network_info_plus/example/ios/Runner/AppDelegate.m create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 packages/network_info_plus/example/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 packages/network_info_plus/example/ios/Runner/Base.lproj/Main.storyboard create mode 100644 packages/network_info_plus/example/ios/Runner/Info.plist create mode 100644 packages/network_info_plus/example/ios/Runner/Runner.entitlements create mode 100644 packages/network_info_plus/example/ios/Runner/main.m create mode 100644 packages/network_info_plus/example/lib/main.dart create mode 100644 packages/network_info_plus/example/linux/.gitignore create mode 100644 packages/network_info_plus/example/linux/CMakeLists.txt create mode 100644 packages/network_info_plus/example/linux/flutter/CMakeLists.txt create mode 100644 packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc create mode 100644 packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.h create mode 100644 packages/network_info_plus/example/linux/flutter/generated_plugins.cmake create mode 100644 packages/network_info_plus/example/linux/main.cc create mode 100644 packages/network_info_plus/example/linux/my_application.cc create mode 100644 packages/network_info_plus/example/linux/my_application.h create mode 100644 packages/network_info_plus/example/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 packages/network_info_plus/example/macos/Flutter/Flutter-Release.xcconfig create mode 100644 packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj create mode 100644 packages/network_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 packages/network_info_plus/example/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 packages/network_info_plus/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/network_info_plus/example/macos/Runner/AppDelegate.swift create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 packages/network_info_plus/example/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 packages/network_info_plus/example/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 packages/network_info_plus/example/macos/Runner/Configs/Debug.xcconfig create mode 100644 packages/network_info_plus/example/macos/Runner/Configs/Release.xcconfig create mode 100644 packages/network_info_plus/example/macos/Runner/Configs/Warnings.xcconfig create mode 100644 packages/network_info_plus/example/macos/Runner/DebugProfile.entitlements create mode 100644 packages/network_info_plus/example/macos/Runner/Info.plist create mode 100644 packages/network_info_plus/example/macos/Runner/MainFlutterWindow.swift create mode 100644 packages/network_info_plus/example/macos/Runner/Release.entitlements create mode 100644 packages/network_info_plus/example/pubspec.yaml create mode 100644 packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart create mode 100644 packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart create mode 100644 packages/network_info_plus/example/web/favicon.png create mode 100644 packages/network_info_plus/example/web/icons/Icon-192.png create mode 100644 packages/network_info_plus/example/web/icons/Icon-512.png create mode 100644 packages/network_info_plus/example/web/index.html create mode 100644 packages/network_info_plus/example/web/manifest.json create mode 100644 packages/network_info_plus/ios/Assets/.gitkeep create mode 100644 packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h create mode 100644 packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m create mode 100644 packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h create mode 100644 packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m create mode 100644 packages/network_info_plus/ios/connectivity_plus.podspec create mode 100644 packages/network_info_plus/lib/connectivity_plus.dart create mode 100644 packages/network_info_plus/macos/connectivity_plus.podspec create mode 100644 packages/network_info_plus/pubspec.yaml create mode 100644 packages/network_info_plus/test/connectivity_test.dart create mode 100644 packages/network_info_plus_linux/.gitignore create mode 100644 packages/network_info_plus_linux/.metadata create mode 100644 packages/network_info_plus_linux/CHANGELOG.md create mode 100644 packages/network_info_plus_linux/LICENSE create mode 100644 packages/network_info_plus_linux/README.md create mode 100644 packages/network_info_plus_linux/lib/connectivity_plus_linux.dart create mode 100644 packages/network_info_plus_linux/lib/src/connectivity_real.dart create mode 100644 packages/network_info_plus_linux/lib/src/connectivity_stub.dart create mode 100644 packages/network_info_plus_linux/lib/src/network_manager.dart create mode 100644 packages/network_info_plus_linux/pubspec.yaml create mode 100644 packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart create mode 100644 packages/network_info_plus_macos/.gitattributes create mode 100644 packages/network_info_plus_macos/.gitignore create mode 100644 packages/network_info_plus_macos/CHANGELOG.md create mode 100644 packages/network_info_plus_macos/LICENSE create mode 100644 packages/network_info_plus_macos/README.md create mode 100644 packages/network_info_plus_macos/lib/connectivity_plus_macos.dart create mode 100644 packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift create mode 100644 packages/network_info_plus_macos/macos/Classes/IPHelper.h create mode 100644 packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec create mode 100644 packages/network_info_plus_macos/pubspec.yaml create mode 100644 packages/network_info_plus_platform_interface/.gitattributes create mode 100644 packages/network_info_plus_platform_interface/.gitignore create mode 100644 packages/network_info_plus_platform_interface/CHANGELOG.md create mode 100644 packages/network_info_plus_platform_interface/LICENSE create mode 100644 packages/network_info_plus_platform_interface/README.md create mode 100644 packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart create mode 100644 packages/network_info_plus_platform_interface/lib/src/enums.dart create mode 100644 packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart create mode 100644 packages/network_info_plus_platform_interface/lib/src/utils.dart create mode 100644 packages/network_info_plus_platform_interface/pubspec.yaml create mode 100644 packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart create mode 100644 packages/network_info_plus_web/.gitattributes create mode 100644 packages/network_info_plus_web/.gitignore create mode 100644 packages/network_info_plus_web/.metadata create mode 100644 packages/network_info_plus_web/CHANGELOG.md create mode 100644 packages/network_info_plus_web/LICENSE create mode 100644 packages/network_info_plus_web/README.md create mode 100644 packages/network_info_plus_web/lib/connectivity_plus_web.dart create mode 100644 packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart create mode 100644 packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart create mode 100644 packages/network_info_plus_web/lib/src/utils/connectivity_result.dart create mode 100644 packages/network_info_plus_web/pubspec.yaml create mode 100644 packages/network_info_plus_web/test/.gitignore create mode 100644 packages/network_info_plus_web/test/lib/main.dart create mode 100644 packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart create mode 100644 packages/network_info_plus_web/test/web/index.html diff --git a/packages/network_info_plus/.gitattributes b/packages/network_info_plus/.gitattributes new file mode 100644 index 0000000000..31fda4bf1c --- /dev/null +++ b/packages/network_info_plus/.gitattributes @@ -0,0 +1,25 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Always perform LF normalization on these files +*.dart text +*.gradle text +*.html text +*.java text +*.json text +*.md text +*.py text +*.sh text +*.txt text +*.xml text +*.yaml text + +# Make sure that these Windows files always have CRLF line endings in checkout +*.bat text eol=crlf +*.ps1 text eol=crlf + +# Never perform LF normalization on these files +*.ico binary +*.jar binary +*.png binary +*.zip binary diff --git a/packages/network_info_plus/.gitignore b/packages/network_info_plus/.gitignore new file mode 100644 index 0000000000..88ce490e47 --- /dev/null +++ b/packages/network_info_plus/.gitignore @@ -0,0 +1,47 @@ +.DS_Store +.atom/ +.idea/ +.vscode/ + +.packages +.pub/ +.dart_tool/ +pubspec.lock +flutter_export_environment.sh + +examples/all_plugins/pubspec.yaml + +Podfile +Podfile.lock +Pods/ +.symlinks/ +**/Flutter/App.framework/ +**/Flutter/ephemeral/ +**/Flutter/Flutter.framework/ +**/Flutter/Generated.xcconfig +**/Flutter/flutter_assets/ + +ServiceDefinitions.json +xcuserdata/ +**/DerivedData/ + +local.properties +keystore.properties +.gradle/ +gradlew +gradlew.bat +gradle-wrapper.jar +.flutter-plugins-dependencies +*.iml + +generated_plugin_registrant.dart +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m +GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +build/ +.flutter-plugins + +.project +.classpath +.settings diff --git a/packages/network_info_plus/CHANGELOG.md b/packages/network_info_plus/CHANGELOG.md new file mode 100644 index 0000000000..c0dae836e1 --- /dev/null +++ b/packages/network_info_plus/CHANGELOG.md @@ -0,0 +1,232 @@ +## 0.7.1 + +- Bump linux version. + +## 0.7.0 + +- Add Linux support (`connectivity_plus_linux`). + +## 0.6.0 + +- Fix issue #56: Rename Android and iOS classes and Method Channel to avoid +collision with the original connectivity package. + +## 0.5.0 + +- Transfer to plus-plugins monorepo + +## 0.4.9+2 + +- Update package:e2e to use package:integration_test + +## 0.4.9+1 + +- Update package:e2e reference to use the local version in the flutter/plugins + repository. + +## 0.4.9 + +- Add support for `web` (by endorsing `connectivity_for_web` 0.3.0) + +## 0.4.8+6 + +- Update lower bound of dart dependency to 2.1.0. + +## 0.4.8+5 + +- Declare API stability and compatibility with `1.0.0` (more details at: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0). + +## 0.4.8+4 + +- Bump the minimum Flutter version to 1.12.13+hotfix.5. +- Clean up various Android workarounds no longer needed after framework v1.12. +- Complete v2 embedding support. +- Fix CocoaPods podspec lint warnings. + +## 0.4.8+3 + +- Replace deprecated `getFlutterEngine` call on Android. + +## 0.4.8+2 + +- Remove hard coded ios workspace setting of the example app. + +## 0.4.8+1 + +- Make the pedantic dev_dependency explicit. + +## 0.4.8 + +- Adds macOS as an endorsed platform. + +## 0.4.7 + +- Migrate the plugin to use the ConnectivityPlatform.instance defined in the connectivity_plus_platform_interface package. + +## 0.4.6+2 + +- Migrate deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. +- Bump Flutter SDK to 1.12.13+hotfix.5 or greater (current stable). + +## 0.4.6+1 + +- Remove the deprecated `author:` field from pubspec.yaml +- Migrate the plugin to the pubspec platforms manifest. +- Require Flutter SDK 1.10.0 or greater. + +## 0.4.6 + +- Add macOS support. + +## 0.4.5+8 + +- Update documentation to explain when connectivity updates are received on Android. + +## 0.4.5+7 + +- Fix unawaited futures in the example app and tests. + +## 0.4.5+6 + +- Fix singleton Reachability problem on iOS. + +## 0.4.5+5 + +- Add an analyzer check for the public documentation. + +## 0.4.5+4 + +- Stability and Maintainability: update documentations. + +## 0.4.5+3 + +- Remove AndroidX warnings. + +## 0.4.5+2 + +- Include lifecycle dependency as a compileOnly one on Android to resolve + potential version conflicts with other transitive libraries. + +## 0.4.5+1 + +- Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX. + +## 0.4.5 + +- Support the v2 Android embedder. + +## 0.4.4+1 + +- Update and migrate iOS example project. +- Define clang module for iOS. + +## 0.4.4 + +- Add `requestLocationServiceAuthorization` to request location authorization on iOS. +- Add `getLocationServiceAuthorization` to get location authorization status on iOS. +- Update README: add more information on iOS 13 updates with CNCopyCurrentNetworkInfo. + +## 0.4.3+7 + +- Update README with the updated information about CNCopyCurrentNetworkInfo on iOS 13. + +## 0.4.3+6 + +- [Android] Fix the invalid suppression check (it should be "deprecation" not "deprecated"). + +## 0.4.3+5 + +- [Android] Added API 29 support for `check()`. +- [Android] Suppress warnings for using deprecated APIs. + +## 0.4.3+4 + +- [Android] Updated logic to retrieve network info. + +## 0.4.3+3 + +- Support for TYPE_MOBILE_HIPRI on Android. + +## 0.4.3+2 + +- Add missing template type parameter to `invokeMethod` calls. + +## 0.4.3+1 + +- Fixes lint error by using `getApplicationContext()` when accessing the Wifi Service. + +## 0.4.3 + +- Add getWifiBSSID to obtain current wifi network's BSSID. + +## 0.4.2+2 + +- Add integration test. + +## 0.4.2+1 + +- Bump the minimum Flutter version to 1.2.0. +- Add template type parameter to `invokeMethod` calls. + +## 0.4.2 + +- Adding getWifiIP() to obtain current wifi network's IP. + +## 0.4.1 + +- Add unit tests. + +## 0.4.0+2 + +- Log a more detailed warning at build time about the previous AndroidX + migration. + +## 0.4.0+1 + +- Updated `Connectivity` to a singleton. + +## 0.4.0 + +- **Breaking change**. Migrate from the deprecated original Android Support + Library to AndroidX. This shouldn't result in any functional changes, but it + requires any Android apps using this plugin to [also + migrate](https://developer.android.com/jetpack/androidx/migrate) if they're + using the original support library. + +## 0.3.2 + +- Adding getWifiName() to obtain current wifi network's SSID. + +## 0.3.1 + +- Updated Gradle tooling to match Android Studio 3.1.2. + +## 0.3.0 + +- **Breaking change**. Set SDK constraints to match the Flutter beta release. + +## 0.2.1 + +- Fixed warnings from the Dart 2.0 analyzer. +- Simplified and upgraded Android project template to Android SDK 27. +- Updated package description. + +## 0.2.0 + +- **Breaking change**. Upgraded to Gradle 4.1 and Android Studio Gradle plugin + 3.0.1. Older Flutter projects need to upgrade their Gradle setup as well in + order to use this version of the plugin. Instructions can be found + [here](https://github.com/flutter/flutter/wiki/Updating-Flutter-projects-to-Gradle-4.1-and-Android-Studio-Gradle-plugin-3.0.1). + +## 0.1.1 + +- Add FLT prefix to iOS types. + +## 0.1.0 + +- Breaking API change: Have a Connectivity class instead of a top level function +- Introduce ability to listen for network state changes + +## 0.0.1 + +- Initial release diff --git a/packages/network_info_plus/LICENSE b/packages/network_info_plus/LICENSE new file mode 100644 index 0000000000..c89293372c --- /dev/null +++ b/packages/network_info_plus/LICENSE @@ -0,0 +1,27 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus/README.md b/packages/network_info_plus/README.md new file mode 100644 index 0000000000..8a9229f477 --- /dev/null +++ b/packages/network_info_plus/README.md @@ -0,0 +1,127 @@ +# connectivity_plus + +[![Flutter Community: connectivity_plus](https://fluttercommunity.dev/_github/header/connectivity_plus)](https://github.com/fluttercommunity/community) + +[![pub package](https://img.shields.io/pub/v/connectivity_plus.svg)](https://pub.dev/packages/connectivity_plus) + +This plugin allows Flutter apps to discover network connectivity and configure +themselves accordingly. It can distinguish between cellular vs WiFi connection. +This plugin works for iOS and Android. + +> Note that on Android, this does not guarantee connection to Internet. For instance, +the app might have wifi access but it might be a VPN or a hotel WiFi with no access. + +## Usage + +Sample usage to check current status: + +```dart +import 'package:connectivity_plus/connectivity.dart'; + +var connectivityResult = await (Connectivity().checkConnectivity()); +if (connectivityResult == ConnectivityResult.mobile) { + // I am connected to a mobile network. +} else if (connectivityResult == ConnectivityResult.wifi) { + // I am connected to a wifi network. +} +``` + +> Note that you should not be using the current network status for deciding +whether you can reliably make a network connection. Always guard your app code +against timeouts and errors that might come from the network layer. + +You can also listen for network state changes by subscribing to the stream +exposed by connectivity plugin: + +```dart +import 'package:connectivity_plus/connectivity.dart'; + +@override +initState() { + super.initState(); + + subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { + // Got a new connectivity status! + }) +} + +// Be sure to cancel subscription after you are done +@override +dispose() { + super.dispose(); + + subscription.cancel(); +} +``` + +Note that connectivity changes are no longer communicated to Android apps in the background starting with Android O. *You should always check for connectivity status when your app is resumed.* The broadcast is only useful when your application is in the foreground. + +You can get wi-fi related information using: + +```dart +import 'package:connectivity_plus/connectivity.dart'; + +var wifiBSSID = await (Connectivity().getWifiBSSID()); +var wifiIP = await (Connectivity().getWifiIP());network +var wifiName = await (Connectivity().getWifiName());wifi network +``` + +### iOS 12 + +To use `.getWifiBSSID()` and `.getWifiName()` on iOS >= 12, the `Access WiFi information capability` in XCode must be enabled. Otherwise, both methods will return null. + +### iOS 13 + +The methods `.getWifiBSSID()` and `.getWifiName()` utilize the [`CNCopyCurrentNetworkInfo`](https://developer.apple.com/documentation/systemconfiguration/1614126-cncopycurrentnetworkinfo) function on iOS. + +As of iOS 13, Apple announced that these APIs will no longer return valid information. +An app linked against iOS 12 or earlier receives pseudo-values such as: + + * SSID: "Wi-Fi" or "WLAN" ("WLAN" will be returned for the China SKU). + + * BSSID: "00:00:00:00:00:00" + +An app linked against iOS 13 or later receives `null`. + +The `CNCopyCurrentNetworkInfo` will work for Apps that: + + * The app uses Core Location, and has the user’s authorization to use location information. + + * The app uses the NEHotspotConfiguration API to configure the current Wi-Fi network. + + * The app has active VPN configurations installed. + +If your app falls into the last two categories, it will work as it is. If your app doesn't fall into the last two categories, +and you still need to access the wifi information, you should request user's authorization to use location information. + +There is a helper method provided in this plugin to request the location authorization: `requestLocationServiceAuthorization`. +To request location authorization, make sure to add the following keys to your _Info.plist_ file, located in `/ios/Runner/Info.plist`: + +* `NSLocationAlwaysAndWhenInUseUsageDescription` - describe why the app needs access to the user’s location information all the time (foreground and background). This is called _Privacy - Location Always and When In Use Usage Description_ in the visual editor. +* `NSLocationWhenInUseUsageDescription` - describe why the app needs access to the user’s location information when the app is running in the foreground. This is called _Privacy - Location When In Use Usage Description_ in the visual editor. + +## Limitations on the web platform + +In order to retrieve information about the quality/speed of a browser's connection, the web implementation of the `connectivity` plugin uses the browser's [**NetworkInformation** Web API](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation), which as of this writing (June 2020) is still "experimental", and not available in all browsers: + +![Data on support for the netinfo feature across the major browsers from caniuse.com](https://caniuse.bitsofco.de/image/netinfo.png) + +On desktop browsers, this API only returns a very broad set of connectivity statuses (One of `'slow-2g', '2g', '3g', or '4g'`), and may *not* provide a Stream of changes. Firefox still hasn't enabled this feature by default. + +**Fallback to `navigator.onLine`** + +For those browsers where the NetworkInformation Web API is not available, the plugin falls back to the [**NavigatorOnLine** Web API](https://developer.mozilla.org/en-US/docs/Web/API/NavigatorOnLine), which is more broadly supported: + +![Data on support for the online-status feature across the major browsers from caniuse.com](https://caniuse.bitsofco.de/image/online-status.png) + + +The NavigatorOnLine API is [provided by `dart:html`](https://api.dart.dev/stable/2.7.2/dart-html/Navigator/onLine.html), and only supports a boolean connectivity status (either online or offline), with no network speed information. In those cases the plugin will return either `wifi` (when the browser is online) or `none` (when it's not). + +Other than the approximate "downlink" speed, where available, and due to security and privacy concerns, **no Web browser will provide** any specific information about the actual network your users' device is connected to, like **the SSID on a Wi-Fi, or the MAC address of their device.** + +## Getting Started + +For help getting started with Flutter, view our online +[documentation](https://flutter.dev/). + +For help on editing plugin code, view the [documentation](https://flutter.dev/platform-plugins/#edit-code). diff --git a/packages/network_info_plus/android/build.gradle b/packages/network_info_plus/android/build.gradle new file mode 100644 index 0000000000..b9b147b29b --- /dev/null +++ b/packages/network_info_plus/android/build.gradle @@ -0,0 +1,34 @@ +group 'io.flutter.plugins.connectivity' +version '1.0-SNAPSHOT' + +buildscript { + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.3.0' + } +} + +rootProject.allprojects { + repositories { + google() + jcenter() + } +} + +apply plugin: 'com.android.library' + +android { + compileSdkVersion 28 + + defaultConfig { + minSdkVersion 16 + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + lintOptions { + disable 'InvalidPackage' + } +} diff --git a/packages/network_info_plus/android/gradle.properties b/packages/network_info_plus/android/gradle.properties new file mode 100644 index 0000000000..8bd86f6805 --- /dev/null +++ b/packages/network_info_plus/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536M diff --git a/packages/network_info_plus/android/settings.gradle b/packages/network_info_plus/android/settings.gradle new file mode 100644 index 0000000000..4fbed4753c --- /dev/null +++ b/packages/network_info_plus/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'connectivity' diff --git a/packages/network_info_plus/android/src/main/AndroidManifest.xml b/packages/network_info_plus/android/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..777ad1eefa --- /dev/null +++ b/packages/network_info_plus/android/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java new file mode 100644 index 0000000000..dc25e34005 --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java @@ -0,0 +1,103 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.connectivity; + +import android.net.ConnectivityManager; +import android.net.Network; +import android.net.NetworkCapabilities; +import android.net.NetworkInfo; +import android.net.wifi.WifiInfo; +import android.net.wifi.WifiManager; +import android.os.Build; + +/** Reports connectivity related information such as connectivity type and wifi information. */ +class Connectivity { + private ConnectivityManager connectivityManager; + private WifiManager wifiManager; + + Connectivity(ConnectivityManager connectivityManager, WifiManager wifiManager) { + this.connectivityManager = connectivityManager; + this.wifiManager = wifiManager; + } + + String getNetworkType() { + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + Network network = connectivityManager.getActiveNetwork(); + NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network); + if (capabilities == null) { + return "none"; + } + if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) + || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) { + return "wifi"; + } + if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { + return "mobile"; + } + } + + return getNetworkTypeLegacy(); + } + + String getWifiName() { + WifiInfo wifiInfo = getWifiInfo(); + String ssid = null; + if (wifiInfo != null) ssid = wifiInfo.getSSID(); + if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID" + return ssid; + } + + String getWifiBSSID() { + WifiInfo wifiInfo = getWifiInfo(); + String bssid = null; + if (wifiInfo != null) { + bssid = wifiInfo.getBSSID(); + } + return bssid; + } + + String getWifiIPAddress() { + WifiInfo wifiInfo = null; + if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo(); + + String ip = null; + int i_ip = 0; + if (wifiInfo != null) i_ip = wifiInfo.getIpAddress(); + + if (i_ip != 0) + ip = + String.format( + "%d.%d.%d.%d", + (i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff)); + + return ip; + } + + private WifiInfo getWifiInfo() { + return wifiManager == null ? null : wifiManager.getConnectionInfo(); + } + + @SuppressWarnings("deprecation") + private String getNetworkTypeLegacy() { + // handle type for Android versions less than Android 9 + NetworkInfo info = connectivityManager.getActiveNetworkInfo(); + if (info == null || !info.isConnected()) { + return "none"; + } + int type = info.getType(); + switch (type) { + case ConnectivityManager.TYPE_ETHERNET: + case ConnectivityManager.TYPE_WIFI: + case ConnectivityManager.TYPE_WIMAX: + return "wifi"; + case ConnectivityManager.TYPE_MOBILE: + case ConnectivityManager.TYPE_MOBILE_DUN: + case ConnectivityManager.TYPE_MOBILE_HIPRI: + return "mobile"; + default: + return "none"; + } + } +} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java new file mode 100644 index 0000000000..c295d3cc67 --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -0,0 +1,50 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.connectivity; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.net.ConnectivityManager; +import io.flutter.plugin.common.EventChannel; + +/** + * The ConnectivityBroadcastReceiver receives the connectivity updates and send them to the UIThread + * through an {@link EventChannel.EventSink} + * + *

Use {@link + * io.flutter.plugin.common.EventChannel#setStreamHandler(io.flutter.plugin.common.EventChannel.StreamHandler)} + * to set up the receiver. + */ +class ConnectivityBroadcastReceiver extends BroadcastReceiver + implements EventChannel.StreamHandler { + private Context context; + private Connectivity connectivity; + private EventChannel.EventSink events; + + ConnectivityBroadcastReceiver(Context context, Connectivity connectivity) { + this.context = context; + this.connectivity = connectivity; + } + + @Override + public void onListen(Object arguments, EventChannel.EventSink events) { + this.events = events; + context.registerReceiver(this, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)); + } + + @Override + public void onCancel(Object arguments) { + context.unregisterReceiver(this); + } + + @Override + public void onReceive(Context context, Intent intent) { + if (events != null) { + events.success(connectivity.getNetworkType()); + } + } +} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java new file mode 100644 index 0000000000..d776964c85 --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java @@ -0,0 +1,48 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.connectivity; + +import io.flutter.plugin.common.MethodCall; +import io.flutter.plugin.common.MethodChannel; + +/** + * The handler receives {@link MethodCall}s from the UIThread, gets the related information from + * a @{@link Connectivity}, and then send the result back to the UIThread through the {@link + * MethodChannel.Result}. + */ +class ConnectivityMethodChannelHandler implements MethodChannel.MethodCallHandler { + + private Connectivity connectivity; + + /** + * Construct the ConnectivityMethodChannelHandler with a {@code connectivity}. The {@code + * connectivity} must not be null. + */ + ConnectivityMethodChannelHandler(Connectivity connectivity) { + assert (connectivity != null); + this.connectivity = connectivity; + } + + @Override + public void onMethodCall(MethodCall call, MethodChannel.Result result) { + switch (call.method) { + case "check": + result.success(connectivity.getNetworkType()); + break; + case "wifiName": + result.success(connectivity.getWifiName()); + break; + case "wifiBSSID": + result.success(connectivity.getWifiBSSID()); + break; + case "wifiIPAddress": + result.success(connectivity.getWifiIPAddress()); + break; + default: + result.notImplemented(); + break; + } + } +} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java new file mode 100644 index 0000000000..717426acb8 --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java @@ -0,0 +1,63 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.connectivity; + +import android.content.Context; +import android.net.ConnectivityManager; +import android.net.wifi.WifiManager; +import io.flutter.embedding.engine.plugins.FlutterPlugin; +import io.flutter.plugin.common.BinaryMessenger; +import io.flutter.plugin.common.EventChannel; +import io.flutter.plugin.common.MethodChannel; +import io.flutter.plugin.common.PluginRegistry.Registrar; + +/** ConnectivityPlugin */ +public class ConnectivityPlugin implements FlutterPlugin { + + private MethodChannel methodChannel; + private EventChannel eventChannel; + + /** Plugin registration. */ + public static void registerWith(Registrar registrar) { + + ConnectivityPlugin plugin = new ConnectivityPlugin(); + plugin.setupChannels(registrar.messenger(), registrar.context()); + } + + @Override + public void onAttachedToEngine(FlutterPluginBinding binding) { + setupChannels(binding.getBinaryMessenger(), binding.getApplicationContext()); + } + + @Override + public void onDetachedFromEngine(FlutterPluginBinding binding) { + teardownChannels(); + } + + private void setupChannels(BinaryMessenger messenger, Context context) { + methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/connectivity"); + eventChannel = new EventChannel(messenger, "dev.fluttercommunity.plus/connectivity_status"); + ConnectivityManager connectivityManager = + (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + + Connectivity connectivity = new Connectivity(connectivityManager, wifiManager); + + ConnectivityMethodChannelHandler methodChannelHandler = + new ConnectivityMethodChannelHandler(connectivity); + ConnectivityBroadcastReceiver receiver = + new ConnectivityBroadcastReceiver(context, connectivity); + + methodChannel.setMethodCallHandler(methodChannelHandler); + eventChannel.setStreamHandler(receiver); + } + + private void teardownChannels() { + methodChannel.setMethodCallHandler(null); + eventChannel.setStreamHandler(null); + methodChannel = null; + eventChannel = null; + } +} diff --git a/packages/network_info_plus/example/.gitignore b/packages/network_info_plus/example/.gitignore new file mode 100644 index 0000000000..0fa6b675c0 --- /dev/null +++ b/packages/network_info_plus/example/.gitignore @@ -0,0 +1,46 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# 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 +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/packages/network_info_plus/example/android/app/build.gradle b/packages/network_info_plus/example/android/app/build.gradle new file mode 100644 index 0000000000..5d1f138bfe --- /dev/null +++ b/packages/network_info_plus/example/android/app/build.gradle @@ -0,0 +1,58 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 28 + + lintOptions { + disable 'InvalidPackage' + } + + defaultConfig { + applicationId "io.flutter.plugins.connectivityexample" + minSdkVersion 16 + targetSdkVersion 28 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' +} diff --git a/packages/network_info_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/network_info_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..9a4163a4f5 --- /dev/null +++ b/packages/network_info_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml b/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..902642e0ca --- /dev/null +++ b/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java new file mode 100644 index 0000000000..795af0a5c1 --- /dev/null +++ b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java @@ -0,0 +1,18 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package io.flutter.plugins.connectivityexample; + +import android.os.Bundle; +import dev.fluttercommunity.plus.connectivity.ConnectivityPlugin; +import io.flutter.app.FlutterActivity; + +public class EmbeddingV1Activity extends FlutterActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ConnectivityPlugin.registerWith( + registrarFor("dev.fluttercommunity.plus.connectivity.ConnectivityPlugin")); + } +} diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java new file mode 100644 index 0000000000..048da07099 --- /dev/null +++ b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java @@ -0,0 +1,17 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package io.flutter.plugins.connectivityexample; + +import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.integration_test.FlutterTestRunner; +import org.junit.Rule; +import org.junit.runner.RunWith; + +@RunWith(FlutterTestRunner.class) +public class EmbeddingV1ActivityTest { + @Rule + public ActivityTestRule rule = + new ActivityTestRule<>(EmbeddingV1Activity.class); +} diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java new file mode 100644 index 0000000000..0f0dcf2555 --- /dev/null +++ b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java @@ -0,0 +1,17 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package io.flutter.plugins.connectivityexample; + +import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.integration_test.FlutterTestRunner; +import io.flutter.embedding.android.FlutterActivity; +import org.junit.Rule; +import org.junit.runner.RunWith; + +@RunWith(FlutterTestRunner.class) +public class FlutterActivityTest { + @Rule + public ActivityTestRule rule = new ActivityTestRule<>(FlutterActivity.class); +} diff --git a/packages/network_info_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/network_info_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/network_info_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/network_info_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/network_info_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/android/build.gradle b/packages/network_info_plus/example/android/build.gradle new file mode 100644 index 0000000000..541636cc49 --- /dev/null +++ b/packages/network_info_plus/example/android/build.gradle @@ -0,0 +1,29 @@ +buildscript { + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.3.0' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/packages/network_info_plus/example/android/gradle.properties b/packages/network_info_plus/example/android/gradle.properties new file mode 100644 index 0000000000..a6738207fd --- /dev/null +++ b/packages/network_info_plus/example/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true diff --git a/packages/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..019065d1d6 --- /dev/null +++ b/packages/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/packages/network_info_plus/example/android/settings.gradle b/packages/network_info_plus/example/android/settings.gradle new file mode 100644 index 0000000000..a159ea7cb9 --- /dev/null +++ b/packages/network_info_plus/example/android/settings.gradle @@ -0,0 +1,15 @@ +include ':app' + +def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + +def plugins = new Properties() +def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') +if (pluginsFile.exists()) { + pluginsFile.withInputStream { stream -> plugins.load(stream) } +} + +plugins.each { name, path -> + def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() + include ":$name" + project(":$name").projectDir = pluginDirectory +} diff --git a/packages/network_info_plus/example/ios/Flutter/AppFrameworkInfo.plist b/packages/network_info_plus/example/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000000..6c2de8086b --- /dev/null +++ b/packages/network_info_plus/example/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + UIRequiredDeviceCapabilities + + arm64 + + MinimumOSVersion + 8.0 + + diff --git a/packages/network_info_plus/example/ios/Flutter/Debug.xcconfig b/packages/network_info_plus/example/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000000..e8efba1146 --- /dev/null +++ b/packages/network_info_plus/example/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/network_info_plus/example/ios/Flutter/Flutter.podspec b/packages/network_info_plus/example/ios/Flutter/Flutter.podspec new file mode 100644 index 0000000000..5ca30416ba --- /dev/null +++ b/packages/network_info_plus/example/ios/Flutter/Flutter.podspec @@ -0,0 +1,18 @@ +# +# NOTE: This podspec is NOT to be published. It is only used as a local source! +# + +Pod::Spec.new do |s| + s.name = 'Flutter' + s.version = '1.0.0' + s.summary = 'High-performance, high-fidelity mobile apps.' + s.description = <<-DESC +Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS. + DESC + s.homepage = 'https://flutter.io' + s.license = { :type => 'MIT' } + s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } + s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } + s.ios.deployment_target = '8.0' + s.vendored_frameworks = 'Flutter.framework' +end diff --git a/packages/network_info_plus/example/ios/Flutter/Release.xcconfig b/packages/network_info_plus/example/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000000..399e9340e6 --- /dev/null +++ b/packages/network_info_plus/example/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..2779467fbc --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,479 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; + 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + EB0BA966000B5C35B13186D7 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C80D49AFD183103034E444C2 /* libPods-Runner.a */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3173C764DD180BE02EB51E47 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 69D903F0A9A7C636EE803AF8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C80D49AFD183103034E444C2 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + EB0BA966000B5C35B13186D7 /* libPods-Runner.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 89F516DEFCBF79E39D2885C2 /* Frameworks */ = { + isa = PBXGroup; + children = ( + C80D49AFD183103034E444C2 /* libPods-Runner.a */, + ); + name = Frameworks; + sourceTree = ""; + }; + 8ECC1C323F60D5498EEC2315 /* Pods */ = { + isa = PBXGroup; + children = ( + 69D903F0A9A7C636EE803AF8 /* Pods-Runner.debug.xcconfig */, + 3173C764DD180BE02EB51E47 /* Pods-Runner.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 8ECC1C323F60D5498EEC2315 /* Pods */, + 89F516DEFCBF79E39D2885C2 /* Frameworks */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, + 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 97C146F21CF9000F007C117D /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 3BAF367E8BACBC7576CEE653 /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1100; + ORGANIZATIONNAME = "The Chromium Authors"; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 3BAF367E8BACBC7576CEE653 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../Flutter/Flutter.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, + 97C146F31CF9000F007C117D /* main.m in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.connectivityExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.connectivityExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/packages/network_info_plus/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..1d526a16ed --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/packages/network_info_plus/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/network_info_plus/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000000..3bb3697ef4 --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/network_info_plus/example/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..21a3cc14c7 --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/network_info_plus/example/ios/Runner/AppDelegate.h b/packages/network_info_plus/example/ios/Runner/AppDelegate.h new file mode 100644 index 0000000000..d9e18e990f --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/AppDelegate.h @@ -0,0 +1,10 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import +#import + +@interface AppDelegate : FlutterAppDelegate + +@end diff --git a/packages/network_info_plus/example/ios/Runner/AppDelegate.m b/packages/network_info_plus/example/ios/Runner/AppDelegate.m new file mode 100644 index 0000000000..f086757071 --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/AppDelegate.m @@ -0,0 +1,17 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "AppDelegate.h" +#include "GeneratedPluginRegistrant.h" + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application + didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [GeneratedPluginRegistrant registerWithRegistry:self]; + // Override point for customization after application launch. + return [super application:application didFinishLaunchingWithOptions:launchOptions]; +} + +@end diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..d22f10b2ab --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..28c6bf03016f6c994b70f38d1b7346e5831b531f GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR5%f>l)FnDQ543{x%ZCiu33$Wg!pQFfT_}?5Q|_VSlIbLC`dpoMXL}9 zHfd9&47Mo(7D231gb+kjFxZHS4-m~7WurTH&doVX2KI5sU4v(sJ1@T9eCIKPjsqSr z)C01LsCxk=72-vXmX}CQD#BD;Cthymh&~=f$Q8nn0J<}ZrusBy4PvRNE}+1ceuj8u z0mW5k8fmgeLnTbWHGwfKA3@PdZxhn|PypR&^p?weGftrtCbjF#+zk_5BJh7;0`#Wr zgDpM_;Ax{jO##IrT`Oz;MvfwGfV$zD#c2xckpcXC6oou4ML~ezCc2EtnsQTB4tWNg z?4bkf;hG7IMfhgNI(FV5Gs4|*GyMTIY0$B=_*mso9Ityq$m^S>15>-?0(zQ<8Qy<_TjHE33(?_M8oaM zyc;NxzRVK@DL6RJnX%U^xW0Gpg(lXp(!uK1v0YgHjs^ZXSQ|m#lV7ip7{`C_J2TxPmfw%h$|%acrYHt)Re^PB%O&&=~a zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?DuHZf3iogk_%#9E|5S zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+ zX$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8 zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ! z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=O zx-7$a;U><*5L^!%xRlw)vAbh;sdlR||& ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#16c{ zJImlNL(npL!W|Gr_kxl1GVmF5&^$^YherS7+~q$p zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$ tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..f091b6b0bca859a3f474b03065bef75ba58a9e4c GIT binary patch literal 1588 zcmV-42Fv-0P)C1SqPt}wig>|5Crh^=oyX$BK<}M8eLU3e2hGT;=G|!_SP)7zNI6fqUMB=)y zRAZ>eDe#*r`yDAVgB_R*LB*MAc)8(b{g{9McCXW!lq7r(btRoB9!8B-#AI6JMb~YFBEvdsV)`mEQO^&#eRKx@b&x- z5lZm*!WfD8oCLzfHGz#u7sT0^VLMI1MqGxF^v+`4YYnVYgk*=kU?HsSz{v({E3lb9 z>+xILjBN)t6`=g~IBOelGQ(O990@BfXf(DRI5I$qN$0Gkz-FSc$3a+2fX$AedL4u{ z4V+5Ong(9LiGcIKW?_352sR;LtDPmPJXI{YtT=O8=76o9;*n%_m|xo!i>7$IrZ-{l z-x3`7M}qzHsPV@$v#>H-TpjDh2UE$9g6sysUREDy_R(a)>=eHw-WAyfIN z*qb!_hW>G)Tu8nSw9yn#3wFMiLcfc4pY0ek1}8(NqkBR@t4{~oC>ryc-h_ByH(Cg5 z>ao-}771+xE3um9lWAY1FeQFxowa1(!J(;Jg*wrg!=6FdRX+t_<%z&d&?|Bn){>zm zZQj(aA_HeBY&OC^jj*)N`8fa^ePOU72VpInJoI1?`ty#lvlNzs(&MZX+R%2xS~5Kh zX*|AU4QE#~SgPzOXe9>tRj>hjU@c1k5Y_mW*Jp3fI;)1&g3j|zDgC+}2Q_v%YfDax z!?umcN^n}KYQ|a$Lr+51Nf9dkkYFSjZZjkma$0KOj+;aQ&721~t7QUKx61J3(P4P1 zstI~7-wOACnWP4=8oGOwz%vNDqD8w&Q`qcNGGrbbf&0s9L0De{4{mRS?o0MU+nR_! zrvshUau0G^DeMhM_v{5BuLjb#Hh@r23lDAk8oF(C+P0rsBpv85EP>4CVMx#04MOfG z;P%vktHcXwTj~+IE(~px)3*MY77e}p#|c>TD?sMatC0Tu4iKKJ0(X8jxQY*gYtxsC z(zYC$g|@+I+kY;dg_dE>scBf&bP1Nc@Hz<3R)V`=AGkc;8CXqdi=B4l2k|g;2%#m& z*jfX^%b!A8#bI!j9-0Fi0bOXl(-c^AB9|nQaE`*)Hw+o&jS9@7&Gov#HbD~#d{twV zXd^Tr^mWLfFh$@Dr$e;PBEz4(-2q1FF0}c;~B5sA}+Q>TOoP+t>wf)V9Iy=5ruQa;z)y zI9C9*oUga6=hxw6QasLPnee@3^Rr*M{CdaL5=R41nLs(AHk_=Y+A9$2&H(B7!_pURs&8aNw7?`&Z&xY_Ye z)~D5Bog^td-^QbUtkTirdyK^mTHAOuptDflut!#^lnKqU md>ggs(5nOWAqO?umG&QVYK#ibz}*4>0000U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI zC*%Wgg22K|8E#!~cTNYR~@Y9KepMPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#% zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?( ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF4|Rt=2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw zqn8u9a)z>l(1kEaPYZ6hwubN6i<8QHgsu0oE) ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy z0um=e3$K3i6K{U_4K!EX?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB# vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{ literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ef06e7edb86cdfe0d15b4b0d98334a86163658 GIT binary patch literal 1716 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 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f9ed8f5cee1c98386d13b17e89f719e83555b2 GIT binary patch literal 1895 zcmV-t2blPYP)FQtfgmafE#=YDCq`qUBt#QpG%*H6QHY765~R=q zZ6iudfM}q!Pz#~9JgOi8QJ|DSu?1-*(kSi1K4#~5?#|rh?sS)(-JQqX*}ciXJ56_H zdw=^s_srbAdqxlvGyrgGet#6T7_|j;95sL%MtM;q86vOxKM$f#puR)Bjv9Zvz9-di zXOTSsZkM83)E9PYBXC<$6(|>lNLVBb&&6y{NByFCp%6+^ALR@NCTse_wqvNmSWI-m z!$%KlHFH2omF!>#%1l3LTZg(s7eof$7*xB)ZQ0h?ejh?Ta9fDv59+u#MokW+1t8Zb zgHv%K(u9G^Lv`lh#f3<6!JVTL3(dCpxHbnbA;kKqQyd1~^Xe0VIaYBSWm6nsr;dFj z4;G-RyL?cYgsN1{L4ZFFNa;8)Rv0fM0C(~Tkit94 zz#~A)59?QjD&pAPSEQ)p8gP|DS{ng)j=2ux)_EzzJ773GmQ_Cic%3JJhC0t2cx>|v zJcVusIB!%F90{+}8hG3QU4KNeKmK%T>mN57NnCZ^56=0?&3@!j>a>B43pi{!u z7JyDj7`6d)qVp^R=%j>UIY6f+3`+qzIc!Y_=+uN^3BYV|o+$vGo-j-Wm<10%A=(Yk^beI{t%ld@yhKjq0iNjqN4XMGgQtbKubPM$JWBz}YA65k%dm*awtC^+f;a-x4+ddbH^7iDWGg&N0n#MW{kA|=8iMUiFYvMoDY@sPC#t$55gn6ykUTPAr`a@!(;np824>2xJthS z*ZdmT`g5-`BuJs`0LVhz+D9NNa3<=6m;cQLaF?tCv8)zcRSh66*Z|vXhG@$I%U~2l z?`Q zykI#*+rQ=z6Jm=Bui-SfpDYLA=|vzGE(dYm=OC8XM&MDo7ux4UF1~0J1+i%aCUpRe zt3L_uNyQ*cE(38Uy03H%I*)*Bh=Lb^Xj3?I^Hnbeq72(EOK^Y93CNp*uAA{5Lc=ky zx=~RKa4{iTm{_>_vSCm?$Ej=i6@=m%@VvAITnigVg{&@!7CDgs908761meDK5azA} z4?=NOH|PdvabgJ&fW2{Mo$Q0CcD8Qc84%{JPYt5EiG{MdLIAeX%T=D7NIP4%Hw}p9 zg)==!2Lbp#j{u_}hMiao9=!VSyx0gHbeCS`;q&vzeq|fs`y&^X-lso(Ls@-706qmA z7u*T5PMo_w3{se1t2`zWeO^hOvTsohG_;>J0wVqVe+n)AbQCx)yh9;w+J6?NF5Lmo zecS@ieAKL8%bVd@+-KT{yI|S}O>pYckUFs;ry9Ow$CD@ztz5K-*D$^{i(_1llhSh^ zEkL$}tsQt5>QA^;QgjgIfBDmcOgi5YDyu?t6vSnbp=1+@6D& z5MJ}B8q;bRlVoxasyhcUF1+)o`&3r0colr}QJ3hcSdLu;9;td>kf@Tcn<@9sIx&=m z;AD;SCh95=&p;$r{Xz3iWCO^MX83AGJ(yH&eTXgv|0=34#-&WAmw{)U7OU9!Wz^!7 zZ%jZFi@JR;>Mhi7S>V7wQ176|FdW2m?&`qa(ScO^CFPR80HucLHOTy%5s*HR0^8)i h0WYBP*#0Ks^FNSabJA*5${_#%002ovPDHLkV1oKhTl@e3 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..75b2d164a5a98e212cca15ea7bf2ab5de5108680 GIT binary patch literal 3831 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 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/network_info_plus/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..c4df70d39da7941ef3f6dcb7f06a192d8dcb308d GIT binary patch literal 1888 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 iW8 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/ios/Runner/Base.lproj/Main.storyboard b/packages/network_info_plus/example/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..f3c28516fb --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/ios/Runner/Info.plist b/packages/network_info_plus/example/ios/Runner/Info.plist new file mode 100644 index 0000000000..babbd80f16 --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/Info.plist @@ -0,0 +1,53 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + connectivity_example + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + NSLocationAlwaysAndWhenInUseUsageDescription + This app requires accessing your location information all the time to get wi-fi information. + NSLocationWhenInUseUsageDescription + This app requires accessing your location information when the app is in foreground to get wi-fi information. + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/packages/network_info_plus/example/ios/Runner/Runner.entitlements b/packages/network_info_plus/example/ios/Runner/Runner.entitlements new file mode 100644 index 0000000000..ba21fbdaf2 --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/Runner.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.developer.networking.wifi-info + + + diff --git a/packages/network_info_plus/example/ios/Runner/main.m b/packages/network_info_plus/example/ios/Runner/main.m new file mode 100644 index 0000000000..bec320c0be --- /dev/null +++ b/packages/network_info_plus/example/ios/Runner/main.m @@ -0,0 +1,13 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import +#import +#import "AppDelegate.h" + +int main(int argc, char* argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/packages/network_info_plus/example/lib/main.dart b/packages/network_info_plus/example/lib/main.dart new file mode 100644 index 0000000000..bd5f90df85 --- /dev/null +++ b/packages/network_info_plus/example/lib/main.dart @@ -0,0 +1,170 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// ignore_for_file: public_member_api_docs + +import 'dart:async'; +import 'dart:io'; + +import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Sets a platform override for desktop to avoid exceptions. See +// https://flutter.dev/desktop#target-platform-override for more info. +void _enablePlatformOverrideForDesktop() { + if (!kIsWeb && (Platform.isWindows || Platform.isLinux)) { + debugDefaultTargetPlatformOverride = TargetPlatform.fuchsia; + } +} + +void main() { + _enablePlatformOverrideForDesktop(); + runApp(MyApp()); +} + +class MyApp extends StatelessWidget { + // This widget is the root of your application. + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Flutter Demo', + theme: ThemeData( + primarySwatch: Colors.blue, + ), + home: MyHomePage(title: 'Flutter Demo Home Page'), + ); + } +} + +class MyHomePage extends StatefulWidget { + MyHomePage({Key key, this.title}) : super(key: key); + + final String title; + + @override + _MyHomePageState createState() => _MyHomePageState(); +} + +class _MyHomePageState extends State { + String _connectionStatus = 'Unknown'; + final Connectivity _connectivity = Connectivity(); + StreamSubscription _connectivitySubscription; + + @override + void initState() { + super.initState(); + initConnectivity(); + _connectivitySubscription = + _connectivity.onConnectivityChanged.listen(_updateConnectionStatus); + } + + @override + void dispose() { + _connectivitySubscription.cancel(); + super.dispose(); + } + + // Platform messages are asynchronous, so we initialize in an async method. + Future initConnectivity() async { + ConnectivityResult result; + // Platform messages may fail, so we use a try/catch PlatformException. + try { + result = await _connectivity.checkConnectivity(); + } on PlatformException catch (e) { + print(e.toString()); + } + + // If the widget was removed from the tree while the asynchronous platform + // message was in flight, we want to discard the reply rather than calling + // setState to update our non-existent appearance. + if (!mounted) { + return Future.value(null); + } + + return _updateConnectionStatus(result); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: const Text('Connectivity example app'), + ), + body: Center(child: Text('Connection Status: $_connectionStatus')), + ); + } + + Future _updateConnectionStatus(ConnectivityResult result) async { + switch (result) { + case ConnectivityResult.wifi: + String wifiName, wifiBSSID, wifiIP; + + try { + if (!kIsWeb && Platform.isIOS) { + var status = await _connectivity.getLocationServiceAuthorization(); + if (status == LocationAuthorizationStatus.notDetermined) { + status = + await _connectivity.requestLocationServiceAuthorization(); + } + if (status == LocationAuthorizationStatus.authorizedAlways || + status == LocationAuthorizationStatus.authorizedWhenInUse) { + wifiName = await _connectivity.getWifiName(); + } else { + wifiName = await _connectivity.getWifiName(); + } + } else { + wifiName = await _connectivity.getWifiName(); + } + } on PlatformException catch (e) { + print(e.toString()); + wifiName = 'Failed to get Wifi Name'; + } + + try { + if (!kIsWeb && Platform.isIOS) { + var status = await _connectivity.getLocationServiceAuthorization(); + if (status == LocationAuthorizationStatus.notDetermined) { + status = + await _connectivity.requestLocationServiceAuthorization(); + } + if (status == LocationAuthorizationStatus.authorizedAlways || + status == LocationAuthorizationStatus.authorizedWhenInUse) { + wifiBSSID = await _connectivity.getWifiBSSID(); + } else { + wifiBSSID = await _connectivity.getWifiBSSID(); + } + } else { + wifiBSSID = await _connectivity.getWifiBSSID(); + } + } on PlatformException catch (e) { + print(e.toString()); + wifiBSSID = 'Failed to get Wifi BSSID'; + } + + try { + wifiIP = await _connectivity.getWifiIP(); + } on PlatformException catch (e) { + print(e.toString()); + wifiIP = 'Failed to get Wifi IP'; + } + + setState(() { + _connectionStatus = '$result\n' + 'Wifi Name: $wifiName\n' + 'Wifi BSSID: $wifiBSSID\n' + 'Wifi IP: $wifiIP\n'; + }); + break; + case ConnectivityResult.mobile: + case ConnectivityResult.none: + setState(() => _connectionStatus = result.toString()); + break; + default: + setState(() => _connectionStatus = 'Failed to get connectivity.'); + break; + } + } +} diff --git a/packages/network_info_plus/example/linux/.gitignore b/packages/network_info_plus/example/linux/.gitignore new file mode 100644 index 0000000000..d3896c9844 --- /dev/null +++ b/packages/network_info_plus/example/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/packages/network_info_plus/example/linux/CMakeLists.txt b/packages/network_info_plus/example/linux/CMakeLists.txt new file mode 100644 index 0000000000..279007eb35 --- /dev/null +++ b/packages/network_info_plus/example/linux/CMakeLists.txt @@ -0,0 +1,106 @@ +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +set(BINARY_NAME "example") +set(APPLICATION_ID "io.flutter.plugins.example") + +cmake_policy(SET CMP0063 NEW) + +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Configure build options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") + +# Flutter library and tool build rules. +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Application build +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) +apply_standard_settings(${BINARY_NAME}) +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) +add_dependencies(${BINARY_NAME} flutter_assemble) +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/packages/network_info_plus/example/linux/flutter/CMakeLists.txt b/packages/network_info_plus/example/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000000..4f48a7ced5 --- /dev/null +++ b/packages/network_info_plus/example/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) +pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO + PkgConfig::BLKID +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + linux-x64 ${CMAKE_BUILD_TYPE} +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000000..d38195aa04 --- /dev/null +++ b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,9 @@ +// +// Generated file. Do not edit. +// + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.h b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000000..9bf7478940 --- /dev/null +++ b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,13 @@ +// +// Generated file. Do not edit. +// + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/packages/network_info_plus/example/linux/flutter/generated_plugins.cmake b/packages/network_info_plus/example/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000000..51436ae8c9 --- /dev/null +++ b/packages/network_info_plus/example/linux/flutter/generated_plugins.cmake @@ -0,0 +1,15 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) diff --git a/packages/network_info_plus/example/linux/main.cc b/packages/network_info_plus/example/linux/main.cc new file mode 100644 index 0000000000..058e6178fe --- /dev/null +++ b/packages/network_info_plus/example/linux/main.cc @@ -0,0 +1,10 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + // Only X11 is currently supported. + // Wayland support is being developed: https://github.com/flutter/flutter/issues/57932. + gdk_set_allowed_backends("x11"); + + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/packages/network_info_plus/example/linux/my_application.cc b/packages/network_info_plus/example/linux/my_application.cc new file mode 100644 index 0000000000..f28ca30940 --- /dev/null +++ b/packages/network_info_plus/example/linux/my_application.cc @@ -0,0 +1,46 @@ +#include "my_application.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "example"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + nullptr)); +} diff --git a/packages/network_info_plus/example/linux/my_application.h b/packages/network_info_plus/example/linux/my_application.h new file mode 100644 index 0000000000..72271d5e41 --- /dev/null +++ b/packages/network_info_plus/example/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/packages/network_info_plus/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/network_info_plus/example/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000000..785633d3a8 --- /dev/null +++ b/packages/network_info_plus/example/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/network_info_plus/example/macos/Flutter/Flutter-Release.xcconfig b/packages/network_info_plus/example/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000000..5fba960c3a --- /dev/null +++ b/packages/network_info_plus/example/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj b/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..0e2413493f --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,654 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; + 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; + D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + EA473EC5F2038B17A2FE4D78 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748ADDF1719804343BB18004 /* Pods_Runner.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */, + 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */, + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* connectivity_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = connectivity_example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 748ADDF1719804343BB18004 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 80418F0A2F74D683C63A4D0A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + AA19B00394637215A825CF5E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; + E960ED3977AF6DF197F74FFA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, + 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, + EA473EC5F2038B17A2FE4D78 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + D42EAEE5849744148CC78D83 /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* connectivity_example.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + D73912EF22F37F9E000D13A0 /* App.framework */, + 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D42EAEE5849744148CC78D83 /* Pods */ = { + isa = PBXGroup; + children = ( + 80418F0A2F74D683C63A4D0A /* Pods-Runner.debug.xcconfig */, + E960ED3977AF6DF197F74FFA /* Pods-Runner.release.xcconfig */, + AA19B00394637215A825CF5E /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 748ADDF1719804343BB18004 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + B24477CAB9D5BDFC8F3553DA /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + 84A8D21305B2F01D093A8F9C /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* connectivity_example.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 0930; + ORGANIZATIONNAME = "Google LLC"; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n"; + }; + 84A8D21305B2F01D093A8F9C /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B24477CAB9D5BDFC8F3553DA /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter/ephemeral", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter/ephemeral", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter/ephemeral", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/packages/network_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/network_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000000..2a7d3e7f34 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/network_info_plus/example/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..21a3cc14c7 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/packages/network_info_plus/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/network_info_plus/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/network_info_plus/example/macos/Runner/AppDelegate.swift b/packages/network_info_plus/example/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000000..d53ef64377 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..a2ec33f19f --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4935a7ca84f0976aca34b7f2895d65fb94d1ea GIT binary patch literal 46993 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 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4cc16421680a50164ba74381b4b35ceaa0ccfc GIT binary patch literal 3276 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 N;OXk;vd$@?2>?>Ex^Vyi literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbf36df2f2aaaa0a63c7dabc94e600184229d0d GIT binary patch literal 5933 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 f$KZHO*s&vt|9^w-6P?|#0pRK8NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zS>O>_%)r1c48n{Iv*t(u1=&kHeO=ifbFy+6aSK)V_AxLppYn8Z42d|rc6w}vOsL55 z`t&mC&y2@JTEyg!eDiFX^k#CC!jq%>erB=yHqUP0XcDOTw6ko}L zX;EmMrq(fKk*eygEuA616;0)>@A{TK|55PV@70 z$OfzS*(VJxQev3J?yY?O=ul(v`fp}?u9z`JK3ugibK>)DyCwImZOF4d{xK%%Ks1*} zv$oa)9anR%lXIBUqYnhLmT>VOzHfNP?ZwJNZ!5$s9M08RynIvaXw>@G^T9@r9^KH1 zVy??F&uuk)bH9Y4pQY!hP58i_H6 znl-NcuCpLV6ZWU;4C zu@9exF&OZi`Bovq_m%T+WhU2kvkz@^_LpycBvqm3bMpLw8X-Or5sL>0AKE1$(k_L=_Zc=CUq#=x1-QZf)G7nHu@fmsQ1eN_N3+nTEz`4HI4Z6uVlE zJH+X&det8JU?tO?upcM4Z=cV!JV;yF>FfL5Q$M|W_2Z!P`S=}Wzp|_1^#d%e?_H`> zV@%vA$+bFVqhw9`U;TfP|5|PD{||OiYdor8P*i??|NJcb%kzT_73*7WE?Ua5hAnR2 z=7WE=PhTlJ#ZeRznjTUb;`E(wkMZrj4e|Hilz-mK>9cZHQY**5TUPw~u}k;u73KI}xAx!0m-)GVia|x^d3p~s_9gh83jA&Ra<8rM%`>U3x69t&NzbwWY}7Ar?)FK#IZ0z|d0H0EkRO w3{9;}4Xg|ebq&m|3=9_N6z8I7$jwj5OsmAL;bP(Gi$Dzwp00i_>zopr02+f8CIA2c literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/network_info_plus/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000000000000000000000000000000000000..e71a726136a47ed24125c7efc79d68a4a01961b4 GIT binary patch literal 14800 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 + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network_info_plus/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/network_info_plus/example/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000000..a951488145 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = connectivity_example + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.connectivityExample + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2019 io.flutter.plugins. All rights reserved. diff --git a/packages/network_info_plus/example/macos/Runner/Configs/Debug.xcconfig b/packages/network_info_plus/example/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000000..36b0fd9464 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/network_info_plus/example/macos/Runner/Configs/Release.xcconfig b/packages/network_info_plus/example/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000000..dff4f49561 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/packages/network_info_plus/example/macos/Runner/Configs/Warnings.xcconfig b/packages/network_info_plus/example/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000000..42bcbf4780 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/packages/network_info_plus/example/macos/Runner/DebugProfile.entitlements b/packages/network_info_plus/example/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000000..dddb8a30c8 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/packages/network_info_plus/example/macos/Runner/Info.plist b/packages/network_info_plus/example/macos/Runner/Info.plist new file mode 100644 index 0000000000..4789daa6a4 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/packages/network_info_plus/example/macos/Runner/MainFlutterWindow.swift b/packages/network_info_plus/example/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000000..2722837ec9 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/packages/network_info_plus/example/macos/Runner/Release.entitlements b/packages/network_info_plus/example/macos/Runner/Release.entitlements new file mode 100644 index 0000000000..852fa1a472 --- /dev/null +++ b/packages/network_info_plus/example/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/packages/network_info_plus/example/pubspec.yaml b/packages/network_info_plus/example/pubspec.yaml new file mode 100644 index 0000000000..d6a005c7a9 --- /dev/null +++ b/packages/network_info_plus/example/pubspec.yaml @@ -0,0 +1,21 @@ +name: connectivity_plus_example +description: Demonstrates how to use the connectivity_plus plugin. + +environment: + sdk: ">=2.7.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + connectivity_plus: + path: ../ + +dev_dependencies: + flutter_driver: + sdk: flutter + test: any + integration_test: ^0.9.1 + pedantic: ^1.9.2 + +flutter: + uses-material-design: true diff --git a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart new file mode 100644 index 0000000000..7e46d2d647 --- /dev/null +++ b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart @@ -0,0 +1,41 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:io'; +import 'package:integration_test/integration_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; + +void main() { + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + + group('Connectivity test driver', () { + Connectivity _connectivity; + + setUpAll(() async { + _connectivity = Connectivity(); + }); + + testWidgets('test connectivity result', (WidgetTester tester) async { + final result = await _connectivity.checkConnectivity(); + expect(result, isNotNull); + switch (result) { + case ConnectivityResult.wifi: + expect(_connectivity.getWifiName(), completes); + expect(_connectivity.getWifiBSSID(), completes); + expect((await _connectivity.getWifiIP()), isNotNull); + break; + default: + break; + } + }); + + testWidgets('test location methods, iOS only', (WidgetTester tester) async { + if (Platform.isIOS) { + expect((await _connectivity.getLocationServiceAuthorization()), + LocationAuthorizationStatus.notDetermined); + } + }); + }); +} diff --git a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart new file mode 100644 index 0000000000..44c08f5784 --- /dev/null +++ b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart @@ -0,0 +1,16 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:convert'; +import 'dart:io'; +import 'package:flutter_driver/flutter_driver.dart'; + +Future main() async { + final driver = await FlutterDriver.connect(); + final data = + await driver.requestData(null, timeout: const Duration(minutes: 1)); + await driver.close(); + final Map result = jsonDecode(data); + exit(result['result'] == 'true' ? 0 : 1); +} diff --git a/packages/network_info_plus/example/web/favicon.png b/packages/network_info_plus/example/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/web/icons/Icon-192.png b/packages/network_info_plus/example/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/web/icons/Icon-512.png b/packages/network_info_plus/example/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/packages/network_info_plus/example/web/index.html b/packages/network_info_plus/example/web/index.html new file mode 100644 index 0000000000..9b7a438f82 --- /dev/null +++ b/packages/network_info_plus/example/web/index.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + example + + + + + + + + diff --git a/packages/network_info_plus/example/web/manifest.json b/packages/network_info_plus/example/web/manifest.json new file mode 100644 index 0000000000..8c012917da --- /dev/null +++ b/packages/network_info_plus/example/web/manifest.json @@ -0,0 +1,23 @@ +{ + "name": "example", + "short_name": "example", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + } + ] +} diff --git a/packages/network_info_plus/ios/Assets/.gitkeep b/packages/network_info_plus/ios/Assets/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h b/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h new file mode 100644 index 0000000000..a6b27b02d4 --- /dev/null +++ b/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h @@ -0,0 +1,22 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@class FLTConnectivityLocationPlusDelegate; + +typedef void (^FLTConnectivityLocationPlusCompletion)(CLAuthorizationStatus); + +@interface FLTConnectivityLocationPlusHandler : NSObject + ++ (CLAuthorizationStatus)locationAuthorizationStatus; + +- (void)requestLocationAuthorization:(BOOL)always + completion:(_Nonnull FLTConnectivityLocationPlusCompletion)completionHnadler; + +@end + +NS_ASSUME_NONNULL_END diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m b/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m new file mode 100644 index 0000000000..27f2b529bc --- /dev/null +++ b/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m @@ -0,0 +1,58 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "FLTConnectivityLocationPlusHandler.h" + +@interface FLTConnectivityLocationPlusHandler () + +@property(copy, nonatomic) FLTConnectivityLocationPlusCompletion completion; +@property(strong, nonatomic) CLLocationManager *locationManager; + +@end + +@implementation FLTConnectivityLocationPlusHandler + ++ (CLAuthorizationStatus)locationAuthorizationStatus { + return CLLocationManager.authorizationStatus; +} + +- (void)requestLocationAuthorization:(BOOL)always + completion:(FLTConnectivityLocationPlusCompletion)completionHandler { + CLAuthorizationStatus status = CLLocationManager.authorizationStatus; + if (status != kCLAuthorizationStatusAuthorizedWhenInUse && always) { + completionHandler(kCLAuthorizationStatusDenied); + return; + } else if (status != kCLAuthorizationStatusNotDetermined) { + completionHandler(status); + return; + } + + if (self.completion) { + // If a request is still in process, immediately return. + completionHandler(kCLAuthorizationStatusNotDetermined); + return; + } + + self.completion = completionHandler; + self.locationManager = [CLLocationManager new]; + self.locationManager.delegate = self; + if (always) { + [self.locationManager requestAlwaysAuthorization]; + } else { + [self.locationManager requestWhenInUseAuthorization]; + } +} + +- (void)locationManager:(CLLocationManager *)manager + didChangeAuthorizationStatus:(CLAuthorizationStatus)status { + if (status == kCLAuthorizationStatusNotDetermined) { + return; + } + if (self.completion) { + self.completion(status); + self.completion = nil; + } +} + +@end diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h b/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h new file mode 100644 index 0000000000..242fb03a15 --- /dev/null +++ b/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h @@ -0,0 +1,8 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import + +@interface FLTConnectivityPlusPlugin : NSObject +@end diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m b/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m new file mode 100644 index 0000000000..edfa7ee923 --- /dev/null +++ b/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m @@ -0,0 +1,195 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "FLTConnectivityPlusPlugin.h" + +#import "Reachability/Reachability.h" + +#import +#import "FLTConnectivityLocationPlusHandler.h" +#import "SystemConfiguration/CaptiveNetwork.h" + +#include + +#include + +@interface FLTConnectivityPlusPlugin () + +@property(strong, nonatomic) FLTConnectivityLocationPlusHandler* locationHandler; + +@end + +@implementation FLTConnectivityPlusPlugin { + FlutterEventSink _eventSink; + Reachability* _reachabilityForInternetConnection; +} + ++ (void)registerWithRegistrar:(NSObject*)registrar { + FLTConnectivityPlusPlugin* instance = [[FLTConnectivityPlusPlugin alloc] init]; + + FlutterMethodChannel* channel = + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/connectivity" + binaryMessenger:[registrar messenger]]; + [registrar addMethodCallDelegate:instance channel:channel]; + + FlutterEventChannel* streamChannel = + [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/connectivity_status" + binaryMessenger:[registrar messenger]]; + [streamChannel setStreamHandler:instance]; +} + +- (NSString*)findNetworkInfo:(NSString*)key { + NSString* info = nil; + NSArray* interfaceNames = (__bridge_transfer id)CNCopySupportedInterfaces(); + for (NSString* interfaceName in interfaceNames) { + NSDictionary* networkInfo = + (__bridge_transfer id)CNCopyCurrentNetworkInfo((__bridge CFStringRef)interfaceName); + if (networkInfo[key]) { + info = networkInfo[key]; + } + } + return info; +} + +- (NSString*)getWifiName { + return [self findNetworkInfo:@"SSID"]; +} + +- (NSString*)getBSSID { + return [self findNetworkInfo:@"BSSID"]; +} + +- (NSString*)getWifiIP { + NSString* address = @"error"; + struct ifaddrs* interfaces = NULL; + struct ifaddrs* temp_addr = NULL; + int success = 0; + + // retrieve the current interfaces - returns 0 on success + success = getifaddrs(&interfaces); + if (success == 0) { + // Loop through linked list of interfaces + temp_addr = interfaces; + while (temp_addr != NULL) { + if (temp_addr->ifa_addr->sa_family == AF_INET) { + // Check if interface is en0 which is the wifi connection on the iPhone + if ([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) { + // Get NSString from C String + address = [NSString + stringWithUTF8String:inet_ntoa(((struct sockaddr_in*)temp_addr->ifa_addr)->sin_addr)]; + } + } + + temp_addr = temp_addr->ifa_next; + } + } + + // Free memory + freeifaddrs(interfaces); + + return address; +} + +- (NSString*)statusFromReachability:(Reachability*)reachability { + NetworkStatus status = [reachability currentReachabilityStatus]; + switch (status) { + case NotReachable: + return @"none"; + case ReachableViaWiFi: + return @"wifi"; + case ReachableViaWWAN: + return @"mobile"; + } +} + +- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { + if ([call.method isEqualToString:@"check"]) { + // This is supposed to be quick. Another way of doing this would be to + // signup for network + // connectivity changes. However that depends on the app being in background + // and the code + // gets more involved. So for now, this will do. + result([self statusFromReachability:[Reachability reachabilityForInternetConnection]]); + } else if ([call.method isEqualToString:@"wifiName"]) { + result([self getWifiName]); + } else if ([call.method isEqualToString:@"wifiBSSID"]) { + result([self getBSSID]); + } else if ([call.method isEqualToString:@"wifiIPAddress"]) { + result([self getWifiIP]); + } else if ([call.method isEqualToString:@"getLocationServiceAuthorization"]) { + result([self convertCLAuthorizationStatusToString:[FLTConnectivityLocationPlusHandler + locationAuthorizationStatus]]); + } else if ([call.method isEqualToString:@"requestLocationServiceAuthorization"]) { + NSArray* arguments = call.arguments; + BOOL always = [arguments.firstObject boolValue]; + __weak typeof(self) weakSelf = self; + [self.locationHandler + requestLocationAuthorization:always + completion:^(CLAuthorizationStatus status) { + result([weakSelf convertCLAuthorizationStatusToString:status]); + }]; + } else { + result(FlutterMethodNotImplemented); + } +} + +- (void)onReachabilityDidChange:(NSNotification*)notification { + Reachability* curReach = [notification object]; + _eventSink([self statusFromReachability:curReach]); +} + +- (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status { + switch (status) { + case kCLAuthorizationStatusNotDetermined: { + return @"notDetermined"; + } + case kCLAuthorizationStatusRestricted: { + return @"restricted"; + } + case kCLAuthorizationStatusDenied: { + return @"denied"; + } + case kCLAuthorizationStatusAuthorizedAlways: { + return @"authorizedAlways"; + } + case kCLAuthorizationStatusAuthorizedWhenInUse: { + return @"authorizedWhenInUse"; + } + default: { + return @"unknown"; + } + } +} + +- (FLTConnectivityLocationPlusHandler*)locationHandler { + if (!_locationHandler) { + _locationHandler = [FLTConnectivityLocationPlusHandler new]; + } + return _locationHandler; +} + +#pragma mark FlutterStreamHandler impl + +- (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)eventSink { + _eventSink = eventSink; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(onReachabilityDidChange:) + name:kReachabilityChangedNotification + object:nil]; + _reachabilityForInternetConnection = [Reachability reachabilityForInternetConnection]; + [_reachabilityForInternetConnection startNotifier]; + return nil; +} + +- (FlutterError*)onCancelWithArguments:(id)arguments { + if (_reachabilityForInternetConnection) { + [_reachabilityForInternetConnection stopNotifier]; + _reachabilityForInternetConnection = nil; + } + [[NSNotificationCenter defaultCenter] removeObserver:self]; + _eventSink = nil; + return nil; +} + +@end diff --git a/packages/network_info_plus/ios/connectivity_plus.podspec b/packages/network_info_plus/ios/connectivity_plus.podspec new file mode 100644 index 0000000000..2bfc4e9755 --- /dev/null +++ b/packages/network_info_plus/ios/connectivity_plus.podspec @@ -0,0 +1,23 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# +Pod::Spec.new do |s| + s.name = 'connectivity_plus' + s.version = '0.0.1' + s.summary = 'Flutter Connectivity' + s.description = <<-DESC +This plugin allows Flutter apps to discover network connectivity and configure themselves accordingly. +Downloaded by pub (not CocoaPods). + DESC + s.homepage = 'https://github.com/flutter/plugins' + s.license = { :type => 'BSD', :file => '../LICENSE' } + s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } + s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity' } + s.documentation_url = 'https://pub.dev/packages/connectivity' + s.source_files = 'Classes/**/*' + s.public_header_files = 'Classes/**/*.h' + s.dependency 'Flutter' + s.dependency 'Reachability' + s.platform = :ios, '8.0' + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } +end diff --git a/packages/network_info_plus/lib/connectivity_plus.dart b/packages/network_info_plus/lib/connectivity_plus.dart new file mode 100644 index 0000000000..cf520e025d --- /dev/null +++ b/packages/network_info_plus/lib/connectivity_plus.dart @@ -0,0 +1,190 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; +import 'dart:io' show Platform; + +import 'package:flutter/services.dart'; +import 'package:flutter/foundation.dart' show kIsWeb; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:connectivity_plus_platform_interface/src/method_channel_connectivity.dart'; +import 'package:connectivity_plus_linux/connectivity_plus_linux.dart'; + +// Export enums from the platform_interface so plugin users can use them directly. +export 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart' + show ConnectivityResult, LocationAuthorizationStatus; + +/// Discover network connectivity configurations: Distinguish between WI-FI and cellular, check WI-FI status and more. +class Connectivity { + /// Constructs a singleton instance of [Connectivity]. + /// + /// [Connectivity] is designed to work as a singleton. + // When a second instance is created, the first instance will not be able to listen to the + // EventChannel because it is overridden. Forcing the class to be a singleton class can prevent + // misuse of creating a second instance from a programmer. + factory Connectivity() { + _singleton ??= Connectivity._(); + return _singleton; + } + + Connectivity._(); + + static Connectivity _singleton; + + static bool _manualDartRegistrationNeeded = true; + + // This is to manually endorse Dart implementations until automatic + // registration of Dart plugins is implemented. For details see + // https://github.com/flutter/flutter/issues/52267. + static ConnectivityPlatform get _platform { + if (_manualDartRegistrationNeeded) { + // Only do the initial registration if it hasn't already been overridden + // with a non-default instance. + if (!kIsWeb && + ConnectivityPlatform.instance is MethodChannelConnectivity) { + if (Platform.isLinux) { + ConnectivityPlatform.instance = ConnectivityLinux(); + } + } + _manualDartRegistrationNeeded = false; + } + return ConnectivityPlatform.instance; + } + + /// Fires whenever the connectivity state changes. + Stream get onConnectivityChanged { + return _platform.onConnectivityChanged; + } + + /// Checks the connection status of the device. + /// + /// Do not use the result of this function to decide whether you can reliably + /// make a network request. It only gives you the radio status. + /// + /// Instead listen for connectivity changes via [onConnectivityChanged] stream. + Future checkConnectivity() { + return _platform.checkConnectivity(); + } + + /// Obtains the wifi name (SSID) of the connected network + /// + /// Please note that it DOESN'T WORK on emulators (returns null). + /// + /// From android 8.0 onwards the GPS must be ON (high accuracy) + /// in order to be able to obtain the SSID. + Future getWifiName() { + return _platform.getWifiName(); + } + + /// Obtains the wifi BSSID of the connected network. + /// + /// Please note that it DOESN'T WORK on emulators (returns null). + /// + /// From Android 8.0 onwards the GPS must be ON (high accuracy) + /// in order to be able to obtain the BSSID. + Future getWifiBSSID() { + return _platform.getWifiBSSID(); + } + + /// Obtains the IP address of the connected wifi network + Future getWifiIP() { + return _platform.getWifiIP(); + } + + /// Request to authorize the location service (Only on iOS). + /// + /// This method will throw a [PlatformException] on Android. + /// + /// Returns a [LocationAuthorizationStatus] after user authorized or denied the location on this request. + /// + /// If the location information needs to be accessible all the time, set `requestAlwaysLocationUsage` to true. If user has + /// already granted a [LocationAuthorizationStatus.authorizedWhenInUse] prior to requesting an "always" access, it will return [LocationAuthorizationStatus.denied]. + /// + /// If the location service authorization is not determined prior to making this call, a platform standard UI of requesting a location service will pop up. + /// This UI will only show once unless the user re-install the app to their phone which resets the location service authorization to not determined. + /// + /// This method is a helper to get the location authorization that is necessary for certain functionality of this plugin. + /// It can be replaced with other permission handling code/plugin if preferred. + /// To request location authorization, make sure to add the following keys to your _Info.plist_ file, located in `/ios/Runner/Info.plist`: + /// * `NSLocationAlwaysAndWhenInUseUsageDescription` - describe why the app needs access to the user’s location information + /// all the time (foreground and background). This is called _Privacy - Location Always and When In Use Usage Description_ in the visual editor. + /// * `NSLocationWhenInUseUsageDescription` - describe why the app needs access to the user’s location information when the app is + /// running in the foreground. This is called _Privacy - Location When In Use Usage Description_ in the visual editor. + /// + /// Starting from iOS 13, `getWifiBSSID` and `getWifiIP` will only work properly if: + /// + /// * The app uses Core Location, and has the user’s authorization to use location information. + /// * The app uses the NEHotspotConfiguration API to configure the current Wi-Fi network. + /// * The app has active VPN configurations installed. + /// + /// If the app falls into the first category, call this method before calling `getWifiBSSID` or `getWifiIP`. + /// For example, + /// ```dart + /// if (Platform.isIOS) { + /// LocationAuthorizationStatus status = await _connectivity.getLocationServiceAuthorization(); + /// if (status == LocationAuthorizationStatus.notDetermined) { + /// status = await _connectivity.requestLocationServiceAuthorization(); + /// } + /// if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { + /// wifiBSSID = await _connectivity.getWifiName(); + /// } else { + /// print('location service is not authorized, the data might not be correct'); + /// wifiBSSID = await _connectivity.getWifiName(); + /// } + /// } else { + /// wifiBSSID = await _connectivity.getWifiName(); + /// } + /// ``` + /// + /// Ideally, a location service authorization should only be requested if the current authorization status is not determined. + /// + /// See also [getLocationServiceAuthorization] to obtain current location service status. + Future requestLocationServiceAuthorization({ + bool requestAlwaysLocationUsage = false, + }) { + return _platform.requestLocationServiceAuthorization( + requestAlwaysLocationUsage: requestAlwaysLocationUsage, + ); + } + + /// Get the current location service authorization (Only on iOS). + /// + /// This method will throw a [PlatformException] on Android. + /// + /// Returns a [LocationAuthorizationStatus]. + /// If the returned value is [LocationAuthorizationStatus.notDetermined], a subsequent [requestLocationServiceAuthorization] call + /// can request the authorization. + /// If the returned value is not [LocationAuthorizationStatus.notDetermined], a subsequent [requestLocationServiceAuthorization] + /// will not initiate another request. It will instead return the "determined" status. + /// + /// This method is a helper to get the location authorization that is necessary for certain functionality of this plugin. + /// It can be replaced with other permission handling code/plugin if preferred. + /// + /// Starting from iOS 13, `getWifiBSSID` and `getWifiIP` will only work properly if: + /// + /// * The app uses Core Location, and has the user’s authorization to use location information. + /// * The app uses the NEHotspotConfiguration API to configure the current Wi-Fi network. + /// * The app has active VPN configurations installed. + /// + /// If the app falls into the first category, call this method before calling `getWifiBSSID` or `getWifiIP`. + /// For example, + /// ```dart + /// if (Platform.isIOS) { + /// LocationAuthorizationStatus status = await _connectivity.getLocationServiceAuthorization(); + /// if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { + /// wifiBSSID = await _connectivity.getWifiName(); + /// } else { + /// print('location service is not authorized, the data might not be correct'); + /// wifiBSSID = await _connectivity.getWifiName(); + /// } + /// } else { + /// wifiBSSID = await _connectivity.getWifiName(); + /// } + /// ``` + /// + /// See also [requestLocationServiceAuthorization] for requesting a location service authorization. + Future getLocationServiceAuthorization() { + return _platform.getLocationServiceAuthorization(); + } +} diff --git a/packages/network_info_plus/macos/connectivity_plus.podspec b/packages/network_info_plus/macos/connectivity_plus.podspec new file mode 100644 index 0000000000..ab86bde983 --- /dev/null +++ b/packages/network_info_plus/macos/connectivity_plus.podspec @@ -0,0 +1,22 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# +Pod::Spec.new do |s| + s.name = 'connectivity_plus' + s.version = '0.0.1' + s.summary = 'No-op implementation of the macos connectivity to avoid build issues on macos' + s.description = <<-DESC + No-op implementation of the connectivity plugin to avoid build issues on macos. + https://github.com/flutter/flutter/issues/46618 + DESC + s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/connectivity' + s.license = { :file => '../LICENSE' } + s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.public_header_files = 'Classes/**/*.h' + + s.platform = :osx + s.osx.deployment_target = '10.11' +end + diff --git a/packages/network_info_plus/pubspec.yaml b/packages/network_info_plus/pubspec.yaml new file mode 100644 index 0000000000..561b762ff0 --- /dev/null +++ b/packages/network_info_plus/pubspec.yaml @@ -0,0 +1,44 @@ +name: connectivity_plus +description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. +version: 0.7.1 +homepage: https://plus.fluttercommunity.dev/ +repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ + +flutter: + plugin: + platforms: + android: + package: dev.fluttercommunity.plus.connectivity + pluginClass: ConnectivityPlugin + ios: + pluginClass: FLTConnectivityPlusPlugin + linux: + default_package: connectivity_plus_linux + macos: + default_package: connectivity_plus_macos + web: + default_package: connectivity_plus_web + +dependencies: + flutter: + sdk: flutter + meta: ^1.0.5 + connectivity_plus_platform_interface: ^0.3.0 + connectivity_plus_linux: ^0.2.0 + connectivity_plus_macos: ^0.3.0 + connectivity_plus_web: ^0.5.0 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_driver: + sdk: flutter + test: any + integration_test: ^0.9.1 + mockito: ^4.1.1 + plugin_platform_interface: ^1.0.0 + pedantic: ^1.9.2 + +environment: + sdk: ">=2.1.0 <3.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/network_info_plus/test/connectivity_test.dart b/packages/network_info_plus/test/connectivity_test.dart new file mode 100644 index 0000000000..56ac696de7 --- /dev/null +++ b/packages/network_info_plus/test/connectivity_test.dart @@ -0,0 +1,96 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; +import 'package:mockito/mockito.dart'; + +const ConnectivityResult kCheckConnectivityResult = ConnectivityResult.wifi; +const String kWifiNameResult = '1337wifi'; +const String kWifiBSSIDResult = 'c0:ff:33:c0:d3:55'; +const String kWifiIpAddressResult = '127.0.0.1'; +const LocationAuthorizationStatus kRequestLocationResult = + LocationAuthorizationStatus.authorizedAlways; +const LocationAuthorizationStatus kGetLocationResult = + LocationAuthorizationStatus.authorizedAlways; + +void main() { + group('Connectivity', () { + Connectivity connectivity; + MockConnectivityPlatform fakePlatform; + setUp(() async { + fakePlatform = MockConnectivityPlatform(); + ConnectivityPlatform.instance = fakePlatform; + connectivity = Connectivity(); + }); + + test('checkConnectivity', () async { + final result = await connectivity.checkConnectivity(); + expect(result, kCheckConnectivityResult); + }); + + test('getWifiName', () async { + final result = await connectivity.getWifiName(); + expect(result, kWifiNameResult); + }); + + test('getWifiBSSID', () async { + final result = await connectivity.getWifiBSSID(); + expect(result, kWifiBSSIDResult); + }); + + test('getWifiIP', () async { + final result = await connectivity.getWifiIP(); + expect(result, kWifiIpAddressResult); + }); + + test('requestLocationServiceAuthorization', () async { + final result = await connectivity.requestLocationServiceAuthorization(); + expect(result, kRequestLocationResult); + }); + + test('getLocationServiceAuthorization', () async { + final result = await connectivity.getLocationServiceAuthorization(); + expect(result, kRequestLocationResult); + }); + }); +} + +class MockConnectivityPlatform extends Mock + with MockPlatformInterfaceMixin + implements ConnectivityPlatform { + @override + Future checkConnectivity() async { + return kCheckConnectivityResult; + } + + @override + Future getWifiName() async { + return kWifiNameResult; + } + + @override + Future getWifiBSSID() async { + return kWifiBSSIDResult; + } + + @override + Future getWifiIP() async { + return kWifiIpAddressResult; + } + + @override + Future requestLocationServiceAuthorization({ + bool requestAlwaysLocationUsage = false, + }) async { + return kRequestLocationResult; + } + + @override + Future getLocationServiceAuthorization() async { + return kGetLocationResult; + } +} diff --git a/packages/network_info_plus_linux/.gitignore b/packages/network_info_plus_linux/.gitignore new file mode 100644 index 0000000000..88ce490e47 --- /dev/null +++ b/packages/network_info_plus_linux/.gitignore @@ -0,0 +1,47 @@ +.DS_Store +.atom/ +.idea/ +.vscode/ + +.packages +.pub/ +.dart_tool/ +pubspec.lock +flutter_export_environment.sh + +examples/all_plugins/pubspec.yaml + +Podfile +Podfile.lock +Pods/ +.symlinks/ +**/Flutter/App.framework/ +**/Flutter/ephemeral/ +**/Flutter/Flutter.framework/ +**/Flutter/Generated.xcconfig +**/Flutter/flutter_assets/ + +ServiceDefinitions.json +xcuserdata/ +**/DerivedData/ + +local.properties +keystore.properties +.gradle/ +gradlew +gradlew.bat +gradle-wrapper.jar +.flutter-plugins-dependencies +*.iml + +generated_plugin_registrant.dart +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m +GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +build/ +.flutter-plugins + +.project +.classpath +.settings diff --git a/packages/network_info_plus_linux/.metadata b/packages/network_info_plus_linux/.metadata new file mode 100644 index 0000000000..6b9d686e29 --- /dev/null +++ b/packages/network_info_plus_linux/.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: 34541c30735bc1086335e13d69a7e0acdc0538c5 + channel: master + +project_type: package diff --git a/packages/network_info_plus_linux/CHANGELOG.md b/packages/network_info_plus_linux/CHANGELOG.md new file mode 100644 index 0000000000..e3f4c0ee67 --- /dev/null +++ b/packages/network_info_plus_linux/CHANGELOG.md @@ -0,0 +1,7 @@ +## 0.2.0 + +* Upgrade to latest platform interface + +## 0.1.0 + +* Initial release for Linux. diff --git a/packages/network_info_plus_linux/LICENSE b/packages/network_info_plus_linux/LICENSE new file mode 100644 index 0000000000..0c91662b3f --- /dev/null +++ b/packages/network_info_plus_linux/LICENSE @@ -0,0 +1,27 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus_linux/README.md b/packages/network_info_plus_linux/README.md new file mode 100644 index 0000000000..bdedb3d90d --- /dev/null +++ b/packages/network_info_plus_linux/README.md @@ -0,0 +1,12 @@ +# Connectivity Plus Linux + +[![Flutter Community: connectivity_plus_linux](https://fluttercommunity.dev/_github/header/connectivity_plus_linux)](https://github.com/fluttercommunity/community) + +[![pub package](https://img.shields.io/pub/v/connectivity_plus_linux.svg)](https://pub.dev/packages/connectivity_plus_linux) + +The Linux implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). + +## Usage + +This package is already included as part of the `connectivity_plus` package dependency, and will +be included when using `connectivity_plus` as normal. diff --git a/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart b/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart new file mode 100644 index 0000000000..08c815673a --- /dev/null +++ b/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart @@ -0,0 +1,8 @@ +/// The Linux implementation of `connectivity_plus`. +library connectivity_plus_linux; + +// connectivity_plus_linux depends on dbus which uses FFI internally; export +// a stub for platforms that don't support FFI (e.g., web) to avoid having +// transitive dependencies break web compilation. +export 'src/connectivity_stub.dart' + if (dart.library.ffi) 'src/connectivity_real.dart'; diff --git a/packages/network_info_plus_linux/lib/src/connectivity_real.dart b/packages/network_info_plus_linux/lib/src/connectivity_real.dart new file mode 100644 index 0000000000..bd1308a163 --- /dev/null +++ b/packages/network_info_plus_linux/lib/src/connectivity_real.dart @@ -0,0 +1,128 @@ +import 'dart:async'; + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:meta/meta.dart'; + +import 'network_manager.dart'; + +// Used internally +// ignore_for_file: public_member_api_docs + +typedef _DeviceGetter = Future Function(NMDevice device); +typedef _ConnectionGetter = Future Function(NMConnection connection); + +@visibleForTesting +typedef NetworkManagerFactory = NetworkManager Function(); + +/// The Linux implementation of ConnectivityPlatform. +class ConnectivityLinux extends ConnectivityPlatform { + /// Checks the connection status of the device. + @override + Future checkConnectivity() { + return _getConnectivity(_ref()).whenComplete(_deref); + } + + /// Obtains the wifi name (SSID) of the connected network + @override + Future getWifiName() { + return _getConnectionValue((connection) => connection.getId()); + } + + /// Obtains the IP address of the connected wifi network + @override + Future getWifiIP() { + return _getDeviceValue((device) => device.getIp4()); + } + + /// Obtains the wifi BSSID of the connected network. + @override + Future getWifiBSSID() { + return _getDeviceValue((device) { + return device + .asWirelessDevice() + .then((wireless) => wireless?.getHwAddress()); + }); + } + + Future _getDeviceValue(_DeviceGetter getter) { + return _getConnectionValue((connection) { + return connection.createDevice().then((device) { + return device != null ? getter(device) : null; + }); + }); + } + + Future _getConnectionValue(_ConnectionGetter getter) { + return _ref().createConnection().then((connection) { + return connection != null ? getter(connection) : null; + }).whenComplete(_deref); + } + + int _refCount = 0; + NetworkManager _manager; + StreamController _controller; + + /// Returns a Stream of ConnectivityResults changes. + @override + Stream get onConnectivityChanged { + _controller ??= StreamController.broadcast( + onListen: _startListenConnectivity, + onCancel: _deref, + ); + return _controller.stream; + } + + Future _getConnectivity(NetworkManager manager) { + return manager.getType().then((value) => value.toConnectivityResult()); + } + + void _startListenConnectivity() { + final manager = _ref(); + manager.getType().then((type) => _addConnectivity(type)); + manager.subscribeTypeChanged().listen((type) { + _addConnectivity(type); + }); + } + + void _addConnectivity(String type) { + _controller.add(type.toConnectivityResult()); + } + + NetworkManager _ref() { + _manager ??= createManager(); + ++_refCount; + return _manager; + } + + void _deref() { + // schedules an asynchronous disposal when the last reference is removed + if (--_refCount == 0) { + scheduleMicrotask(() { + if (_refCount == 0) { + _manager.dispose(); + _manager = null; + } + }); + } + } + + @visibleForTesting + NetworkManagerFactory createManager = () => NetworkManager.system(); +} + +extension _NMConnectivityType on String { + ConnectivityResult toConnectivityResult() { + if (isEmpty) { + return ConnectivityResult.none; + } + if (contains('wireless')) { + return ConnectivityResult.wifi; + } + // ### TODO: ethernet + //if (contains('ethernet')) { + // return ConnectivityResult.ethernet; + //} + // gsm, cdma, bluetooth, ... + return ConnectivityResult.mobile; + } +} diff --git a/packages/network_info_plus_linux/lib/src/connectivity_stub.dart b/packages/network_info_plus_linux/lib/src/connectivity_stub.dart new file mode 100644 index 0000000000..c080737b07 --- /dev/null +++ b/packages/network_info_plus_linux/lib/src/connectivity_stub.dart @@ -0,0 +1,16 @@ +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; + +/// A stub implementation to satisfy compilation of multi-platform packages that +/// depend on connectivity_plus_linux. This should never actually be created. +/// +/// Notably, because connectivity_plus needs to manually register +/// connectivity_plus_linux, anything with a transitive dependency on +/// connectivity_plus will also depend on connectivity_plus_linux, not just at +/// the pubspec level but the code level. +class ConnectivityLinux extends ConnectivityPlatform { + /// Errors on attempted instantiation of the stub. It exists only to satisfy + /// compile-time dependencies, and should never actually be created. + ConnectivityLinux() { + assert(false); + } +} diff --git a/packages/network_info_plus_linux/lib/src/network_manager.dart b/packages/network_info_plus_linux/lib/src/network_manager.dart new file mode 100644 index 0000000000..38601baee4 --- /dev/null +++ b/packages/network_info_plus_linux/lib/src/network_manager.dart @@ -0,0 +1,123 @@ +import 'dart:async'; + +import 'package:dbus/dbus.dart'; + +// Used internally +// ignore_for_file: public_member_api_docs + +const _kNetworkManager = 'org.freedesktop.NetworkManager'; +const _kActiveConnection = _kNetworkManager + '.Connection.Active'; +const _kDevice = _kNetworkManager + '.Device'; +const _kWireless = _kDevice + '.Wireless'; + +const _kPath = '/org/freedesktop/NetworkManager'; +const _kType = 'PrimaryConnectionType'; + +class NetworkManager extends DBusRemoteObject { + NetworkManager(DBusClient client) + : super(client, _kNetworkManager, DBusObjectPath(_kPath)); + + factory NetworkManager.system() => NetworkManager(DBusClient.system()); + void dispose() => client?.close(); + + Future getPath() => _getString('PrimaryConnection', fallback: '/'); + Future getType() => _getString(_kType); + + Future _getString(String path, {String fallback = ''}) { + return getProperty(_kNetworkManager, path) + .then((value) => (value as DBusString).value) + .catchError((error) => print(error)) + .then((value) => value ?? fallback); + } + + Stream subscribeTypeChanged() { + return subscribePropertiesChanged() + .where((event) => event.changedProperties.containsKey(_kType)) + .map((event) => (event.changedProperties[_kType] as DBusString).value); + } + + Future createConnection() { + return getPath().then((path) => NMConnection.fromPath(client, path)); + } +} + +class NMConnection extends DBusRemoteObject { + NMConnection(DBusClient client, {DBusObjectPath path}) + : super(client, _kNetworkManager, path); + + factory NMConnection.fromPath(DBusClient client, String path) { + if (path == '/') return null; + return NMConnection(client, path: DBusObjectPath(path)); + } + + Future getId() { + return getProperty(_kActiveConnection, 'Id') + .then((value) => (value as DBusString).value) + .catchError((error) => print(error)) + .then((value) => value ?? ''); + } + + Future> getDevices() { + return getProperty(_kActiveConnection, 'Devices') + .then((value) => (value as DBusArray) + .children + .map((child) => (child as DBusObjectPath).value) + .toList()) + .catchError((error) => print(error)) + .then((value) => value ?? []); + } + + Future createDevice() { + return getDevices().then((devices) { + if (devices.isEmpty) return null; + return NMDevice.fromPath(client, devices.first); + }); + } +} + +enum NMDeviceType { unknown, ethernet, wifi } + +extension NMDeviceInt on int { + int byteAt(int i) => (this >> (i * 8)) & 0xff; + String toIp4() => '${byteAt(0)}.${byteAt(1)}.${byteAt(2)}.${byteAt(3)}'; + NMDeviceType toType() => NMDeviceType.values[this]; +} + +class NMDevice extends DBusRemoteObject { + NMDevice(DBusClient client, {DBusObjectPath path}) + : super(client, _kNetworkManager, path); + + factory NMDevice.fromPath(DBusClient client, String path) { + return NMDevice(client, path: DBusObjectPath(path)); + } + + Future getIp4() { + return getProperty(_kDevice, 'Ip4Address') + .then((value) => (value as DBusUint32).value.toIp4()) + .catchError((error) => print(error)); + } + + Future getType() { + return getProperty(_kDevice, 'DeviceType') + .then((value) => (value as DBusUint32).value.toType()) + .catchError((error) => print(error)); + } + + Future asWirelessDevice() { + return getType().then((type) { + if (type != NMDeviceType.wifi) return null; + return NMWirelessDevice(client, path: path); + }); + } +} + +class NMWirelessDevice extends DBusRemoteObject { + NMWirelessDevice(DBusClient client, {DBusObjectPath path}) + : super(client, _kNetworkManager, path); + + Future getHwAddress() { + return getProperty(_kWireless, 'HwAddress') + .then((value) => (value as DBusString).value) + .catchError((error) => print(error)); + } +} diff --git a/packages/network_info_plus_linux/pubspec.yaml b/packages/network_info_plus_linux/pubspec.yaml new file mode 100644 index 0000000000..7345aaf866 --- /dev/null +++ b/packages/network_info_plus_linux/pubspec.yaml @@ -0,0 +1,29 @@ +name: connectivity_plus_linux +description: Linux implementation of the connectivity_plus plugin +homepage: https://plus.fluttercommunity.dev/ +repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ +version: 0.2.0 + +environment: + sdk: ">=2.7.0 <3.0.0" + flutter: ">=1.20.0" + +dependencies: + flutter: + sdk: flutter + connectivity_plus_platform_interface: ^0.3.0 + dbus: ^0.1.0 + meta: ^1.2.3 + +dev_dependencies: + flutter_test: + sdk: flutter + mockito: ^4.1.2 + pedantic: ^1.9.2 + +flutter: + plugin: + platforms: + linux: + dartPluginClass: ConnectivityLinux + pluginClass: none diff --git a/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart b/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart new file mode 100644 index 0000000000..0201f04e55 --- /dev/null +++ b/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart @@ -0,0 +1,47 @@ +import 'package:connectivity_plus_linux/src/connectivity_real.dart'; +import 'package:connectivity_plus_linux/src/network_manager.dart'; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/mockito.dart'; + +class MockNetworkManager extends Mock implements NetworkManager {} + +void main() { + test('wireless', () async { + final linux = ConnectivityLinux(); + linux.createManager = () { + final manager = MockNetworkManager(); + when(manager.getType()).thenAnswer((_) => Future.value('wireless')); + return manager; + }; + expect( + linux.checkConnectivity(), completion(equals(ConnectivityResult.wifi))); + }); + + test('no connectivity', () async { + final linux = ConnectivityLinux(); + linux.createManager = () { + final manager = MockNetworkManager(); + when(manager.getType()).thenAnswer((_) => Future.value('')); + return manager; + }; + expect( + linux.checkConnectivity(), completion(equals(ConnectivityResult.none))); + }); + + test('connectivity changes', () { + final linux = ConnectivityLinux(); + linux.createManager = () { + final manager = MockNetworkManager(); + when(manager.getType()).thenAnswer((_) { + return Future.value('wireless'); + }); + when(manager.subscribeTypeChanged()).thenAnswer((_) { + return Stream.value(''); + }); + return manager; + }; + expect(linux.onConnectivityChanged, + emitsInOrder([ConnectivityResult.wifi, ConnectivityResult.none])); + }); +} diff --git a/packages/network_info_plus_macos/.gitattributes b/packages/network_info_plus_macos/.gitattributes new file mode 100644 index 0000000000..31fda4bf1c --- /dev/null +++ b/packages/network_info_plus_macos/.gitattributes @@ -0,0 +1,25 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Always perform LF normalization on these files +*.dart text +*.gradle text +*.html text +*.java text +*.json text +*.md text +*.py text +*.sh text +*.txt text +*.xml text +*.yaml text + +# Make sure that these Windows files always have CRLF line endings in checkout +*.bat text eol=crlf +*.ps1 text eol=crlf + +# Never perform LF normalization on these files +*.ico binary +*.jar binary +*.png binary +*.zip binary diff --git a/packages/network_info_plus_macos/.gitignore b/packages/network_info_plus_macos/.gitignore new file mode 100644 index 0000000000..88ce490e47 --- /dev/null +++ b/packages/network_info_plus_macos/.gitignore @@ -0,0 +1,47 @@ +.DS_Store +.atom/ +.idea/ +.vscode/ + +.packages +.pub/ +.dart_tool/ +pubspec.lock +flutter_export_environment.sh + +examples/all_plugins/pubspec.yaml + +Podfile +Podfile.lock +Pods/ +.symlinks/ +**/Flutter/App.framework/ +**/Flutter/ephemeral/ +**/Flutter/Flutter.framework/ +**/Flutter/Generated.xcconfig +**/Flutter/flutter_assets/ + +ServiceDefinitions.json +xcuserdata/ +**/DerivedData/ + +local.properties +keystore.properties +.gradle/ +gradlew +gradlew.bat +gradle-wrapper.jar +.flutter-plugins-dependencies +*.iml + +generated_plugin_registrant.dart +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m +GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +build/ +.flutter-plugins + +.project +.classpath +.settings diff --git a/packages/network_info_plus_macos/CHANGELOG.md b/packages/network_info_plus_macos/CHANGELOG.md new file mode 100644 index 0000000000..0d82fc6421 --- /dev/null +++ b/packages/network_info_plus_macos/CHANGELOG.md @@ -0,0 +1,49 @@ +## 0.3.0 + +- Updated platform interface + +## 0.2.0 + +- Transfer to plus-plugins monorepo + +## 0.1.0+6 + +- Transfer package to Flutter Community under new name `connectivity_plus_macos`. + +## 0.1.0+5 + +- Update package:e2e reference to use the local version in the flutter/plugins + repository. + +## 0.1.0+4 + +- Remove Android folder from `connectivity_macos`. + +## 0.1.0+3 + +- Bump the minimum Flutter version to 1.12.13+hotfix.5. +- Clean up various Android workarounds no longer needed after framework v1.12. +- Complete v2 embedding support. +- Fix CocoaPods podspec lint warnings. +- Declare API stability and compatibility with `1.0.0` (more details at: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0). + +## 0.1.0+2 + +- Remove hard coded ios workspace setting of the example app. + +## 0.1.0+1 + +- Make the pedantic dev_dependency explicit. + +## 0.1.0 + +- Adds an example app to trigger CI tests. Bumped the MINOR version to + avoid compatibility issues once this packages is endorsed. + +## 0.0.2+1 + +- Add CHANGELOG. + +## 0.0.1 + +- Initial open source release. diff --git a/packages/network_info_plus_macos/LICENSE b/packages/network_info_plus_macos/LICENSE new file mode 100644 index 0000000000..0c382ce171 --- /dev/null +++ b/packages/network_info_plus_macos/LICENSE @@ -0,0 +1,27 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus_macos/README.md b/packages/network_info_plus_macos/README.md new file mode 100644 index 0000000000..23f92ca6a0 --- /dev/null +++ b/packages/network_info_plus_macos/README.md @@ -0,0 +1,12 @@ +# Connectivity Plus macOS + +[![Flutter Community: connectivity_plus_macos](https://fluttercommunity.dev/_github/header/connectivity_plus_macos)](https://github.com/fluttercommunity/community) + +[![pub package](https://img.shields.io/pub/v/connectivity_plus_macos.svg)](https://pub.dev/packages/connectivity_plus_macos) + +The macOS implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). + +## Usage + +This package is already included as part of the `connectivity_plus` package dependency, and will +be included when using `connectivity_plus` as normal. diff --git a/packages/network_info_plus_macos/lib/connectivity_plus_macos.dart b/packages/network_info_plus_macos/lib/connectivity_plus_macos.dart new file mode 100644 index 0000000000..7be7b143ca --- /dev/null +++ b/packages/network_info_plus_macos/lib/connectivity_plus_macos.dart @@ -0,0 +1,3 @@ +// Analyze will fail if there is no main.dart file. This file should +// be removed once an example app has been added to connectivity_macos. +// https://github.com/flutter/flutter/issues/51007 diff --git a/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift b/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift new file mode 100644 index 0000000000..7d3814e7fd --- /dev/null +++ b/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift @@ -0,0 +1,104 @@ +// Copyright 2019 Google LLC +// +// 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. + +import Cocoa +import CoreWLAN +import FlutterMacOS +import Reachability +import SystemConfiguration.CaptiveNetwork + +public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler { + var reach: Reachability? + var eventSink: FlutterEventSink? + var cwinterface: CWInterface? + + public override init() { + cwinterface = CWWiFiClient.shared().interface() + } + + public static func register(with registrar: FlutterPluginRegistrar) { + let channel = FlutterMethodChannel( + name: "dev.fluttercommunity.plus/connectivity", + binaryMessenger: registrar.messenger) + + let streamChannel = FlutterEventChannel( + name: "dev.fluttercommunity.plus/connectivity_status", + binaryMessenger: registrar.messenger) + + let instance = ConnectivityPlugin() + streamChannel.setStreamHandler(instance) + + registrar.addMethodCallDelegate(instance, channel: channel) + } + + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + switch call.method { + case "check": + result(statusFromReachability(reachability: Reachability.forInternetConnection())) + case "wifiName": + result(cwinterface?.ssid()) + case "wifiBSSID": + result(cwinterface?.bssid()) + case "wifiIPAddress": + result(getWifiIP()) + default: + result(FlutterMethodNotImplemented) + } + } + + /// Returns a string describing connection type + /// + /// - Parameters: + /// - reachability: an instance of reachability + /// - Returns: connection type string + private func statusFromReachability(reachability: Reachability?) -> String { + // checks any non-WWAN connection + if reachability?.isReachableViaWiFi() ?? false { + return "wifi" + } + + return "none" + } + + public func onListen( + withArguments _: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { + reach = Reachability.forInternetConnection() + eventSink = events + + NotificationCenter.default.addObserver( + self, + selector: #selector(reachabilityChanged), + name: NSNotification.Name.reachabilityChanged, + object: reach) + + reach?.startNotifier() + + return nil + } + + @objc private func reachabilityChanged(notification: NSNotification) { + let reach = notification.object + let reachability = statusFromReachability(reachability: reach as? Reachability) + eventSink?(reachability) + } + + public func onCancel(withArguments _: Any?) -> FlutterError? { + reach?.stopNotifier() + NotificationCenter.default.removeObserver(self) + eventSink = nil + return nil + } +} diff --git a/packages/network_info_plus_macos/macos/Classes/IPHelper.h b/packages/network_info_plus_macos/macos/Classes/IPHelper.h new file mode 100644 index 0000000000..5fef2b9721 --- /dev/null +++ b/packages/network_info_plus_macos/macos/Classes/IPHelper.h @@ -0,0 +1,51 @@ +// Copyright 2019 Google LLC +// +// 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. + +#import + +#import "SystemConfiguration/CaptiveNetwork.h" + +#include +#include + +NSString* getWifiIP() { + NSString* address = @"error"; + struct ifaddrs* interfaces = NULL; + struct ifaddrs* temp_addr = NULL; + int success = 0; + + // Retrieve the current interfaces - returns 0 on success. + success = getifaddrs(&interfaces); + if (success == 0) { + // Loop through linked list of interfaces. + temp_addr = interfaces; + while (temp_addr != NULL) { + if (temp_addr->ifa_addr->sa_family == AF_INET) { + // Check if interface is en0 which is the wifi connection on the iPhone. + if ([[NSString stringWithUTF8String:temp_addr->ifa_name] isEqualToString:@"en0"]) { + // Get NSString from C String + address = [NSString + stringWithUTF8String:inet_ntoa(((struct sockaddr_in*)temp_addr->ifa_addr)->sin_addr)]; + } + } + + temp_addr = temp_addr->ifa_next; + } + } + + // Free memory + freeifaddrs(interfaces); + + return address; +} diff --git a/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec b/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec new file mode 100644 index 0000000000..323e22b554 --- /dev/null +++ b/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec @@ -0,0 +1,21 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# +Pod::Spec.new do |s| + s.name = 'connectivity_plus_macos' + s.version = '0.0.1' + s.summary = 'Flutter plugin for checking connectivity' + s.description = <<-DESC + Desktop implementation of the connectivity plugin + DESC + s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity_macos' + s.license = { :type => 'BSD', :file => '../LICENSE' } + s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } + s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity_macos' } + s.source_files = 'Classes/**/*' + s.dependency 'FlutterMacOS' + s.dependency 'Reachability' + + s.platform = :osx + s.osx.deployment_target = '10.11' +end \ No newline at end of file diff --git a/packages/network_info_plus_macos/pubspec.yaml b/packages/network_info_plus_macos/pubspec.yaml new file mode 100644 index 0000000000..90099bbb74 --- /dev/null +++ b/packages/network_info_plus_macos/pubspec.yaml @@ -0,0 +1,20 @@ +name: connectivity_plus_macos +description: macOS implementation of the connectivity_plus plugin. +version: 0.3.0 +homepage: https://plus.fluttercommunity.dev/ +repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ + +flutter: + plugin: + platforms: + macos: + pluginClass: ConnectivityPlugin + +environment: + sdk: ">=2.1.0 <3.0.0" + flutter: '>=1.20.0' + +dependencies: + connectivity_plus_platform_interface: ^0.3.0 + flutter: + sdk: flutter diff --git a/packages/network_info_plus_platform_interface/.gitattributes b/packages/network_info_plus_platform_interface/.gitattributes new file mode 100644 index 0000000000..31fda4bf1c --- /dev/null +++ b/packages/network_info_plus_platform_interface/.gitattributes @@ -0,0 +1,25 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Always perform LF normalization on these files +*.dart text +*.gradle text +*.html text +*.java text +*.json text +*.md text +*.py text +*.sh text +*.txt text +*.xml text +*.yaml text + +# Make sure that these Windows files always have CRLF line endings in checkout +*.bat text eol=crlf +*.ps1 text eol=crlf + +# Never perform LF normalization on these files +*.ico binary +*.jar binary +*.png binary +*.zip binary diff --git a/packages/network_info_plus_platform_interface/.gitignore b/packages/network_info_plus_platform_interface/.gitignore new file mode 100644 index 0000000000..bfb8a70b52 --- /dev/null +++ b/packages/network_info_plus_platform_interface/.gitignore @@ -0,0 +1,46 @@ +.DS_Store +.atom/ +.idea/ +.vscode/ + +.packages +.pub/ +.dart_tool/ +pubspec.lock +flutter_export_environment.sh + +examples/all_plugins/pubspec.yaml + +Podfile +Podfile.lock +Pods/ +.symlinks/ +**/Flutter/App.framework/ +**/Flutter/ephemeral/ +**/Flutter/Flutter.framework/ +**/Flutter/Generated.xcconfig +**/Flutter/flutter_assets/ + +ServiceDefinitions.json +xcuserdata/ +**/DerivedData/ + +local.properties +keystore.properties +.gradle/ +gradlew +gradlew.bat +gradle-wrapper.jar +.flutter-plugins-dependencies +*.iml + +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m +GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +build/ +.flutter-plugins + +.project +.classpath +.settings diff --git a/packages/network_info_plus_platform_interface/CHANGELOG.md b/packages/network_info_plus_platform_interface/CHANGELOG.md new file mode 100644 index 0000000000..8c818ec8f7 --- /dev/null +++ b/packages/network_info_plus_platform_interface/CHANGELOG.md @@ -0,0 +1,44 @@ +## 0.3.0 + +- Renamed method channel + +## 0.2.0 + +- Transfer to plus-plugins monorepo + +## 0.1.7 + +- Transfer package to Flutter Community under new name `connectivity_plus_platform_interface`. + +## 0.1.6 + +- Update lower bound of dart dependency to 2.1.0. + +## 0.1.5 + +- Remove dart:io Platform checks from the MethodChannel implementation. This is + tripping the analysis of other versions of the plugin. + +## 0.1.4 + +- Bump the minimum Flutter version to 1.12.13+hotfix.5. + +## 0.1.3 + +- Make the pedantic dev_dependency explicit. + +## 0.1.2 + +- Bring ConnectivityResult and LocationAuthorizationStatus enums from the core package. +- Use the above Enums as return values for ConnectivityPlatformInterface methods. +- Modify the MethodChannel implementation so it returns the right types. +- Bring all utility methods, asserts and other logic that is only needed on the MethodChannel implementation from the core package. +- Bring MethodChannel unit tests from core package. + +## 0.1.1 + +- Fix README.md link. + +## 0.1.0 + +- Initial release. diff --git a/packages/network_info_plus_platform_interface/LICENSE b/packages/network_info_plus_platform_interface/LICENSE new file mode 100644 index 0000000000..0c91662b3f --- /dev/null +++ b/packages/network_info_plus_platform_interface/LICENSE @@ -0,0 +1,27 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus_platform_interface/README.md b/packages/network_info_plus_platform_interface/README.md new file mode 100644 index 0000000000..dfdb11d105 --- /dev/null +++ b/packages/network_info_plus_platform_interface/README.md @@ -0,0 +1,12 @@ +# Connectivity Plus Platform Interface + +[![Flutter Community: connectivity_plus_platform_interface](https://fluttercommunity.dev/_github/header/connectivity_plus_platform_interface)](https://github.com/fluttercommunity/community) + +[![pub package](https://img.shields.io/pub/v/connectivity_plus_platform_interface.svg)](https://pub.dev/packages/connectivity_plus_platform_interface) + +A common platform interface for [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). + +## Usage + +This package is already included as part of the `connectivity_plus` package dependency, and will +be included when using `connectivity_plus` as normal. diff --git a/packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart b/packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart new file mode 100644 index 0000000000..cfd9cf648a --- /dev/null +++ b/packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart @@ -0,0 +1,79 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:plugin_platform_interface/plugin_platform_interface.dart'; + +import 'src/enums.dart'; +import 'src/method_channel_connectivity.dart'; + +export 'src/enums.dart'; + +/// The interface that implementations of connectivity must implement. +/// +/// Platform implementations should extend this class rather than implement it as `Connectivity` +/// does not consider newly added methods to be breaking changes. Extending this class +/// (using `extends`) ensures that the subclass will get the default implementation, while +/// platform implementations that `implements` this interface will be broken by newly added +/// [ConnectivityPlatform] methods. +abstract class ConnectivityPlatform extends PlatformInterface { + /// Constructs a ConnectivityPlatform. + ConnectivityPlatform() : super(token: _token); + + static final Object _token = Object(); + + static ConnectivityPlatform _instance = MethodChannelConnectivity(); + + /// The default instance of [ConnectivityPlatform] to use. + /// + /// Defaults to [MethodChannelConnectivity]. + static ConnectivityPlatform get instance => _instance; + + /// Platform-specific plugins should set this with their own platform-specific + /// class that extends [ConnectivityPlatform] when they register themselves. + static set instance(ConnectivityPlatform instance) { + PlatformInterface.verifyToken(instance, _token); + _instance = instance; + } + + /// Checks the connection status of the device. + Future checkConnectivity() { + throw UnimplementedError('checkConnectivity() has not been implemented.'); + } + + /// Returns a Stream of ConnectivityResults changes. + Stream get onConnectivityChanged { + throw UnimplementedError( + 'get onConnectivityChanged has not been implemented.'); + } + + /// Obtains the wifi name (SSID) of the connected network + Future getWifiName() { + throw UnimplementedError('getWifiName() has not been implemented.'); + } + + /// Obtains the wifi BSSID of the connected network. + Future getWifiBSSID() { + throw UnimplementedError('getWifiBSSID() has not been implemented.'); + } + + /// Obtains the IP address of the connected wifi network + Future getWifiIP() { + throw UnimplementedError('getWifiIP() has not been implemented.'); + } + + /// Request to authorize the location service (Only on iOS). + Future requestLocationServiceAuthorization( + {bool requestAlwaysLocationUsage = false}) { + throw UnimplementedError( + 'requestLocationServiceAuthorization() has not been implemented.'); + } + + /// Get the current location service authorization (Only on iOS). + Future getLocationServiceAuthorization() { + throw UnimplementedError( + 'getLocationServiceAuthorization() has not been implemented.'); + } +} diff --git a/packages/network_info_plus_platform_interface/lib/src/enums.dart b/packages/network_info_plus_platform_interface/lib/src/enums.dart new file mode 100644 index 0000000000..9d8cef9e1a --- /dev/null +++ b/packages/network_info_plus_platform_interface/lib/src/enums.dart @@ -0,0 +1,32 @@ +/// Connection status check result. +enum ConnectivityResult { + /// WiFi: Device connected via Wi-Fi + wifi, + + /// Mobile: Device connected to cellular network + mobile, + + /// None: Device not connected to any network + none +} + +/// The status of the location service authorization. +enum LocationAuthorizationStatus { + /// The authorization of the location service is not determined. + notDetermined, + + /// This app is not authorized to use location. + restricted, + + /// User explicitly denied the location service. + denied, + + /// User authorized the app to access the location at any time. + authorizedAlways, + + /// User authorized the app to access the location when the app is visible to them. + authorizedWhenInUse, + + /// Status unknown. + unknown +} diff --git a/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart b/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart new file mode 100644 index 0000000000..002df731e9 --- /dev/null +++ b/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart @@ -0,0 +1,81 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:flutter/services.dart'; +import 'package:meta/meta.dart'; + +import 'utils.dart'; + +/// An implementation of [ConnectivityPlatform] that uses method channels. +class MethodChannelConnectivity extends ConnectivityPlatform { + /// The method channel used to interact with the native platform. + @visibleForTesting + MethodChannel methodChannel = + MethodChannel('dev.fluttercommunity.plus/connectivity'); + + /// The event channel used to receive ConnectivityResult changes from the native platform. + @visibleForTesting + EventChannel eventChannel = + EventChannel('dev.fluttercommunity.plus/connectivity_status'); + + Stream _onConnectivityChanged; + + /// Fires whenever the connectivity state changes. + @override + Stream get onConnectivityChanged { + _onConnectivityChanged ??= eventChannel + .receiveBroadcastStream() + .map((dynamic result) => result.toString()) + .map(parseConnectivityResult); + return _onConnectivityChanged; + } + + @override + Future checkConnectivity() { + return methodChannel + .invokeMethod('check') + .then(parseConnectivityResult); + } + + @override + Future getWifiName() async { + var wifiName = await methodChannel.invokeMethod('wifiName'); + // as Android might return , uniforming result + // our iOS implementation will return null + if (wifiName == '') { + wifiName = null; + } + return wifiName; + } + + @override + Future getWifiBSSID() { + return methodChannel.invokeMethod('wifiBSSID'); + } + + @override + Future getWifiIP() { + return methodChannel.invokeMethod('wifiIPAddress'); + } + + @override + Future requestLocationServiceAuthorization({ + bool requestAlwaysLocationUsage = false, + }) { + return methodChannel.invokeMethod( + 'requestLocationServiceAuthorization', [ + requestAlwaysLocationUsage + ]).then(parseLocationAuthorizationStatus); + } + + @override + Future getLocationServiceAuthorization() { + return methodChannel + .invokeMethod('getLocationServiceAuthorization') + .then(parseLocationAuthorizationStatus); + } +} diff --git a/packages/network_info_plus_platform_interface/lib/src/utils.dart b/packages/network_info_plus_platform_interface/lib/src/utils.dart new file mode 100644 index 0000000000..4209c135fd --- /dev/null +++ b/packages/network_info_plus_platform_interface/lib/src/utils.dart @@ -0,0 +1,32 @@ +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; + +/// Convert a String to a ConnectivityResult value. +ConnectivityResult parseConnectivityResult(String state) { + switch (state) { + case 'wifi': + return ConnectivityResult.wifi; + case 'mobile': + return ConnectivityResult.mobile; + case 'none': + default: + return ConnectivityResult.none; + } +} + +/// Convert a String to a LocationAuthorizationStatus value. +LocationAuthorizationStatus parseLocationAuthorizationStatus(String result) { + switch (result) { + case 'notDetermined': + return LocationAuthorizationStatus.notDetermined; + case 'restricted': + return LocationAuthorizationStatus.restricted; + case 'denied': + return LocationAuthorizationStatus.denied; + case 'authorizedAlways': + return LocationAuthorizationStatus.authorizedAlways; + case 'authorizedWhenInUse': + return LocationAuthorizationStatus.authorizedWhenInUse; + default: + return LocationAuthorizationStatus.unknown; + } +} diff --git a/packages/network_info_plus_platform_interface/pubspec.yaml b/packages/network_info_plus_platform_interface/pubspec.yaml new file mode 100644 index 0000000000..ac2ebd3c2c --- /dev/null +++ b/packages/network_info_plus_platform_interface/pubspec.yaml @@ -0,0 +1,20 @@ +name: connectivity_plus_platform_interface +description: A common platform interface for the connectivity_plus plugin. +version: 0.3.0 +homepage: https://plus.fluttercommunity.dev/ +repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ + +dependencies: + flutter: + sdk: flutter + meta: ^1.0.5 + plugin_platform_interface: ^1.0.1 + +dev_dependencies: + flutter_test: + sdk: flutter + pedantic: ^1.9.2 + +environment: + sdk: ">=2.1.0 <3.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart b/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart new file mode 100644 index 0000000000..3165b26d87 --- /dev/null +++ b/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart @@ -0,0 +1,152 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:connectivity_plus_platform_interface/src/method_channel_connectivity.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + group('$MethodChannelConnectivity', () { + final log = []; + MethodChannelConnectivity methodChannelConnectivity; + + setUp(() async { + methodChannelConnectivity = MethodChannelConnectivity(); + + methodChannelConnectivity.methodChannel + .setMockMethodCallHandler((MethodCall methodCall) async { + log.add(methodCall); + switch (methodCall.method) { + case 'check': + return 'wifi'; + case 'wifiName': + return '1337wifi'; + case 'wifiBSSID': + return 'c0:ff:33:c0:d3:55'; + case 'wifiIPAddress': + return '127.0.0.1'; + case 'requestLocationServiceAuthorization': + return 'authorizedAlways'; + case 'getLocationServiceAuthorization': + return 'authorizedAlways'; + default: + return null; + } + }); + log.clear(); + MethodChannel(methodChannelConnectivity.eventChannel.name) + .setMockMethodCallHandler((MethodCall methodCall) async { + switch (methodCall.method) { + case 'listen': + await ServicesBinding.instance.defaultBinaryMessenger + .handlePlatformMessage( + methodChannelConnectivity.eventChannel.name, + methodChannelConnectivity.eventChannel.codec + .encodeSuccessEnvelope('wifi'), + (_) {}, + ); + break; + case 'cancel': + default: + return null; + } + }); + }); + + test('onConnectivityChanged', () async { + final result = + await methodChannelConnectivity.onConnectivityChanged.first; + expect(result, ConnectivityResult.wifi); + }); + + test('getWifiName', () async { + final result = await methodChannelConnectivity.getWifiName(); + expect(result, '1337wifi'); + expect( + log, + [ + isMethodCall( + 'wifiName', + arguments: null, + ), + ], + ); + }); + + test('getWifiBSSID', () async { + final result = await methodChannelConnectivity.getWifiBSSID(); + expect(result, 'c0:ff:33:c0:d3:55'); + expect( + log, + [ + isMethodCall( + 'wifiBSSID', + arguments: null, + ), + ], + ); + }); + + test('getWifiIP', () async { + final result = await methodChannelConnectivity.getWifiIP(); + expect(result, '127.0.0.1'); + expect( + log, + [ + isMethodCall( + 'wifiIPAddress', + arguments: null, + ), + ], + ); + }); + + test('requestLocationServiceAuthorization', () async { + final result = + await methodChannelConnectivity.requestLocationServiceAuthorization(); + expect(result, LocationAuthorizationStatus.authorizedAlways); + expect( + log, + [ + isMethodCall( + 'requestLocationServiceAuthorization', + arguments: [false], + ), + ], + ); + }); + + test('getLocationServiceAuthorization', () async { + final result = + await methodChannelConnectivity.getLocationServiceAuthorization(); + expect(result, LocationAuthorizationStatus.authorizedAlways); + expect( + log, + [ + isMethodCall( + 'getLocationServiceAuthorization', + arguments: null, + ), + ], + ); + }); + + test('checkConnectivity', () async { + final result = await methodChannelConnectivity.checkConnectivity(); + expect(result, ConnectivityResult.wifi); + expect( + log, + [ + isMethodCall( + 'check', + arguments: null, + ), + ], + ); + }); + }); +} diff --git a/packages/network_info_plus_web/.gitattributes b/packages/network_info_plus_web/.gitattributes new file mode 100644 index 0000000000..31fda4bf1c --- /dev/null +++ b/packages/network_info_plus_web/.gitattributes @@ -0,0 +1,25 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Always perform LF normalization on these files +*.dart text +*.gradle text +*.html text +*.java text +*.json text +*.md text +*.py text +*.sh text +*.txt text +*.xml text +*.yaml text + +# Make sure that these Windows files always have CRLF line endings in checkout +*.bat text eol=crlf +*.ps1 text eol=crlf + +# Never perform LF normalization on these files +*.ico binary +*.jar binary +*.png binary +*.zip binary diff --git a/packages/network_info_plus_web/.gitignore b/packages/network_info_plus_web/.gitignore new file mode 100644 index 0000000000..88ce490e47 --- /dev/null +++ b/packages/network_info_plus_web/.gitignore @@ -0,0 +1,47 @@ +.DS_Store +.atom/ +.idea/ +.vscode/ + +.packages +.pub/ +.dart_tool/ +pubspec.lock +flutter_export_environment.sh + +examples/all_plugins/pubspec.yaml + +Podfile +Podfile.lock +Pods/ +.symlinks/ +**/Flutter/App.framework/ +**/Flutter/ephemeral/ +**/Flutter/Flutter.framework/ +**/Flutter/Generated.xcconfig +**/Flutter/flutter_assets/ + +ServiceDefinitions.json +xcuserdata/ +**/DerivedData/ + +local.properties +keystore.properties +.gradle/ +gradlew +gradlew.bat +gradle-wrapper.jar +.flutter-plugins-dependencies +*.iml + +generated_plugin_registrant.dart +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m +GeneratedPluginRegistrant.java +GeneratedPluginRegistrant.swift +build/ +.flutter-plugins + +.project +.classpath +.settings diff --git a/packages/network_info_plus_web/.metadata b/packages/network_info_plus_web/.metadata new file mode 100644 index 0000000000..23eb55ba6d --- /dev/null +++ b/packages/network_info_plus_web/.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: 52ee8a6c6565cd421dfa32042941eb40691f4746 + channel: master + +project_type: plugin diff --git a/packages/network_info_plus_web/CHANGELOG.md b/packages/network_info_plus_web/CHANGELOG.md new file mode 100644 index 0000000000..b8afc8d26e --- /dev/null +++ b/packages/network_info_plus_web/CHANGELOG.md @@ -0,0 +1,36 @@ +## 0.5.0 + +- Updated platform interface + +## 0.4.0 + +- Transfer to plus-plugins monorepo + +## 0.3.1+3 + +- Transfer package to Flutter Community under new name `connectivity_plus_web`. + +## 0.3.1+2 + +- Update package:e2e to use package:integration_test + +## 0.3.1+1 + +- Update package:e2e reference to use the local version in the flutter/plugins + repository. + +## 0.3.1 + +- Use NetworkInformation API from dart:html, instead of the JS-interop version. + +## 0.3.0 + +- Rename from "experimental_connectivity_web" to "connectivity_web", and move to flutter/plugins master. + +## 0.2.0 + +- Add fallback on dart:html for browsers where NetworkInformationAPI is not supported. + +## 0.1.0 + +- Initial release. diff --git a/packages/network_info_plus_web/LICENSE b/packages/network_info_plus_web/LICENSE new file mode 100644 index 0000000000..4da9688730 --- /dev/null +++ b/packages/network_info_plus_web/LICENSE @@ -0,0 +1,26 @@ +Copyright 2016, the Flutter project authors. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus_web/README.md b/packages/network_info_plus_web/README.md new file mode 100644 index 0000000000..b42eb86081 --- /dev/null +++ b/packages/network_info_plus_web/README.md @@ -0,0 +1,12 @@ +# Connectivity Plus Web + +[![Flutter Community: connectivity_plus_web](https://fluttercommunity.dev/_github/header/connectivity_plus_web)](https://github.com/fluttercommunity/community) + +[![pub package](https://img.shields.io/pub/v/connectivity_plus_web.svg)](https://pub.dev/packages/connectivity_plus_web) + +The Web implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). + +## Usage + +This package is already included as part of the `connectivity_plus` package dependency, and will +be included when using `connectivity_plus` as normal. diff --git a/packages/network_info_plus_web/lib/connectivity_plus_web.dart b/packages/network_info_plus_web/lib/connectivity_plus_web.dart new file mode 100644 index 0000000000..0a78ca2eb9 --- /dev/null +++ b/packages/network_info_plus_web/lib/connectivity_plus_web.dart @@ -0,0 +1,63 @@ +import 'dart:async'; + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; + +import 'src/network_information_api_connectivity_plugin.dart'; +import 'src/dart_html_connectivity_plugin.dart'; + +/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. +class ConnectivityPlugin extends ConnectivityPlatform { + /// Factory method that initializes the connectivity plugin platform with an instance + /// of the plugin for the web. + static void registerWith(Registrar registrar) { + if (NetworkInformationApiConnectivityPlugin.isSupported()) { + ConnectivityPlatform.instance = NetworkInformationApiConnectivityPlugin(); + } else { + ConnectivityPlatform.instance = DartHtmlConnectivityPlugin(); + } + } + + // The following are completely unsupported methods on the web platform. + + // Creates an "unsupported_operation" PlatformException for a given `method` name. + Object _unsupported(String method) { + return PlatformException( + code: 'UNSUPPORTED_OPERATION', + message: '$method() is not supported on the web platform.', + ); + } + + /// Obtains the wifi name (SSID) of the connected network + @override + Future getWifiName() { + throw _unsupported('getWifiName'); + } + + /// Obtains the wifi BSSID of the connected network. + @override + Future getWifiBSSID() { + throw _unsupported('getWifiBSSID'); + } + + /// Obtains the IP address of the connected wifi network + @override + Future getWifiIP() { + throw _unsupported('getWifiIP'); + } + + /// Request to authorize the location service (Only on iOS). + @override + Future requestLocationServiceAuthorization({ + bool requestAlwaysLocationUsage = false, + }) { + throw _unsupported('requestLocationServiceAuthorization'); + } + + /// Get the current location service authorization (Only on iOS). + @override + Future getLocationServiceAuthorization() { + throw _unsupported('getLocationServiceAuthorization'); + } +} diff --git a/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart new file mode 100644 index 0000000000..40011989e6 --- /dev/null +++ b/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart @@ -0,0 +1,34 @@ +import 'dart:async'; +import 'dart:html' as html show window; + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:connectivity_plus_web/connectivity_plus_web.dart'; + +/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. +class DartHtmlConnectivityPlugin extends ConnectivityPlugin { + /// Checks the connection status of the device. + @override + Future checkConnectivity() async { + return html.window.navigator.onLine + ? ConnectivityResult.wifi + : ConnectivityResult.none; + } + + StreamController _connectivityResult; + + /// Returns a Stream of ConnectivityResults changes. + @override + Stream get onConnectivityChanged { + if (_connectivityResult == null) { + _connectivityResult = StreamController(); + // Fallback to dart:html window.onOnline / window.onOffline + html.window.onOnline.listen((event) { + _connectivityResult.add(ConnectivityResult.wifi); + }); + html.window.onOffline.listen((event) { + _connectivityResult.add(ConnectivityResult.none); + }); + } + return _connectivityResult.stream; + } +} diff --git a/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart new file mode 100644 index 0000000000..d2e2fd4769 --- /dev/null +++ b/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart @@ -0,0 +1,61 @@ +import 'dart:async'; +import 'dart:html' as html show window, NetworkInformation; +import 'dart:js'; +import 'dart:js_util'; + +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:connectivity_plus_web/connectivity_plus_web.dart'; +import 'package:flutter/foundation.dart'; + +import 'utils/connectivity_result.dart'; + +/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. +class NetworkInformationApiConnectivityPlugin extends ConnectivityPlugin { + final html.NetworkInformation _networkInformation; + + /// A check to determine if this version of the plugin can be used. + static bool isSupported() => html.window.navigator.connection != null; + + /// The constructor of the plugin. + NetworkInformationApiConnectivityPlugin() + : this.withConnection(html.window.navigator.connection); + + /// Creates the plugin, with an override of the NetworkInformation object. + @visibleForTesting + NetworkInformationApiConnectivityPlugin.withConnection( + html.NetworkInformation connection) + : _networkInformation = connection; + + /// Checks the connection status of the device. + @override + Future checkConnectivity() async { + return networkInformationToConnectivityResult(_networkInformation); + } + + StreamController _connectivityResultStreamController; + Stream _connectivityResultStream; + + /// Returns a Stream of ConnectivityResults changes. + @override + Stream get onConnectivityChanged { + if (_connectivityResultStreamController == null) { + _connectivityResultStreamController = + StreamController(); + setProperty(_networkInformation, 'onchange', allowInterop((_) { + _connectivityResultStreamController + .add(networkInformationToConnectivityResult(_networkInformation)); + })); + // TODO: Implement the above with _networkInformation.onChange: + // _networkInformation.onChange.listen((_) { + // _connectivityResult + // .add(networkInformationToConnectivityResult(_networkInformation)); + // }); + // Once we can detect when to *cancel* a subscription to the _networkInformation + // onChange Stream upon hot restart. + // https://github.com/dart-lang/sdk/issues/42679 + _connectivityResultStream = + _connectivityResultStreamController.stream.asBroadcastStream(); + } + return _connectivityResultStream; + } +} diff --git a/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart b/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart new file mode 100644 index 0000000000..7c5ec95e68 --- /dev/null +++ b/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart @@ -0,0 +1,51 @@ +import 'dart:html' as html show NetworkInformation; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; + +/// Converts an incoming NetworkInformation object into the correct ConnectivityResult. +ConnectivityResult networkInformationToConnectivityResult( + html.NetworkInformation info, +) { + if (info == null) { + return ConnectivityResult.none; + } + if (info.downlink == 0 && info.rtt == 0) { + return ConnectivityResult.none; + } + if (info.effectiveType != null) { + return _effectiveTypeToConnectivityResult(info.effectiveType); + } + if (info.type != null) { + return _typeToConnectivityResult(info.type); + } + return ConnectivityResult.none; +} + +ConnectivityResult _effectiveTypeToConnectivityResult(String effectiveType) { + // Possible values: + /*'2g'|'3g'|'4g'|'slow-2g'*/ + switch (effectiveType) { + case 'slow-2g': + case '2g': + case '3g': + return ConnectivityResult.mobile; + default: + return ConnectivityResult.wifi; + } +} + +ConnectivityResult _typeToConnectivityResult(String type) { + // Possible values: + /*'bluetooth'|'cellular'|'ethernet'|'mixed'|'none'|'other'|'unknown'|'wifi'|'wimax'*/ + switch (type) { + case 'none': + return ConnectivityResult.none; + case 'bluetooth': + case 'cellular': + case 'mixed': + case 'other': + case 'unknown': + return ConnectivityResult.mobile; + default: + return ConnectivityResult.wifi; + } +} diff --git a/packages/network_info_plus_web/pubspec.yaml b/packages/network_info_plus_web/pubspec.yaml new file mode 100644 index 0000000000..f8cf2ea5de --- /dev/null +++ b/packages/network_info_plus_web/pubspec.yaml @@ -0,0 +1,33 @@ +name: connectivity_plus_web +description: An implementation for the web platform of the Flutter `connectivity_plus` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine. +version: 0.5.0 +homepage: https://plus.fluttercommunity.dev/ +repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ + +flutter: + plugin: + platforms: + web: + pluginClass: ConnectivityPlugin + fileName: connectivity_plus_web.dart + +dependencies: + connectivity_plus_platform_interface: ^0.3.0 + flutter_web_plugins: + sdk: flutter + flutter: + sdk: flutter + +dev_dependencies: + test: any + flutter_driver: + sdk: flutter + flutter_test: + sdk: flutter + integration_test: ^0.9.1 + mockito: ^4.1.1 + pedantic: ^1.9.2 + +environment: + sdk: ">=2.6.0 <3.0.0" + flutter: '>=1.20.0' diff --git a/packages/network_info_plus_web/test/.gitignore b/packages/network_info_plus_web/test/.gitignore new file mode 100644 index 0000000000..d7dee828a6 --- /dev/null +++ b/packages/network_info_plus_web/test/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +.dart_tool/ + +.packages +.pub/ + +build/ +lib/generated_plugin_registrant.dart diff --git a/packages/network_info_plus_web/test/lib/main.dart b/packages/network_info_plus_web/test/lib/main.dart new file mode 100644 index 0000000000..203d2ae626 --- /dev/null +++ b/packages/network_info_plus_web/test/lib/main.dart @@ -0,0 +1,76 @@ +import 'package:integration_test/integration_test.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:connectivity_plus_web/src/network_information_api_connectivity_plugin.dart'; + +import 'package:mockito/mockito.dart'; + +import 'src/connectivity_mocks.dart'; + +void main() { + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + + group('checkConnectivity', () { + void testCheckConnectivity({ + String type, + String effectiveType, + num downlink = 10, + num rtt = 50, + ConnectivityResult expected, + }) { + final connection = MockNetworkInformation(); + when(connection.type).thenReturn(type); + when(connection.effectiveType).thenReturn(effectiveType); + when(connection.downlink).thenReturn(downlink); + when(connection.rtt).thenReturn(downlink); + + final plugin = + NetworkInformationApiConnectivityPlugin.withConnection(connection); + expect(plugin.checkConnectivity(), completion(equals(expected))); + } + + test('0 downlink and rtt -> none', () { + testCheckConnectivity( + effectiveType: '4g', + downlink: 0, + rtt: 0, + expected: ConnectivityResult.none); + }); + test('slow-2g -> mobile', () { + testCheckConnectivity( + effectiveType: 'slow-2g', expected: ConnectivityResult.mobile); + }); + test('2g -> mobile', () { + testCheckConnectivity( + effectiveType: '2g', expected: ConnectivityResult.mobile); + }); + test('3g -> mobile', () { + testCheckConnectivity( + effectiveType: '3g', expected: ConnectivityResult.mobile); + }); + test('4g -> wifi', () { + testCheckConnectivity( + effectiveType: '4g', expected: ConnectivityResult.wifi); + }); + }); + + group('get onConnectivityChanged', () { + test('puts change events in a Stream', () async { + final connection = MockNetworkInformation(); + final plugin = + NetworkInformationApiConnectivityPlugin.withConnection(connection); + final results = plugin.onConnectivityChanged; + + // Fake a disconnect-reconnect + await connection.mockChangeValue(downlink: 0, rtt: 0); + await connection.mockChangeValue( + downlink: 10, rtt: 50, effectiveType: '4g'); + + // The stream of results is infinite, so we need to .take(2) for this test to complete. + expect( + results.take(2).toList(), + completion( + equals([ConnectivityResult.none, ConnectivityResult.wifi]))); + }); + }); +} diff --git a/packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart b/packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart new file mode 100644 index 0000000000..7b82b51206 --- /dev/null +++ b/packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart @@ -0,0 +1,25 @@ +import 'dart:html'; + +import 'package:mockito/mockito.dart'; + +/// A Mock implementation of the NetworkInformation API that allows +/// for external modification of its values. +class MockNetworkInformation extends Mock implements NetworkInformation { + /// The callback that will fire after the network information values change. + Function onchange; + + /// Changes the desired values, and triggers the change event listener. + void mockChangeValue({ + String type, + String effectiveType, + num downlink, + num rtt, + }) async { + when(this.type).thenAnswer((_) => type); + when(this.effectiveType).thenAnswer((_) => effectiveType); + when(this.downlink).thenAnswer((_) => downlink); + when(this.rtt).thenAnswer((_) => rtt); + + onchange(Event('change')); + } +} diff --git a/packages/network_info_plus_web/test/web/index.html b/packages/network_info_plus_web/test/web/index.html new file mode 100644 index 0000000000..6eff9a740d --- /dev/null +++ b/packages/network_info_plus_web/test/web/index.html @@ -0,0 +1,10 @@ + + + + + example + + + + + From 91a3aeed78ececcef49140f3489039b9cfbc6224 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:15:20 +0100 Subject: [PATCH 02/13] [network_info_plus] search'n'replace connectivity_plus --- packages/network_info_plus/CHANGELOG.md | 4 ++-- packages/network_info_plus/README.md | 12 ++++++------ packages/network_info_plus/example/lib/main.dart | 2 +- packages/network_info_plus/example/pubspec.yaml | 6 +++--- .../test_driver/connectivity_plus_e2e.dart | 2 +- .../ios/connectivity_plus.podspec | 2 +- .../network_info_plus/lib/connectivity_plus.dart | 8 ++++---- .../macos/connectivity_plus.podspec | 2 +- packages/network_info_plus/pubspec.yaml | 16 ++++++++-------- .../test/connectivity_test.dart | 4 ++-- packages/network_info_plus_linux/README.md | 10 +++++----- .../lib/connectivity_plus_linux.dart | 6 +++--- .../lib/src/connectivity_real.dart | 2 +- .../lib/src/connectivity_stub.dart | 10 +++++----- packages/network_info_plus_linux/pubspec.yaml | 6 +++--- .../test/connectivity_plus_linux_test.dart | 6 +++--- packages/network_info_plus_macos/CHANGELOG.md | 2 +- packages/network_info_plus_macos/README.md | 10 +++++----- .../macos/connectivity_plus_macos.podspec | 2 +- packages/network_info_plus_macos/pubspec.yaml | 6 +++--- .../CHANGELOG.md | 2 +- .../README.md | 10 +++++----- .../lib/src/method_channel_connectivity.dart | 2 +- .../lib/src/utils.dart | 2 +- .../pubspec.yaml | 4 ++-- .../test/method_channel_connectivity_test.dart | 4 ++-- packages/network_info_plus_web/CHANGELOG.md | 2 +- packages/network_info_plus_web/README.md | 10 +++++----- .../lib/connectivity_plus_web.dart | 2 +- .../lib/src/dart_html_connectivity_plugin.dart | 4 ++-- ...work_information_api_connectivity_plugin.dart | 4 ++-- .../lib/src/utils/connectivity_result.dart | 2 +- packages/network_info_plus_web/pubspec.yaml | 8 ++++---- .../network_info_plus_web/test/lib/main.dart | 4 ++-- 34 files changed, 89 insertions(+), 89 deletions(-) diff --git a/packages/network_info_plus/CHANGELOG.md b/packages/network_info_plus/CHANGELOG.md index c0dae836e1..f60b017dbc 100644 --- a/packages/network_info_plus/CHANGELOG.md +++ b/packages/network_info_plus/CHANGELOG.md @@ -4,7 +4,7 @@ ## 0.7.0 -- Add Linux support (`connectivity_plus_linux`). +- Add Linux support (`network_info_plus_linux`). ## 0.6.0 @@ -61,7 +61,7 @@ collision with the original connectivity package. ## 0.4.7 -- Migrate the plugin to use the ConnectivityPlatform.instance defined in the connectivity_plus_platform_interface package. +- Migrate the plugin to use the ConnectivityPlatform.instance defined in the network_info_plus_platform_interface package. ## 0.4.6+2 diff --git a/packages/network_info_plus/README.md b/packages/network_info_plus/README.md index 8a9229f477..e055f562f3 100644 --- a/packages/network_info_plus/README.md +++ b/packages/network_info_plus/README.md @@ -1,8 +1,8 @@ -# connectivity_plus +# network_info_plus -[![Flutter Community: connectivity_plus](https://fluttercommunity.dev/_github/header/connectivity_plus)](https://github.com/fluttercommunity/community) +[![Flutter Community: network_info_plus](https://fluttercommunity.dev/_github/header/network_info_plus)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/connectivity_plus.svg)](https://pub.dev/packages/connectivity_plus) +[![pub package](https://img.shields.io/pub/v/network_info_plus.svg)](https://pub.dev/packages/network_info_plus) This plugin allows Flutter apps to discover network connectivity and configure themselves accordingly. It can distinguish between cellular vs WiFi connection. @@ -16,7 +16,7 @@ the app might have wifi access but it might be a VPN or a hotel WiFi with no acc Sample usage to check current status: ```dart -import 'package:connectivity_plus/connectivity.dart'; +import 'package:network_info_plus/connectivity.dart'; var connectivityResult = await (Connectivity().checkConnectivity()); if (connectivityResult == ConnectivityResult.mobile) { @@ -34,7 +34,7 @@ You can also listen for network state changes by subscribing to the stream exposed by connectivity plugin: ```dart -import 'package:connectivity_plus/connectivity.dart'; +import 'package:network_info_plus/connectivity.dart'; @override initState() { @@ -59,7 +59,7 @@ Note that connectivity changes are no longer communicated to Android apps in the You can get wi-fi related information using: ```dart -import 'package:connectivity_plus/connectivity.dart'; +import 'package:network_info_plus/connectivity.dart'; var wifiBSSID = await (Connectivity().getWifiBSSID()); var wifiIP = await (Connectivity().getWifiIP());network diff --git a/packages/network_info_plus/example/lib/main.dart b/packages/network_info_plus/example/lib/main.dart index bd5f90df85..ba7b33eea5 100644 --- a/packages/network_info_plus/example/lib/main.dart +++ b/packages/network_info_plus/example/lib/main.dart @@ -7,7 +7,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:network_info_plus/network_info_plus.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/packages/network_info_plus/example/pubspec.yaml b/packages/network_info_plus/example/pubspec.yaml index d6a005c7a9..6fb521646a 100644 --- a/packages/network_info_plus/example/pubspec.yaml +++ b/packages/network_info_plus/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: connectivity_plus_example -description: Demonstrates how to use the connectivity_plus plugin. +name: network_info_plus_example +description: Demonstrates how to use the network_info_plus plugin. environment: sdk: ">=2.7.0 <3.0.0" @@ -7,7 +7,7 @@ environment: dependencies: flutter: sdk: flutter - connectivity_plus: + network_info_plus: path: ../ dev_dependencies: diff --git a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart index 7e46d2d647..eaee4741d5 100644 --- a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart +++ b/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart @@ -5,7 +5,7 @@ import 'dart:io'; import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:connectivity_plus/connectivity_plus.dart'; +import 'package:network_info_plus/network_info_plus.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/network_info_plus/ios/connectivity_plus.podspec b/packages/network_info_plus/ios/connectivity_plus.podspec index 2bfc4e9755..71721a0965 100644 --- a/packages/network_info_plus/ios/connectivity_plus.podspec +++ b/packages/network_info_plus/ios/connectivity_plus.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'connectivity_plus' + s.name = 'network_info_plus' s.version = '0.0.1' s.summary = 'Flutter Connectivity' s.description = <<-DESC diff --git a/packages/network_info_plus/lib/connectivity_plus.dart b/packages/network_info_plus/lib/connectivity_plus.dart index cf520e025d..71681b6d99 100644 --- a/packages/network_info_plus/lib/connectivity_plus.dart +++ b/packages/network_info_plus/lib/connectivity_plus.dart @@ -7,12 +7,12 @@ import 'dart:io' show Platform; import 'package:flutter/services.dart'; import 'package:flutter/foundation.dart' show kIsWeb; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:connectivity_plus_platform_interface/src/method_channel_connectivity.dart'; -import 'package:connectivity_plus_linux/connectivity_plus_linux.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/src/method_channel_connectivity.dart'; +import 'package:network_info_plus_linux/network_info_plus_linux.dart'; // Export enums from the platform_interface so plugin users can use them directly. -export 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart' +export 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart' show ConnectivityResult, LocationAuthorizationStatus; /// Discover network connectivity configurations: Distinguish between WI-FI and cellular, check WI-FI status and more. diff --git a/packages/network_info_plus/macos/connectivity_plus.podspec b/packages/network_info_plus/macos/connectivity_plus.podspec index ab86bde983..4417a8bc8b 100644 --- a/packages/network_info_plus/macos/connectivity_plus.podspec +++ b/packages/network_info_plus/macos/connectivity_plus.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'connectivity_plus' + s.name = 'network_info_plus' s.version = '0.0.1' s.summary = 'No-op implementation of the macos connectivity to avoid build issues on macos' s.description = <<-DESC diff --git a/packages/network_info_plus/pubspec.yaml b/packages/network_info_plus/pubspec.yaml index 561b762ff0..863755332a 100644 --- a/packages/network_info_plus/pubspec.yaml +++ b/packages/network_info_plus/pubspec.yaml @@ -1,4 +1,4 @@ -name: connectivity_plus +name: network_info_plus description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. version: 0.7.1 homepage: https://plus.fluttercommunity.dev/ @@ -13,20 +13,20 @@ flutter: ios: pluginClass: FLTConnectivityPlusPlugin linux: - default_package: connectivity_plus_linux + default_package: network_info_plus_linux macos: - default_package: connectivity_plus_macos + default_package: network_info_plus_macos web: - default_package: connectivity_plus_web + default_package: network_info_plus_web dependencies: flutter: sdk: flutter meta: ^1.0.5 - connectivity_plus_platform_interface: ^0.3.0 - connectivity_plus_linux: ^0.2.0 - connectivity_plus_macos: ^0.3.0 - connectivity_plus_web: ^0.5.0 + network_info_plus_platform_interface: ^0.3.0 + network_info_plus_linux: ^0.2.0 + network_info_plus_macos: ^0.3.0 + network_info_plus_web: ^0.5.0 dev_dependencies: flutter_test: diff --git a/packages/network_info_plus/test/connectivity_test.dart b/packages/network_info_plus/test/connectivity_test.dart index 56ac696de7..53eb323bb4 100644 --- a/packages/network_info_plus/test/connectivity_test.dart +++ b/packages/network_info_plus/test/connectivity_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:connectivity_plus/connectivity_plus.dart'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus/network_info_plus.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/network_info_plus_linux/README.md b/packages/network_info_plus_linux/README.md index bdedb3d90d..02b3e47fef 100644 --- a/packages/network_info_plus_linux/README.md +++ b/packages/network_info_plus_linux/README.md @@ -1,12 +1,12 @@ # Connectivity Plus Linux -[![Flutter Community: connectivity_plus_linux](https://fluttercommunity.dev/_github/header/connectivity_plus_linux)](https://github.com/fluttercommunity/community) +[![Flutter Community: network_info_plus_linux](https://fluttercommunity.dev/_github/header/network_info_plus_linux)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/connectivity_plus_linux.svg)](https://pub.dev/packages/connectivity_plus_linux) +[![pub package](https://img.shields.io/pub/v/network_info_plus_linux.svg)](https://pub.dev/packages/network_info_plus_linux) -The Linux implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). +The Linux implementation of [`network_info_plus`](https://pub.dev/packages/network_info_plus). ## Usage -This package is already included as part of the `connectivity_plus` package dependency, and will -be included when using `connectivity_plus` as normal. +This package is already included as part of the `network_info_plus` package dependency, and will +be included when using `network_info_plus` as normal. diff --git a/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart b/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart index 08c815673a..a9edd2350b 100644 --- a/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart +++ b/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart @@ -1,7 +1,7 @@ -/// The Linux implementation of `connectivity_plus`. -library connectivity_plus_linux; +/// The Linux implementation of `network_info_plus`. +library network_info_plus_linux; -// connectivity_plus_linux depends on dbus which uses FFI internally; export +// network_info_plus_linux depends on dbus which uses FFI internally; export // a stub for platforms that don't support FFI (e.g., web) to avoid having // transitive dependencies break web compilation. export 'src/connectivity_stub.dart' diff --git a/packages/network_info_plus_linux/lib/src/connectivity_real.dart b/packages/network_info_plus_linux/lib/src/connectivity_real.dart index bd1308a163..29000136fd 100644 --- a/packages/network_info_plus_linux/lib/src/connectivity_real.dart +++ b/packages/network_info_plus_linux/lib/src/connectivity_real.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:meta/meta.dart'; import 'network_manager.dart'; diff --git a/packages/network_info_plus_linux/lib/src/connectivity_stub.dart b/packages/network_info_plus_linux/lib/src/connectivity_stub.dart index c080737b07..71483ba4ad 100644 --- a/packages/network_info_plus_linux/lib/src/connectivity_stub.dart +++ b/packages/network_info_plus_linux/lib/src/connectivity_stub.dart @@ -1,11 +1,11 @@ -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; /// A stub implementation to satisfy compilation of multi-platform packages that -/// depend on connectivity_plus_linux. This should never actually be created. +/// depend on network_info_plus_linux. This should never actually be created. /// -/// Notably, because connectivity_plus needs to manually register -/// connectivity_plus_linux, anything with a transitive dependency on -/// connectivity_plus will also depend on connectivity_plus_linux, not just at +/// Notably, because network_info_plus needs to manually register +/// network_info_plus_linux, anything with a transitive dependency on +/// network_info_plus will also depend on network_info_plus_linux, not just at /// the pubspec level but the code level. class ConnectivityLinux extends ConnectivityPlatform { /// Errors on attempted instantiation of the stub. It exists only to satisfy diff --git a/packages/network_info_plus_linux/pubspec.yaml b/packages/network_info_plus_linux/pubspec.yaml index 7345aaf866..29c9a41d49 100644 --- a/packages/network_info_plus_linux/pubspec.yaml +++ b/packages/network_info_plus_linux/pubspec.yaml @@ -1,5 +1,5 @@ -name: connectivity_plus_linux -description: Linux implementation of the connectivity_plus plugin +name: network_info_plus_linux +description: Linux implementation of the network_info_plus plugin homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ version: 0.2.0 @@ -11,7 +11,7 @@ environment: dependencies: flutter: sdk: flutter - connectivity_plus_platform_interface: ^0.3.0 + network_info_plus_platform_interface: ^0.3.0 dbus: ^0.1.0 meta: ^1.2.3 diff --git a/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart b/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart index 0201f04e55..eb5bf5b6da 100644 --- a/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart +++ b/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart @@ -1,6 +1,6 @@ -import 'package:connectivity_plus_linux/src/connectivity_real.dart'; -import 'package:connectivity_plus_linux/src/network_manager.dart'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_linux/src/connectivity_real.dart'; +import 'package:network_info_plus_linux/src/network_manager.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/network_info_plus_macos/CHANGELOG.md b/packages/network_info_plus_macos/CHANGELOG.md index 0d82fc6421..e03e24e43f 100644 --- a/packages/network_info_plus_macos/CHANGELOG.md +++ b/packages/network_info_plus_macos/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.1.0+6 -- Transfer package to Flutter Community under new name `connectivity_plus_macos`. +- Transfer package to Flutter Community under new name `network_info_plus_macos`. ## 0.1.0+5 diff --git a/packages/network_info_plus_macos/README.md b/packages/network_info_plus_macos/README.md index 23f92ca6a0..88da5334a5 100644 --- a/packages/network_info_plus_macos/README.md +++ b/packages/network_info_plus_macos/README.md @@ -1,12 +1,12 @@ # Connectivity Plus macOS -[![Flutter Community: connectivity_plus_macos](https://fluttercommunity.dev/_github/header/connectivity_plus_macos)](https://github.com/fluttercommunity/community) +[![Flutter Community: network_info_plus_macos](https://fluttercommunity.dev/_github/header/network_info_plus_macos)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/connectivity_plus_macos.svg)](https://pub.dev/packages/connectivity_plus_macos) +[![pub package](https://img.shields.io/pub/v/network_info_plus_macos.svg)](https://pub.dev/packages/network_info_plus_macos) -The macOS implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). +The macOS implementation of [`network_info_plus`](https://pub.dev/packages/network_info_plus). ## Usage -This package is already included as part of the `connectivity_plus` package dependency, and will -be included when using `connectivity_plus` as normal. +This package is already included as part of the `network_info_plus` package dependency, and will +be included when using `network_info_plus` as normal. diff --git a/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec b/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec index 323e22b554..341d415b22 100644 --- a/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec +++ b/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'connectivity_plus_macos' + s.name = 'network_info_plus_macos' s.version = '0.0.1' s.summary = 'Flutter plugin for checking connectivity' s.description = <<-DESC diff --git a/packages/network_info_plus_macos/pubspec.yaml b/packages/network_info_plus_macos/pubspec.yaml index 90099bbb74..93a97bddaa 100644 --- a/packages/network_info_plus_macos/pubspec.yaml +++ b/packages/network_info_plus_macos/pubspec.yaml @@ -1,5 +1,5 @@ -name: connectivity_plus_macos -description: macOS implementation of the connectivity_plus plugin. +name: network_info_plus_macos +description: macOS implementation of the network_info_plus plugin. version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -15,6 +15,6 @@ environment: flutter: '>=1.20.0' dependencies: - connectivity_plus_platform_interface: ^0.3.0 + network_info_plus_platform_interface: ^0.3.0 flutter: sdk: flutter diff --git a/packages/network_info_plus_platform_interface/CHANGELOG.md b/packages/network_info_plus_platform_interface/CHANGELOG.md index 8c818ec8f7..10e57a97dd 100644 --- a/packages/network_info_plus_platform_interface/CHANGELOG.md +++ b/packages/network_info_plus_platform_interface/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.1.7 -- Transfer package to Flutter Community under new name `connectivity_plus_platform_interface`. +- Transfer package to Flutter Community under new name `network_info_plus_platform_interface`. ## 0.1.6 diff --git a/packages/network_info_plus_platform_interface/README.md b/packages/network_info_plus_platform_interface/README.md index dfdb11d105..4d44cb6df3 100644 --- a/packages/network_info_plus_platform_interface/README.md +++ b/packages/network_info_plus_platform_interface/README.md @@ -1,12 +1,12 @@ # Connectivity Plus Platform Interface -[![Flutter Community: connectivity_plus_platform_interface](https://fluttercommunity.dev/_github/header/connectivity_plus_platform_interface)](https://github.com/fluttercommunity/community) +[![Flutter Community: network_info_plus_platform_interface](https://fluttercommunity.dev/_github/header/network_info_plus_platform_interface)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/connectivity_plus_platform_interface.svg)](https://pub.dev/packages/connectivity_plus_platform_interface) +[![pub package](https://img.shields.io/pub/v/network_info_plus_platform_interface.svg)](https://pub.dev/packages/network_info_plus_platform_interface) -A common platform interface for [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). +A common platform interface for [`network_info_plus`](https://pub.dev/packages/network_info_plus). ## Usage -This package is already included as part of the `connectivity_plus` package dependency, and will -be included when using `connectivity_plus` as normal. +This package is already included as part of the `network_info_plus` package dependency, and will +be included when using `network_info_plus` as normal. diff --git a/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart b/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart index 002df731e9..9ec092303d 100644 --- a/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart +++ b/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter/services.dart'; import 'package:meta/meta.dart'; diff --git a/packages/network_info_plus_platform_interface/lib/src/utils.dart b/packages/network_info_plus_platform_interface/lib/src/utils.dart index 4209c135fd..4f05a696f2 100644 --- a/packages/network_info_plus_platform_interface/lib/src/utils.dart +++ b/packages/network_info_plus_platform_interface/lib/src/utils.dart @@ -1,4 +1,4 @@ -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; /// Convert a String to a ConnectivityResult value. ConnectivityResult parseConnectivityResult(String state) { diff --git a/packages/network_info_plus_platform_interface/pubspec.yaml b/packages/network_info_plus_platform_interface/pubspec.yaml index ac2ebd3c2c..4b7ba94fcc 100644 --- a/packages/network_info_plus_platform_interface/pubspec.yaml +++ b/packages/network_info_plus_platform_interface/pubspec.yaml @@ -1,5 +1,5 @@ -name: connectivity_plus_platform_interface -description: A common platform interface for the connectivity_plus plugin. +name: network_info_plus_platform_interface +description: A common platform interface for the network_info_plus plugin. version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart b/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart index 3165b26d87..3604b2ad26 100644 --- a/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart +++ b/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:connectivity_plus_platform_interface/src/method_channel_connectivity.dart'; +import 'package:network_info_plus_platform_interface/src/method_channel_connectivity.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/network_info_plus_web/CHANGELOG.md b/packages/network_info_plus_web/CHANGELOG.md index b8afc8d26e..1429034abd 100644 --- a/packages/network_info_plus_web/CHANGELOG.md +++ b/packages/network_info_plus_web/CHANGELOG.md @@ -8,7 +8,7 @@ ## 0.3.1+3 -- Transfer package to Flutter Community under new name `connectivity_plus_web`. +- Transfer package to Flutter Community under new name `network_info_plus_web`. ## 0.3.1+2 diff --git a/packages/network_info_plus_web/README.md b/packages/network_info_plus_web/README.md index b42eb86081..147188b3b4 100644 --- a/packages/network_info_plus_web/README.md +++ b/packages/network_info_plus_web/README.md @@ -1,12 +1,12 @@ # Connectivity Plus Web -[![Flutter Community: connectivity_plus_web](https://fluttercommunity.dev/_github/header/connectivity_plus_web)](https://github.com/fluttercommunity/community) +[![Flutter Community: network_info_plus_web](https://fluttercommunity.dev/_github/header/network_info_plus_web)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/connectivity_plus_web.svg)](https://pub.dev/packages/connectivity_plus_web) +[![pub package](https://img.shields.io/pub/v/network_info_plus_web.svg)](https://pub.dev/packages/network_info_plus_web) -The Web implementation of [`connectivity_plus`](https://pub.dev/packages/connectivity_plus). +The Web implementation of [`network_info_plus`](https://pub.dev/packages/network_info_plus). ## Usage -This package is already included as part of the `connectivity_plus` package dependency, and will -be included when using `connectivity_plus` as normal. +This package is already included as part of the `network_info_plus` package dependency, and will +be included when using `network_info_plus` as normal. diff --git a/packages/network_info_plus_web/lib/connectivity_plus_web.dart b/packages/network_info_plus_web/lib/connectivity_plus_web.dart index 0a78ca2eb9..8c22521416 100644 --- a/packages/network_info_plus_web/lib/connectivity_plus_web.dart +++ b/packages/network_info_plus_web/lib/connectivity_plus_web.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter/services.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; diff --git a/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart index 40011989e6..b0503545a1 100644 --- a/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart +++ b/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:html' as html show window; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:connectivity_plus_web/connectivity_plus_web.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; +import 'package:network_info_plus_web/network_info_plus_web.dart'; /// The web implementation of the ConnectivityPlatform of the Connectivity plugin. class DartHtmlConnectivityPlugin extends ConnectivityPlugin { diff --git a/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart index d2e2fd4769..9ec9ae6b49 100644 --- a/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart +++ b/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart @@ -3,8 +3,8 @@ import 'dart:html' as html show window, NetworkInformation; import 'dart:js'; import 'dart:js_util'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:connectivity_plus_web/connectivity_plus_web.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; +import 'package:network_info_plus_web/network_info_plus_web.dart'; import 'package:flutter/foundation.dart'; import 'utils/connectivity_result.dart'; diff --git a/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart b/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart index 7c5ec95e68..cbda4cc107 100644 --- a/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart +++ b/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart @@ -1,5 +1,5 @@ import 'dart:html' as html show NetworkInformation; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; /// Converts an incoming NetworkInformation object into the correct ConnectivityResult. ConnectivityResult networkInformationToConnectivityResult( diff --git a/packages/network_info_plus_web/pubspec.yaml b/packages/network_info_plus_web/pubspec.yaml index f8cf2ea5de..fb60c14dcc 100644 --- a/packages/network_info_plus_web/pubspec.yaml +++ b/packages/network_info_plus_web/pubspec.yaml @@ -1,5 +1,5 @@ -name: connectivity_plus_web -description: An implementation for the web platform of the Flutter `connectivity_plus` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine. +name: network_info_plus_web +description: An implementation for the web platform of the Flutter `network_info_plus` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine. version: 0.5.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -9,10 +9,10 @@ flutter: platforms: web: pluginClass: ConnectivityPlugin - fileName: connectivity_plus_web.dart + fileName: network_info_plus_web.dart dependencies: - connectivity_plus_platform_interface: ^0.3.0 + network_info_plus_platform_interface: ^0.3.0 flutter_web_plugins: sdk: flutter flutter: diff --git a/packages/network_info_plus_web/test/lib/main.dart b/packages/network_info_plus_web/test/lib/main.dart index 203d2ae626..85d1c696e3 100644 --- a/packages/network_info_plus_web/test/lib/main.dart +++ b/packages/network_info_plus_web/test/lib/main.dart @@ -1,7 +1,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'; -import 'package:connectivity_plus_web/src/network_information_api_connectivity_plugin.dart'; +import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; +import 'package:network_info_plus_web/src/network_information_api_connectivity_plugin.dart'; import 'package:mockito/mockito.dart'; From 9102a5e8db15e2ea8558dd3b52764b350c6767e1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:25:28 +0100 Subject: [PATCH 03/13] [network_info_plus] mass rename files --- .../plus/{connectivity => network_info}/Connectivity.java | 0 .../ConnectivityBroadcastReceiver.java | 0 .../ConnectivityMethodChannelHandler.java | 0 .../plus/{connectivity => network_info}/ConnectivityPlugin.java | 0 .../EmbeddingV1Activity.java | 0 .../EmbeddingV1ActivityTest.java | 0 .../FlutterActivityTest.java | 0 .../{connectivity_plus_e2e.dart => network_info_plus_e2e.dart} | 0 ...ctivity_plus_e2e_test.dart => network_info_plus_e2e_test.dart} | 0 .../ios/{connectivity_plus.podspec => network_info_plus.podspec} | 0 .../lib/{connectivity_plus.dart => network_info_plus.dart} | 0 .../{connectivity_plus.podspec => network_info_plus.podspec} | 0 .../test/{connectivity_test.dart => network_info_test.dart} | 0 ...{connectivity_plus_linux.dart => network_info_plus_linux.dart} | 0 .../lib/src/{connectivity_real.dart => network_info_real.dart} | 0 .../lib/src/{connectivity_stub.dart => network_info_stub.dart} | 0 ...ity_plus_linux_test.dart => network_info_plus_linux_test.dart} | 0 ...{connectivity_plus_macos.dart => network_info_plus_macos.dart} | 0 ...ctivity_plus_macos.podspec => network_info_plus_macos.podspec} | 0 ...m_interface.dart => network_info_plus_platform_interface.dart} | 0 ...channel_connectivity.dart => method_channel_network_info.dart} | 0 ...nnectivity_test.dart => method_channel_network_info_test.dart} | 0 .../{connectivity_plus_web.dart => network_info_plus_web.dart} | 0 ...onnectivity_plugin.dart => dart_html_network_info_plugin.dart} | 0 ...nnectivity_plugin.dart => network_information_api_plugin.dart} | 0 .../utils/{connectivity_result.dart => network_info_result.dart} | 0 .../lib/src/{connectivity_mocks.dart => network_info_mocks.dart} | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/{connectivity => network_info}/Connectivity.java (100%) rename packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/{connectivity => network_info}/ConnectivityBroadcastReceiver.java (100%) rename packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/{connectivity => network_info}/ConnectivityMethodChannelHandler.java (100%) rename packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/{connectivity => network_info}/ConnectivityPlugin.java (100%) rename packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/{connectivityexample => network_info_example}/EmbeddingV1Activity.java (100%) rename packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/{connectivityexample => network_info_example}/EmbeddingV1ActivityTest.java (100%) rename packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/{connectivityexample => network_info_example}/FlutterActivityTest.java (100%) rename packages/network_info_plus/example/test_driver/{connectivity_plus_e2e.dart => network_info_plus_e2e.dart} (100%) rename packages/network_info_plus/example/test_driver/{connectivity_plus_e2e_test.dart => network_info_plus_e2e_test.dart} (100%) rename packages/network_info_plus/ios/{connectivity_plus.podspec => network_info_plus.podspec} (100%) rename packages/network_info_plus/lib/{connectivity_plus.dart => network_info_plus.dart} (100%) rename packages/network_info_plus/macos/{connectivity_plus.podspec => network_info_plus.podspec} (100%) rename packages/network_info_plus/test/{connectivity_test.dart => network_info_test.dart} (100%) rename packages/network_info_plus_linux/lib/{connectivity_plus_linux.dart => network_info_plus_linux.dart} (100%) rename packages/network_info_plus_linux/lib/src/{connectivity_real.dart => network_info_real.dart} (100%) rename packages/network_info_plus_linux/lib/src/{connectivity_stub.dart => network_info_stub.dart} (100%) rename packages/network_info_plus_linux/test/{connectivity_plus_linux_test.dart => network_info_plus_linux_test.dart} (100%) rename packages/network_info_plus_macos/lib/{connectivity_plus_macos.dart => network_info_plus_macos.dart} (100%) rename packages/network_info_plus_macos/macos/{connectivity_plus_macos.podspec => network_info_plus_macos.podspec} (100%) rename packages/network_info_plus_platform_interface/lib/{connectivity_plus_platform_interface.dart => network_info_plus_platform_interface.dart} (100%) rename packages/network_info_plus_platform_interface/lib/src/{method_channel_connectivity.dart => method_channel_network_info.dart} (100%) rename packages/network_info_plus_platform_interface/test/{method_channel_connectivity_test.dart => method_channel_network_info_test.dart} (100%) rename packages/network_info_plus_web/lib/{connectivity_plus_web.dart => network_info_plus_web.dart} (100%) rename packages/network_info_plus_web/lib/src/{dart_html_connectivity_plugin.dart => dart_html_network_info_plugin.dart} (100%) rename packages/network_info_plus_web/lib/src/{network_information_api_connectivity_plugin.dart => network_information_api_plugin.dart} (100%) rename packages/network_info_plus_web/lib/src/utils/{connectivity_result.dart => network_info_result.dart} (100%) rename packages/network_info_plus_web/test/lib/src/{connectivity_mocks.dart => network_info_mocks.dart} (100%) diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java similarity index 100% rename from packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java rename to packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java similarity index 100% rename from packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java rename to packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java similarity index 100% rename from packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java rename to packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityPlugin.java similarity index 100% rename from packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java rename to packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityPlugin.java diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/EmbeddingV1Activity.java similarity index 100% rename from packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java rename to packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/EmbeddingV1Activity.java diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/EmbeddingV1ActivityTest.java similarity index 100% rename from packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java rename to packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/EmbeddingV1ActivityTest.java diff --git a/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/FlutterActivityTest.java similarity index 100% rename from packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java rename to packages/network_info_plus/example/android/app/src/main/java/io/flutter/plugins/network_info_example/FlutterActivityTest.java diff --git a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart b/packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart similarity index 100% rename from packages/network_info_plus/example/test_driver/connectivity_plus_e2e.dart rename to packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart diff --git a/packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart b/packages/network_info_plus/example/test_driver/network_info_plus_e2e_test.dart similarity index 100% rename from packages/network_info_plus/example/test_driver/connectivity_plus_e2e_test.dart rename to packages/network_info_plus/example/test_driver/network_info_plus_e2e_test.dart diff --git a/packages/network_info_plus/ios/connectivity_plus.podspec b/packages/network_info_plus/ios/network_info_plus.podspec similarity index 100% rename from packages/network_info_plus/ios/connectivity_plus.podspec rename to packages/network_info_plus/ios/network_info_plus.podspec diff --git a/packages/network_info_plus/lib/connectivity_plus.dart b/packages/network_info_plus/lib/network_info_plus.dart similarity index 100% rename from packages/network_info_plus/lib/connectivity_plus.dart rename to packages/network_info_plus/lib/network_info_plus.dart diff --git a/packages/network_info_plus/macos/connectivity_plus.podspec b/packages/network_info_plus/macos/network_info_plus.podspec similarity index 100% rename from packages/network_info_plus/macos/connectivity_plus.podspec rename to packages/network_info_plus/macos/network_info_plus.podspec diff --git a/packages/network_info_plus/test/connectivity_test.dart b/packages/network_info_plus/test/network_info_test.dart similarity index 100% rename from packages/network_info_plus/test/connectivity_test.dart rename to packages/network_info_plus/test/network_info_test.dart diff --git a/packages/network_info_plus_linux/lib/connectivity_plus_linux.dart b/packages/network_info_plus_linux/lib/network_info_plus_linux.dart similarity index 100% rename from packages/network_info_plus_linux/lib/connectivity_plus_linux.dart rename to packages/network_info_plus_linux/lib/network_info_plus_linux.dart diff --git a/packages/network_info_plus_linux/lib/src/connectivity_real.dart b/packages/network_info_plus_linux/lib/src/network_info_real.dart similarity index 100% rename from packages/network_info_plus_linux/lib/src/connectivity_real.dart rename to packages/network_info_plus_linux/lib/src/network_info_real.dart diff --git a/packages/network_info_plus_linux/lib/src/connectivity_stub.dart b/packages/network_info_plus_linux/lib/src/network_info_stub.dart similarity index 100% rename from packages/network_info_plus_linux/lib/src/connectivity_stub.dart rename to packages/network_info_plus_linux/lib/src/network_info_stub.dart diff --git a/packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart b/packages/network_info_plus_linux/test/network_info_plus_linux_test.dart similarity index 100% rename from packages/network_info_plus_linux/test/connectivity_plus_linux_test.dart rename to packages/network_info_plus_linux/test/network_info_plus_linux_test.dart diff --git a/packages/network_info_plus_macos/lib/connectivity_plus_macos.dart b/packages/network_info_plus_macos/lib/network_info_plus_macos.dart similarity index 100% rename from packages/network_info_plus_macos/lib/connectivity_plus_macos.dart rename to packages/network_info_plus_macos/lib/network_info_plus_macos.dart diff --git a/packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec b/packages/network_info_plus_macos/macos/network_info_plus_macos.podspec similarity index 100% rename from packages/network_info_plus_macos/macos/connectivity_plus_macos.podspec rename to packages/network_info_plus_macos/macos/network_info_plus_macos.podspec diff --git a/packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart b/packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart similarity index 100% rename from packages/network_info_plus_platform_interface/lib/connectivity_plus_platform_interface.dart rename to packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart diff --git a/packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart b/packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart similarity index 100% rename from packages/network_info_plus_platform_interface/lib/src/method_channel_connectivity.dart rename to packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart diff --git a/packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart b/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart similarity index 100% rename from packages/network_info_plus_platform_interface/test/method_channel_connectivity_test.dart rename to packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart diff --git a/packages/network_info_plus_web/lib/connectivity_plus_web.dart b/packages/network_info_plus_web/lib/network_info_plus_web.dart similarity index 100% rename from packages/network_info_plus_web/lib/connectivity_plus_web.dart rename to packages/network_info_plus_web/lib/network_info_plus_web.dart diff --git a/packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart similarity index 100% rename from packages/network_info_plus_web/lib/src/dart_html_connectivity_plugin.dart rename to packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart diff --git a/packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart b/packages/network_info_plus_web/lib/src/network_information_api_plugin.dart similarity index 100% rename from packages/network_info_plus_web/lib/src/network_information_api_connectivity_plugin.dart rename to packages/network_info_plus_web/lib/src/network_information_api_plugin.dart diff --git a/packages/network_info_plus_web/lib/src/utils/connectivity_result.dart b/packages/network_info_plus_web/lib/src/utils/network_info_result.dart similarity index 100% rename from packages/network_info_plus_web/lib/src/utils/connectivity_result.dart rename to packages/network_info_plus_web/lib/src/utils/network_info_result.dart diff --git a/packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart b/packages/network_info_plus_web/test/lib/src/network_info_mocks.dart similarity index 100% rename from packages/network_info_plus_web/test/lib/src/connectivity_mocks.dart rename to packages/network_info_plus_web/test/lib/src/network_info_mocks.dart From 278595c4e860509f1f61551feff64ef2799af5d4 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:29:50 +0100 Subject: [PATCH 04/13] [network_info_plus] adapt the Linux package --- packages/network_info_plus_linux/CHANGELOG.md | 4 -- packages/network_info_plus_linux/README.md | 2 +- .../lib/network_info_plus_linux.dart | 4 +- .../lib/src/network_info_real.dart | 54 +------------------ .../lib/src/network_info_stub.dart | 4 +- packages/network_info_plus_linux/pubspec.yaml | 6 +-- .../test/network_info_plus_linux_test.dart | 47 ---------------- 7 files changed, 10 insertions(+), 111 deletions(-) delete mode 100644 packages/network_info_plus_linux/test/network_info_plus_linux_test.dart diff --git a/packages/network_info_plus_linux/CHANGELOG.md b/packages/network_info_plus_linux/CHANGELOG.md index e3f4c0ee67..f7950bb58c 100644 --- a/packages/network_info_plus_linux/CHANGELOG.md +++ b/packages/network_info_plus_linux/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.2.0 - -* Upgrade to latest platform interface - ## 0.1.0 * Initial release for Linux. diff --git a/packages/network_info_plus_linux/README.md b/packages/network_info_plus_linux/README.md index 02b3e47fef..2ae3411189 100644 --- a/packages/network_info_plus_linux/README.md +++ b/packages/network_info_plus_linux/README.md @@ -1,4 +1,4 @@ -# Connectivity Plus Linux +# Network Info Plus Linux [![Flutter Community: network_info_plus_linux](https://fluttercommunity.dev/_github/header/network_info_plus_linux)](https://github.com/fluttercommunity/community) diff --git a/packages/network_info_plus_linux/lib/network_info_plus_linux.dart b/packages/network_info_plus_linux/lib/network_info_plus_linux.dart index a9edd2350b..d3eb2252e9 100644 --- a/packages/network_info_plus_linux/lib/network_info_plus_linux.dart +++ b/packages/network_info_plus_linux/lib/network_info_plus_linux.dart @@ -4,5 +4,5 @@ library network_info_plus_linux; // network_info_plus_linux depends on dbus which uses FFI internally; export // a stub for platforms that don't support FFI (e.g., web) to avoid having // transitive dependencies break web compilation. -export 'src/connectivity_stub.dart' - if (dart.library.ffi) 'src/connectivity_real.dart'; +export 'src/network_info_stub.dart' + if (dart.library.ffi) 'src/network_info_real.dart'; diff --git a/packages/network_info_plus_linux/lib/src/network_info_real.dart b/packages/network_info_plus_linux/lib/src/network_info_real.dart index 29000136fd..e50b59990f 100644 --- a/packages/network_info_plus_linux/lib/src/network_info_real.dart +++ b/packages/network_info_plus_linux/lib/src/network_info_real.dart @@ -14,14 +14,8 @@ typedef _ConnectionGetter = Future Function(NMConnection connection); @visibleForTesting typedef NetworkManagerFactory = NetworkManager Function(); -/// The Linux implementation of ConnectivityPlatform. -class ConnectivityLinux extends ConnectivityPlatform { - /// Checks the connection status of the device. - @override - Future checkConnectivity() { - return _getConnectivity(_ref()).whenComplete(_deref); - } - +/// The Linux implementation of NetworkInfoPlatform. +class NetworkInfoLinux extends NetworkInfoPlatform { /// Obtains the wifi name (SSID) of the connected network @override Future getWifiName() { @@ -60,33 +54,6 @@ class ConnectivityLinux extends ConnectivityPlatform { int _refCount = 0; NetworkManager _manager; - StreamController _controller; - - /// Returns a Stream of ConnectivityResults changes. - @override - Stream get onConnectivityChanged { - _controller ??= StreamController.broadcast( - onListen: _startListenConnectivity, - onCancel: _deref, - ); - return _controller.stream; - } - - Future _getConnectivity(NetworkManager manager) { - return manager.getType().then((value) => value.toConnectivityResult()); - } - - void _startListenConnectivity() { - final manager = _ref(); - manager.getType().then((type) => _addConnectivity(type)); - manager.subscribeTypeChanged().listen((type) { - _addConnectivity(type); - }); - } - - void _addConnectivity(String type) { - _controller.add(type.toConnectivityResult()); - } NetworkManager _ref() { _manager ??= createManager(); @@ -109,20 +76,3 @@ class ConnectivityLinux extends ConnectivityPlatform { @visibleForTesting NetworkManagerFactory createManager = () => NetworkManager.system(); } - -extension _NMConnectivityType on String { - ConnectivityResult toConnectivityResult() { - if (isEmpty) { - return ConnectivityResult.none; - } - if (contains('wireless')) { - return ConnectivityResult.wifi; - } - // ### TODO: ethernet - //if (contains('ethernet')) { - // return ConnectivityResult.ethernet; - //} - // gsm, cdma, bluetooth, ... - return ConnectivityResult.mobile; - } -} diff --git a/packages/network_info_plus_linux/lib/src/network_info_stub.dart b/packages/network_info_plus_linux/lib/src/network_info_stub.dart index 71483ba4ad..33a1420d5e 100644 --- a/packages/network_info_plus_linux/lib/src/network_info_stub.dart +++ b/packages/network_info_plus_linux/lib/src/network_info_stub.dart @@ -7,10 +7,10 @@ import 'package:network_info_plus_platform_interface/network_info_plus_platform_ /// network_info_plus_linux, anything with a transitive dependency on /// network_info_plus will also depend on network_info_plus_linux, not just at /// the pubspec level but the code level. -class ConnectivityLinux extends ConnectivityPlatform { +class NetworkInfoLinux extends NetworkInfoPlatform { /// Errors on attempted instantiation of the stub. It exists only to satisfy /// compile-time dependencies, and should never actually be created. - ConnectivityLinux() { + NetworkInfoLinux() { assert(false); } } diff --git a/packages/network_info_plus_linux/pubspec.yaml b/packages/network_info_plus_linux/pubspec.yaml index 29c9a41d49..8e53cd0920 100644 --- a/packages/network_info_plus_linux/pubspec.yaml +++ b/packages/network_info_plus_linux/pubspec.yaml @@ -2,7 +2,7 @@ name: network_info_plus_linux description: Linux implementation of the network_info_plus plugin homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ -version: 0.2.0 +version: 0.1.0 environment: sdk: ">=2.7.0 <3.0.0" @@ -11,7 +11,7 @@ environment: dependencies: flutter: sdk: flutter - network_info_plus_platform_interface: ^0.3.0 + network_info_plus_platform_interface: ^0.1.0 dbus: ^0.1.0 meta: ^1.2.3 @@ -25,5 +25,5 @@ flutter: plugin: platforms: linux: - dartPluginClass: ConnectivityLinux + dartPluginClass: NetworkInfoLinux pluginClass: none diff --git a/packages/network_info_plus_linux/test/network_info_plus_linux_test.dart b/packages/network_info_plus_linux/test/network_info_plus_linux_test.dart deleted file mode 100644 index eb5bf5b6da..0000000000 --- a/packages/network_info_plus_linux/test/network_info_plus_linux_test.dart +++ /dev/null @@ -1,47 +0,0 @@ -import 'package:network_info_plus_linux/src/connectivity_real.dart'; -import 'package:network_info_plus_linux/src/network_manager.dart'; -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:mockito/mockito.dart'; - -class MockNetworkManager extends Mock implements NetworkManager {} - -void main() { - test('wireless', () async { - final linux = ConnectivityLinux(); - linux.createManager = () { - final manager = MockNetworkManager(); - when(manager.getType()).thenAnswer((_) => Future.value('wireless')); - return manager; - }; - expect( - linux.checkConnectivity(), completion(equals(ConnectivityResult.wifi))); - }); - - test('no connectivity', () async { - final linux = ConnectivityLinux(); - linux.createManager = () { - final manager = MockNetworkManager(); - when(manager.getType()).thenAnswer((_) => Future.value('')); - return manager; - }; - expect( - linux.checkConnectivity(), completion(equals(ConnectivityResult.none))); - }); - - test('connectivity changes', () { - final linux = ConnectivityLinux(); - linux.createManager = () { - final manager = MockNetworkManager(); - when(manager.getType()).thenAnswer((_) { - return Future.value('wireless'); - }); - when(manager.subscribeTypeChanged()).thenAnswer((_) { - return Stream.value(''); - }); - return manager; - }; - expect(linux.onConnectivityChanged, - emitsInOrder([ConnectivityResult.wifi, ConnectivityResult.none])); - }); -} From c309c6f78ca39d0524776f2055abbb67999f51a7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:37:04 +0100 Subject: [PATCH 05/13] [network_info_plus] adapt the platform interface package --- .../CHANGELOG.md | 41 ----------------- .../README.md | 2 +- .../network_info_plus_platform_interface.dart | 37 ++++++--------- .../lib/src/enums.dart | 12 ----- .../lib/src/method_channel_network_info.dart | 30 ++---------- .../lib/src/utils.dart | 13 ------ .../pubspec.yaml | 2 +- .../method_channel_network_info_test.dart | 46 ++++++------------- 8 files changed, 31 insertions(+), 152 deletions(-) diff --git a/packages/network_info_plus_platform_interface/CHANGELOG.md b/packages/network_info_plus_platform_interface/CHANGELOG.md index 10e57a97dd..951a5a3f13 100644 --- a/packages/network_info_plus_platform_interface/CHANGELOG.md +++ b/packages/network_info_plus_platform_interface/CHANGELOG.md @@ -1,44 +1,3 @@ -## 0.3.0 - -- Renamed method channel - -## 0.2.0 - -- Transfer to plus-plugins monorepo - -## 0.1.7 - -- Transfer package to Flutter Community under new name `network_info_plus_platform_interface`. - -## 0.1.6 - -- Update lower bound of dart dependency to 2.1.0. - -## 0.1.5 - -- Remove dart:io Platform checks from the MethodChannel implementation. This is - tripping the analysis of other versions of the plugin. - -## 0.1.4 - -- Bump the minimum Flutter version to 1.12.13+hotfix.5. - -## 0.1.3 - -- Make the pedantic dev_dependency explicit. - -## 0.1.2 - -- Bring ConnectivityResult and LocationAuthorizationStatus enums from the core package. -- Use the above Enums as return values for ConnectivityPlatformInterface methods. -- Modify the MethodChannel implementation so it returns the right types. -- Bring all utility methods, asserts and other logic that is only needed on the MethodChannel implementation from the core package. -- Bring MethodChannel unit tests from core package. - -## 0.1.1 - -- Fix README.md link. - ## 0.1.0 - Initial release. diff --git a/packages/network_info_plus_platform_interface/README.md b/packages/network_info_plus_platform_interface/README.md index 4d44cb6df3..686a1d09a7 100644 --- a/packages/network_info_plus_platform_interface/README.md +++ b/packages/network_info_plus_platform_interface/README.md @@ -1,4 +1,4 @@ -# Connectivity Plus Platform Interface +# Network Info Plus Platform Interface [![Flutter Community: network_info_plus_platform_interface](https://fluttercommunity.dev/_github/header/network_info_plus_platform_interface)](https://github.com/fluttercommunity/community) diff --git a/packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart b/packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart index cfd9cf648a..2553bf06ae 100644 --- a/packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart +++ b/packages/network_info_plus_platform_interface/lib/network_info_plus_platform_interface.dart @@ -7,48 +7,37 @@ import 'dart:async'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; import 'src/enums.dart'; -import 'src/method_channel_connectivity.dart'; +import 'src/method_channel_network_info.dart'; export 'src/enums.dart'; -/// The interface that implementations of connectivity must implement. +/// The interface that implementations of network_info must implement. /// -/// Platform implementations should extend this class rather than implement it as `Connectivity` +/// Platform implementations should extend this class rather than implement it as `NetworkInfo` /// does not consider newly added methods to be breaking changes. Extending this class /// (using `extends`) ensures that the subclass will get the default implementation, while /// platform implementations that `implements` this interface will be broken by newly added -/// [ConnectivityPlatform] methods. -abstract class ConnectivityPlatform extends PlatformInterface { - /// Constructs a ConnectivityPlatform. - ConnectivityPlatform() : super(token: _token); +/// [NetworkInfoPlatform] methods. +abstract class NetworkInfoPlatform extends PlatformInterface { + /// Constructs a NetworkInfoPlatform. + NetworkInfoPlatform() : super(token: _token); static final Object _token = Object(); - static ConnectivityPlatform _instance = MethodChannelConnectivity(); + static NetworkInfoPlatform _instance = MethodChannelNetworkInfo(); - /// The default instance of [ConnectivityPlatform] to use. + /// The default instance of [NetworkInfoPlatform] to use. /// - /// Defaults to [MethodChannelConnectivity]. - static ConnectivityPlatform get instance => _instance; + /// Defaults to [MethodChannelNetworkInfo]. + static NetworkInfoPlatform get instance => _instance; /// Platform-specific plugins should set this with their own platform-specific - /// class that extends [ConnectivityPlatform] when they register themselves. - static set instance(ConnectivityPlatform instance) { + /// class that extends [NetworkInfoPlatform] when they register themselves. + static set instance(NetworkInfoPlatform instance) { PlatformInterface.verifyToken(instance, _token); _instance = instance; } - /// Checks the connection status of the device. - Future checkConnectivity() { - throw UnimplementedError('checkConnectivity() has not been implemented.'); - } - - /// Returns a Stream of ConnectivityResults changes. - Stream get onConnectivityChanged { - throw UnimplementedError( - 'get onConnectivityChanged has not been implemented.'); - } - /// Obtains the wifi name (SSID) of the connected network Future getWifiName() { throw UnimplementedError('getWifiName() has not been implemented.'); diff --git a/packages/network_info_plus_platform_interface/lib/src/enums.dart b/packages/network_info_plus_platform_interface/lib/src/enums.dart index 9d8cef9e1a..8cd7abaf25 100644 --- a/packages/network_info_plus_platform_interface/lib/src/enums.dart +++ b/packages/network_info_plus_platform_interface/lib/src/enums.dart @@ -1,15 +1,3 @@ -/// Connection status check result. -enum ConnectivityResult { - /// WiFi: Device connected via Wi-Fi - wifi, - - /// Mobile: Device connected to cellular network - mobile, - - /// None: Device not connected to any network - none -} - /// The status of the location service authorization. enum LocationAuthorizationStatus { /// The authorization of the location service is not determined. diff --git a/packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart b/packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart index 9ec092303d..a001ec3a16 100644 --- a/packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart +++ b/packages/network_info_plus_platform_interface/lib/src/method_channel_network_info.dart @@ -10,36 +10,12 @@ import 'package:meta/meta.dart'; import 'utils.dart'; -/// An implementation of [ConnectivityPlatform] that uses method channels. -class MethodChannelConnectivity extends ConnectivityPlatform { +/// An implementation of [NetworkInfoPlatform] that uses method channels. +class MethodChannelNetworkInfo extends NetworkInfoPlatform { /// The method channel used to interact with the native platform. @visibleForTesting MethodChannel methodChannel = - MethodChannel('dev.fluttercommunity.plus/connectivity'); - - /// The event channel used to receive ConnectivityResult changes from the native platform. - @visibleForTesting - EventChannel eventChannel = - EventChannel('dev.fluttercommunity.plus/connectivity_status'); - - Stream _onConnectivityChanged; - - /// Fires whenever the connectivity state changes. - @override - Stream get onConnectivityChanged { - _onConnectivityChanged ??= eventChannel - .receiveBroadcastStream() - .map((dynamic result) => result.toString()) - .map(parseConnectivityResult); - return _onConnectivityChanged; - } - - @override - Future checkConnectivity() { - return methodChannel - .invokeMethod('check') - .then(parseConnectivityResult); - } + MethodChannel('dev.fluttercommunity.plus/network_info'); @override Future getWifiName() async { diff --git a/packages/network_info_plus_platform_interface/lib/src/utils.dart b/packages/network_info_plus_platform_interface/lib/src/utils.dart index 4f05a696f2..2dfac1860a 100644 --- a/packages/network_info_plus_platform_interface/lib/src/utils.dart +++ b/packages/network_info_plus_platform_interface/lib/src/utils.dart @@ -1,18 +1,5 @@ import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -/// Convert a String to a ConnectivityResult value. -ConnectivityResult parseConnectivityResult(String state) { - switch (state) { - case 'wifi': - return ConnectivityResult.wifi; - case 'mobile': - return ConnectivityResult.mobile; - case 'none': - default: - return ConnectivityResult.none; - } -} - /// Convert a String to a LocationAuthorizationStatus value. LocationAuthorizationStatus parseLocationAuthorizationStatus(String result) { switch (result) { diff --git a/packages/network_info_plus_platform_interface/pubspec.yaml b/packages/network_info_plus_platform_interface/pubspec.yaml index 4b7ba94fcc..fae64b2bd3 100644 --- a/packages/network_info_plus_platform_interface/pubspec.yaml +++ b/packages/network_info_plus_platform_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: network_info_plus_platform_interface description: A common platform interface for the network_info_plus plugin. -version: 0.3.0 +version: 0.1.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart b/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart index 3604b2ad26..12aca6e69f 100644 --- a/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart +++ b/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart @@ -5,19 +5,19 @@ import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:network_info_plus_platform_interface/src/method_channel_connectivity.dart'; +import 'package:network_info_plus_platform_interface/src/method_channel_network_info.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); - group('$MethodChannelConnectivity', () { + group('$MethodChannelNetworkInfo', () { final log = []; - MethodChannelConnectivity methodChannelConnectivity; + MethodChannelNetworkInfo methodChannelNetworkInfo; setUp(() async { - methodChannelConnectivity = MethodChannelConnectivity(); + methodChannelNetworkInfo = MethodChannelNetworkInfo(); - methodChannelConnectivity.methodChannel + methodChannelNetworkInfo.methodChannel .setMockMethodCallHandler((MethodCall methodCall) async { log.add(methodCall); switch (methodCall.method) { @@ -38,14 +38,14 @@ void main() { } }); log.clear(); - MethodChannel(methodChannelConnectivity.eventChannel.name) + MethodChannel(methodChannelNetworkInfo.eventChannel.name) .setMockMethodCallHandler((MethodCall methodCall) async { switch (methodCall.method) { case 'listen': await ServicesBinding.instance.defaultBinaryMessenger .handlePlatformMessage( - methodChannelConnectivity.eventChannel.name, - methodChannelConnectivity.eventChannel.codec + methodChannelNetworkInfo.eventChannel.name, + methodChannelNetworkInfo.eventChannel.codec .encodeSuccessEnvelope('wifi'), (_) {}, ); @@ -57,14 +57,8 @@ void main() { }); }); - test('onConnectivityChanged', () async { - final result = - await methodChannelConnectivity.onConnectivityChanged.first; - expect(result, ConnectivityResult.wifi); - }); - test('getWifiName', () async { - final result = await methodChannelConnectivity.getWifiName(); + final result = await methodChannelNetworkInfo.getWifiName(); expect(result, '1337wifi'); expect( log, @@ -78,7 +72,7 @@ void main() { }); test('getWifiBSSID', () async { - final result = await methodChannelConnectivity.getWifiBSSID(); + final result = await methodChannelNetworkInfo.getWifiBSSID(); expect(result, 'c0:ff:33:c0:d3:55'); expect( log, @@ -92,7 +86,7 @@ void main() { }); test('getWifiIP', () async { - final result = await methodChannelConnectivity.getWifiIP(); + final result = await methodChannelNetworkInfo.getWifiIP(); expect(result, '127.0.0.1'); expect( log, @@ -107,7 +101,7 @@ void main() { test('requestLocationServiceAuthorization', () async { final result = - await methodChannelConnectivity.requestLocationServiceAuthorization(); + await methodChannelNetworkInfo.requestLocationServiceAuthorization(); expect(result, LocationAuthorizationStatus.authorizedAlways); expect( log, @@ -122,7 +116,7 @@ void main() { test('getLocationServiceAuthorization', () async { final result = - await methodChannelConnectivity.getLocationServiceAuthorization(); + await methodChannelNetworkInfo.getLocationServiceAuthorization(); expect(result, LocationAuthorizationStatus.authorizedAlways); expect( log, @@ -134,19 +128,5 @@ void main() { ], ); }); - - test('checkConnectivity', () async { - final result = await methodChannelConnectivity.checkConnectivity(); - expect(result, ConnectivityResult.wifi); - expect( - log, - [ - isMethodCall( - 'check', - arguments: null, - ), - ], - ); - }); }); } From 524361e2edac234344314d94d6edea1618e58787 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:42:05 +0100 Subject: [PATCH 06/13] [network_info_plus] delete the Web package Only and only the connectivity part was supported. --- packages/network_info_plus/pubspec.yaml | 3 - packages/network_info_plus_web/.gitattributes | 25 ------ packages/network_info_plus_web/.gitignore | 47 ------------ packages/network_info_plus_web/.metadata | 10 --- packages/network_info_plus_web/CHANGELOG.md | 36 --------- packages/network_info_plus_web/LICENSE | 26 ------- packages/network_info_plus_web/README.md | 12 --- .../lib/network_info_plus_web.dart | 63 --------------- .../src/dart_html_network_info_plugin.dart | 34 --------- .../src/network_information_api_plugin.dart | 61 --------------- .../lib/src/utils/network_info_result.dart | 51 ------------- packages/network_info_plus_web/pubspec.yaml | 33 -------- .../network_info_plus_web/test/.gitignore | 8 -- .../network_info_plus_web/test/lib/main.dart | 76 ------------------- .../test/lib/src/network_info_mocks.dart | 25 ------ .../network_info_plus_web/test/web/index.html | 10 --- 16 files changed, 520 deletions(-) delete mode 100644 packages/network_info_plus_web/.gitattributes delete mode 100644 packages/network_info_plus_web/.gitignore delete mode 100644 packages/network_info_plus_web/.metadata delete mode 100644 packages/network_info_plus_web/CHANGELOG.md delete mode 100644 packages/network_info_plus_web/LICENSE delete mode 100644 packages/network_info_plus_web/README.md delete mode 100644 packages/network_info_plus_web/lib/network_info_plus_web.dart delete mode 100644 packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart delete mode 100644 packages/network_info_plus_web/lib/src/network_information_api_plugin.dart delete mode 100644 packages/network_info_plus_web/lib/src/utils/network_info_result.dart delete mode 100644 packages/network_info_plus_web/pubspec.yaml delete mode 100644 packages/network_info_plus_web/test/.gitignore delete mode 100644 packages/network_info_plus_web/test/lib/main.dart delete mode 100644 packages/network_info_plus_web/test/lib/src/network_info_mocks.dart delete mode 100644 packages/network_info_plus_web/test/web/index.html diff --git a/packages/network_info_plus/pubspec.yaml b/packages/network_info_plus/pubspec.yaml index 863755332a..442f0fb9a3 100644 --- a/packages/network_info_plus/pubspec.yaml +++ b/packages/network_info_plus/pubspec.yaml @@ -16,8 +16,6 @@ flutter: default_package: network_info_plus_linux macos: default_package: network_info_plus_macos - web: - default_package: network_info_plus_web dependencies: flutter: @@ -26,7 +24,6 @@ dependencies: network_info_plus_platform_interface: ^0.3.0 network_info_plus_linux: ^0.2.0 network_info_plus_macos: ^0.3.0 - network_info_plus_web: ^0.5.0 dev_dependencies: flutter_test: diff --git a/packages/network_info_plus_web/.gitattributes b/packages/network_info_plus_web/.gitattributes deleted file mode 100644 index 31fda4bf1c..0000000000 --- a/packages/network_info_plus_web/.gitattributes +++ /dev/null @@ -1,25 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Always perform LF normalization on these files -*.dart text -*.gradle text -*.html text -*.java text -*.json text -*.md text -*.py text -*.sh text -*.txt text -*.xml text -*.yaml text - -# Make sure that these Windows files always have CRLF line endings in checkout -*.bat text eol=crlf -*.ps1 text eol=crlf - -# Never perform LF normalization on these files -*.ico binary -*.jar binary -*.png binary -*.zip binary diff --git a/packages/network_info_plus_web/.gitignore b/packages/network_info_plus_web/.gitignore deleted file mode 100644 index 88ce490e47..0000000000 --- a/packages/network_info_plus_web/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -.DS_Store -.atom/ -.idea/ -.vscode/ - -.packages -.pub/ -.dart_tool/ -pubspec.lock -flutter_export_environment.sh - -examples/all_plugins/pubspec.yaml - -Podfile -Podfile.lock -Pods/ -.symlinks/ -**/Flutter/App.framework/ -**/Flutter/ephemeral/ -**/Flutter/Flutter.framework/ -**/Flutter/Generated.xcconfig -**/Flutter/flutter_assets/ - -ServiceDefinitions.json -xcuserdata/ -**/DerivedData/ - -local.properties -keystore.properties -.gradle/ -gradlew -gradlew.bat -gradle-wrapper.jar -.flutter-plugins-dependencies -*.iml - -generated_plugin_registrant.dart -GeneratedPluginRegistrant.h -GeneratedPluginRegistrant.m -GeneratedPluginRegistrant.java -GeneratedPluginRegistrant.swift -build/ -.flutter-plugins - -.project -.classpath -.settings diff --git a/packages/network_info_plus_web/.metadata b/packages/network_info_plus_web/.metadata deleted file mode 100644 index 23eb55ba6d..0000000000 --- a/packages/network_info_plus_web/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# 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: 52ee8a6c6565cd421dfa32042941eb40691f4746 - channel: master - -project_type: plugin diff --git a/packages/network_info_plus_web/CHANGELOG.md b/packages/network_info_plus_web/CHANGELOG.md deleted file mode 100644 index 1429034abd..0000000000 --- a/packages/network_info_plus_web/CHANGELOG.md +++ /dev/null @@ -1,36 +0,0 @@ -## 0.5.0 - -- Updated platform interface - -## 0.4.0 - -- Transfer to plus-plugins monorepo - -## 0.3.1+3 - -- Transfer package to Flutter Community under new name `network_info_plus_web`. - -## 0.3.1+2 - -- Update package:e2e to use package:integration_test - -## 0.3.1+1 - -- Update package:e2e reference to use the local version in the flutter/plugins - repository. - -## 0.3.1 - -- Use NetworkInformation API from dart:html, instead of the JS-interop version. - -## 0.3.0 - -- Rename from "experimental_connectivity_web" to "connectivity_web", and move to flutter/plugins master. - -## 0.2.0 - -- Add fallback on dart:html for browsers where NetworkInformationAPI is not supported. - -## 0.1.0 - -- Initial release. diff --git a/packages/network_info_plus_web/LICENSE b/packages/network_info_plus_web/LICENSE deleted file mode 100644 index 4da9688730..0000000000 --- a/packages/network_info_plus_web/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -Copyright 2016, the Flutter project authors. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/network_info_plus_web/README.md b/packages/network_info_plus_web/README.md deleted file mode 100644 index 147188b3b4..0000000000 --- a/packages/network_info_plus_web/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Connectivity Plus Web - -[![Flutter Community: network_info_plus_web](https://fluttercommunity.dev/_github/header/network_info_plus_web)](https://github.com/fluttercommunity/community) - -[![pub package](https://img.shields.io/pub/v/network_info_plus_web.svg)](https://pub.dev/packages/network_info_plus_web) - -The Web implementation of [`network_info_plus`](https://pub.dev/packages/network_info_plus). - -## Usage - -This package is already included as part of the `network_info_plus` package dependency, and will -be included when using `network_info_plus` as normal. diff --git a/packages/network_info_plus_web/lib/network_info_plus_web.dart b/packages/network_info_plus_web/lib/network_info_plus_web.dart deleted file mode 100644 index 8c22521416..0000000000 --- a/packages/network_info_plus_web/lib/network_info_plus_web.dart +++ /dev/null @@ -1,63 +0,0 @@ -import 'dart:async'; - -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - -import 'src/network_information_api_connectivity_plugin.dart'; -import 'src/dart_html_connectivity_plugin.dart'; - -/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. -class ConnectivityPlugin extends ConnectivityPlatform { - /// Factory method that initializes the connectivity plugin platform with an instance - /// of the plugin for the web. - static void registerWith(Registrar registrar) { - if (NetworkInformationApiConnectivityPlugin.isSupported()) { - ConnectivityPlatform.instance = NetworkInformationApiConnectivityPlugin(); - } else { - ConnectivityPlatform.instance = DartHtmlConnectivityPlugin(); - } - } - - // The following are completely unsupported methods on the web platform. - - // Creates an "unsupported_operation" PlatformException for a given `method` name. - Object _unsupported(String method) { - return PlatformException( - code: 'UNSUPPORTED_OPERATION', - message: '$method() is not supported on the web platform.', - ); - } - - /// Obtains the wifi name (SSID) of the connected network - @override - Future getWifiName() { - throw _unsupported('getWifiName'); - } - - /// Obtains the wifi BSSID of the connected network. - @override - Future getWifiBSSID() { - throw _unsupported('getWifiBSSID'); - } - - /// Obtains the IP address of the connected wifi network - @override - Future getWifiIP() { - throw _unsupported('getWifiIP'); - } - - /// Request to authorize the location service (Only on iOS). - @override - Future requestLocationServiceAuthorization({ - bool requestAlwaysLocationUsage = false, - }) { - throw _unsupported('requestLocationServiceAuthorization'); - } - - /// Get the current location service authorization (Only on iOS). - @override - Future getLocationServiceAuthorization() { - throw _unsupported('getLocationServiceAuthorization'); - } -} diff --git a/packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart b/packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart deleted file mode 100644 index b0503545a1..0000000000 --- a/packages/network_info_plus_web/lib/src/dart_html_network_info_plugin.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'dart:async'; -import 'dart:html' as html show window; - -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:network_info_plus_web/network_info_plus_web.dart'; - -/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. -class DartHtmlConnectivityPlugin extends ConnectivityPlugin { - /// Checks the connection status of the device. - @override - Future checkConnectivity() async { - return html.window.navigator.onLine - ? ConnectivityResult.wifi - : ConnectivityResult.none; - } - - StreamController _connectivityResult; - - /// Returns a Stream of ConnectivityResults changes. - @override - Stream get onConnectivityChanged { - if (_connectivityResult == null) { - _connectivityResult = StreamController(); - // Fallback to dart:html window.onOnline / window.onOffline - html.window.onOnline.listen((event) { - _connectivityResult.add(ConnectivityResult.wifi); - }); - html.window.onOffline.listen((event) { - _connectivityResult.add(ConnectivityResult.none); - }); - } - return _connectivityResult.stream; - } -} diff --git a/packages/network_info_plus_web/lib/src/network_information_api_plugin.dart b/packages/network_info_plus_web/lib/src/network_information_api_plugin.dart deleted file mode 100644 index 9ec9ae6b49..0000000000 --- a/packages/network_info_plus_web/lib/src/network_information_api_plugin.dart +++ /dev/null @@ -1,61 +0,0 @@ -import 'dart:async'; -import 'dart:html' as html show window, NetworkInformation; -import 'dart:js'; -import 'dart:js_util'; - -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:network_info_plus_web/network_info_plus_web.dart'; -import 'package:flutter/foundation.dart'; - -import 'utils/connectivity_result.dart'; - -/// The web implementation of the ConnectivityPlatform of the Connectivity plugin. -class NetworkInformationApiConnectivityPlugin extends ConnectivityPlugin { - final html.NetworkInformation _networkInformation; - - /// A check to determine if this version of the plugin can be used. - static bool isSupported() => html.window.navigator.connection != null; - - /// The constructor of the plugin. - NetworkInformationApiConnectivityPlugin() - : this.withConnection(html.window.navigator.connection); - - /// Creates the plugin, with an override of the NetworkInformation object. - @visibleForTesting - NetworkInformationApiConnectivityPlugin.withConnection( - html.NetworkInformation connection) - : _networkInformation = connection; - - /// Checks the connection status of the device. - @override - Future checkConnectivity() async { - return networkInformationToConnectivityResult(_networkInformation); - } - - StreamController _connectivityResultStreamController; - Stream _connectivityResultStream; - - /// Returns a Stream of ConnectivityResults changes. - @override - Stream get onConnectivityChanged { - if (_connectivityResultStreamController == null) { - _connectivityResultStreamController = - StreamController(); - setProperty(_networkInformation, 'onchange', allowInterop((_) { - _connectivityResultStreamController - .add(networkInformationToConnectivityResult(_networkInformation)); - })); - // TODO: Implement the above with _networkInformation.onChange: - // _networkInformation.onChange.listen((_) { - // _connectivityResult - // .add(networkInformationToConnectivityResult(_networkInformation)); - // }); - // Once we can detect when to *cancel* a subscription to the _networkInformation - // onChange Stream upon hot restart. - // https://github.com/dart-lang/sdk/issues/42679 - _connectivityResultStream = - _connectivityResultStreamController.stream.asBroadcastStream(); - } - return _connectivityResultStream; - } -} diff --git a/packages/network_info_plus_web/lib/src/utils/network_info_result.dart b/packages/network_info_plus_web/lib/src/utils/network_info_result.dart deleted file mode 100644 index cbda4cc107..0000000000 --- a/packages/network_info_plus_web/lib/src/utils/network_info_result.dart +++ /dev/null @@ -1,51 +0,0 @@ -import 'dart:html' as html show NetworkInformation; -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; - -/// Converts an incoming NetworkInformation object into the correct ConnectivityResult. -ConnectivityResult networkInformationToConnectivityResult( - html.NetworkInformation info, -) { - if (info == null) { - return ConnectivityResult.none; - } - if (info.downlink == 0 && info.rtt == 0) { - return ConnectivityResult.none; - } - if (info.effectiveType != null) { - return _effectiveTypeToConnectivityResult(info.effectiveType); - } - if (info.type != null) { - return _typeToConnectivityResult(info.type); - } - return ConnectivityResult.none; -} - -ConnectivityResult _effectiveTypeToConnectivityResult(String effectiveType) { - // Possible values: - /*'2g'|'3g'|'4g'|'slow-2g'*/ - switch (effectiveType) { - case 'slow-2g': - case '2g': - case '3g': - return ConnectivityResult.mobile; - default: - return ConnectivityResult.wifi; - } -} - -ConnectivityResult _typeToConnectivityResult(String type) { - // Possible values: - /*'bluetooth'|'cellular'|'ethernet'|'mixed'|'none'|'other'|'unknown'|'wifi'|'wimax'*/ - switch (type) { - case 'none': - return ConnectivityResult.none; - case 'bluetooth': - case 'cellular': - case 'mixed': - case 'other': - case 'unknown': - return ConnectivityResult.mobile; - default: - return ConnectivityResult.wifi; - } -} diff --git a/packages/network_info_plus_web/pubspec.yaml b/packages/network_info_plus_web/pubspec.yaml deleted file mode 100644 index fb60c14dcc..0000000000 --- a/packages/network_info_plus_web/pubspec.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: network_info_plus_web -description: An implementation for the web platform of the Flutter `network_info_plus` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine. -version: 0.5.0 -homepage: https://plus.fluttercommunity.dev/ -repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ - -flutter: - plugin: - platforms: - web: - pluginClass: ConnectivityPlugin - fileName: network_info_plus_web.dart - -dependencies: - network_info_plus_platform_interface: ^0.3.0 - flutter_web_plugins: - sdk: flutter - flutter: - sdk: flutter - -dev_dependencies: - test: any - flutter_driver: - sdk: flutter - flutter_test: - sdk: flutter - integration_test: ^0.9.1 - mockito: ^4.1.1 - pedantic: ^1.9.2 - -environment: - sdk: ">=2.6.0 <3.0.0" - flutter: '>=1.20.0' diff --git a/packages/network_info_plus_web/test/.gitignore b/packages/network_info_plus_web/test/.gitignore deleted file mode 100644 index d7dee828a6..0000000000 --- a/packages/network_info_plus_web/test/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -.dart_tool/ - -.packages -.pub/ - -build/ -lib/generated_plugin_registrant.dart diff --git a/packages/network_info_plus_web/test/lib/main.dart b/packages/network_info_plus_web/test/lib/main.dart deleted file mode 100644 index 85d1c696e3..0000000000 --- a/packages/network_info_plus_web/test/lib/main.dart +++ /dev/null @@ -1,76 +0,0 @@ -import 'package:integration_test/integration_test.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:network_info_plus_web/src/network_information_api_connectivity_plugin.dart'; - -import 'package:mockito/mockito.dart'; - -import 'src/connectivity_mocks.dart'; - -void main() { - IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - - group('checkConnectivity', () { - void testCheckConnectivity({ - String type, - String effectiveType, - num downlink = 10, - num rtt = 50, - ConnectivityResult expected, - }) { - final connection = MockNetworkInformation(); - when(connection.type).thenReturn(type); - when(connection.effectiveType).thenReturn(effectiveType); - when(connection.downlink).thenReturn(downlink); - when(connection.rtt).thenReturn(downlink); - - final plugin = - NetworkInformationApiConnectivityPlugin.withConnection(connection); - expect(plugin.checkConnectivity(), completion(equals(expected))); - } - - test('0 downlink and rtt -> none', () { - testCheckConnectivity( - effectiveType: '4g', - downlink: 0, - rtt: 0, - expected: ConnectivityResult.none); - }); - test('slow-2g -> mobile', () { - testCheckConnectivity( - effectiveType: 'slow-2g', expected: ConnectivityResult.mobile); - }); - test('2g -> mobile', () { - testCheckConnectivity( - effectiveType: '2g', expected: ConnectivityResult.mobile); - }); - test('3g -> mobile', () { - testCheckConnectivity( - effectiveType: '3g', expected: ConnectivityResult.mobile); - }); - test('4g -> wifi', () { - testCheckConnectivity( - effectiveType: '4g', expected: ConnectivityResult.wifi); - }); - }); - - group('get onConnectivityChanged', () { - test('puts change events in a Stream', () async { - final connection = MockNetworkInformation(); - final plugin = - NetworkInformationApiConnectivityPlugin.withConnection(connection); - final results = plugin.onConnectivityChanged; - - // Fake a disconnect-reconnect - await connection.mockChangeValue(downlink: 0, rtt: 0); - await connection.mockChangeValue( - downlink: 10, rtt: 50, effectiveType: '4g'); - - // The stream of results is infinite, so we need to .take(2) for this test to complete. - expect( - results.take(2).toList(), - completion( - equals([ConnectivityResult.none, ConnectivityResult.wifi]))); - }); - }); -} diff --git a/packages/network_info_plus_web/test/lib/src/network_info_mocks.dart b/packages/network_info_plus_web/test/lib/src/network_info_mocks.dart deleted file mode 100644 index 7b82b51206..0000000000 --- a/packages/network_info_plus_web/test/lib/src/network_info_mocks.dart +++ /dev/null @@ -1,25 +0,0 @@ -import 'dart:html'; - -import 'package:mockito/mockito.dart'; - -/// A Mock implementation of the NetworkInformation API that allows -/// for external modification of its values. -class MockNetworkInformation extends Mock implements NetworkInformation { - /// The callback that will fire after the network information values change. - Function onchange; - - /// Changes the desired values, and triggers the change event listener. - void mockChangeValue({ - String type, - String effectiveType, - num downlink, - num rtt, - }) async { - when(this.type).thenAnswer((_) => type); - when(this.effectiveType).thenAnswer((_) => effectiveType); - when(this.downlink).thenAnswer((_) => downlink); - when(this.rtt).thenAnswer((_) => rtt); - - onchange(Event('change')); - } -} diff --git a/packages/network_info_plus_web/test/web/index.html b/packages/network_info_plus_web/test/web/index.html deleted file mode 100644 index 6eff9a740d..0000000000 --- a/packages/network_info_plus_web/test/web/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - example - - - - - From 04b104cb5f59a88606285d29fb734beae21a1afa Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 17:50:27 +0100 Subject: [PATCH 07/13] [network_info_plus] adapt the macOS plugin --- packages/network_info_plus_macos/CHANGELOG.md | 48 +------- packages/network_info_plus_macos/README.md | 2 +- .../lib/network_info_plus_macos.dart | 2 +- .../macos/Classes/ConnectivityPlugin.swift | 104 ------------------ .../macos/Classes/NetworkInfoPlusPlugin.swift | 48 ++++++++ .../macos/network_info_plus_macos.podspec | 8 +- packages/network_info_plus_macos/pubspec.yaml | 6 +- 7 files changed, 58 insertions(+), 160 deletions(-) delete mode 100644 packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift create mode 100644 packages/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift diff --git a/packages/network_info_plus_macos/CHANGELOG.md b/packages/network_info_plus_macos/CHANGELOG.md index e03e24e43f..951a5a3f13 100644 --- a/packages/network_info_plus_macos/CHANGELOG.md +++ b/packages/network_info_plus_macos/CHANGELOG.md @@ -1,49 +1,3 @@ -## 0.3.0 - -- Updated platform interface - -## 0.2.0 - -- Transfer to plus-plugins monorepo - -## 0.1.0+6 - -- Transfer package to Flutter Community under new name `network_info_plus_macos`. - -## 0.1.0+5 - -- Update package:e2e reference to use the local version in the flutter/plugins - repository. - -## 0.1.0+4 - -- Remove Android folder from `connectivity_macos`. - -## 0.1.0+3 - -- Bump the minimum Flutter version to 1.12.13+hotfix.5. -- Clean up various Android workarounds no longer needed after framework v1.12. -- Complete v2 embedding support. -- Fix CocoaPods podspec lint warnings. -- Declare API stability and compatibility with `1.0.0` (more details at: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0). - -## 0.1.0+2 - -- Remove hard coded ios workspace setting of the example app. - -## 0.1.0+1 - -- Make the pedantic dev_dependency explicit. - ## 0.1.0 -- Adds an example app to trigger CI tests. Bumped the MINOR version to - avoid compatibility issues once this packages is endorsed. - -## 0.0.2+1 - -- Add CHANGELOG. - -## 0.0.1 - -- Initial open source release. +- Initial release. diff --git a/packages/network_info_plus_macos/README.md b/packages/network_info_plus_macos/README.md index 88da5334a5..1030ea5c19 100644 --- a/packages/network_info_plus_macos/README.md +++ b/packages/network_info_plus_macos/README.md @@ -1,4 +1,4 @@ -# Connectivity Plus macOS +# Network Info Plus macOS [![Flutter Community: network_info_plus_macos](https://fluttercommunity.dev/_github/header/network_info_plus_macos)](https://github.com/fluttercommunity/community) diff --git a/packages/network_info_plus_macos/lib/network_info_plus_macos.dart b/packages/network_info_plus_macos/lib/network_info_plus_macos.dart index 7be7b143ca..ba7fc71daa 100644 --- a/packages/network_info_plus_macos/lib/network_info_plus_macos.dart +++ b/packages/network_info_plus_macos/lib/network_info_plus_macos.dart @@ -1,3 +1,3 @@ // Analyze will fail if there is no main.dart file. This file should -// be removed once an example app has been added to connectivity_macos. +// be removed once an example app has been added to network_info_plus_macos. // https://github.com/flutter/flutter/issues/51007 diff --git a/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift b/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift deleted file mode 100644 index 7d3814e7fd..0000000000 --- a/packages/network_info_plus_macos/macos/Classes/ConnectivityPlugin.swift +++ /dev/null @@ -1,104 +0,0 @@ -// Copyright 2019 Google LLC -// -// 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. - -import Cocoa -import CoreWLAN -import FlutterMacOS -import Reachability -import SystemConfiguration.CaptiveNetwork - -public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler { - var reach: Reachability? - var eventSink: FlutterEventSink? - var cwinterface: CWInterface? - - public override init() { - cwinterface = CWWiFiClient.shared().interface() - } - - public static func register(with registrar: FlutterPluginRegistrar) { - let channel = FlutterMethodChannel( - name: "dev.fluttercommunity.plus/connectivity", - binaryMessenger: registrar.messenger) - - let streamChannel = FlutterEventChannel( - name: "dev.fluttercommunity.plus/connectivity_status", - binaryMessenger: registrar.messenger) - - let instance = ConnectivityPlugin() - streamChannel.setStreamHandler(instance) - - registrar.addMethodCallDelegate(instance, channel: channel) - } - - public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { - switch call.method { - case "check": - result(statusFromReachability(reachability: Reachability.forInternetConnection())) - case "wifiName": - result(cwinterface?.ssid()) - case "wifiBSSID": - result(cwinterface?.bssid()) - case "wifiIPAddress": - result(getWifiIP()) - default: - result(FlutterMethodNotImplemented) - } - } - - /// Returns a string describing connection type - /// - /// - Parameters: - /// - reachability: an instance of reachability - /// - Returns: connection type string - private func statusFromReachability(reachability: Reachability?) -> String { - // checks any non-WWAN connection - if reachability?.isReachableViaWiFi() ?? false { - return "wifi" - } - - return "none" - } - - public func onListen( - withArguments _: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { - reach = Reachability.forInternetConnection() - eventSink = events - - NotificationCenter.default.addObserver( - self, - selector: #selector(reachabilityChanged), - name: NSNotification.Name.reachabilityChanged, - object: reach) - - reach?.startNotifier() - - return nil - } - - @objc private func reachabilityChanged(notification: NSNotification) { - let reach = notification.object - let reachability = statusFromReachability(reachability: reach as? Reachability) - eventSink?(reachability) - } - - public func onCancel(withArguments _: Any?) -> FlutterError? { - reach?.stopNotifier() - NotificationCenter.default.removeObserver(self) - eventSink = nil - return nil - } -} diff --git a/packages/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift b/packages/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift new file mode 100644 index 0000000000..45226789c2 --- /dev/null +++ b/packages/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift @@ -0,0 +1,48 @@ +// Copyright 2019 Google LLC +// +// 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. + +import Cocoa +import CoreWLAN +import FlutterMacOS +import SystemConfiguration.CaptiveNetwork + +public class NetworkInfoPlusPlugin: NSObject, FlutterPlugin { + var cwinterface: CWInterface? + + public override init() { + cwinterface = CWWiFiClient.shared().interface() + } + + public static func register(with registrar: FlutterPluginRegistrar) { + let channel = FlutterMethodChannel( + name: "dev.fluttercommunity.plus/network_info", + binaryMessenger: registrar.messenger) + + let instance = NetworkInfoPlusPlugin() + registrar.addMethodCallDelegate(instance, channel: channel) + } + + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + switch call.method { + case "wifiName": + result(cwinterface?.ssid()) + case "wifiBSSID": + result(cwinterface?.bssid()) + case "wifiIPAddress": + result(getWifiIP()) + default: + result(FlutterMethodNotImplemented) + } + } +} diff --git a/packages/network_info_plus_macos/macos/network_info_plus_macos.podspec b/packages/network_info_plus_macos/macos/network_info_plus_macos.podspec index 341d415b22..15e50ed312 100644 --- a/packages/network_info_plus_macos/macos/network_info_plus_macos.podspec +++ b/packages/network_info_plus_macos/macos/network_info_plus_macos.podspec @@ -4,14 +4,14 @@ Pod::Spec.new do |s| s.name = 'network_info_plus_macos' s.version = '0.0.1' - s.summary = 'Flutter plugin for checking connectivity' + s.summary = 'Flutter plugin for checking network info' s.description = <<-DESC - Desktop implementation of the connectivity plugin + Desktop implementation of the network info plugin DESC - s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity_macos' + s.homepage = 'https://github.com/fluttercommunity/plus_plugins' s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity_macos' } + s.source = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/network_info_plus_macos' } s.source_files = 'Classes/**/*' s.dependency 'FlutterMacOS' s.dependency 'Reachability' diff --git a/packages/network_info_plus_macos/pubspec.yaml b/packages/network_info_plus_macos/pubspec.yaml index 93a97bddaa..6569d847c5 100644 --- a/packages/network_info_plus_macos/pubspec.yaml +++ b/packages/network_info_plus_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: network_info_plus_macos description: macOS implementation of the network_info_plus plugin. -version: 0.3.0 +version: 0.1.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -8,13 +8,13 @@ flutter: plugin: platforms: macos: - pluginClass: ConnectivityPlugin + pluginClass: NetworkInfoPlusPlugin environment: sdk: ">=2.1.0 <3.0.0" flutter: '>=1.20.0' dependencies: - network_info_plus_platform_interface: ^0.3.0 + network_info_plus_platform_interface: ^0.1.0 flutter: sdk: flutter From deeb4e7f65b013d22ed11fd6fb4abdd17d386825 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 18:07:36 +0100 Subject: [PATCH 08/13] [network_info_plus] adapt the Android plugin --- .../network_info_plus/android/build.gradle | 2 +- .../network_info_plus/android/settings.gradle | 2 +- .../android/src/main/AndroidManifest.xml | 2 +- .../plus/network_info/Connectivity.java | 103 ------------------ .../ConnectivityBroadcastReceiver.java | 50 --------- .../ConnectivityMethodChannelHandler.java | 48 -------- .../plus/network_info/NetworkInfo.java | 56 ++++++++++ .../NetworkInfoMethodChannelHandler.java | 45 ++++++++ ...Plugin.java => NetworkInfoPlusPlugin.java} | 27 ++--- 9 files changed, 112 insertions(+), 223 deletions(-) delete mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java delete mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java delete mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java create mode 100644 packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoMethodChannelHandler.java rename packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/{ConnectivityPlugin.java => NetworkInfoPlusPlugin.java} (57%) diff --git a/packages/network_info_plus/android/build.gradle b/packages/network_info_plus/android/build.gradle index b9b147b29b..d6e4638304 100644 --- a/packages/network_info_plus/android/build.gradle +++ b/packages/network_info_plus/android/build.gradle @@ -1,4 +1,4 @@ -group 'io.flutter.plugins.connectivity' +group 'dev.fluttercommunity.plus.network_info' version '1.0-SNAPSHOT' buildscript { diff --git a/packages/network_info_plus/android/settings.gradle b/packages/network_info_plus/android/settings.gradle index 4fbed4753c..aa218d55a1 100644 --- a/packages/network_info_plus/android/settings.gradle +++ b/packages/network_info_plus/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'connectivity' +rootProject.name = 'network_info' diff --git a/packages/network_info_plus/android/src/main/AndroidManifest.xml b/packages/network_info_plus/android/src/main/AndroidManifest.xml index 777ad1eefa..dd7b047f5f 100644 --- a/packages/network_info_plus/android/src/main/AndroidManifest.xml +++ b/packages/network_info_plus/android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="dev.fluttercommunity.plus.network_info"> diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java deleted file mode 100644 index dc25e34005..0000000000 --- a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/Connectivity.java +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package dev.fluttercommunity.plus.connectivity; - -import android.net.ConnectivityManager; -import android.net.Network; -import android.net.NetworkCapabilities; -import android.net.NetworkInfo; -import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; -import android.os.Build; - -/** Reports connectivity related information such as connectivity type and wifi information. */ -class Connectivity { - private ConnectivityManager connectivityManager; - private WifiManager wifiManager; - - Connectivity(ConnectivityManager connectivityManager, WifiManager wifiManager) { - this.connectivityManager = connectivityManager; - this.wifiManager = wifiManager; - } - - String getNetworkType() { - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - Network network = connectivityManager.getActiveNetwork(); - NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network); - if (capabilities == null) { - return "none"; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) - || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) { - return "wifi"; - } - if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { - return "mobile"; - } - } - - return getNetworkTypeLegacy(); - } - - String getWifiName() { - WifiInfo wifiInfo = getWifiInfo(); - String ssid = null; - if (wifiInfo != null) ssid = wifiInfo.getSSID(); - if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID" - return ssid; - } - - String getWifiBSSID() { - WifiInfo wifiInfo = getWifiInfo(); - String bssid = null; - if (wifiInfo != null) { - bssid = wifiInfo.getBSSID(); - } - return bssid; - } - - String getWifiIPAddress() { - WifiInfo wifiInfo = null; - if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo(); - - String ip = null; - int i_ip = 0; - if (wifiInfo != null) i_ip = wifiInfo.getIpAddress(); - - if (i_ip != 0) - ip = - String.format( - "%d.%d.%d.%d", - (i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff)); - - return ip; - } - - private WifiInfo getWifiInfo() { - return wifiManager == null ? null : wifiManager.getConnectionInfo(); - } - - @SuppressWarnings("deprecation") - private String getNetworkTypeLegacy() { - // handle type for Android versions less than Android 9 - NetworkInfo info = connectivityManager.getActiveNetworkInfo(); - if (info == null || !info.isConnected()) { - return "none"; - } - int type = info.getType(); - switch (type) { - case ConnectivityManager.TYPE_ETHERNET: - case ConnectivityManager.TYPE_WIFI: - case ConnectivityManager.TYPE_WIMAX: - return "wifi"; - case ConnectivityManager.TYPE_MOBILE: - case ConnectivityManager.TYPE_MOBILE_DUN: - case ConnectivityManager.TYPE_MOBILE_HIPRI: - return "mobile"; - default: - return "none"; - } - } -} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java deleted file mode 100644 index c295d3cc67..0000000000 --- a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityBroadcastReceiver.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package dev.fluttercommunity.plus.connectivity; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.net.ConnectivityManager; -import io.flutter.plugin.common.EventChannel; - -/** - * The ConnectivityBroadcastReceiver receives the connectivity updates and send them to the UIThread - * through an {@link EventChannel.EventSink} - * - *

Use {@link - * io.flutter.plugin.common.EventChannel#setStreamHandler(io.flutter.plugin.common.EventChannel.StreamHandler)} - * to set up the receiver. - */ -class ConnectivityBroadcastReceiver extends BroadcastReceiver - implements EventChannel.StreamHandler { - private Context context; - private Connectivity connectivity; - private EventChannel.EventSink events; - - ConnectivityBroadcastReceiver(Context context, Connectivity connectivity) { - this.context = context; - this.connectivity = connectivity; - } - - @Override - public void onListen(Object arguments, EventChannel.EventSink events) { - this.events = events; - context.registerReceiver(this, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)); - } - - @Override - public void onCancel(Object arguments) { - context.unregisterReceiver(this); - } - - @Override - public void onReceive(Context context, Intent intent) { - if (events != null) { - events.success(connectivity.getNetworkType()); - } - } -} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java deleted file mode 100644 index d776964c85..0000000000 --- a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityMethodChannelHandler.java +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package dev.fluttercommunity.plus.connectivity; - -import io.flutter.plugin.common.MethodCall; -import io.flutter.plugin.common.MethodChannel; - -/** - * The handler receives {@link MethodCall}s from the UIThread, gets the related information from - * a @{@link Connectivity}, and then send the result back to the UIThread through the {@link - * MethodChannel.Result}. - */ -class ConnectivityMethodChannelHandler implements MethodChannel.MethodCallHandler { - - private Connectivity connectivity; - - /** - * Construct the ConnectivityMethodChannelHandler with a {@code connectivity}. The {@code - * connectivity} must not be null. - */ - ConnectivityMethodChannelHandler(Connectivity connectivity) { - assert (connectivity != null); - this.connectivity = connectivity; - } - - @Override - public void onMethodCall(MethodCall call, MethodChannel.Result result) { - switch (call.method) { - case "check": - result.success(connectivity.getNetworkType()); - break; - case "wifiName": - result.success(connectivity.getWifiName()); - break; - case "wifiBSSID": - result.success(connectivity.getWifiBSSID()); - break; - case "wifiIPAddress": - result.success(connectivity.getWifiIPAddress()); - break; - default: - result.notImplemented(); - break; - } - } -} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java new file mode 100644 index 0000000000..d9b4f766a7 --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java @@ -0,0 +1,56 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.network_info; + +import android.net.wifi.WifiInfo; +import android.net.wifi.WifiManager; +import android.os.Build; + +/** Reports network info such as wifi name and address. */ +class NetworkInfo { + private WifiManager wifiManager; + + NetworkInfo(WifiManager wifiManager) { + this.wifiManager = wifiManager; + } + + String getWifiName() { + WifiInfo wifiInfo = getWifiInfo(); + String ssid = null; + if (wifiInfo != null) ssid = wifiInfo.getSSID(); + if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID" + return ssid; + } + + String getWifiBSSID() { + WifiInfo wifiInfo = getWifiInfo(); + String bssid = null; + if (wifiInfo != null) { + bssid = wifiInfo.getBSSID(); + } + return bssid; + } + + String getWifiIPAddress() { + WifiInfo wifiInfo = null; + if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo(); + + String ip = null; + int i_ip = 0; + if (wifiInfo != null) i_ip = wifiInfo.getIpAddress(); + + if (i_ip != 0) + ip = + String.format( + "%d.%d.%d.%d", + (i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff)); + + return ip; + } + + private WifiInfo getWifiInfo() { + return wifiManager == null ? null : wifiManager.getConnectionInfo(); + } +} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoMethodChannelHandler.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoMethodChannelHandler.java new file mode 100644 index 0000000000..a5df91d14f --- /dev/null +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoMethodChannelHandler.java @@ -0,0 +1,45 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package dev.fluttercommunity.plus.network_info; + +import io.flutter.plugin.common.MethodCall; +import io.flutter.plugin.common.MethodChannel; + +/** + * The handler receives {@link MethodCall}s from the UIThread, gets the related information from + * a @{@link NetworkInfo}, and then send the result back to the UIThread through the {@link + * MethodChannel.Result}. + */ +class NetworkInfoMethodChannelHandler implements MethodChannel.MethodCallHandler { + + private NetworkInfo networkInfo; + + /** + * Construct the NetworkInfoMethodChannelHandler with a {@code networkInfo}. The {@code + * networkInfo} must not be null. + */ + NetworkInfoMethodChannelHandler(NetworkInfo networkInfo) { + assert (networkInfo != null); + this.networkInfo = networkInfo; + } + + @Override + public void onMethodCall(MethodCall call, MethodChannel.Result result) { + switch (call.method) { + case "wifiName": + result.success(networkInfo.getWifiName()); + break; + case "wifiBSSID": + result.success(networkInfo.getWifiBSSID()); + break; + case "wifiIPAddress": + result.success(networkInfo.getWifiIPAddress()); + break; + default: + result.notImplemented(); + break; + } + } +} diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityPlugin.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java similarity index 57% rename from packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityPlugin.java rename to packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java index 717426acb8..8ccd16022a 100644 --- a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/ConnectivityPlugin.java +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfoPlusPlugin.java @@ -2,27 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.fluttercommunity.plus.connectivity; +package dev.fluttercommunity.plus.network_info; import android.content.Context; -import android.net.ConnectivityManager; import android.net.wifi.WifiManager; import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; -import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.PluginRegistry.Registrar; -/** ConnectivityPlugin */ -public class ConnectivityPlugin implements FlutterPlugin { +/** NetworkInfoPlusPlugin */ +public class NetworkInfoPlusPlugin implements FlutterPlugin { private MethodChannel methodChannel; - private EventChannel eventChannel; /** Plugin registration. */ public static void registerWith(Registrar registrar) { - ConnectivityPlugin plugin = new ConnectivityPlugin(); + NetworkInfoPlusPlugin plugin = new NetworkInfoPlusPlugin(); plugin.setupChannels(registrar.messenger(), registrar.context()); } @@ -37,27 +34,19 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { } private void setupChannels(BinaryMessenger messenger, Context context) { - methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/connectivity"); - eventChannel = new EventChannel(messenger, "dev.fluttercommunity.plus/connectivity_status"); - ConnectivityManager connectivityManager = - (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/network_info"); WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - Connectivity connectivity = new Connectivity(connectivityManager, wifiManager); + NetworkInfo networkInfo = new NetworkInfo(wifiManager); - ConnectivityMethodChannelHandler methodChannelHandler = - new ConnectivityMethodChannelHandler(connectivity); - ConnectivityBroadcastReceiver receiver = - new ConnectivityBroadcastReceiver(context, connectivity); + NetworkInfoMethodChannelHandler methodChannelHandler = + new NetworkInfoMethodChannelHandler(networkInfo); methodChannel.setMethodCallHandler(methodChannelHandler); - eventChannel.setStreamHandler(receiver); } private void teardownChannels() { methodChannel.setMethodCallHandler(null); - eventChannel.setStreamHandler(null); methodChannel = null; - eventChannel = null; } } From 5579dc85fbe04f79db9707e176f1b66703d79b9b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 18:12:47 +0100 Subject: [PATCH 09/13] [network_info_plus] adapt the iOS plugin --- ....h => FLTNetworkInfoLocationPlusHandler.h} | 8 +- ....m => FLTNetworkInfoLocationPlusHandler.m} | 10 +-- ...lusPlugin.h => FLTNetworkInfoPlusPlugin.h} | 2 +- ...lusPlugin.m => FLTNetworkInfoPlusPlugin.m} | 78 +++---------------- .../ios/network_info_plus.podspec | 11 ++- 5 files changed, 26 insertions(+), 83 deletions(-) rename packages/network_info_plus/ios/Classes/{FLTConnectivityLocationPlusHandler.h => FLTNetworkInfoLocationPlusHandler.h} (58%) rename packages/network_info_plus/ios/Classes/{FLTConnectivityLocationPlusHandler.m => FLTNetworkInfoLocationPlusHandler.m} (80%) rename packages/network_info_plus/ios/Classes/{FLTConnectivityPlusPlugin.h => FLTNetworkInfoPlusPlugin.h} (75%) rename packages/network_info_plus/ios/Classes/{FLTConnectivityPlusPlugin.m => FLTNetworkInfoPlusPlugin.m} (56%) diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h similarity index 58% rename from packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h rename to packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h index a6b27b02d4..c7bb38c9c2 100644 --- a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h +++ b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h @@ -6,16 +6,16 @@ NS_ASSUME_NONNULL_BEGIN -@class FLTConnectivityLocationPlusDelegate; +@class FLTNetworkInfoLocationPlusDelegate; -typedef void (^FLTConnectivityLocationPlusCompletion)(CLAuthorizationStatus); +typedef void (^FLTNetworkInfoLocationPlusCompletion)(CLAuthorizationStatus); -@interface FLTConnectivityLocationPlusHandler : NSObject +@interface FLTNetworkInfoLocationPlusHandler : NSObject + (CLAuthorizationStatus)locationAuthorizationStatus; - (void)requestLocationAuthorization:(BOOL)always - completion:(_Nonnull FLTConnectivityLocationPlusCompletion)completionHnadler; + completion:(_Nonnull FLTNetworkInfoLocationPlusCompletion)completionHnadler; @end diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.m similarity index 80% rename from packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m rename to packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.m index 27f2b529bc..6fca387640 100644 --- a/packages/network_info_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m +++ b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.m @@ -2,23 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTConnectivityLocationPlusHandler.h" +#import "FLTNetworkInfoLocationPlusHandler.h" -@interface FLTConnectivityLocationPlusHandler () +@interface FLTNetworkInfoLocationPlusHandler () -@property(copy, nonatomic) FLTConnectivityLocationPlusCompletion completion; +@property(copy, nonatomic) FLTNetworkInfoLocationPlusCompletion completion; @property(strong, nonatomic) CLLocationManager *locationManager; @end -@implementation FLTConnectivityLocationPlusHandler +@implementation FLTNetworkInfoLocationPlusHandler + (CLAuthorizationStatus)locationAuthorizationStatus { return CLLocationManager.authorizationStatus; } - (void)requestLocationAuthorization:(BOOL)always - completion:(FLTConnectivityLocationPlusCompletion)completionHandler { + completion:(FLTNetworkInfoLocationPlusCompletion)completionHandler { CLAuthorizationStatus status = CLLocationManager.authorizationStatus; if (status != kCLAuthorizationStatusAuthorizedWhenInUse && always) { completionHandler(kCLAuthorizationStatusDenied); diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h b/packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.h similarity index 75% rename from packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h rename to packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.h index 242fb03a15..31fedebb99 100644 --- a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.h +++ b/packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.h @@ -4,5 +4,5 @@ #import -@interface FLTConnectivityPlusPlugin : NSObject +@interface FLTNetworkInfoPlusPlugin : NSObject @end diff --git a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m b/packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.m similarity index 56% rename from packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m rename to packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.m index edfa7ee923..0dda81ba74 100644 --- a/packages/network_info_plus/ios/Classes/FLTConnectivityPlusPlugin.m +++ b/packages/network_info_plus/ios/Classes/FLTNetworkInfoPlusPlugin.m @@ -2,41 +2,32 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTConnectivityPlusPlugin.h" - -#import "Reachability/Reachability.h" +#import "FLTNetworkInfoPlusPlugin.h" #import -#import "FLTConnectivityLocationPlusHandler.h" +#import "FLTNetworkInfoLocationPlusHandler.h" #import "SystemConfiguration/CaptiveNetwork.h" #include #include -@interface FLTConnectivityPlusPlugin () +@interface FLTNetworkInfoPlusPlugin () -@property(strong, nonatomic) FLTConnectivityLocationPlusHandler* locationHandler; +@property(strong, nonatomic) FLTNetworkInfoLocationPlusHandler* locationHandler; @end -@implementation FLTConnectivityPlusPlugin { - FlutterEventSink _eventSink; - Reachability* _reachabilityForInternetConnection; +@implementation FLTNetworkInfoPlusPlugin { } + (void)registerWithRegistrar:(NSObject*)registrar { - FLTConnectivityPlusPlugin* instance = [[FLTConnectivityPlusPlugin alloc] init]; + FLTNetworkInfoPlusPlugin* instance = [[FLTNetworkInfoPlusPlugin alloc] init]; FlutterMethodChannel* channel = - [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/connectivity" + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/network_info" binaryMessenger:[registrar messenger]]; [registrar addMethodCallDelegate:instance channel:channel]; - - FlutterEventChannel* streamChannel = - [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/connectivity_status" - binaryMessenger:[registrar messenger]]; - [streamChannel setStreamHandler:instance]; } - (NSString*)findNetworkInfo:(NSString*)key { @@ -91,34 +82,15 @@ - (NSString*)getWifiIP { return address; } -- (NSString*)statusFromReachability:(Reachability*)reachability { - NetworkStatus status = [reachability currentReachabilityStatus]; - switch (status) { - case NotReachable: - return @"none"; - case ReachableViaWiFi: - return @"wifi"; - case ReachableViaWWAN: - return @"mobile"; - } -} - - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { - if ([call.method isEqualToString:@"check"]) { - // This is supposed to be quick. Another way of doing this would be to - // signup for network - // connectivity changes. However that depends on the app being in background - // and the code - // gets more involved. So for now, this will do. - result([self statusFromReachability:[Reachability reachabilityForInternetConnection]]); - } else if ([call.method isEqualToString:@"wifiName"]) { + if ([call.method isEqualToString:@"wifiName"]) { result([self getWifiName]); } else if ([call.method isEqualToString:@"wifiBSSID"]) { result([self getBSSID]); } else if ([call.method isEqualToString:@"wifiIPAddress"]) { result([self getWifiIP]); } else if ([call.method isEqualToString:@"getLocationServiceAuthorization"]) { - result([self convertCLAuthorizationStatusToString:[FLTConnectivityLocationPlusHandler + result([self convertCLAuthorizationStatusToString:[FLTNetworkInfoLocationPlusHandler locationAuthorizationStatus]]); } else if ([call.method isEqualToString:@"requestLocationServiceAuthorization"]) { NSArray* arguments = call.arguments; @@ -134,11 +106,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { } } -- (void)onReachabilityDidChange:(NSNotification*)notification { - Reachability* curReach = [notification object]; - _eventSink([self statusFromReachability:curReach]); -} - - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status { switch (status) { case kCLAuthorizationStatusNotDetermined: { @@ -162,34 +129,11 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status } } -- (FLTConnectivityLocationPlusHandler*)locationHandler { +- (FLTNetworkInfoLocationPlusHandler*)locationHandler { if (!_locationHandler) { - _locationHandler = [FLTConnectivityLocationPlusHandler new]; + _locationHandler = [FLTNetworkInfoLocationPlusHandler new]; } return _locationHandler; } -#pragma mark FlutterStreamHandler impl - -- (FlutterError*)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)eventSink { - _eventSink = eventSink; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(onReachabilityDidChange:) - name:kReachabilityChangedNotification - object:nil]; - _reachabilityForInternetConnection = [Reachability reachabilityForInternetConnection]; - [_reachabilityForInternetConnection startNotifier]; - return nil; -} - -- (FlutterError*)onCancelWithArguments:(id)arguments { - if (_reachabilityForInternetConnection) { - [_reachabilityForInternetConnection stopNotifier]; - _reachabilityForInternetConnection = nil; - } - [[NSNotificationCenter defaultCenter] removeObserver:self]; - _eventSink = nil; - return nil; -} - @end diff --git a/packages/network_info_plus/ios/network_info_plus.podspec b/packages/network_info_plus/ios/network_info_plus.podspec index 71721a0965..7b5e2cac77 100644 --- a/packages/network_info_plus/ios/network_info_plus.podspec +++ b/packages/network_info_plus/ios/network_info_plus.podspec @@ -4,20 +4,19 @@ Pod::Spec.new do |s| s.name = 'network_info_plus' s.version = '0.0.1' - s.summary = 'Flutter Connectivity' + s.summary = 'Flutter Network Info' s.description = <<-DESC -This plugin allows Flutter apps to discover network connectivity and configure themselves accordingly. +This plugin allows Flutter apps to discover network info and configure themselves accordingly. Downloaded by pub (not CocoaPods). DESC - s.homepage = 'https://github.com/flutter/plugins' + s.homepage = 'https://github.com/fluttercommunity/plus_plugins' s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/main/packages/connectivity/connectivity' } - s.documentation_url = 'https://pub.dev/packages/connectivity' + s.source = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/network_info_plus' } + s.documentation_url = 'https://pub.dev/packages/network_info_plus' s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'Reachability' s.platform = :ios, '8.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } end From cedda3d423338212d9f1eff6347a7b956423136e Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 18:13:50 +0100 Subject: [PATCH 10/13] [network_info_plus] adapt the main package --- packages/network_info_plus/CHANGELOG.md | 229 ------------------ packages/network_info_plus/README.md | 78 +----- .../lib/network_info_plus.dart | 61 ++--- .../macos/network_info_plus.podspec | 6 +- packages/network_info_plus/pubspec.yaml | 16 +- .../test/network_info_test.dart | 37 +-- 6 files changed, 53 insertions(+), 374 deletions(-) diff --git a/packages/network_info_plus/CHANGELOG.md b/packages/network_info_plus/CHANGELOG.md index f60b017dbc..090fc36598 100644 --- a/packages/network_info_plus/CHANGELOG.md +++ b/packages/network_info_plus/CHANGELOG.md @@ -1,232 +1,3 @@ -## 0.7.1 - -- Bump linux version. - -## 0.7.0 - -- Add Linux support (`network_info_plus_linux`). - -## 0.6.0 - -- Fix issue #56: Rename Android and iOS classes and Method Channel to avoid -collision with the original connectivity package. - -## 0.5.0 - -- Transfer to plus-plugins monorepo - -## 0.4.9+2 - -- Update package:e2e to use package:integration_test - -## 0.4.9+1 - -- Update package:e2e reference to use the local version in the flutter/plugins - repository. - -## 0.4.9 - -- Add support for `web` (by endorsing `connectivity_for_web` 0.3.0) - -## 0.4.8+6 - -- Update lower bound of dart dependency to 2.1.0. - -## 0.4.8+5 - -- Declare API stability and compatibility with `1.0.0` (more details at: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0). - -## 0.4.8+4 - -- Bump the minimum Flutter version to 1.12.13+hotfix.5. -- Clean up various Android workarounds no longer needed after framework v1.12. -- Complete v2 embedding support. -- Fix CocoaPods podspec lint warnings. - -## 0.4.8+3 - -- Replace deprecated `getFlutterEngine` call on Android. - -## 0.4.8+2 - -- Remove hard coded ios workspace setting of the example app. - -## 0.4.8+1 - -- Make the pedantic dev_dependency explicit. - -## 0.4.8 - -- Adds macOS as an endorsed platform. - -## 0.4.7 - -- Migrate the plugin to use the ConnectivityPlatform.instance defined in the network_info_plus_platform_interface package. - -## 0.4.6+2 - -- Migrate deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. -- Bump Flutter SDK to 1.12.13+hotfix.5 or greater (current stable). - -## 0.4.6+1 - -- Remove the deprecated `author:` field from pubspec.yaml -- Migrate the plugin to the pubspec platforms manifest. -- Require Flutter SDK 1.10.0 or greater. - -## 0.4.6 - -- Add macOS support. - -## 0.4.5+8 - -- Update documentation to explain when connectivity updates are received on Android. - -## 0.4.5+7 - -- Fix unawaited futures in the example app and tests. - -## 0.4.5+6 - -- Fix singleton Reachability problem on iOS. - -## 0.4.5+5 - -- Add an analyzer check for the public documentation. - -## 0.4.5+4 - -- Stability and Maintainability: update documentations. - -## 0.4.5+3 - -- Remove AndroidX warnings. - -## 0.4.5+2 - -- Include lifecycle dependency as a compileOnly one on Android to resolve - potential version conflicts with other transitive libraries. - -## 0.4.5+1 - -- Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX. - -## 0.4.5 - -- Support the v2 Android embedder. - -## 0.4.4+1 - -- Update and migrate iOS example project. -- Define clang module for iOS. - -## 0.4.4 - -- Add `requestLocationServiceAuthorization` to request location authorization on iOS. -- Add `getLocationServiceAuthorization` to get location authorization status on iOS. -- Update README: add more information on iOS 13 updates with CNCopyCurrentNetworkInfo. - -## 0.4.3+7 - -- Update README with the updated information about CNCopyCurrentNetworkInfo on iOS 13. - -## 0.4.3+6 - -- [Android] Fix the invalid suppression check (it should be "deprecation" not "deprecated"). - -## 0.4.3+5 - -- [Android] Added API 29 support for `check()`. -- [Android] Suppress warnings for using deprecated APIs. - -## 0.4.3+4 - -- [Android] Updated logic to retrieve network info. - -## 0.4.3+3 - -- Support for TYPE_MOBILE_HIPRI on Android. - -## 0.4.3+2 - -- Add missing template type parameter to `invokeMethod` calls. - -## 0.4.3+1 - -- Fixes lint error by using `getApplicationContext()` when accessing the Wifi Service. - -## 0.4.3 - -- Add getWifiBSSID to obtain current wifi network's BSSID. - -## 0.4.2+2 - -- Add integration test. - -## 0.4.2+1 - -- Bump the minimum Flutter version to 1.2.0. -- Add template type parameter to `invokeMethod` calls. - -## 0.4.2 - -- Adding getWifiIP() to obtain current wifi network's IP. - -## 0.4.1 - -- Add unit tests. - -## 0.4.0+2 - -- Log a more detailed warning at build time about the previous AndroidX - migration. - -## 0.4.0+1 - -- Updated `Connectivity` to a singleton. - -## 0.4.0 - -- **Breaking change**. Migrate from the deprecated original Android Support - Library to AndroidX. This shouldn't result in any functional changes, but it - requires any Android apps using this plugin to [also - migrate](https://developer.android.com/jetpack/androidx/migrate) if they're - using the original support library. - -## 0.3.2 - -- Adding getWifiName() to obtain current wifi network's SSID. - -## 0.3.1 - -- Updated Gradle tooling to match Android Studio 3.1.2. - -## 0.3.0 - -- **Breaking change**. Set SDK constraints to match the Flutter beta release. - -## 0.2.1 - -- Fixed warnings from the Dart 2.0 analyzer. -- Simplified and upgraded Android project template to Android SDK 27. -- Updated package description. - -## 0.2.0 - -- **Breaking change**. Upgraded to Gradle 4.1 and Android Studio Gradle plugin - 3.0.1. Older Flutter projects need to upgrade their Gradle setup as well in - order to use this version of the plugin. Instructions can be found - [here](https://github.com/flutter/flutter/wiki/Updating-Flutter-projects-to-Gradle-4.1-and-Android-Studio-Gradle-plugin-3.0.1). - -## 0.1.1 - -- Add FLT prefix to iOS types. - ## 0.1.0 -- Breaking API change: Have a Connectivity class instead of a top level function -- Introduce ability to listen for network state changes - -## 0.0.1 - - Initial release diff --git a/packages/network_info_plus/README.md b/packages/network_info_plus/README.md index e055f562f3..a2ca841fc7 100644 --- a/packages/network_info_plus/README.md +++ b/packages/network_info_plus/README.md @@ -4,66 +4,19 @@ [![pub package](https://img.shields.io/pub/v/network_info_plus.svg)](https://pub.dev/packages/network_info_plus) -This plugin allows Flutter apps to discover network connectivity and configure -themselves accordingly. It can distinguish between cellular vs WiFi connection. -This plugin works for iOS and Android. - -> Note that on Android, this does not guarantee connection to Internet. For instance, -the app might have wifi access but it might be a VPN or a hotel WiFi with no access. +This plugin allows Flutter apps to discover network info and configure +themselves accordingly. ## Usage -Sample usage to check current status: - -```dart -import 'package:network_info_plus/connectivity.dart'; - -var connectivityResult = await (Connectivity().checkConnectivity()); -if (connectivityResult == ConnectivityResult.mobile) { - // I am connected to a mobile network. -} else if (connectivityResult == ConnectivityResult.wifi) { - // I am connected to a wifi network. -} -``` - -> Note that you should not be using the current network status for deciding -whether you can reliably make a network connection. Always guard your app code -against timeouts and errors that might come from the network layer. - -You can also listen for network state changes by subscribing to the stream -exposed by connectivity plugin: - -```dart -import 'package:network_info_plus/connectivity.dart'; - -@override -initState() { - super.initState(); - - subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { - // Got a new connectivity status! - }) -} - -// Be sure to cancel subscription after you are done -@override -dispose() { - super.dispose(); - - subscription.cancel(); -} -``` - -Note that connectivity changes are no longer communicated to Android apps in the background starting with Android O. *You should always check for connectivity status when your app is resumed.* The broadcast is only useful when your application is in the foreground. - You can get wi-fi related information using: ```dart -import 'package:network_info_plus/connectivity.dart'; +import 'package:network_info_plus/network_info_plus.dart'; -var wifiBSSID = await (Connectivity().getWifiBSSID()); -var wifiIP = await (Connectivity().getWifiIP());network -var wifiName = await (Connectivity().getWifiName());wifi network +var wifiBSSID = await (NetworkInfo().getWifiBSSID()); +var wifiIP = await (NetworkInfo().getWifiIP());network +var wifiName = await (NetworkInfo().getWifiName());wifi network ``` ### iOS 12 @@ -100,25 +53,6 @@ To request location authorization, make sure to add the following keys to your _ * `NSLocationAlwaysAndWhenInUseUsageDescription` - describe why the app needs access to the user’s location information all the time (foreground and background). This is called _Privacy - Location Always and When In Use Usage Description_ in the visual editor. * `NSLocationWhenInUseUsageDescription` - describe why the app needs access to the user’s location information when the app is running in the foreground. This is called _Privacy - Location When In Use Usage Description_ in the visual editor. -## Limitations on the web platform - -In order to retrieve information about the quality/speed of a browser's connection, the web implementation of the `connectivity` plugin uses the browser's [**NetworkInformation** Web API](https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation), which as of this writing (June 2020) is still "experimental", and not available in all browsers: - -![Data on support for the netinfo feature across the major browsers from caniuse.com](https://caniuse.bitsofco.de/image/netinfo.png) - -On desktop browsers, this API only returns a very broad set of connectivity statuses (One of `'slow-2g', '2g', '3g', or '4g'`), and may *not* provide a Stream of changes. Firefox still hasn't enabled this feature by default. - -**Fallback to `navigator.onLine`** - -For those browsers where the NetworkInformation Web API is not available, the plugin falls back to the [**NavigatorOnLine** Web API](https://developer.mozilla.org/en-US/docs/Web/API/NavigatorOnLine), which is more broadly supported: - -![Data on support for the online-status feature across the major browsers from caniuse.com](https://caniuse.bitsofco.de/image/online-status.png) - - -The NavigatorOnLine API is [provided by `dart:html`](https://api.dart.dev/stable/2.7.2/dart-html/Navigator/onLine.html), and only supports a boolean connectivity status (either online or offline), with no network speed information. In those cases the plugin will return either `wifi` (when the browser is online) or `none` (when it's not). - -Other than the approximate "downlink" speed, where available, and due to security and privacy concerns, **no Web browser will provide** any specific information about the actual network your users' device is connected to, like **the SSID on a Wi-Fi, or the MAC address of their device.** - ## Getting Started For help getting started with Flutter, view our online diff --git a/packages/network_info_plus/lib/network_info_plus.dart b/packages/network_info_plus/lib/network_info_plus.dart index 71681b6d99..5a8e91920d 100644 --- a/packages/network_info_plus/lib/network_info_plus.dart +++ b/packages/network_info_plus/lib/network_info_plus.dart @@ -8,63 +8,48 @@ import 'dart:io' show Platform; import 'package:flutter/services.dart'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart'; -import 'package:network_info_plus_platform_interface/src/method_channel_connectivity.dart'; +import 'package:network_info_plus_platform_interface/src/method_channel_network_info.dart'; import 'package:network_info_plus_linux/network_info_plus_linux.dart'; // Export enums from the platform_interface so plugin users can use them directly. export 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart' - show ConnectivityResult, LocationAuthorizationStatus; + show NetworkInfoResult, LocationAuthorizationStatus; -/// Discover network connectivity configurations: Distinguish between WI-FI and cellular, check WI-FI status and more. -class Connectivity { - /// Constructs a singleton instance of [Connectivity]. +/// Discover network info: check WI-FI details and more. +class NetworkInfo { + /// Constructs a singleton instance of [NetworkInfo]. /// - /// [Connectivity] is designed to work as a singleton. + /// [NetworkInfo] is designed to work as a singleton. // When a second instance is created, the first instance will not be able to listen to the // EventChannel because it is overridden. Forcing the class to be a singleton class can prevent // misuse of creating a second instance from a programmer. - factory Connectivity() { - _singleton ??= Connectivity._(); + factory NetworkInfo() { + _singleton ??= NetworkInfo._(); return _singleton; } - Connectivity._(); + NetworkInfo._(); - static Connectivity _singleton; + static NetworkInfo _singleton; static bool _manualDartRegistrationNeeded = true; // This is to manually endorse Dart implementations until automatic // registration of Dart plugins is implemented. For details see // https://github.com/flutter/flutter/issues/52267. - static ConnectivityPlatform get _platform { + static NetworkInfoPlatform get _platform { if (_manualDartRegistrationNeeded) { // Only do the initial registration if it hasn't already been overridden // with a non-default instance. if (!kIsWeb && - ConnectivityPlatform.instance is MethodChannelConnectivity) { + NetworkInfoPlatform.instance is MethodChannelNetworkInfo) { if (Platform.isLinux) { - ConnectivityPlatform.instance = ConnectivityLinux(); + NetworkInfoPlatform.instance = NetworkInfoLinux(); } } _manualDartRegistrationNeeded = false; } - return ConnectivityPlatform.instance; - } - - /// Fires whenever the connectivity state changes. - Stream get onConnectivityChanged { - return _platform.onConnectivityChanged; - } - - /// Checks the connection status of the device. - /// - /// Do not use the result of this function to decide whether you can reliably - /// make a network request. It only gives you the radio status. - /// - /// Instead listen for connectivity changes via [onConnectivityChanged] stream. - Future checkConnectivity() { - return _platform.checkConnectivity(); + return NetworkInfoPlatform.instance; } /// Obtains the wifi name (SSID) of the connected network @@ -122,18 +107,18 @@ class Connectivity { /// For example, /// ```dart /// if (Platform.isIOS) { - /// LocationAuthorizationStatus status = await _connectivity.getLocationServiceAuthorization(); + /// LocationAuthorizationStatus status = await _networkInfo.getLocationServiceAuthorization(); /// if (status == LocationAuthorizationStatus.notDetermined) { - /// status = await _connectivity.requestLocationServiceAuthorization(); + /// status = await _networkInfo.requestLocationServiceAuthorization(); /// } /// if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } else { /// print('location service is not authorized, the data might not be correct'); - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } /// } else { - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } /// ``` /// @@ -171,15 +156,15 @@ class Connectivity { /// For example, /// ```dart /// if (Platform.isIOS) { - /// LocationAuthorizationStatus status = await _connectivity.getLocationServiceAuthorization(); + /// LocationAuthorizationStatus status = await _networkInfo.getLocationServiceAuthorization(); /// if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } else { /// print('location service is not authorized, the data might not be correct'); - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } /// } else { - /// wifiBSSID = await _connectivity.getWifiName(); + /// wifiBSSID = await _networkInfo.getWifiName(); /// } /// ``` /// diff --git a/packages/network_info_plus/macos/network_info_plus.podspec b/packages/network_info_plus/macos/network_info_plus.podspec index 4417a8bc8b..8371009463 100644 --- a/packages/network_info_plus/macos/network_info_plus.podspec +++ b/packages/network_info_plus/macos/network_info_plus.podspec @@ -4,12 +4,12 @@ Pod::Spec.new do |s| s.name = 'network_info_plus' s.version = '0.0.1' - s.summary = 'No-op implementation of the macos connectivity to avoid build issues on macos' + s.summary = 'No-op implementation of the macos network_info_plus to avoid build issues on macos' s.description = <<-DESC - No-op implementation of the connectivity plugin to avoid build issues on macos. + No-op implementation of the network_info_plus plugin to avoid build issues on macos. https://github.com/flutter/flutter/issues/46618 DESC - s.homepage = 'https://github.com/flutter/plugins/tree/main/packages/connectivity' + s.homepage = 'https://github.com/fluttercommunity/plus_plugins' s.license = { :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } s.source = { :path => '.' } diff --git a/packages/network_info_plus/pubspec.yaml b/packages/network_info_plus/pubspec.yaml index 442f0fb9a3..e507c45427 100644 --- a/packages/network_info_plus/pubspec.yaml +++ b/packages/network_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: network_info_plus -description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. -version: 0.7.1 +description: Flutter plugin for discovering network info. +version: 0.1.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -8,10 +8,10 @@ flutter: plugin: platforms: android: - package: dev.fluttercommunity.plus.connectivity - pluginClass: ConnectivityPlugin + package: dev.fluttercommunity.plus.network_info + pluginClass: NetworkInfoPlusPlugin ios: - pluginClass: FLTConnectivityPlusPlugin + pluginClass: FLTNetworkInfoPlusPlugin linux: default_package: network_info_plus_linux macos: @@ -21,9 +21,9 @@ dependencies: flutter: sdk: flutter meta: ^1.0.5 - network_info_plus_platform_interface: ^0.3.0 - network_info_plus_linux: ^0.2.0 - network_info_plus_macos: ^0.3.0 + network_info_plus_platform_interface: ^0.1.0 + network_info_plus_linux: ^0.1.0 + network_info_plus_macos: ^0.1.0 dev_dependencies: flutter_test: diff --git a/packages/network_info_plus/test/network_info_test.dart b/packages/network_info_plus/test/network_info_test.dart index 53eb323bb4..4570c3169a 100644 --- a/packages/network_info_plus/test/network_info_test.dart +++ b/packages/network_info_plus/test/network_info_test.dart @@ -8,7 +8,6 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; import 'package:mockito/mockito.dart'; -const ConnectivityResult kCheckConnectivityResult = ConnectivityResult.wifi; const String kWifiNameResult = '1337wifi'; const String kWifiBSSIDResult = 'c0:ff:33:c0:d3:55'; const String kWifiIpAddressResult = '127.0.0.1'; @@ -18,55 +17,45 @@ const LocationAuthorizationStatus kGetLocationResult = LocationAuthorizationStatus.authorizedAlways; void main() { - group('Connectivity', () { - Connectivity connectivity; - MockConnectivityPlatform fakePlatform; + group('NetworkInfo', () { + NetworkInfo networkInfo; + MockNetworkInfoPlatform fakePlatform; setUp(() async { - fakePlatform = MockConnectivityPlatform(); - ConnectivityPlatform.instance = fakePlatform; - connectivity = Connectivity(); - }); - - test('checkConnectivity', () async { - final result = await connectivity.checkConnectivity(); - expect(result, kCheckConnectivityResult); + fakePlatform = MockNetworkInfoPlatform(); + NetworkInfoPlatform.instance = fakePlatform; + networkInfo = NetworkInfo(); }); test('getWifiName', () async { - final result = await connectivity.getWifiName(); + final result = await networkInfo.getWifiName(); expect(result, kWifiNameResult); }); test('getWifiBSSID', () async { - final result = await connectivity.getWifiBSSID(); + final result = await networkInfo.getWifiBSSID(); expect(result, kWifiBSSIDResult); }); test('getWifiIP', () async { - final result = await connectivity.getWifiIP(); + final result = await networkInfo.getWifiIP(); expect(result, kWifiIpAddressResult); }); test('requestLocationServiceAuthorization', () async { - final result = await connectivity.requestLocationServiceAuthorization(); + final result = await networkInfo.requestLocationServiceAuthorization(); expect(result, kRequestLocationResult); }); test('getLocationServiceAuthorization', () async { - final result = await connectivity.getLocationServiceAuthorization(); + final result = await networkInfo.getLocationServiceAuthorization(); expect(result, kRequestLocationResult); }); }); } -class MockConnectivityPlatform extends Mock +class MockNetworkInfoPlatform extends Mock with MockPlatformInterfaceMixin - implements ConnectivityPlatform { - @override - Future checkConnectivity() async { - return kCheckConnectivityResult; - } - + implements NetworkInfoPlatform { @override Future getWifiName() async { return kWifiNameResult; From 9d387e350825dfff6fdaa7b5899a2c016d3b80ea Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2020 18:25:24 +0100 Subject: [PATCH 11/13] [network_info_plus] adapt the example --- .../example/android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../EmbeddingV1Activity.java | 8 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../example/ios/Flutter/Flutter.podspec | 8 +- .../ios/Runner.xcodeproj/project.pbxproj | 23 +-- .../example/ios/Runner/Info.plist | 2 +- .../network_info_plus/example/lib/main.dart | 150 +++++++----------- .../macos/Runner.xcodeproj/project.pbxproj | 16 +- .../test_driver/network_info_plus_e2e.dart | 22 +-- .../network_info_plus/example/web/favicon.png | Bin 917 -> 0 bytes .../example/web/icons/Icon-192.png | Bin 5292 -> 0 bytes .../example/web/icons/Icon-512.png | Bin 8252 -> 0 bytes .../network_info_plus/example/web/index.html | 33 ---- .../example/web/manifest.json | 23 --- 16 files changed, 78 insertions(+), 217 deletions(-) rename packages/network_info_plus/example/android/app/src/main/java/{io/flutter/plugins/network_info_example => dev/fluttercommunity/plus/network_info_plus_example}/EmbeddingV1Activity.java (61%) rename packages/network_info_plus/example/android/app/src/main/java/{io/flutter/plugins/network_info_example => dev/fluttercommunity/plus/network_info_plus_example}/EmbeddingV1ActivityTest.java (89%) rename packages/network_info_plus/example/android/app/src/main/java/{io/flutter/plugins/network_info_example => dev/fluttercommunity/plus/network_info_plus_example}/FlutterActivityTest.java (90%) delete mode 100644 packages/network_info_plus/example/web/favicon.png delete mode 100644 packages/network_info_plus/example/web/icons/Icon-192.png delete mode 100644 packages/network_info_plus/example/web/icons/Icon-512.png delete mode 100644 packages/network_info_plus/example/web/index.html delete mode 100644 packages/network_info_plus/example/web/manifest.json diff --git a/packages/network_info_plus/example/android/app/build.gradle b/packages/network_info_plus/example/android/app/build.gradle index 5d1f138bfe..99786cdb6c 100644 --- a/packages/network_info_plus/example/android/app/build.gradle +++ b/packages/network_info_plus/example/android/app/build.gradle @@ -32,7 +32,7 @@ android { } defaultConfig { - applicationId "io.flutter.plugins.connectivityexample" + applicationId "dev.fluttercommunity.plus.network_info_plus_example" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml b/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml index 902642e0ca..9e8e49ef8e 100644 --- a/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/network_info_plus/example/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="dev.fluttercommunity.plus.network_info_plus_example"> - + 'MIT' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } s.ios.deployment_target = '8.0' - s.vendored_frameworks = 'Flutter.framework' + # Framework linking is handled by Flutter tooling, not CocoaPods. + # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. + s.vendored_frameworks = 'path/to/nothing' end diff --git a/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj index 2779467fbc..818569bdf5 100644 --- a/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/network_info_plus/example/ios/Runner.xcodeproj/project.pbxproj @@ -147,7 +147,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -237,24 +236,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 6A2F146AD353BE7A0C3E797E /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../Flutter/Flutter.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -426,7 +407,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.connectivityExample; + PRODUCT_BUNDLE_IDENTIFIER = dev.fluttercommunity.plus.networkInfoExample; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -447,7 +428,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = io.flutter.plugins.connectivityExample; + PRODUCT_BUNDLE_IDENTIFIER = dev.fluttercommunity.plus.networkInfoExample; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/packages/network_info_plus/example/ios/Runner/Info.plist b/packages/network_info_plus/example/ios/Runner/Info.plist index babbd80f16..153602ea04 100644 --- a/packages/network_info_plus/example/ios/Runner/Info.plist +++ b/packages/network_info_plus/example/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - connectivity_example + network_info_plus_example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/packages/network_info_plus/example/lib/main.dart b/packages/network_info_plus/example/lib/main.dart index ba7b33eea5..fae78b6921 100644 --- a/packages/network_info_plus/example/lib/main.dart +++ b/packages/network_info_plus/example/lib/main.dart @@ -50,121 +50,81 @@ class MyHomePage extends StatefulWidget { class _MyHomePageState extends State { String _connectionStatus = 'Unknown'; - final Connectivity _connectivity = Connectivity(); - StreamSubscription _connectivitySubscription; + final NetworkInfo _networkInfo = NetworkInfo(); @override void initState() { super.initState(); - initConnectivity(); - _connectivitySubscription = - _connectivity.onConnectivityChanged.listen(_updateConnectionStatus); - } - - @override - void dispose() { - _connectivitySubscription.cancel(); - super.dispose(); - } - - // Platform messages are asynchronous, so we initialize in an async method. - Future initConnectivity() async { - ConnectivityResult result; - // Platform messages may fail, so we use a try/catch PlatformException. - try { - result = await _connectivity.checkConnectivity(); - } on PlatformException catch (e) { - print(e.toString()); - } - - // If the widget was removed from the tree while the asynchronous platform - // message was in flight, we want to discard the reply rather than calling - // setState to update our non-existent appearance. - if (!mounted) { - return Future.value(null); - } - - return _updateConnectionStatus(result); + _initNetworkInfo(); } @override Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: const Text('Connectivity example app'), + title: const Text('NetworkInfo example app'), ), body: Center(child: Text('Connection Status: $_connectionStatus')), ); } - Future _updateConnectionStatus(ConnectivityResult result) async { - switch (result) { - case ConnectivityResult.wifi: - String wifiName, wifiBSSID, wifiIP; - - try { - if (!kIsWeb && Platform.isIOS) { - var status = await _connectivity.getLocationServiceAuthorization(); - if (status == LocationAuthorizationStatus.notDetermined) { - status = - await _connectivity.requestLocationServiceAuthorization(); - } - if (status == LocationAuthorizationStatus.authorizedAlways || - status == LocationAuthorizationStatus.authorizedWhenInUse) { - wifiName = await _connectivity.getWifiName(); - } else { - wifiName = await _connectivity.getWifiName(); - } - } else { - wifiName = await _connectivity.getWifiName(); - } - } on PlatformException catch (e) { - print(e.toString()); - wifiName = 'Failed to get Wifi Name'; - } + Future _initNetworkInfo() async { + String wifiName, wifiBSSID, wifiIP; - try { - if (!kIsWeb && Platform.isIOS) { - var status = await _connectivity.getLocationServiceAuthorization(); - if (status == LocationAuthorizationStatus.notDetermined) { - status = - await _connectivity.requestLocationServiceAuthorization(); - } - if (status == LocationAuthorizationStatus.authorizedAlways || - status == LocationAuthorizationStatus.authorizedWhenInUse) { - wifiBSSID = await _connectivity.getWifiBSSID(); - } else { - wifiBSSID = await _connectivity.getWifiBSSID(); - } - } else { - wifiBSSID = await _connectivity.getWifiBSSID(); - } - } on PlatformException catch (e) { - print(e.toString()); - wifiBSSID = 'Failed to get Wifi BSSID'; + try { + if (!kIsWeb && Platform.isIOS) { + var status = await _networkInfo.getLocationServiceAuthorization(); + if (status == LocationAuthorizationStatus.notDetermined) { + status = + await _networkInfo.requestLocationServiceAuthorization(); } + if (status == LocationAuthorizationStatus.authorizedAlways || + status == LocationAuthorizationStatus.authorizedWhenInUse) { + wifiName = await _networkInfo.getWifiName(); + } else { + wifiName = await _networkInfo.getWifiName(); + } + } else { + wifiName = await _networkInfo.getWifiName(); + } + } on PlatformException catch (e) { + print(e.toString()); + wifiName = 'Failed to get Wifi Name'; + } - try { - wifiIP = await _connectivity.getWifiIP(); - } on PlatformException catch (e) { - print(e.toString()); - wifiIP = 'Failed to get Wifi IP'; + try { + if (!kIsWeb && Platform.isIOS) { + var status = await _networkInfo.getLocationServiceAuthorization(); + if (status == LocationAuthorizationStatus.notDetermined) { + status = + await _networkInfo.requestLocationServiceAuthorization(); + } + if (status == LocationAuthorizationStatus.authorizedAlways || + status == LocationAuthorizationStatus.authorizedWhenInUse) { + wifiBSSID = await _networkInfo.getWifiBSSID(); + } else { + wifiBSSID = await _networkInfo.getWifiBSSID(); } + } else { + wifiBSSID = await _networkInfo.getWifiBSSID(); + } + } on PlatformException catch (e) { + print(e.toString()); + wifiBSSID = 'Failed to get Wifi BSSID'; + } - setState(() { - _connectionStatus = '$result\n' - 'Wifi Name: $wifiName\n' - 'Wifi BSSID: $wifiBSSID\n' - 'Wifi IP: $wifiIP\n'; - }); - break; - case ConnectivityResult.mobile: - case ConnectivityResult.none: - setState(() => _connectionStatus = result.toString()); - break; - default: - setState(() => _connectionStatus = 'Failed to get connectivity.'); - break; + try { + wifiIP = await _networkInfo.getWifiIP(); + } on PlatformException catch (e) { + print(e.toString()); + wifiIP = 'Failed to get Wifi IP'; } + + setState(() { + _connectionStatus = + 'Wifi Name: $wifiName\n' + 'Wifi BSSID: $wifiBSSID\n' + 'Wifi IP: $wifiIP\n'; + }); } } diff --git a/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj b/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj index 0e2413493f..e5933e98cf 100644 --- a/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj @@ -26,10 +26,6 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; - 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; - D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; EA473EC5F2038B17A2FE4D78 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748ADDF1719804343BB18004 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -50,8 +46,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */, - 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */, ); name = "Bundle Framework"; runOnlyForDeploymentPostprocessing = 0; @@ -70,7 +64,6 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; - 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; }; 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; @@ -79,7 +72,6 @@ 80418F0A2F74D683C63A4D0A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; AA19B00394637215A825CF5E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; E960ED3977AF6DF197F74FFA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -88,8 +80,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, - 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, EA473EC5F2038B17A2FE4D78 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -145,8 +135,6 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, - D73912EF22F37F9E000D13A0 /* App.framework */, - 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */, ); path = Flutter; sourceTree = ""; @@ -281,7 +269,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -309,9 +297,11 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart b/packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart index eaee4741d5..1d930cfc99 100644 --- a/packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart +++ b/packages/network_info_plus/example/test_driver/network_info_plus_e2e.dart @@ -10,30 +10,16 @@ import 'package:network_info_plus/network_info_plus.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); - group('Connectivity test driver', () { - Connectivity _connectivity; + group('NetworkInfo test driver', () { + NetworkInfo _networkInfo; setUpAll(() async { - _connectivity = Connectivity(); - }); - - testWidgets('test connectivity result', (WidgetTester tester) async { - final result = await _connectivity.checkConnectivity(); - expect(result, isNotNull); - switch (result) { - case ConnectivityResult.wifi: - expect(_connectivity.getWifiName(), completes); - expect(_connectivity.getWifiBSSID(), completes); - expect((await _connectivity.getWifiIP()), isNotNull); - break; - default: - break; - } + _networkInfo = NetworkInfo(); }); testWidgets('test location methods, iOS only', (WidgetTester tester) async { if (Platform.isIOS) { - expect((await _connectivity.getLocationServiceAuthorization()), + expect((await _networkInfo.getLocationServiceAuthorization()), LocationAuthorizationStatus.notDetermined); } }); diff --git a/packages/network_info_plus/example/web/favicon.png b/packages/network_info_plus/example/web/favicon.png deleted file mode 100644 index 8aaa46ac1ae21512746f852a42ba87e4165dfdd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM diff --git a/packages/network_info_plus/example/web/icons/Icon-192.png b/packages/network_info_plus/example/web/icons/Icon-192.png deleted file mode 100644 index b749bfef07473333cf1dd31e9eed89862a5d52aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5292 zcmZ`-2T+sGz6~)*FVZ`aW+(v>MIm&M-g^@e2u-B-DoB?qO+b1Tq<5uCCv>ESfRum& zp%X;f!~1{tzL__3=gjVJ=j=J>+nMj%ncXj1Q(b|Ckbw{Y0FWpt%4y%$uD=Z*c-x~o zE;IoE;xa#7Ll5nj-e4CuXB&G*IM~D21rCP$*xLXAK8rIMCSHuSu%bL&S3)8YI~vyp@KBu9Ph7R_pvKQ@xv>NQ`dZp(u{Z8K3yOB zn7-AR+d2JkW)KiGx0hosml;+eCXp6+w%@STjFY*CJ?udJ64&{BCbuebcuH;}(($@@ znNlgBA@ZXB)mcl9nbX#F!f_5Z=W>0kh|UVWnf!At4V*LQP%*gPdCXd6P@J4Td;!Ur z<2ZLmwr(NG`u#gDEMP19UcSzRTL@HsK+PnIXbVBT@oHm53DZr?~V(0{rsalAfwgo zEh=GviaqkF;}F_5-yA!1u3!gxaR&Mj)hLuj5Q-N-@Lra{%<4ONja8pycD90&>yMB` zchhd>0CsH`^|&TstH-8+R`CfoWqmTTF_0?zDOY`E`b)cVi!$4xA@oO;SyOjJyP^_j zx^@Gdf+w|FW@DMdOi8=4+LJl$#@R&&=UM`)G!y%6ZzQLoSL%*KE8IO0~&5XYR9 z&N)?goEiWA(YoRfT{06&D6Yuu@Qt&XVbuW@COb;>SP9~aRc+z`m`80pB2o%`#{xD@ zI3RAlukL5L>px6b?QW1Ac_0>ew%NM!XB2(H+1Y3AJC?C?O`GGs`331Nd4ZvG~bMo{lh~GeL zSL|tT*fF-HXxXYtfu5z+T5Mx9OdP7J4g%@oeC2FaWO1D{=NvL|DNZ}GO?O3`+H*SI z=grGv=7dL{+oY0eJFGO!Qe(e2F?CHW(i!!XkGo2tUvsQ)I9ev`H&=;`N%Z{L zO?vV%rDv$y(@1Yj@xfr7Kzr<~0{^T8wM80xf7IGQF_S-2c0)0D6b0~yD7BsCy+(zL z#N~%&e4iAwi4F$&dI7x6cE|B{f@lY5epaDh=2-(4N05VO~A zQT3hanGy_&p+7Fb^I#ewGsjyCEUmSCaP6JDB*=_()FgQ(-pZ28-{qx~2foO4%pM9e z*_63RT8XjgiaWY|*xydf;8MKLd{HnfZ2kM%iq}fstImB-K6A79B~YoPVa@tYN@T_$ zea+9)<%?=Fl!kd(Y!G(-o}ko28hg2!MR-o5BEa_72uj7Mrc&{lRh3u2%Y=Xk9^-qa zBPWaD=2qcuJ&@Tf6ue&)4_V*45=zWk@Z}Q?f5)*z)-+E|-yC4fs5CE6L_PH3=zI8p z*Z3!it{1e5_^(sF*v=0{`U9C741&lub89gdhKp|Y8CeC{_{wYK-LSbp{h)b~9^j!s z7e?Y{Z3pZv0J)(VL=g>l;<}xk=T*O5YR|hg0eg4u98f2IrA-MY+StQIuK-(*J6TRR z|IM(%uI~?`wsfyO6Tgmsy1b3a)j6M&-jgUjVg+mP*oTKdHg?5E`!r`7AE_#?Fc)&a z08KCq>Gc=ne{PCbRvs6gVW|tKdcE1#7C4e`M|j$C5EYZ~Y=jUtc zj`+?p4ba3uy7><7wIokM79jPza``{Lx0)zGWg;FW1^NKY+GpEi=rHJ+fVRGfXO zPHV52k?jxei_!YYAw1HIz}y8ZMwdZqU%ESwMn7~t zdI5%B;U7RF=jzRz^NuY9nM)&<%M>x>0(e$GpU9th%rHiZsIT>_qp%V~ILlyt^V`=d z!1+DX@ah?RnB$X!0xpTA0}lN@9V-ePx>wQ?-xrJr^qDlw?#O(RsXeAvM%}rg0NT#t z!CsT;-vB=B87ShG`GwO;OEbeL;a}LIu=&@9cb~Rsx(ZPNQ!NT7H{@j0e(DiLea>QD zPmpe90gEKHEZ8oQ@6%E7k-Ptn#z)b9NbD@_GTxEhbS+}Bb74WUaRy{w;E|MgDAvHw zL)ycgM7mB?XVh^OzbC?LKFMotw3r@i&VdUV%^Efdib)3@soX%vWCbnOyt@Y4swW925@bt45y0HY3YI~BnnzZYrinFy;L?2D3BAL`UQ zEj))+f>H7~g8*VuWQ83EtGcx`hun$QvuurSMg3l4IP8Fe`#C|N6mbYJ=n;+}EQm;< z!!N=5j1aAr_uEnnzrEV%_E|JpTb#1p1*}5!Ce!R@d$EtMR~%9# zd;h8=QGT)KMW2IKu_fA_>p_und#-;Q)p%%l0XZOXQicfX8M~7?8}@U^ihu;mizj)t zgV7wk%n-UOb z#!P5q?Ex+*Kx@*p`o$q8FWL*E^$&1*!gpv?Za$YO~{BHeGY*5%4HXUKa_A~~^d z=E*gf6&+LFF^`j4$T~dR)%{I)T?>@Ma?D!gi9I^HqvjPc3-v~=qpX1Mne@*rzT&Xw zQ9DXsSV@PqpEJO-g4A&L{F&;K6W60D!_vs?Vx!?w27XbEuJJP&);)^+VF1nHqHBWu z^>kI$M9yfOY8~|hZ9WB!q-9u&mKhEcRjlf2nm_@s;0D#c|@ED7NZE% zzR;>P5B{o4fzlfsn3CkBK&`OSb-YNrqx@N#4CK!>bQ(V(D#9|l!e9(%sz~PYk@8zt zPN9oK78&-IL_F zhsk1$6p;GqFbtB^ZHHP+cjMvA0(LqlskbdYE_rda>gvQLTiqOQ1~*7lg%z*&p`Ry& zRcG^DbbPj_jOKHTr8uk^15Boj6>hA2S-QY(W-6!FIq8h$<>MI>PYYRenQDBamO#Fv zAH5&ImqKBDn0v5kb|8i0wFhUBJTpT!rB-`zK)^SNnRmLraZcPYK7b{I@+}wXVdW-{Ps17qdRA3JatEd?rPV z4@}(DAMf5EqXCr4-B+~H1P#;t@O}B)tIJ(W6$LrK&0plTmnPpb1TKn3?f?Kk``?D+ zQ!MFqOX7JbsXfQrz`-M@hq7xlfNz;_B{^wbpG8des56x(Q)H)5eLeDwCrVR}hzr~= zM{yXR6IM?kXxauLza#@#u?Y|o;904HCqF<8yT~~c-xyRc0-vxofnxG^(x%>bj5r}N zyFT+xnn-?B`ohA>{+ZZQem=*Xpqz{=j8i2TAC#x-m;;mo{{sLB_z(UoAqD=A#*juZ zCv=J~i*O8;F}A^Wf#+zx;~3B{57xtoxC&j^ie^?**T`WT2OPRtC`xj~+3Kprn=rVM zVJ|h5ux%S{dO}!mq93}P+h36mZ5aZg1-?vhL$ke1d52qIiXSE(llCr5i=QUS?LIjc zV$4q=-)aaR4wsrQv}^shL5u%6;`uiSEs<1nG^?$kl$^6DL z43CjY`M*p}ew}}3rXc7Xck@k41jx}c;NgEIhKZ*jsBRZUP-x2cm;F1<5$jefl|ppO zmZd%%?gMJ^g9=RZ^#8Mf5aWNVhjAS^|DQO+q$)oeob_&ZLFL(zur$)); zU19yRm)z<4&4-M}7!9+^Wl}Uk?`S$#V2%pQ*SIH5KI-mn%i;Z7-)m$mN9CnI$G7?# zo`zVrUwoSL&_dJ92YhX5TKqaRkfPgC4=Q&=K+;_aDs&OU0&{WFH}kKX6uNQC6%oUH z2DZa1s3%Vtk|bglbxep-w)PbFG!J17`<$g8lVhqD2w;Z0zGsh-r zxZ13G$G<48leNqR!DCVt9)@}(zMI5w6Wo=N zpP1*3DI;~h2WDWgcKn*f!+ORD)f$DZFwgKBafEZmeXQMAsq9sxP9A)7zOYnkHT9JU zRA`umgmP9d6=PHmFIgx=0$(sjb>+0CHG)K@cPG{IxaJ&Ueo8)0RWgV9+gO7+Bl1(F z7!BslJ2MP*PWJ;x)QXbR$6jEr5q3 z(3}F@YO_P1NyTdEXRLU6fp?9V2-S=E+YaeLL{Y)W%6`k7$(EW8EZSA*(+;e5@jgD^I zaJQ2|oCM1n!A&-8`;#RDcZyk*+RPkn_r8?Ak@agHiSp*qFNX)&i21HE?yuZ;-C<3C zwJGd1lx5UzViP7sZJ&|LqH*mryb}y|%AOw+v)yc`qM)03qyyrqhX?ub`Cjwx2PrR! z)_z>5*!*$x1=Qa-0uE7jy0z`>|Ni#X+uV|%_81F7)b+nf%iz=`fF4g5UfHS_?PHbr zB;0$bK@=di?f`dS(j{l3-tSCfp~zUuva+=EWxJcRfp(<$@vd(GigM&~vaYZ0c#BTs z3ijkxMl=vw5AS&DcXQ%eeKt!uKvh2l3W?&3=dBHU=Gz?O!40S&&~ei2vg**c$o;i89~6DVns zG>9a*`k5)NI9|?W!@9>rzJ;9EJ=YlJTx1r1BA?H`LWijk(rTax9(OAu;q4_wTj-yj z1%W4GW&K4T=uEGb+E!>W0SD_C0RR91 diff --git a/packages/network_info_plus/example/web/icons/Icon-512.png b/packages/network_info_plus/example/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48dff1169879ba46840804b412fe02fefd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8252 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 diff --git a/packages/network_info_plus/example/web/index.html b/packages/network_info_plus/example/web/index.html deleted file mode 100644 index 9b7a438f82..0000000000 --- a/packages/network_info_plus/example/web/index.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - example - - - - - - - - diff --git a/packages/network_info_plus/example/web/manifest.json b/packages/network_info_plus/example/web/manifest.json deleted file mode 100644 index 8c012917da..0000000000 --- a/packages/network_info_plus/example/web/manifest.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "example", - "short_name": "example", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - } - ] -} From 281143a346680ecb728b52fee7c2040f9d6e2aed Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 20 Dec 2020 11:04:58 +0100 Subject: [PATCH 12/13] [network_info_plus] run melos format --- .../fluttercommunity/plus/network_info/NetworkInfo.java | 1 - packages/network_info_plus/example/lib/main.dart | 9 +++------ .../example/linux/flutter/generated_plugin_registrant.cc | 4 +--- packages/network_info_plus/example/linux/main.cc | 3 ++- .../network_info_plus/example/linux/my_application.cc | 7 +++---- .../ios/Classes/FLTNetworkInfoLocationPlusHandler.h | 3 ++- packages/network_info_plus/lib/network_info_plus.dart | 3 +-- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java index d9b4f766a7..cb03a0769f 100644 --- a/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java +++ b/packages/network_info_plus/android/src/main/java/dev/fluttercommunity/plus/network_info/NetworkInfo.java @@ -6,7 +6,6 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.os.Build; /** Reports network info such as wifi name and address. */ class NetworkInfo { diff --git a/packages/network_info_plus/example/lib/main.dart b/packages/network_info_plus/example/lib/main.dart index fae78b6921..9b02a1f918 100644 --- a/packages/network_info_plus/example/lib/main.dart +++ b/packages/network_info_plus/example/lib/main.dart @@ -75,8 +75,7 @@ class _MyHomePageState extends State { if (!kIsWeb && Platform.isIOS) { var status = await _networkInfo.getLocationServiceAuthorization(); if (status == LocationAuthorizationStatus.notDetermined) { - status = - await _networkInfo.requestLocationServiceAuthorization(); + status = await _networkInfo.requestLocationServiceAuthorization(); } if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { @@ -96,8 +95,7 @@ class _MyHomePageState extends State { if (!kIsWeb && Platform.isIOS) { var status = await _networkInfo.getLocationServiceAuthorization(); if (status == LocationAuthorizationStatus.notDetermined) { - status = - await _networkInfo.requestLocationServiceAuthorization(); + status = await _networkInfo.requestLocationServiceAuthorization(); } if (status == LocationAuthorizationStatus.authorizedAlways || status == LocationAuthorizationStatus.authorizedWhenInUse) { @@ -121,8 +119,7 @@ class _MyHomePageState extends State { } setState(() { - _connectionStatus = - 'Wifi Name: $wifiName\n' + _connectionStatus = 'Wifi Name: $wifiName\n' 'Wifi BSSID: $wifiBSSID\n' 'Wifi IP: $wifiIP\n'; }); diff --git a/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc index d38195aa04..890de29bba 100644 --- a/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/network_info_plus/example/linux/flutter/generated_plugin_registrant.cc @@ -4,6 +4,4 @@ #include "generated_plugin_registrant.h" - -void fl_register_plugins(FlPluginRegistry* registry) { -} +void fl_register_plugins(FlPluginRegistry* registry) {} diff --git a/packages/network_info_plus/example/linux/main.cc b/packages/network_info_plus/example/linux/main.cc index 058e6178fe..10835acb58 100644 --- a/packages/network_info_plus/example/linux/main.cc +++ b/packages/network_info_plus/example/linux/main.cc @@ -2,7 +2,8 @@ int main(int argc, char** argv) { // Only X11 is currently supported. - // Wayland support is being developed: https://github.com/flutter/flutter/issues/57932. + // Wayland support is being developed: + // https://github.com/flutter/flutter/issues/57932. gdk_set_allowed_backends("x11"); g_autoptr(MyApplication) app = my_application_new(); diff --git a/packages/network_info_plus/example/linux/my_application.cc b/packages/network_info_plus/example/linux/my_application.cc index f28ca30940..67ed0b9025 100644 --- a/packages/network_info_plus/example/linux/my_application.cc +++ b/packages/network_info_plus/example/linux/my_application.cc @@ -14,7 +14,7 @@ G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) static void my_application_activate(GApplication* application) { GtkWindow* window = GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); - GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); gtk_header_bar_set_title(header_bar, "example"); gtk_header_bar_set_show_close_button(header_bar, TRUE); @@ -40,7 +40,6 @@ static void my_application_class_init(MyApplicationClass* klass) { static void my_application_init(MyApplication* self) {} MyApplication* my_application_new() { - return MY_APPLICATION(g_object_new(my_application_get_type(), - "application-id", APPLICATION_ID, - nullptr)); + return MY_APPLICATION(g_object_new( + my_application_get_type(), "application-id", APPLICATION_ID, nullptr)); } diff --git a/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h index c7bb38c9c2..516a9bab85 100644 --- a/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h +++ b/packages/network_info_plus/ios/Classes/FLTNetworkInfoLocationPlusHandler.h @@ -15,7 +15,8 @@ typedef void (^FLTNetworkInfoLocationPlusCompletion)(CLAuthorizationStatus); + (CLAuthorizationStatus)locationAuthorizationStatus; - (void)requestLocationAuthorization:(BOOL)always - completion:(_Nonnull FLTNetworkInfoLocationPlusCompletion)completionHnadler; + completion: + (_Nonnull FLTNetworkInfoLocationPlusCompletion)completionHnadler; @end diff --git a/packages/network_info_plus/lib/network_info_plus.dart b/packages/network_info_plus/lib/network_info_plus.dart index 5a8e91920d..3ccaee46da 100644 --- a/packages/network_info_plus/lib/network_info_plus.dart +++ b/packages/network_info_plus/lib/network_info_plus.dart @@ -41,8 +41,7 @@ class NetworkInfo { if (_manualDartRegistrationNeeded) { // Only do the initial registration if it hasn't already been overridden // with a non-default instance. - if (!kIsWeb && - NetworkInfoPlatform.instance is MethodChannelNetworkInfo) { + if (!kIsWeb && NetworkInfoPlatform.instance is MethodChannelNetworkInfo) { if (Platform.isLinux) { NetworkInfoPlatform.instance = NetworkInfoLinux(); } From 82aa9152f80bbeb910348b082a09db49b60cd785 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 20 Dec 2020 11:12:31 +0100 Subject: [PATCH 13/13] [network_info_plus] fix analysis warnings --- .../lib/network_info_plus.dart | 2 +- .../method_channel_network_info_test.dart | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/network_info_plus/lib/network_info_plus.dart b/packages/network_info_plus/lib/network_info_plus.dart index 3ccaee46da..00695cedba 100644 --- a/packages/network_info_plus/lib/network_info_plus.dart +++ b/packages/network_info_plus/lib/network_info_plus.dart @@ -13,7 +13,7 @@ import 'package:network_info_plus_linux/network_info_plus_linux.dart'; // Export enums from the platform_interface so plugin users can use them directly. export 'package:network_info_plus_platform_interface/network_info_plus_platform_interface.dart' - show NetworkInfoResult, LocationAuthorizationStatus; + show LocationAuthorizationStatus; /// Discover network info: check WI-FI details and more. class NetworkInfo { diff --git a/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart b/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart index 12aca6e69f..cc75723813 100644 --- a/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart +++ b/packages/network_info_plus_platform_interface/test/method_channel_network_info_test.dart @@ -21,8 +21,6 @@ void main() { .setMockMethodCallHandler((MethodCall methodCall) async { log.add(methodCall); switch (methodCall.method) { - case 'check': - return 'wifi'; case 'wifiName': return '1337wifi'; case 'wifiBSSID': @@ -38,23 +36,6 @@ void main() { } }); log.clear(); - MethodChannel(methodChannelNetworkInfo.eventChannel.name) - .setMockMethodCallHandler((MethodCall methodCall) async { - switch (methodCall.method) { - case 'listen': - await ServicesBinding.instance.defaultBinaryMessenger - .handlePlatformMessage( - methodChannelNetworkInfo.eventChannel.name, - methodChannelNetworkInfo.eventChannel.codec - .encodeSuccessEnvelope('wifi'), - (_) {}, - ); - break; - case 'cancel': - default: - return null; - } - }); }); test('getWifiName', () async {