Skip to content

Commit

Permalink
Merge branch 'master' into patched
Browse files Browse the repository at this point in the history
* master: (69 commits)
  [google_maps_flutter_platform_interface] Adds support for holes in polygon overlays to the Google Maps plugin (flutter#3135)
  [camera] Add iOS and Android implementations for managing auto focus. (flutter#3370)
  [camera] Implemented ImageStream ImageFormat setting for Dart and Android (flutter#3359)
  Sync the PR template to the new style (flutter#3397)
  [battery] Migrate battery_plugin_interface to null safety (flutter#3366)
  Ignore deprecated_member_use analysis lint (flutter#3400)
  fix version (flutter#3399)
  Update obsolete button refs in plugin examples (flutter#3395)
  [in_app_purchase] Added serviceTimeout code (flutter#3287)
  [image_picker] Update README.md  (flutter#3098)
  [camera] set useAutoFocus to true by default (flutter#3396)
  [camera_platform_interface] Add platform interface methods for locking capture orientation. (flutter#3389)
  [camera_platform_interface] Add platform interface methods for setting auto focus. (flutter#3369)
  [camera] disable auto focus when using front facing camera on Android (flutter#3383)
  [camera] Fixed stale images in imageStream subscriptions (flutter#3344)
  [camera_platform_interface] Added imageFormatGroup to initialize (flutter#3364)
  Added closeCaptureSession() to stopVideoRecording in Camera.java to fix an Android 6 crash (flutter#3336)
  [camera] Add iOS and Android implementations for managing auto exposure. (flutter#3346)
  Change platform interface dependency (flutter#3377)
  Update camera_platform_interface to 1.2.0 (flutter#3376)
  ...

# Conflicts:
#	packages/webview_flutter/lib/src/webview_method_channel.dart
  • Loading branch information
Jeremy committed Jan 13, 2021
2 parents 804f965 + a0e7937 commit 48710ed
Show file tree
Hide file tree
Showing 382 changed files with 11,705 additions and 3,208 deletions.
14 changes: 14 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,16 @@ task:
- flutter channel $CHANNEL
- ./script/incremental_build.sh test
- name: analyze
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
script: ./script/incremental_build.sh analyze
- name: build_all_plugins_apk
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
script:
# TODO(jackson): Allow web plugins once supported on stable
# https://github.com/flutter/flutter/issues/42864
Expand Down Expand Up @@ -132,6 +140,7 @@ task:
osx_instance:
image: catalina-xcode-11.3.1-flutter
upgrade_script:
- sudo gem install cocoapods
- flutter channel stable
- flutter upgrade
- flutter channel master
Expand All @@ -143,6 +152,10 @@ task:
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
matrix:
- name: build_all_plugins_ipa
env:
matrix:
CHANNEL: "master"
CHANNEL: "stable"
script:
# TODO(jackson): Allow web plugins once supported on stable
# https://github.com/flutter/flutter/issues/42864
Expand Down Expand Up @@ -190,6 +203,7 @@ task:
setup_script:
- flutter config --enable-macos-desktop
upgrade_script:
- sudo gem install cocoapods
- flutter channel master
- flutter upgrade
- git fetch origin master
Expand Down
43 changes: 19 additions & 24 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,32 @@
## Description
*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.*

*Replace this paragraph with a description of what this PR is doing. If you're modifying existing behavior, describe the existing behavior, how this PR is changing it, and what motivated the change.*
*List which issues are fixed by this PR. You must list at least one issue.*

## Related Issues
*If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*

*Replace this paragraph with a list of issues related to this PR from the [issue database](https://github.com/flutter/flutter/issues). Indicate, which of these issues are resolved or fixed by this PR. Note that you'll have to prefix the issue numbers with flutter/flutter#.*

## Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
## Pre-launch Checklist

- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]).
- [ ] All existing and new tests are passing.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.
- [ ] I read and followed the [Flutter Style Guide].
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
- [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
- [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
- [ ] I listed at least one issue that this PR fixes in the description above.
- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
- [ ] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
- [ ] I updated CHANGELOG.md to add a description of the change.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] I signed the [CLA].
- [ ] I am willing to follow-up on review comments in a timely manner.

## Breaking Change

Does your PR require plugin users to manually update their apps to accommodate your change?
- [ ] All existing and new tests are passing.

- [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
- [ ] No, this is *not* a breaking change.
If you need help, consider asking for advice on the #hackers-new channel on [Discord].

<!-- Links -->
[issue database]: https://github.com/flutter/flutter/issues
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ Kazuki Yamaguchi <[email protected]>
Eitan Schwartz <[email protected]>
Chris Rutkowski <[email protected]>
Juan Alvarez <[email protected]>
Aleksandr Yurkovskiy <[email protected]>
9 changes: 4 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)

_See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
_See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_

## Things you will need

Expand Down Expand Up @@ -131,17 +131,16 @@ pub global run flutter_plugin_tools xctest --target RunnerUITests --skip <plugin
We gladly accept contributions via GitHub pull requests.

Please peruse our
[style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo) and
[design principles](https://flutter.io/design-principles/) before
working on anything non-trivial. These guidelines are intended to
[style guide](https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo)
before working on anything non-trivial. These guidelines are intended to
keep the code consistent and avoid common pitfalls.

To start working on a patch:

* `git fetch upstream`
* `git checkout upstream/master -b <name_of_your_branch>`
* Hack away.
* Verify changes with [flutter_plugin_tools](https://pub.dartlang.org/packages/flutter_plugin_tools)
* Verify changes with [flutter_plugin_tools](https://pub.dev/packages/flutter_plugin_tools)
```
pub global activate flutter_plugin_tools
pub global run flutter_plugin_tools format --plugins plugin_name
Expand Down
3 changes: 3 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ analyzer:
# Ignore generated files
- '**/*.g.dart'
- 'lib/src/generated/*.dart'
errors:
always_require_non_null_named_parameters: false # not needed with nnbd
unnecessary_null_comparison: false # Turned as long as nnbd mix-mode is supported.
linter:
rules:
- public_member_api_docs
12 changes: 12 additions & 0 deletions packages/android_alarm_manager/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 0.4.5+20

* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.

## 0.4.5+19

* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))

## 0.4.5+18

* Update Flutter SDK constraint.

## 0.4.5+17

* Update Dart SDK constraint in example.
Expand Down
8 changes: 4 additions & 4 deletions packages/android_alarm_manager/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# android_alarm_manager

[![pub package](https://img.shields.io/pub/v/android_alarm_manager.svg)](https://pub.dartlang.org/packages/android_alarm_manager)
[![pub package](https://img.shields.io/pub/v/android_alarm_manager.svg)](https://pub.dev/packages/android_alarm_manager)

A Flutter plugin for accessing the Android AlarmManager service, and running
Dart code in the background when alarms fire.
Expand Down Expand Up @@ -36,7 +36,7 @@ Next, within the `<application></application>` tags, add:
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>

Expand Down Expand Up @@ -121,6 +121,6 @@ register plugins. This can be resolved by running `flutter upgrade` to upgrade
to the latest Flutter version.**

For help getting started with Flutter, view our online
[documentation](http://flutter.io/).
[documentation](https://flutter.dev/).

For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
For help on editing plugin code, view the [documentation](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin).
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<meta-data
Expand Down
2 changes: 1 addition & 1 deletion packages/android_alarm_manager/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
),
],
),
RaisedButton(
ElevatedButton(
child: Text(
'Schedule OneShot Alarm',
),
Expand Down
4 changes: 2 additions & 2 deletions packages/android_alarm_manager/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Flutter plugin for accessing the Android AlarmManager service, and
# 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
# the version to 2.0.0.
# See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
version: 0.4.5+17
version: 0.4.5+20
homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager

dependencies:
Expand All @@ -25,4 +25,4 @@ flutter:

environment:
sdk: ">=2.1.0 <3.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0"
flutter: ">=1.12.13+hotfix.5"
16 changes: 16 additions & 0 deletions packages/android_intent/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 2.0.0-nullsafety.2

* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.

## 2.0.0-nullsafety.1

* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))

## 2.0.0-nullsafety

* Migrate to null safety.

## 0.3.7+8

* Update Flutter SDK constraint.

## 0.3.7+7

* Update Dart SDK constraint in example.
Expand Down
8 changes: 4 additions & 4 deletions packages/android_intent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ if (platform.isAndroid) {
Feel free to add support for additional Android intents.

The Dart values supported for the arguments parameter, and their corresponding
Android values, are listed [here](https://flutter.io/platform-channels/#codec).
Android values, are listed [here](https://flutter.dev/docs/development/platform-integration/platform-channels#codec).
On the Android side, the arguments are used to populate an Android `Bundle`
instance. This process currently restricts the use of lists to homogeneous lists
of integers or strings.

> Note that a similar method does not currently exist for iOS. Instead, the
[url_launcher](https://pub.dartlang.org/packages/url_launcher) plugin
[url_launcher](https://pub.dev/packages/url_launcher) plugin
can be used for deep linking. Url launcher can also be used for creating
ACTION_VIEW intents for Android, however this intent plugin also allows
clients to set extra parameters for the intent.

## Getting Started

For help getting started with Flutter, view our online
[documentation](http://flutter.io/).
[documentation](https://flutter.dev/).

For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
For help on editing plugin code, view the [documentation](https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin).
20 changes: 10 additions & 10 deletions packages/android_intent/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ class MyHomePage extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to set an alarm\non weekdays at 9:30pm.'),
onPressed: _createAlarm,
),
RaisedButton(
ElevatedButton(
child: const Text('Tap here to test explicit intents.'),
onPressed: () => _openExplicitIntentsView(context)),
],
Expand Down Expand Up @@ -166,40 +166,40 @@ class ExplicitIntentsWidget extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to display panorama\nimagery in Google Street View.'),
onPressed: _openGoogleMapsStreetView,
),
RaisedButton(
ElevatedButton(
child: const Text('Tap here to display\na map in Google Maps.'),
onPressed: _displayMapInGoogleMaps,
),
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to launch turn-by-turn\nnavigation in Google Maps.'),
onPressed: _launchTurnByTurnNavigationInGoogleMaps,
),
RaisedButton(
ElevatedButton(
child: const Text('Tap here to open link in Google Chrome.'),
onPressed: _openLinkInGoogleChrome,
),
RaisedButton(
ElevatedButton(
child: const Text('Tap here to start activity in new task.'),
onPressed: _startActivityInNewTask,
),
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to test explicit intent fallback to implicit.'),
onPressed: _testExplicitIntentFallback,
),
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to open Location Settings Configuration',
),
onPressed: _openLocationSettingsConfiguration,
),
RaisedButton(
ElevatedButton(
child: const Text(
'Tap here to open Application Details',
),
Expand Down
Loading

0 comments on commit 48710ed

Please sign in to comment.