From 46c251b7575051e2d07bc80d6bf965c4760323f6 Mon Sep 17 00:00:00 2001 From: tim Hoogstrate Date: Mon, 24 Feb 2025 08:59:43 +0100 Subject: [PATCH] fixed dart format changes. --- google_api_availability/example/lib/main.dart | 114 +++++---- .../lib/src/google_api_availability.dart | 5 +- .../test/google_api_availability_test.dart | 234 +++++++++--------- .../example/lib/main.dart | 114 +++++---- .../src/google_api_availability_android.dart | 18 +- .../google_api_availability_android_test.dart | 159 ++++++------ .../test/method_channel_mock.dart | 6 +- 7 files changed, 339 insertions(+), 311 deletions(-) diff --git a/google_api_availability/example/lib/main.dart b/google_api_availability/example/lib/main.dart index 5803e03..40bc66f 100644 --- a/google_api_availability/example/lib/main.dart +++ b/google_api_availability/example/lib/main.dart @@ -129,64 +129,68 @@ class _MyAppState extends State { Widget build(BuildContext context) { return MaterialApp( home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - ), - body: ListView( - children: [ - MaterialButton( - onPressed: () => checkPlayServices(), - child: const Text('Get PlayServices availability'), - color: Colors.red, + appBar: AppBar(title: const Text('Plugin example app')), + body: ListView( + children: [ + MaterialButton( + onPressed: () => checkPlayServices(), + child: const Text('Get PlayServices availability'), + color: Colors.red, + ), + Center( + child: Text( + 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n', ), - Center( - child: Text( - 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n')), - MaterialButton( - onPressed: () => checkPlayServices(true), - child: - const Text('Get PlayServices availability with fix dialog'), - color: Colors.redAccent, + ), + MaterialButton( + onPressed: () => checkPlayServices(true), + child: const Text( + 'Get PlayServices availability with fix dialog', ), - Center( - child: Text( - 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n')), - MaterialButton( - onPressed: () => makeGooglePlayServicesAvailable(), - child: const Text('Make Google Play Service available'), - color: Colors.red, + color: Colors.redAccent, + ), + Center( + child: Text( + 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n', ), - const SizedBox(height: 30), - MaterialButton( - onPressed: () => getErrorString(), - child: const Text('Get string of the error code'), - color: Colors.red, - ), - Center(child: Text('Error string: $_errorString\n')), - MaterialButton( - onPressed: () => isUserResolvable(), - child: const Text('Error resolvable by user'), - color: Colors.red, - ), - Center( - child: - Text('Error resolvable by user: $_isUserResolvable\n')), - MaterialButton( - onPressed: () => showErrorNotification(), - child: const Text('Show error notification'), - color: Colors.red, - ), - const SizedBox(height: 30), - MaterialButton( - onPressed: () => showErrorDialogFragment(), - child: const Text('Show error dialog fragment'), - color: Colors.red, - ), - Center( - child: - Text('Error dialog shown: $_errorDialogFragmentShown\n')), - ], - )), + ), + MaterialButton( + onPressed: () => makeGooglePlayServicesAvailable(), + child: const Text('Make Google Play Service available'), + color: Colors.red, + ), + const SizedBox(height: 30), + MaterialButton( + onPressed: () => getErrorString(), + child: const Text('Get string of the error code'), + color: Colors.red, + ), + Center(child: Text('Error string: $_errorString\n')), + MaterialButton( + onPressed: () => isUserResolvable(), + child: const Text('Error resolvable by user'), + color: Colors.red, + ), + Center( + child: Text('Error resolvable by user: $_isUserResolvable\n'), + ), + MaterialButton( + onPressed: () => showErrorNotification(), + child: const Text('Show error notification'), + color: Colors.red, + ), + const SizedBox(height: 30), + MaterialButton( + onPressed: () => showErrorDialogFragment(), + child: const Text('Show error dialog fragment'), + color: Colors.red, + ), + Center( + child: Text('Error dialog shown: $_errorDialogFragmentShown\n'), + ), + ], + ), + ), ); } } diff --git a/google_api_availability/lib/src/google_api_availability.dart b/google_api_availability/lib/src/google_api_availability.dart index a9baf8d..b9a7d73 100644 --- a/google_api_availability/lib/src/google_api_availability.dart +++ b/google_api_availability/lib/src/google_api_availability.dart @@ -20,8 +20,9 @@ class GoogleApiAvailability { /// /// Optionally, you can also show an error dialog if the connection status is /// not [SUCCESS]. - Future checkGooglePlayServicesAvailability( - [bool showDialogIfNecessary = false]) async { + Future checkGooglePlayServicesAvailability([ + bool showDialogIfNecessary = false, + ]) async { if (GoogleApiAvailabilityPlatform.instance == null) { throw UnsupportedError('This platform is not supported.'); } diff --git a/google_api_availability/test/google_api_availability_test.dart b/google_api_availability/test/google_api_availability_test.dart index 70b642d..dc067de 100644 --- a/google_api_availability/test/google_api_availability_test.dart +++ b/google_api_availability/test/google_api_availability_test.dart @@ -23,194 +23,196 @@ void main() { }); group('checkGooglePlayServicesAvailability', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.checkGooglePlayServicesAvailability, - throwsA(isA()), - ); - }); - - test('Should receive the corresponding $GooglePlayServicesAvailability', - () async { - // Arrange. - const availability = GooglePlayServicesAvailability.serviceDisabled; - - when(() => googleApiAvailabilityPlatform - .checkGooglePlayServicesAvailability()) - .thenAnswer((_) async => availability); - - // Act. - final googlePlayServiceAvailability = - await googleApiAvailability.checkGooglePlayServicesAvailability(); - - // Assert. - expect( - googlePlayServiceAvailability, - availability, - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.checkGooglePlayServicesAvailability, + throwsA(isA()), + ); + }, + ); + + test( + 'Should receive the corresponding $GooglePlayServicesAvailability', + () async { + // Arrange. + const availability = GooglePlayServicesAvailability.serviceDisabled; + + when( + () => googleApiAvailabilityPlatform + .checkGooglePlayServicesAvailability(), + ).thenAnswer((_) async => availability); + + // Act. + final googlePlayServiceAvailability = + await googleApiAvailability.checkGooglePlayServicesAvailability(); + + // Assert. + expect(googlePlayServiceAvailability, availability); + }, + ); }); group('makeGooglePlayServicesAvailable', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.makeGooglePlayServicesAvailable, - throwsA(isA()), - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.makeGooglePlayServicesAvailable, + throwsA(isA()), + ); + }, + ); }); group('getErrorString', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.getErrorString, - throwsA(isA()), - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.getErrorString, + throwsA(isA()), + ); + }, + ); test('Should receive the corresponding error string', () async { // Arrange. const expectedErrorString = 'test_error_string'; - when(() => googleApiAvailabilityPlatform.getErrorString()) - .thenAnswer((_) async => expectedErrorString); + when( + () => googleApiAvailabilityPlatform.getErrorString(), + ).thenAnswer((_) async => expectedErrorString); // Act. final errorString = await const GoogleApiAvailability.private().getErrorString(); // Assert. - expect( - errorString, - expectedErrorString, - ); + expect(errorString, expectedErrorString); }); }); group('isUserResolvable', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.isUserResolvable, - throwsA(isA()), - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.isUserResolvable, + throwsA(isA()), + ); + }, + ); test('Should receive true if the user is resolvable', () async { // Arrange. const expectedIsUserResolvable = true; - when(() => googleApiAvailabilityPlatform.isUserResolvable()) - .thenAnswer((_) async => expectedIsUserResolvable); + when( + () => googleApiAvailabilityPlatform.isUserResolvable(), + ).thenAnswer((_) async => expectedIsUserResolvable); // Act. final isUserResolvable = await googleApiAvailability.isUserResolvable(); // Assert. - expect( - isUserResolvable, - expectedIsUserResolvable, - ); + expect(isUserResolvable, expectedIsUserResolvable); }); test('Should receive false if the user is not resolvable', () async { // Arrange. const expectedIsUserResolvable = false; - when(() => googleApiAvailabilityPlatform.isUserResolvable()) - .thenAnswer((_) async => expectedIsUserResolvable); + when( + () => googleApiAvailabilityPlatform.isUserResolvable(), + ).thenAnswer((_) async => expectedIsUserResolvable); // Act. final isUserResolvable = await googleApiAvailability.isUserResolvable(); // Assert. - expect( - isUserResolvable, - expectedIsUserResolvable, - ); + expect(isUserResolvable, expectedIsUserResolvable); }); }); group('showErrorNotification', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.showErrorNotification, - throwsA(isA()), - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.showErrorNotification, + throwsA(isA()), + ); + }, + ); }); group('showErrorDialogFragment', () { - test('Should throw if no platform implementation is registered', - () async { - // Arrange. - GoogleApiAvailabilityPlatform.removeInstance(); - - // Act & Assert. - expect( - googleApiAvailability.showErrorDialogFragment, - throwsA(isA()), - ); - }); + test( + 'Should throw if no platform implementation is registered', + () async { + // Arrange. + GoogleApiAvailabilityPlatform.removeInstance(); + + // Act & Assert. + expect( + googleApiAvailability.showErrorDialogFragment, + throwsA(isA()), + ); + }, + ); test('Should receive false when dialog should not be shown', () async { // Arrange. const expectedShowDialogFragment = false; - when(() => googleApiAvailabilityPlatform.showErrorDialogFragment()) - .thenAnswer((_) async => expectedShowDialogFragment); + when( + () => googleApiAvailabilityPlatform.showErrorDialogFragment(), + ).thenAnswer((_) async => expectedShowDialogFragment); // Act. final showErrorDialogFragment = await googleApiAvailability.showErrorDialogFragment(); // Assert. - expect( - expectedShowDialogFragment, - showErrorDialogFragment, - ); + expect(expectedShowDialogFragment, showErrorDialogFragment); }); test('Should receive true when dialog should be shown', () async { // Arrange. const expectedShowDialogFragment = true; - when(() => googleApiAvailabilityPlatform.showErrorDialogFragment()) - .thenAnswer((_) async => expectedShowDialogFragment); + when( + () => googleApiAvailabilityPlatform.showErrorDialogFragment(), + ).thenAnswer((_) async => expectedShowDialogFragment); // Act. final showErrorDialogFragment = await googleApiAvailability.showErrorDialogFragment(); // Assert. - expect( - expectedShowDialogFragment, - showErrorDialogFragment, - ); + expect(expectedShowDialogFragment, showErrorDialogFragment); }); }); }); diff --git a/google_api_availability_android/example/lib/main.dart b/google_api_availability_android/example/lib/main.dart index aa4ca7c..be22fd5 100644 --- a/google_api_availability_android/example/lib/main.dart +++ b/google_api_availability_android/example/lib/main.dart @@ -131,64 +131,68 @@ class _MyAppState extends State { Widget build(BuildContext context) { return MaterialApp( home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - ), - body: ListView( - children: [ - MaterialButton( - onPressed: () => checkPlayServices(), - color: Colors.red, - child: const Text('Get PlayServices availability'), + appBar: AppBar(title: const Text('Plugin example app')), + body: ListView( + children: [ + MaterialButton( + onPressed: () => checkPlayServices(), + color: Colors.red, + child: const Text('Get PlayServices availability'), + ), + Center( + child: Text( + 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n', ), - Center( - child: Text( - 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n')), - MaterialButton( - onPressed: () => checkPlayServices(true), - color: Colors.redAccent, - child: - const Text('Get PlayServices availability with fix dialog'), + ), + MaterialButton( + onPressed: () => checkPlayServices(true), + color: Colors.redAccent, + child: const Text( + 'Get PlayServices availability with fix dialog', ), - Center( - child: Text( - 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n')), - MaterialButton( - onPressed: () => makeGooglePlayServicesAvailable(), - color: Colors.red, - child: const Text('Make Google Play Service available'), + ), + Center( + child: Text( + 'Google Play Store status: ${_playStoreAvailability.toString().split('.').last}\n', ), - const SizedBox(height: 30), - MaterialButton( - onPressed: () => getErrorString(), - color: Colors.red, - child: const Text('Get string of the error code'), - ), - Center(child: Text('Error string: $_errorString\n')), - MaterialButton( - onPressed: () => isUserResolvable(), - color: Colors.red, - child: const Text('Error resolvable by user'), - ), - Center( - child: - Text('Error resolvable by user: $_isUserResolvable\n')), - MaterialButton( - onPressed: () => showErrorNotification(), - color: Colors.red, - child: const Text('Show error notification'), - ), - const SizedBox(height: 30), - MaterialButton( - onPressed: () => showErrorDialogFragment(), - color: Colors.red, - child: const Text('Show error dialog fragment'), - ), - Center( - child: - Text('Error dialog shown: $_errorDialogFragmentShown\n')), - ], - )), + ), + MaterialButton( + onPressed: () => makeGooglePlayServicesAvailable(), + color: Colors.red, + child: const Text('Make Google Play Service available'), + ), + const SizedBox(height: 30), + MaterialButton( + onPressed: () => getErrorString(), + color: Colors.red, + child: const Text('Get string of the error code'), + ), + Center(child: Text('Error string: $_errorString\n')), + MaterialButton( + onPressed: () => isUserResolvable(), + color: Colors.red, + child: const Text('Error resolvable by user'), + ), + Center( + child: Text('Error resolvable by user: $_isUserResolvable\n'), + ), + MaterialButton( + onPressed: () => showErrorNotification(), + color: Colors.red, + child: const Text('Show error notification'), + ), + const SizedBox(height: 30), + MaterialButton( + onPressed: () => showErrorDialogFragment(), + color: Colors.red, + child: const Text('Show error dialog fragment'), + ), + Center( + child: Text('Error dialog shown: $_errorDialogFragmentShown\n'), + ), + ], + ), + ), ); } } diff --git a/google_api_availability_android/lib/src/google_api_availability_android.dart b/google_api_availability_android/lib/src/google_api_availability_android.dart index a5537ce..4c1953d 100644 --- a/google_api_availability_android/lib/src/google_api_availability_android.dart +++ b/google_api_availability_android/lib/src/google_api_availability_android.dart @@ -5,7 +5,8 @@ import 'package:google_api_availability_platform_interface/google_api_availabili /// An Android implementation of [GoogleApiAvailabilityPlatform] that used method channels. class GoogleApiAvailabilityAndroid extends GoogleApiAvailabilityPlatform { static const MethodChannel _methodChannel = MethodChannel( - 'flutter.baseflow.com/google_api_availability_android/methods'); + 'flutter.baseflow.com/google_api_availability_android/methods', + ); /// Registers this class as the default instance of [GoogleApiAvailabilityPlatform]. static void registerWith() { @@ -17,8 +18,9 @@ class GoogleApiAvailabilityAndroid extends GoogleApiAvailabilityPlatform { /// Optionally, you can also show an error dialog if the connection status is /// not [GooglePlayServicesAvailability.success]. @override - Future checkGooglePlayServicesAvailability( - [bool showDialogIfNecessary = false]) async { + Future checkGooglePlayServicesAvailability([ + bool showDialogIfNecessary = false, + ]) async { final availability = await _methodChannel.invokeMethod( 'checkPlayServicesAvailability', {'showDialog': showDialogIfNecessary}, @@ -57,8 +59,9 @@ class GoogleApiAvailabilityAndroid extends GoogleApiAvailabilityPlatform { /// Determines whether an error can be resolved via user action. @override Future isUserResolvable() async { - final isUserResolvable = - await _methodChannel.invokeMethod('isUserResolvable'); + final isUserResolvable = await _methodChannel.invokeMethod( + 'isUserResolvable', + ); if (isUserResolvable == null) { return false; @@ -84,8 +87,9 @@ class GoogleApiAvailabilityAndroid extends GoogleApiAvailabilityPlatform { /// non-[ConnectionResult] value. Returns false otherwise. @override Future showErrorDialogFragment() async { - final showErrorDialogFragment = - await _methodChannel.invokeMethod('showErrorDialogFragment'); + final showErrorDialogFragment = await _methodChannel.invokeMethod( + 'showErrorDialogFragment', + ); if (showErrorDialogFragment == null) { return false; diff --git a/google_api_availability_android/test/google_api_availability_android_test.dart b/google_api_availability_android/test/google_api_availability_android_test.dart index f71faff..11fb5d8 100644 --- a/google_api_availability_android/test/google_api_availability_android_test.dart +++ b/google_api_availability_android/test/google_api_availability_android_test.dart @@ -8,87 +8,98 @@ void main() { TestWidgetsFlutterBinding.ensureInitialized(); group('checkGooglePlayServiceAvailability', () { - test('Should receive the corresponding GooglePlayServiceAvailability', - () async { - // Arrange - const availability = GooglePlayServicesAvailability.serviceDisabled; - - MethodChannelMock( - channelName: - 'flutter.baseflow.com/google_api_availability_android/methods', - method: 'checkPlayServicesAvailability', - result: availability.value, - ); - - // Act - final googlePlayServiceAvailability = await GoogleApiAvailabilityAndroid() - .checkGooglePlayServicesAvailability(); - - // Assert - expect(googlePlayServiceAvailability, availability); - }); - test( - 'Should receive GooglePlayServiceAvailability.unknown when availability is null', - () async { - // Arrange - const availability = null; + 'Should receive the corresponding GooglePlayServiceAvailability', + () async { + // Arrange + const availability = GooglePlayServicesAvailability.serviceDisabled; + + MethodChannelMock( + channelName: + 'flutter.baseflow.com/google_api_availability_android/methods', + method: 'checkPlayServicesAvailability', + result: availability.value, + ); + + // Act + final googlePlayServiceAvailability = + await GoogleApiAvailabilityAndroid() + .checkGooglePlayServicesAvailability(); + + // Assert + expect(googlePlayServiceAvailability, availability); + }, + ); - MethodChannelMock( - channelName: - 'flutter.baseflow.com/google_api_availability_android/methods', - method: 'checkPlayServicesAvailability', - result: availability, - ); - - // Act - final googlePlayServiceAvailability = await GoogleApiAvailabilityAndroid() - .checkGooglePlayServicesAvailability(); - - // Assert - expect(googlePlayServiceAvailability, - GooglePlayServicesAvailability.unknown); - }); + test( + 'Should receive GooglePlayServiceAvailability.unknown when availability is null', + () async { + // Arrange + const availability = null; + + MethodChannelMock( + channelName: + 'flutter.baseflow.com/google_api_availability_android/methods', + method: 'checkPlayServicesAvailability', + result: availability, + ); + + // Act + final googlePlayServiceAvailability = + await GoogleApiAvailabilityAndroid() + .checkGooglePlayServicesAvailability(); + + // Assert + expect( + googlePlayServiceAvailability, + GooglePlayServicesAvailability.unknown, + ); + }, + ); }); group('getErrorString', () { - test('Should receive "ErrorString is null" when availability is null', - () async { - // Arrange - const errorString = null; - - MethodChannelMock( - channelName: - 'flutter.baseflow.com/google_api_availability_android/methods', - method: 'getErrorString', - result: errorString, - ); - - // Act - final errorStringResult = - await GoogleApiAvailabilityAndroid().getErrorString(); - - //Assert - expect(errorStringResult, "ErrorString is null"); - }); - test( - 'Should receive ${GooglePlayServicesAvailability.success} when connection status is success', - () async { - // Arrange - MethodChannelMock( - channelName: - 'flutter.baseflow.com/google_api_availability_android/methods', - method: 'getErrorString', - result: "SUCCESS", - ); + 'Should receive "ErrorString is null" when availability is null', + () async { + // Arrange + const errorString = null; + + MethodChannelMock( + channelName: + 'flutter.baseflow.com/google_api_availability_android/methods', + method: 'getErrorString', + result: errorString, + ); + + // Act + final errorStringResult = + await GoogleApiAvailabilityAndroid().getErrorString(); + + //Assert + expect(errorStringResult, "ErrorString is null"); + }, + ); - // Act - final errorString = await GoogleApiAvailabilityAndroid().getErrorString(); - - // Assert - expect(errorString, "SUCCESS"); - }); + test( + 'Should receive ${GooglePlayServicesAvailability.success} when connection status is success', + () async { + // Arrange + MethodChannelMock( + channelName: + 'flutter.baseflow.com/google_api_availability_android/methods', + method: 'getErrorString', + result: "SUCCESS", + ); + + // Act + final errorString = + await GoogleApiAvailabilityAndroid().getErrorString(); + + // Assert + expect(errorString, "SUCCESS"); + }, + ); }); group('isUserResolvable', () { diff --git a/google_api_availability_android/test/method_channel_mock.dart b/google_api_availability_android/test/method_channel_mock.dart index 2b5da96..77e4671 100644 --- a/google_api_availability_android/test/method_channel_mock.dart +++ b/google_api_availability_android/test/method_channel_mock.dart @@ -19,8 +19,10 @@ class MethodChannelMock { Future _handler(MethodCall methodCall) async { if (methodCall.method != method) { - throw MissingPluginException('No implementation found for method ' - '$method on channel ${methodChannel.name}'); + throw MissingPluginException( + 'No implementation found for method ' + '$method on channel ${methodChannel.name}', + ); } return Future.delayed(delay, () {