Skip to content

Commit 545460c

Browse files
parloughparlough
committed
Merge branch 'main' into feat/dart-3-7-reformat
2 parents bc953b1 + d69db60 commit 545460c

File tree

25 files changed

+379
-199
lines changed

25 files changed

+379
-199
lines changed

‎diagrams/resources/web-framework-diagram.drawio

+31-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36" version="26.0.7">
1+
<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36" version="26.0.11">
22
<diagram name="Page-1" id="iEswzy7BcGWgSbrlDjEJ">
3-
<mxGraphModel dx="1226" dy="746" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
3+
<mxGraphModel dx="1070" dy="669" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
44
<root>
55
<mxCell id="0" />
66
<mxCell id="1" parent="0" />
@@ -19,9 +19,6 @@
1919
<mxPoint x="165" y="640" as="targetPoint" />
2020
</mxGeometry>
2121
</mxCell>
22-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-7" value="&lt;font style=&quot;font-size: 22px;&quot;&gt;&lt;b&gt;Browser&lt;/b&gt;&lt;/font&gt;&lt;div&gt;&lt;font style=&quot;font-size: 18px;&quot;&gt;JavaScript / C++&lt;/font&gt;&lt;/div&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
23-
<mxGeometry x="30" y="489" width="150" height="30" as="geometry" />
24-
</mxCell>
2522
<mxCell id="eU0kjX7wS5xwUF7xRdHj-10" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#008a00;fontColor=#ffffff;strokeColor=#005700;" parent="1" vertex="1">
2623
<mxGeometry x="180" y="85" width="330" height="45" as="geometry" />
2724
</mxCell>
@@ -70,29 +67,8 @@
7067
<mxCell id="eU0kjX7wS5xwUF7xRdHj-27" value="&lt;span style=&quot;font-size: 22px;&quot;&gt;Painting&lt;/span&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=28;fontColor=light-dark(#ffffff, #ededed);" parent="1" vertex="1">
7168
<mxGeometry x="480" y="275" width="80" height="35" as="geometry" />
7269
</mxCell>
73-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-28" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
74-
<mxGeometry x="180" y="481.5" width="160" height="45" as="geometry" />
75-
</mxCell>
7670
<mxCell id="eU0kjX7wS5xwUF7xRdHj-29" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
77-
<mxGeometry x="348" y="481.5" width="152" height="45" as="geometry" />
78-
</mxCell>
79-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-30" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
80-
<mxGeometry x="510" y="481.5" width="170" height="45" as="geometry" />
81-
</mxCell>
82-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-31" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" parent="1" vertex="1">
83-
<mxGeometry x="690" y="481.5" width="170" height="45" as="geometry" />
84-
</mxCell>
85-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-33" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;HTML/CSS&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
86-
<mxGeometry x="230" y="489" width="60" height="30" as="geometry" />
87-
</mxCell>
88-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-34" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;Canvas&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
89-
<mxGeometry x="394" y="489" width="60" height="30" as="geometry" />
90-
</mxCell>
91-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-35" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;WebGL&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
92-
<mxGeometry x="565" y="489" width="60" height="30" as="geometry" />
93-
</mxCell>
94-
<mxCell id="eU0kjX7wS5xwUF7xRdHj-36" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;WebAssembly&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
95-
<mxGeometry x="745" y="489" width="60" height="30" as="geometry" />
71+
<mxGeometry x="180" y="481.5" width="160" height="45" as="geometry" />
9672
</mxCell>
9773
<mxCell id="7qe8jE41nwvI0GSgo9u9-1" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#dae8fc;strokeColor=#6c8ebf;labelBackgroundColor=default;textShadow=1;" parent="1" vertex="1">
9874
<mxGeometry x="20" y="400" width="850" height="60" as="geometry" />
@@ -112,7 +88,7 @@
11288
<mxCell id="7qe8jE41nwvI0GSgo9u9-6" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#1ba1e2;fontColor=#ffffff;strokeColor=#006EAF;" parent="1" vertex="1">
11389
<mxGeometry x="690" y="407.5" width="170" height="45" as="geometry" />
11490
</mxCell>
115-
<mxCell id="7qe8jE41nwvI0GSgo9u9-7" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;Rendering&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
91+
<mxCell id="7qe8jE41nwvI0GSgo9u9-7" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;Compositor&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
11692
<mxGeometry x="230" y="415" width="60" height="30" as="geometry" />
11793
</mxCell>
11894
<mxCell id="7qe8jE41nwvI0GSgo9u9-8" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;Embedding&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
@@ -124,6 +100,33 @@
124100
<mxCell id="7qe8jE41nwvI0GSgo9u9-10" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;Accessibility&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
125101
<mxGeometry x="745" y="415" width="60" height="30" as="geometry" />
126102
</mxCell>
103+
<mxCell id="NK9HXle7FpP0BrMxsV12-2" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;WebGL&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
104+
<mxGeometry x="584.5" y="489" width="60" height="30" as="geometry" />
105+
</mxCell>
106+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-2" value="&lt;font style=&quot;font-size: 22px;&quot;&gt;&lt;b&gt;Browser&lt;/b&gt;&lt;/font&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
107+
<mxGeometry x="30" y="494" width="150" height="30" as="geometry" />
108+
</mxCell>
109+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-4" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;HTML/CSS&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
110+
<mxGeometry x="225" y="489" width="60" height="30" as="geometry" />
111+
</mxCell>
112+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-5" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" vertex="1" parent="1">
113+
<mxGeometry x="520" y="481.5" width="160" height="45" as="geometry" />
114+
</mxCell>
115+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-6" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" vertex="1" parent="1">
116+
<mxGeometry x="350" y="481.5" width="160" height="45" as="geometry" />
117+
</mxCell>
118+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-9" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;JavaScript&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
119+
<mxGeometry x="395" y="489" width="60" height="30" as="geometry" />
120+
</mxCell>
121+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-10" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;WebGL&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
122+
<mxGeometry x="565" y="489" width="60" height="30" as="geometry" />
123+
</mxCell>
124+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-13" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.patternFillRect;fillStyle=diag;step=5;fillStrokeWidth=0.2;fillStrokeColor=#dddddd;fillColor=#f0a30a;fontColor=#000000;strokeColor=#BD7000;" vertex="1" parent="1">
125+
<mxGeometry x="690" y="481.5" width="170" height="45" as="geometry" />
126+
</mxCell>
127+
<mxCell id="uTWjtHHHEZxcMKsox1Cd-14" value="&lt;font style=&quot;font-size: 22px; color: rgb(255, 255, 255);&quot;&gt;WebAssembly&lt;/font&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
128+
<mxGeometry x="742" y="489" width="60" height="30" as="geometry" />
129+
</mxCell>
127130
</root>
128131
</mxGraphModel>
129132
</diagram>

‎examples/app-architecture/offline_first/lib/main.dart

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class MyApp extends StatelessWidget {
2020
title: 'Flutter Demo',
2121
theme: ThemeData(
2222
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
23-
useMaterial3: true,
2423
),
2524
home: UserProfileScreen(
2625
viewModel: UserProfileViewModel(

‎examples/cookbook/design/themes/lib/main.dart

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class MyApp extends StatelessWidget {
1919
return MaterialApp(
2020
title: appName,
2121
theme: ThemeData(
22-
useMaterial3: true,
23-
2422
// Define the default brightness and colors.
2523
colorScheme: ColorScheme.fromSeed(
2624
seedColor: Colors.purple,

‎examples/cookbook/effects/gradient_bubbles/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class App extends StatelessWidget {
1818
return MaterialApp(
1919
debugShowCheckedModeBanner: false,
2020
title: 'Flutter Chat',
21-
theme: ThemeData.dark(useMaterial3: true),
21+
theme: ThemeData.dark(),
2222
home: home,
2323
);
2424
}

‎examples/cookbook/lists/spaced_items/lib/main.dart

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class SpacedItemsList extends StatelessWidget {
1515
theme: ThemeData(
1616
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
1717
cardTheme: CardTheme(color: Colors.blue.shade50),
18-
useMaterial3: true,
1918
),
2019
home: Scaffold(
2120
body: LayoutBuilder(

‎examples/cookbook/testing/integration/introduction/lib/main.dart

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class MyApp extends StatelessWidget {
1313
title: 'Flutter Demo',
1414
theme: ThemeData(
1515
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
16-
useMaterial3: true,
1716
),
1817
home: const MyHomePage(title: 'Flutter Demo Home Page'),
1918
);

‎examples/testing/native_debugging/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MyApp extends StatelessWidget {
1616
Widget build(BuildContext context) {
1717
return MaterialApp(
1818
title: 'URL Launcher',
19-
theme: ThemeData(useMaterial3: true, colorSchemeSeed: Colors.purple),
19+
theme: ThemeData(colorSchemeSeed: Colors.purple),
2020
home: const MyHomePage(title: 'URL Launcher'),
2121
);
2222
}

‎src/_11ty/plugins/markdown.ts

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export const markdown = (() => {
1313
.use(markdownItAttrs, {
1414
leftDelimiter: '{:',
1515
rightDelimiter: '}',
16-
allowedAttributes: ['id', 'class', /^data-.*$/],
1716
})
1817
.use(markdownItAnchor, {
1918
slugify: (s) => slugify(s),

‎src/_data/sidenav.yml

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
children:
3535
- title: Flutter for Android devs
3636
permalink: /get-started/flutter-for/android-devs
37+
- title: Flutter for Jetpack Compose devs
38+
permalink: /get-started/flutter-for/compose-devs
3739
- title: Flutter for SwiftUI devs
3840
permalink: /get-started/flutter-for/swiftui-devs
3941
- title: Flutter for UIKit devs

‎src/_sass/base/_utils.scss

+7
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,16 @@ main {
2323
display: grid;
2424
grid-template-columns: 1fr;
2525
column-gap: 1.5rem;
26+
margin-block-end: 0.5rem;
2627

2728
@media (min-width: 768px) {
2829
grid-template-columns: minmax(60%, 1fr) auto;
30+
margin-block-end: 0;
31+
}
32+
33+
> * {
34+
max-width: 100%;
35+
min-width: 0;
2936
}
3037
}
3138

‎src/content/assets/images/docs/arch-overview/web-framework-diagram.drawio.png

-1.38 KB
Loading

‎src/content/cookbook/design/themes.md

-4
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ Flutter creates a default theme for you.
5252
MaterialApp(
5353
title: appName,
5454
theme: ThemeData(
55-
useMaterial3: true,
56-
5755
// Define the default brightness and colors.
5856
colorScheme: ColorScheme.fromSeed(
5957
seedColor: Colors.purple,
@@ -191,8 +189,6 @@ class MyApp extends StatelessWidget {
191189
return MaterialApp(
192190
title: appName,
193191
theme: ThemeData(
194-
useMaterial3: true,
195-
196192
// Define the default brightness and colors.
197193
colorScheme: ColorScheme.fromSeed(
198194
seedColor: Colors.purple,

‎src/content/cookbook/effects/gradient-bubbles.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class App extends StatelessWidget {
269269
return MaterialApp(
270270
debugShowCheckedModeBanner: false,
271271
title: 'Flutter Chat',
272-
theme: ThemeData.dark(useMaterial3: true),
272+
theme: ThemeData.dark(),
273273
home: home,
274274
);
275275
}

‎src/content/cookbook/lists/spaced-items.md

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ class SpacedItemsList extends StatelessWidget {
185185
theme: ThemeData(
186186
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
187187
cardTheme: CardTheme(color: Colors.blue.shade50),
188-
useMaterial3: true,
189188
),
190189
home: Scaffold(
191190
body: LayoutBuilder(

‎src/content/cookbook/networking/background-parsing.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ If this work takes more than 16 milliseconds,
1616
your users experience jank.
1717

1818
To avoid jank, you need to perform expensive computations
19-
like this in the background.
20-
On Android, this means scheduling work on a different thread.
21-
In Flutter, you can use a separate [Isolate][].
19+
like this in the background, using a separate [Isolate][].
2220
This recipe uses the following steps:
2321

2422
1. Add the `http` package.

‎src/content/perf/impeller.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ check out the [Can I use Impeller?][] page.
1616

1717
Impeller provides a new rendering runtime for Flutter.
1818
Impeller precompiles a [smaller, simpler set of shaders][]
19-
at Engine-build time so they don't compile at runtime.
19+
at engine-build time so they don't compile at runtime.
2020

2121
[smaller, simpler set of shaders]: {{site.repo.flutter}}/issues/77412
2222

@@ -76,7 +76,7 @@ Flutter **enables Impeller by default** on iOS.
7676

7777
Flutter **enables Impeller by default** on Android.
7878
On devices that don't support Vulkan,
79-
Impeller will fallback to the the legacy OpenGL renderer.
79+
Impeller falls back to the the legacy OpenGL renderer.
8080
No action on your part is necessary for this fallback behavior.
8181

8282
* To _disable_ Impeller when debugging,
@@ -96,6 +96,15 @@ No action on your part is necessary for this fallback behavior.
9696
android:value="false" />
9797
```
9898

99+
### Web
100+
101+
Flutter on the web offers two renderers and
102+
two build modes. For more information, visit
103+
[Flutter web support][] in the Flutter
104+
architectural guide.
105+
106+
[Flutter web support]: /resources/architectural-overview#flutter-web-support
107+
99108
### macOS
100109

101110
You can try out Impeller for macOS behind a flag.

0 commit comments

Comments
 (0)