Merge branch 'master' into image_picker-Fix-#41046

Author: Miguel Ruivo

.cirrus.yml

@@ -13,7 +13,9 @@ task:
   activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
-      script: ./script/check_publish.sh
+      script:
+        - flutter channel stable
+        - ./script/check_publish.sh
     - name: format
       install_script:
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -

packages/connectivity/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.5+4
+
+* Stability and Maintainability: update documentations.
+
 ## 0.4.5+3
 
 * Remove AndroidX warnings.

packages/connectivity/example/README.md

@@ -15,6 +15,7 @@ import 'package:meta/meta.dart';
 /// None: Device not connected to any network
 enum ConnectivityResult { wifi, mobile, none }
 
+/// Discover network connectivity configurations: Distinguish between WI-FI and cellular, check WI-FI status and more.
 class Connectivity {
   /// Constructs a singleton instance of [Connectivity].
   ///
@@ -35,11 +36,13 @@ class Connectivity {
 
   Stream<ConnectivityResult> _onConnectivityChanged;
 
+  /// Exposed for testing purposes and should not be used by users of the plugin.
   @visibleForTesting
   static const MethodChannel methodChannel = MethodChannel(
     'plugins.flutter.io/connectivity',
   );
 
+  /// Exposed for testing purposes and should not be used by users of the plugin.
   @visibleForTesting
   static const EventChannel eventChannel = EventChannel(
     'plugins.flutter.io/connectivity_status',

packages/connectivity/lib/connectivity.dart

@@ -3,7 +3,7 @@ description: Flutter plugin for discovering the state of the network (WiFi &
   mobile/cellular) connectivity on Android and iOS.
 author: Flutter Team <[email protected]>
 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
-version: 0.4.5+3
+version: 0.4.5+4
 
 flutter:
   plugin:

packages/connectivity/pubspec.yaml

@@ -2,6 +2,10 @@
 
 * iOS: Fixes an issue where picking conent from Gallery would result in a crash on iOS 13.
 
+## 0.6.1+11
+
+* Stability and Maintainability: update documentations, add unit tests.
+
 ## 0.6.1+10
 
 * iOS: Fix image orientation problems when scaling images.

packages/image_picker/CHANGELOG.md

@@ -5,8 +5,6 @@
 A Flutter plugin for iOS and Android for picking images from the image library,
 and taking new pictures with the camera.
 
-*Note*: This plugin is still under development, and some APIs might not be available yet. [Feedback welcome](https://github.com/flutter/flutter/issues) and [Pull Requests](https://github.com/flutter/plugins/pulls) are most welcome!
-
 ## Installation
 
 First, add `image_picker` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/).
@@ -67,7 +65,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
 ### Handling MainActivity destruction on Android
 
-Android system -- although very rarely -- sometimes kills the MainActivity after the image_picker finishes. When this happens, we lost the data selected from the image_picker. You can use `retrieveLostData` to retrieve the lost data in this situation. For example: 
+Android system -- although very rarely -- sometimes kills the MainActivity after the image_picker finishes. When this happens, we lost the data selected from the image_picker. You can use `retrieveLostData` to retrieve the lost data in this situation. For example:
 
 ```dart
 Future<void> retrieveLostData() async {

packages/image_picker/README.md

@@ -20,6 +20,8 @@ enum ImageSource {
   gallery,
 }
 
+/// Provides an easy way to pick an image/video from the image library,
+/// or to take a picture/video with the camera.
 class ImagePicker {
   static const MethodChannel _channel =
       MethodChannel('plugins.flutter.io/image_picker');

packages/image_picker/lib/image_picker.dart

@@ -143,6 +143,33 @@ void main() {
       });
     });
 
+    group('#pickVideo', () {
+      test('passes the image source argument correctly', () async {
+        await ImagePicker.pickVideo(source: ImageSource.camera);
+        await ImagePicker.pickVideo(source: ImageSource.gallery);
+
+        expect(
+          log,
+          <Matcher>[
+            isMethodCall('pickVideo', arguments: <String, dynamic>{
+              'source': 0,
+            }),
+            isMethodCall('pickVideo', arguments: <String, dynamic>{
+              'source': 1,
+            }),
+          ],
+        );
+      });
+
+      test('handles a null image path response gracefully', () async {
+        channel.setMockMethodCallHandler((MethodCall methodCall) => null);
+
+        expect(
+            await ImagePicker.pickVideo(source: ImageSource.gallery), isNull);
+        expect(await ImagePicker.pickVideo(source: ImageSource.camera), isNull);
+      });
+    });
+
     group('#retrieveLostData', () {
       test('retrieveLostData get success response', () async {
         channel.setMockMethodCallHandler((MethodCall methodCall) async {

packages/image_picker/test/image_picker_test.dart

@@ -1,3 +1,9 @@
+## 0.3.3
+
+* Support Android V2 embedding.
+* Add e2e tests.
+* Migrate to using the new e2e test binding.
+
 ## 0.3.2+4
 
 * Remove AndroidX warnings.
@@ -7,6 +13,7 @@
 * Define clang module for iOS.
 
 ## 0.3.2+2
+
 * Fix bug that would make the shortcut not open on Android.
 * Report shortcut used on Android.
 * Improves example.
@@ -17,7 +24,7 @@
 
 ## 0.3.2
 
-* Fixed the quick actions launch on Android when the app is killed. 
+* Fixed the quick actions launch on Android when the app is killed.
 
 ## 0.3.1
 

packages/quick_actions/CHANGELOG.md

@@ -32,3 +32,28 @@ android {
         disable 'InvalidPackage'
     }
 }
+
+afterEvaluate {
+    def containsEmbeddingDependencies = false
+    for (def configuration : configurations.all) {
+        for (def dependency : configuration.dependencies) {
+            if (dependency.group == 'io.flutter' &&
+                dependency.name.startsWith('flutter_embedding') &&
+                dependency.isTransitive())
+            {
+                containsEmbeddingDependencies = true
+                break
+            }
+        }
+    }
+    if (!containsEmbeddingDependencies) {
+        android {
+            dependencies {
+                def lifecycle_version = "1.1.1"
+                compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
+            }
+        }
+    }
+}

packages/quick_actions/android/build.gradle

@@ -0,0 +1,131 @@
+// 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.quickactions;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
+
+  private static final String CHANNEL_ID = "plugins.flutter.io/quick_actions";
+  private static final String EXTRA_ACTION = "some unique action key";
+
+  private final Context context;
+  private Activity activity;
+
+  MethodCallHandlerImpl(Context context, Activity activity) {
+    this.context = context;
+    this.activity = activity;
+  }
+
+  void setActivity(Activity activity) {
+    this.activity = activity;
+  }
+
+  @Override
+  public void onMethodCall(MethodCall call, MethodChannel.Result result) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
+      // We already know that this functionality does not work for anything
+      // lower than API 25 so we chose not to return error. Instead we do nothing.
+      result.success(null);
+      return;
+    }
+    ShortcutManager shortcutManager =
+        (ShortcutManager) context.getSystemService(Context.SHORTCUT_SERVICE);
+    switch (call.method) {
+      case "setShortcutItems":
+        List<Map<String, String>> serializedShortcuts = call.arguments();
+        List<ShortcutInfo> shortcuts = deserializeShortcuts(serializedShortcuts);
+        shortcutManager.setDynamicShortcuts(shortcuts);
+        break;
+      case "clearShortcutItems":
+        shortcutManager.removeAllDynamicShortcuts();
+        break;
+      case "getLaunchAction":
+        if (activity == null) {
+          result.error(
+              "quick_action_getlaunchaction_no_activity",
+              "There is no activity available when launching action",
+              null);
+          return;
+        }
+        final Intent intent = activity.getIntent();
+        final String launchAction = intent.getStringExtra(EXTRA_ACTION);
+        if (launchAction != null && !launchAction.isEmpty()) {
+          shortcutManager.reportShortcutUsed(launchAction);
+          intent.removeExtra(EXTRA_ACTION);
+        }
+        result.success(launchAction);
+        return;
+      default:
+        result.notImplemented();
+        return;
+    }
+    result.success(null);
+  }
+
+  @TargetApi(Build.VERSION_CODES.N_MR1)
+  private List<ShortcutInfo> deserializeShortcuts(List<Map<String, String>> shortcuts) {
+    final List<ShortcutInfo> shortcutInfos = new ArrayList<>();
+
+    for (Map<String, String> shortcut : shortcuts) {
+      final String icon = shortcut.get("icon");
+      final String type = shortcut.get("type");
+      final String title = shortcut.get("localizedTitle");
+      final ShortcutInfo.Builder shortcutBuilder = new ShortcutInfo.Builder(context, type);
+
+      final int resourceId = loadResourceId(context, icon);
+      final Intent intent = getIntentToOpenMainActivity(type);
+
+      if (resourceId > 0) {
+        shortcutBuilder.setIcon(Icon.createWithResource(context, resourceId));
+      }
+
+      final ShortcutInfo shortcutInfo =
+          shortcutBuilder.setLongLabel(title).setShortLabel(title).setIntent(intent).build();
+      shortcutInfos.add(shortcutInfo);
+    }
+    return shortcutInfos;
+  }
+
+  private int loadResourceId(Context context, String icon) {
+    if (icon == null) {
+      return 0;
+    }
+    final String packageName = context.getPackageName();
+    final Resources res = context.getResources();
+    final int resourceId = res.getIdentifier(icon, "drawable", packageName);
+
+    if (resourceId == 0) {
+      return res.getIdentifier(icon, "mipmap", packageName);
+    } else {
+      return resourceId;
+    }
+  }
+
+  private Intent getIntentToOpenMainActivity(String type) {
+    final String packageName = context.getPackageName();
+
+    return context
+        .getPackageManager()
+        .getLaunchIntentForPackage(packageName)
+        .setAction(Intent.ACTION_RUN)
+        .putExtra(EXTRA_ACTION, type)
+        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+  }
+}