Skip to content

Commit c6de385

Browse files
authored
Merge branch 'flutter:main' into main
2 parents 5871500 + dcaf555 commit c6de385

File tree

147 files changed

+28
-5620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+28
-5620
lines changed

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ Googler's, you can freely add samples to the [flutter/demos] repository.
1717

1818
### Quickstarts
1919

20-
* [`asset_transformation`] - Demonstrates how to transform images' color scales and formats.
20+
* [`asset_transformation`] - Demonstrates how to transform images' color scales and formats.
2121
* [`background_isolate_channels`] - Demonstrates how to use long-lived isolates.
2222
* [`code_sharing`] - Demonstrates how to share business logic between Flutter client and Dart server using [`package:shelf`] )
2323
* [`context_menus`] - This sample shows how to create and customize cross-platform context menus, such as the text selection toolbar on mobile or the right click menu on desktop.
2424
* [`desktop_photo_search`] - Demonstrates desktop features in both Material and FluentUI design systems.
2525
* [`dynamic_theme`] - A developer sample demonstrating how to call on-device Flutter APIs based on output from the Gemini API.
2626
* [`form_app`] - A sample demonstrating different types of forms and best practices.
2727
* [`game_template`] - (**note: deprecated!**) A starter game in Flutter with all the bells and whistles of a mobile (iOS & Android) game.
28-
* [`gemini_tasks`] - A developer sample written in Flutter demonstrating how to interact with a to-do list in natural language using the Gemini API.
2928
* [`google_maps`] - Demonstrates the Google Maps for Flutter plugin.
3029
* [`infinite_list`] - A Flutter sample app that shows an implementation of the "infinite list" UX pattern.
3130
* [`isolate_example`] - A sample application that demonstrate best practices when using [isolates].
@@ -78,10 +77,10 @@ Googler's, you can freely add samples to the [flutter/demos] repository.
7877

7978
## Flutter sample code
8079

81-
Samples are **correct and concise code** that developers
82-
can **quickly understand** and **easily reuse** with minimal side effects.
83-
Samples teach developers how to be successful using Flutter and Dart.
84-
They are maintained on an ongoing basis
80+
Samples are **correct and concise code** that developers
81+
can **quickly understand** and **easily reuse** with minimal side effects.
82+
Samples teach developers how to be successful using Flutter and Dart.
83+
They are maintained on an ongoing basis
8584
to reflect changing APIs and best practices.
8685

8786
### Types of samples
@@ -90,18 +89,18 @@ There are two types of sample code in this repository:
9089

9190
* **Quickstarts** provide a starting point to extend. They answer the question,
9291
"What is the minimal amount of code needed to implement this feature?"
93-
* **Demo apps** are meant to be built and ran. They demo the _product_,
92+
* **Demo apps** are meant to be built and ran. They demo the _product_,
9493
not how to write code.
9594

9695
A majority of samples in this repository are quickstarts.
9796

9897
## Usage
9998

100-
Every sample in this repo is fully runnable. To run an example,
101-
use `flutter run` inside that example's directory.
99+
Every sample in this repo is fully runnable. To run an example,
100+
use `flutter run` inside that example's directory.
102101
See the [getting started guide] to install the `flutter` tool.
103102

104-
> [!IMPORTANT]
103+
> [!IMPORTANT]
105104
> If you want to run an add-to-app sample, there are additional requirements.
106105
> We suggest reading the [add-to-app documentation].
107106
@@ -129,7 +128,6 @@ If you run into a bug in one of the samples, please file an issue in the
129128
[`dynamic_theme`]: ./dynamic_theme
130129
[`form_app`]: ./form_app
131130
[`game_template`]: ./game_template
132-
[`gemini_tasks`]: ./gemini_tasks
133131
[`google_maps`]: ./google_maps
134132
[`infinite_list`]: ./infinite_list
135133
[`isolate_example`]: ./isolate_example
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
<!-- Include Cleartext traffic for the espresso package -->
5-
6-
<application android:usesCleartextTraffic="true" />
7-
3+
<!-- The network security config is needed for Espresso testing since it
4+
uses http cleartext traffic.
5+
-->
6+
<application android:networkSecurityConfig="@xml/network_security_config">
7+
<meta-data android:name="io.flutter.network-policy"
8+
android:resource="@xml/network_security_config"/>
9+
</application>
810
</manifest>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<!-- Cleartext is needed for Espresso testing. -->
4+
<base-config cleartextTrafficPermitted="true">
5+
</base-config>
6+
</network-security-config>

ai_recipe_generation/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ we don't maintain samples that are tied to events.
77

88
This sample has been copied to [another repository](https://github.com/ericwindmill/gemini_recipe_generation). It will not be updated to reflect changes to Gemini.
99

10-
## Other Gemini resources
10+
## Other Gemini resources
1111

1212
The following resources can assist you in integrating Gemini with Flutter:
1313

14-
* [gemini_tasks sample](https://github.com/flutter/samples/tree/main/gemini_tasks) is a Gemini sample in this repository.
1514
* [google_generative_ai package](https://pub.dev/packages/google_generative_ai) is the package that Flutter apps use to integrate with gemini, and it has additional samples.
16-
* The [google-gemini github](https://github.com/google-gemini) has additional Flutter samples.
15+
* The [google-gemini github](https://github.com/google-gemini) has additional Flutter samples.

animations/lib/src/misc/animated_list.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class _AnimatedListDemoState extends State<AnimatedListDemo> {
4949
parent: animation,
5050
curve: const Interval(0.0, 1.0),
5151
),
52+
// ignore: deprecated_member_use
5253
axisAlignment: 0.0,
5354
child: _buildItem(user),
5455
),

gemini_tasks/.gitignore

Lines changed: 0 additions & 43 deletions
This file was deleted.

gemini_tasks/.idx/dev.nix

Lines changed: 0 additions & 62 deletions
This file was deleted.

gemini_tasks/.metadata

Lines changed: 0 additions & 45 deletions
This file was deleted.

gemini_tasks/CONTRIBUTING.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)