Apply feedback from PR

flutter · Feb 8, 2022 · a45e70c · a45e70c
1 parent 0c507df
commit a45e70c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 24 deletions.
diff --git a/packages/quick_actions/quick_actions_ios/README.md b/packages/quick_actions/quick_actions_ios/README.md
@@ -1,6 +1,6 @@
 # quick\_actions\_ios
 
-The Android implementation of [`quick_actions`][1].
+The iOS implementation of [`quick_actions`][1].
 
 ## Usage
 

diff --git a/packages/quick_actions/quick_actions_ios/example/integration_test/quick_actions_test.dart b/packages/quick_actions/quick_actions_ios/example/integration_test/quick_actions_test.dart
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:quick_actions_ios/quick_actions_ios.dart';
@@ -12,7 +11,7 @@ void main() {
 
   testWidgets('Can set shortcuts', (WidgetTester tester) async {
     final QuickActionsIos quickActions = QuickActionsIos();
-    await quickActions.initialize(null);
+    await quickActions.initialize((String value){});
 
     const ShortcutItem shortCutItem = ShortcutItem(
       type: 'action_one',

diff --git a/packages/quick_actions/quick_actions_ios/example/lib/main.dart b/packages/quick_actions/quick_actions_ios/example/lib/main.dart
@@ -48,19 +48,11 @@ class _MyHomePageState extends State<MyHomePage> {
     });
 
     quickActions.setShortcutItems(<ShortcutItem>[
-      // NOTE: This first action icon will only work on iOS.
-      // In a real world project keep the same file name for both platforms.
       const ShortcutItem(
         type: 'action_one',
         localizedTitle: 'Action one',
         icon: 'AppIcon',
       ),
-      // NOTE: This second action icon will only work on Android.
-      // In a real world project keep the same file name for both platforms.
-      const ShortcutItem(
-          type: 'action_two',
-          localizedTitle: 'Action two',
-          icon: 'ic_launcher'),
     ]).then((void _) {
       setState(() {
         if (shortcut == 'no action set') {

diff --git a/packages/quick_actions/quick_actions_ios/example/pubspec.yaml b/packages/quick_actions/quick_actions_ios/example/pubspec.yaml
@@ -11,19 +11,17 @@ dependencies:
     sdk: flutter
   quick_actions_ios:
     # When depending on this package from a real application you should use:
-    #   quick_actions: ^x.y.z
+    #   quick_actions_ios: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
 
 dev_dependencies:
-  espresso: ^0.1.0+2
   flutter_driver:
     sdk: flutter
   integration_test:
     sdk: flutter
-  pedantic: ^1.10.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/quick_actions/quick_actions_ios/example/test_driver/integration_test.dart b/packages/quick_actions/quick_actions_ios/example/test_driver/integration_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart=2.9
-
 import 'package:integration_test/integration_test_driver.dart';
 
 Future<void> main() => integrationDriver();
diff --git a/packages/quick_actions/quick_actions_ios/ios/Classes/FLTQuickActionsPlugin.m b/packages/quick_actions/quick_actions_ios/ios/Classes/FLTQuickActionsPlugin.m
@@ -4,7 +4,7 @@
 
 #import "FLTQuickActionsPlugin.h"
 
-static NSString *const CHANNEL_NAME = @"plugins.flutter.io/quick_actions_ios";
+static NSString *const kChannelName = @"plugins.flutter.io/quick_actions_ios";
 
 @interface FLTQuickActionsPlugin ()
 @property(nonatomic, retain) FlutterMethodChannel *channel;
@@ -15,7 +15,7 @@ @implementation FLTQuickActionsPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   FlutterMethodChannel *channel =
-      [FlutterMethodChannel methodChannelWithName:CHANNEL_NAME
+      [FlutterMethodChannel methodChannelWithName:kChannelName
                                   binaryMessenger:[registrar messenger]];
   FLTQuickActionsPlugin *instance = [[FLTQuickActionsPlugin alloc] init];
   instance.channel = channel;

diff --git a/packages/quick_actions/quick_actions_ios/lib/quick_actions_ios.dart b/packages/quick_actions/quick_actions_ios/lib/quick_actions_ios.dart
@@ -11,7 +11,7 @@ export 'package:quick_actions_platform_interface/types/types.dart';
 const MethodChannel _channel =
     MethodChannel('plugins.flutter.io/quick_actions_ios');
 
-/// An implementation of [QuickActionsPlatform] that for iOS.
+/// An implementation of [QuickActionsPlatform] for iOS.
 class QuickActionsIos extends QuickActionsPlatform {
   /// Registers this class as the default instance of [QuickActionsPlatform].
   static void registerWith() {

diff --git a/packages/quick_actions/quick_actions_ios/pubspec.yaml b/packages/quick_actions/quick_actions_ios/pubspec.yaml
@@ -27,6 +27,5 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   mockito: ^5.0.0
-  pedantic: ^1.11.0
   plugin_platform_interface: ^2.1.2
 
diff --git a/script/configs/exclude_all_plugins_app.yaml b/script/configs/exclude_all_plugins_app.yaml
@@ -8,7 +8,3 @@
 
 # This is a permament entry, as it should never be a direct app dependency.
 - plugin_platform_interface
-# TODO(mvanbeusekom): Remove the exclusion of the quick_actions_ios once the 
-#                     native implementation is removed from the quick_actions 
-#                     package.
-- quick_actions_ios