From 8c7eb2b9be1c1357b103ff4d87bc5cc918610009 Mon Sep 17 00:00:00 2001 From: John Ryan Date: Mon, 14 Oct 2019 14:51:29 -0700 Subject: [PATCH 1/8] use site.custom instead of custom for dartpad URL (#3102) fixes #3098 --- src/docs/codelabs/layout-basics.md | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/docs/codelabs/layout-basics.md b/src/docs/codelabs/layout-basics.md index 4430db27d0..b935b3ef58 100644 --- a/src/docs/codelabs/layout-basics.md +++ b/src/docs/codelabs/layout-basics.md @@ -51,7 +51,7 @@ and `Column` lays out its widgets vertically. {% comment %} Gist: https://gist.github.com/4e11c4a7ec824685f963f25d7c30ba0b {% endcomment %} - + ## Axis size and alignment @@ -103,7 +103,7 @@ The `mainAxisSize` property has two possible values: {% comment %} Gist: https://gist.github.com/d852e4f07d6c87600fe8e0f186c7a31b {% endcomment %} - + ### mainAxisAlignment property @@ -152,7 +152,7 @@ can position their children in that extra space. {% comment %} Gist: https://gist.github.com/cb8abed13f90a6a0c7a0ada6f15a09c9 {% endcomment %} - + {{site.alert.tip}} Before moving to the next section, change `MainAxisAlignment.end` to another value. @@ -209,7 +209,7 @@ The `crossAxisAlignment` property has five possible values: {% comment %} Gist: https://gist.github.com/70a6eb88f13019eec349a57bc4fd5fe0 {% endcomment %} - + {{site.alert.tip}} Before moving to the next section, change `CrossAxisAlignment.start` to another value. @@ -265,7 +265,7 @@ the widgets are resized according to their {% comment %} Gist: https://gist.github.com/ba0f40356d1023066d960f6de2be1a4b {% endcomment %} - + #### Example: Testing flex values {:.no_toc} @@ -295,7 +295,7 @@ the widgets are resized according to their {% comment %} Gist: https://gist.github.com/82e4dd24028034ae03ba0ddc71bf59e5 {% endcomment %} - + {{site.alert.tip}} Before moving to the next example, try changing the `flex` properties to other values, @@ -338,7 +338,7 @@ wrap a widget and force the widget to fill extra space. {% comment %} Gist: https://gist.github.com/77021d2ed15f9ece850de15e73c47526 {% endcomment %} - + ## SizedBox widget @@ -364,7 +364,7 @@ create empty space. {% comment %} Gist: https://gist.github.com/6582851e85b57180ff5321f814fabb81 {% endcomment %} - + #### Example: Creating space {:.no_toc} @@ -384,7 +384,7 @@ create empty space. {% comment %} Gist: https://gist.github.com/datafoya/19ead147ab5c7668d7d32e1cfed90097 {% endcomment %} - + ## Spacer widget @@ -413,7 +413,7 @@ can create space between widgets. {% comment %} Gist: https://gist.github.com/datafoya/bfc367aefde35e02ea5283efdbf58e60 {% endcomment %} - + ## Text widget @@ -436,7 +436,7 @@ for different fonts, sizes, and colors. {% comment %} Gist: https://gist.github.com/datafoya/0ff109090b99ef1873d9fad501b2bc86 {% endcomment %} - + ## Icon widget @@ -463,7 +463,7 @@ Flutter is preloaded with icon packages for {% comment %} Gist: https://gist.github.com/datafoya/01688fca8c13f85d93078054af2e858b {% endcomment %} - + ## Image widget @@ -495,7 +495,7 @@ the following example uses an image from the network. {% comment %} Gist: https://gist.github.com/datafoya/b6f3084800bd139cdb522b8858bb58b7 {% endcomment %} - + ## Putting it all together @@ -563,7 +563,7 @@ which are positioned below the contact information. {% comment %} Gist: https://gist.github.com/datafoya/30ccbe0fcf31cc10eafba3aea8ff0697 {% endcomment %} - + #### Exercise: Wrap the Column in a Row {:.no_toc} @@ -604,7 +604,7 @@ which are positioned below the contact information. {% comment %} Gist: https://gist.github.com/datafoya/95dcc1451aea8412669c41eb8a1a5f23 {% endcomment %} - + ### Part 2 {:.no_toc} @@ -649,7 +649,7 @@ which are positioned below the contact information. {% comment %} Gist: https://gist.github.com/datafoya/c3ac34ed8952724a0ecb0af1445c2af8 {% endcomment %} - + #### Exercise: Enter contact information {:.no_toc} @@ -672,7 +672,7 @@ which are positioned below the contact information. {% comment %} Gist: https://gist.github.com/datafoya/c5be61116652927c5d92262fce1b5360 {% endcomment %} - + ### Part 3 {:.no_toc} @@ -693,7 +693,7 @@ which are positioned below the contact information. {% comment %} Gist: https://gist.github.com/datafoya/dae36611fc9af04c4b9d0fbc3429275e {% endcomment %} - + ## What's next? From 12147edbf3d22a05950cfbbe1e68fc6506209598 Mon Sep 17 00:00:00 2001 From: digitaljoni Date: Wed, 16 Oct 2019 00:02:31 +0800 Subject: [PATCH 2/8] Swift and Kotlin is the default for flutter create (#3105) --- .../packages-and-plugins/developing-packages.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/docs/development/packages-and-plugins/developing-packages.md b/src/docs/development/packages-and-plugins/developing-packages.md index 5cf210ee3f..22979bc345 100644 --- a/src/docs/development/packages-and-plugins/developing-packages.md +++ b/src/docs/development/packages-and-plugins/developing-packages.md @@ -91,19 +91,19 @@ specialized content: * `lib/hello.dart`: - The Dart API for the plugin. -* android/src/main/java/com/example/​hello/HelloPlugin.java: +* android/src/main/java/com/example/​hello/HelloPlugin.kt: - The Android platform specific implementation of the plugin API. * `ios/Classes/HelloPlugin.m`: - The iOS platform specific implementation of the plugin API. * `example/`: - A Flutter app that depends on the plugin, and illustrates how to use it. -By default, the plugin project uses Objective-C for iOS code and -Java for Android code. If you prefer Swift or Kotlin, you can specify the +By default, the plugin project uses Swift for iOS code and +Kotlin for Android code. If you prefer Objective-C or Java, you can specify the iOS language using `-i` and/or the Android language using `-a`. For example: ```terminal -$ flutter create --template=plugin -i swift -a kotlin hello +$ flutter create --template=plugin -i objc -a java hello ``` ### Step 2: Implement the package {#edit-plugin-package} From f43cec09e38203cb71d4a9838c6993f754a13b8c Mon Sep 17 00:00:00 2001 From: Martin A Date: Tue, 15 Oct 2019 12:31:10 -0700 Subject: [PATCH 3/8] Added info about Google Ads on Android app page (#3103) used HTML (a href =) for linking. @Sfshaza let me know if there is a different required way as I did not see this used anywhere else on the page. --- src/docs/deployment/android.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/docs/deployment/android.md b/src/docs/deployment/android.md index ac5345a218..b0184a5856 100644 --- a/src/docs/deployment/android.md +++ b/src/docs/deployment/android.md @@ -377,6 +377,17 @@ From the command line: For detailed instructions on publishing your app to the Google Play Store, see the [Google Play launch][play] documentation. +Now that you’ve created your app, attract more users with Google Ads. App campaigns use machine learning to drive more installs and make the most of your budget. + +Get your campaign running in a few steps +1. Create your ad - we’ll help create your ad from your app information +2. Choose your budget - set your target cost-per-install (tCPI) and daily budget cap +3. Select your location - let us know where you’d like your ads to run +4. Decide what action you want users to take - choose installs, in-app actions, or target return on ad spend (ROAS) + + Get $75 app advertising credit when you spend $25 + + ## Android release FAQ Here are some commonly asked questions about deployment for From 2cac68c1614d15194686dd23e2fb29601a6f218f Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Tue, 15 Oct 2019 16:02:03 -0400 Subject: [PATCH 4/8] Refresh pubspec.lock files (#3108) I don't think that we should be committing the lock files (#3107), but since they are present, this updates them. --- example/pubspec.lock | 40 ++++++---------------------------------- pubspec.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index b00b790f50..55b50d49a8 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -8,13 +8,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.36.4" - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" args: dependency: transitive description: @@ -70,7 +63,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1+1" css_colors: dependency: "direct dev" description: @@ -132,7 +125,7 @@ packages: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.14.0+2" + version: "0.14.0+3" http: dependency: transitive description: @@ -154,13 +147,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.3" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" intl: dependency: transitive description: @@ -266,13 +252,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" platform: dependency: transitive description: @@ -375,7 +354,7 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "1.1.6+5" + version: "1.1.7+1" stack_trace: dependency: transitive description: @@ -466,7 +445,7 @@ packages: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "0.10.2+1" + version: "0.10.2+3" vm_service_client: dependency: transitive description: @@ -488,13 +467,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.15" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" yaml: dependency: transitive description: @@ -503,5 +475,5 @@ packages: source: hosted version: "2.2.0" sdks: - dart: ">=2.4.0 <3.0.0" - flutter: ">=1.5.0 <2.0.0" + dart: ">=2.5.0 <3.0.0" + flutter: ">=1.9.1 <2.0.0" diff --git a/pubspec.lock b/pubspec.lock index bb474da3fe..a3bbd77d7d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.37.0" + version: "0.38.5" args: dependency: transitive description: @@ -21,14 +21,14 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.0" build: dependency: transitive description: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "1.2.0" build_config: dependency: transitive description: @@ -42,28 +42,28 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.0.6" + version: "1.2.0" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.6.5" + version: "1.7.1" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "3.0.9" + version: "4.1.0" built_collection: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "6.7.0" + version: "6.7.1" charcode: dependency: transitive description: @@ -113,17 +113,17 @@ packages: description: path: "." ref: HEAD - resolved-ref: d81e903a36bd36532fcbf85ba38c679ce264e6e3 + resolved-ref: "194181c88c8c8861257d2ee38d99909af7120211" url: "https://github.com/chalin/code_excerpter.git" source: git - version: "0.6.0" + version: "0.6.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.14.12" console: dependency: transitive description: @@ -144,7 +144,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.1+1" + version: "2.1.3" csslib: dependency: transitive description: @@ -158,7 +158,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "1.2.9" + version: "1.3.1" firebase: dependency: "direct dev" description: @@ -179,7 +179,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.20" + version: "0.1.27" github: dependency: "direct dev" description: @@ -207,7 +207,7 @@ packages: name: html url: "https://pub.dartlang.org" source: hosted - version: "0.14.0+2" + version: "0.14.0+3" http: dependency: transitive description: @@ -256,14 +256,14 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.20" + version: "0.3.27" linkcheck: dependency: "direct dev" description: name: linkcheck url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" logging: dependency: transitive description: @@ -298,7 +298,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" package_resolver: dependency: transitive description: @@ -438,13 +438,13 @@ packages: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "1.0.15" + version: "1.1.0" yaml: dependency: "direct dev" description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.16" + version: "2.2.0" sdks: - dart: ">=2.3.0 <3.0.0" \ No newline at end of file + dart: ">=2.3.0 <3.0.0" From d231c483a5ea29d28629eb050ee1cf85e5b3bd2d Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 15 Oct 2019 16:08:25 -0700 Subject: [PATCH 5/8] Add xcodebuild -runFirstLaunch command to iOS setup instructions (#3101) --- src/docs/get-started/install/_ios-setup.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/docs/get-started/install/_ios-setup.md b/src/docs/get-started/install/_ios-setup.md index fe034e2ffb..d518547ba9 100644 --- a/src/docs/get-started/install/_ios-setup.md +++ b/src/docs/get-started/install/_ios-setup.md @@ -12,6 +12,7 @@ To develop Flutter apps for iOS, you need a Mac with Xcode. ```terminal $ sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer + $ sudo xcodebuild -runFirstLaunch ``` This is the correct path for most cases, From 4801bcf6477d987f50a8d5dc90171169abdab4c5 Mon Sep 17 00:00:00 2001 From: Riley Shea Date: Tue, 15 Oct 2019 19:09:43 -0400 Subject: [PATCH 6/8] Typo in sqflite (#3097) missing 'l' --- src/docs/cookbook/persistence/sqlite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/cookbook/persistence/sqlite.md b/src/docs/cookbook/persistence/sqlite.md index 22260a2ca4..e8056a3e2f 100644 --- a/src/docs/cookbook/persistence/sqlite.md +++ b/src/docs/cookbook/persistence/sqlite.md @@ -298,7 +298,7 @@ Future deleteDog(int id) async { To run the example: 1. Create a new Flutter project. - 2. Add the `sqfite` and `path` packages to your `pubspec.yaml`. + 2. Add the `sqflite` and `path` packages to your `pubspec.yaml`. 3. Paste the following code into a new file called `lib/db_test.dart`. 4. Run the code with `flutter run lib/db_test.dart`. From 903076231d93e5d2906b7a1bd017953a8d06cdd4 Mon Sep 17 00:00:00 2001 From: Nabil Mohammed Nalakath <32065631+nabilnalakath@users.noreply.github.com> Date: Wed, 16 Oct 2019 04:41:56 +0530 Subject: [PATCH 7/8] Added CD Option (#3096) Added Github Actions to CD Options along with a link to sample project. --- src/docs/deployment/cd.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/docs/deployment/cd.md b/src/docs/deployment/cd.md index dbcd8204ae..828533d893 100644 --- a/src/docs/deployment/cd.md +++ b/src/docs/deployment/cd.md @@ -180,3 +180,6 @@ The following are some other options available to help automate the delivery of in the [flutter_redux library]({{site.github}}/brianegan/flutter_redux). * [Codemagic CI/CD for Flutter](https://blog.codemagic.io/getting-started-with-codemagic/) * [Flutter CI/CD with Bitrise](https://devcenter.bitrise.io/getting-started/getting-started-with-flutter-apps/) +* [Github Actions- CI/CD on Github] (https://github.com/features/actions) Get + [Example Project](https://github.com/nabilnalakath/flutter-githubaction) + From 46a8c0a85a92a507da29a7e5055f42382de3bba6 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Tue, 15 Oct 2019 19:39:25 -0400 Subject: [PATCH 8/8] Animation tutorial: drop unnecessary local var type decl (#3110) - Closes #3073 - Followup to #2842 - Refresh code excerpts. --- examples/animation/animate2/lib/main.dart | 2 +- examples/animation/animate3/lib/main.dart | 2 +- examples/animation/animate5/lib/main.dart | 2 +- src/docs/development/ui/animations/tutorial.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/animation/animate2/lib/main.dart b/examples/animation/animate2/lib/main.dart index 7dcf0e41d5..4f3e47a3d3 100644 --- a/examples/animation/animate2/lib/main.dart +++ b/examples/animation/animate2/lib/main.dart @@ -9,7 +9,7 @@ class AnimatedLogo extends AnimatedWidget { : super(key: key, listenable: animation); Widget build(BuildContext context) { - final Animation animation = listenable as Animation; + final animation = listenable as Animation; return Center( child: Container( margin: EdgeInsets.symmetric(vertical: 10), diff --git a/examples/animation/animate3/lib/main.dart b/examples/animation/animate3/lib/main.dart index 8e51809f30..176bd9cf22 100644 --- a/examples/animation/animate3/lib/main.dart +++ b/examples/animation/animate3/lib/main.dart @@ -8,7 +8,7 @@ class AnimatedLogo extends AnimatedWidget { : super(key: key, listenable: animation); Widget build(BuildContext context) { - final Animation animation = listenable as Animation; + final animation = listenable as Animation; return Center( child: Container( margin: EdgeInsets.symmetric(vertical: 10), diff --git a/examples/animation/animate5/lib/main.dart b/examples/animation/animate5/lib/main.dart index a4e7a9584e..ccc431a762 100644 --- a/examples/animation/animate5/lib/main.dart +++ b/examples/animation/animate5/lib/main.dart @@ -17,7 +17,7 @@ class AnimatedLogo extends AnimatedWidget { : super(key: key, listenable: animation); Widget build(BuildContext context) { - final Animation animation = listenable as Animation; + final animation = listenable as Animation; return Center( child: Opacity( opacity: _opacityTween.evaluate(animation), diff --git a/src/docs/development/ui/animations/tutorial.md b/src/docs/development/ui/animations/tutorial.md index 9f688da14a..3206b39cda 100644 --- a/src/docs/development/ui/animations/tutorial.md +++ b/src/docs/development/ui/animations/tutorial.md @@ -414,7 +414,7 @@ class AnimatedLogo extends AnimatedWidget { : super(key: key, listenable: animation); Widget build(BuildContext context) { - final Animation animation = listenable; + final animation = listenable as Animation; return Center( child: Container( margin: EdgeInsets.symmetric(vertical: 10), @@ -735,7 +735,7 @@ class AnimatedLogo extends AnimatedWidget { : super(key: key, listenable: animation); Widget build(BuildContext context) { - final Animation animation = listenable; + final animation = listenable as Animation; return Center( [!child: Opacity(!] [!opacity: _opacityTween.evaluate(animation),!]