Skip to content

Commit b6e1e4c

Browse files
domesticmousedomesticmouse
committed
Merge branch 'main' of https://github.com/flutter/codelabs into Dart-3.7-reformat
2 parents 5c133a8 + 3d80d77 commit b6e1e4c

File tree

643 files changed

+7762
-6894
lines changed

Some content is hidden

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

643 files changed

+7762
-6894
lines changed

‎adaptive_app/step_03/android/app/src/main/kotlin/com/example/adaptive_app/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package com.example.adaptive_app
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity()
5+
class MainActivity : FlutterActivity()

‎adaptive_app/step_03/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎adaptive_app/step_03/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎adaptive_app/step_04/android/app/src/main/kotlin/com/example/adaptive_app/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package com.example.adaptive_app
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity()
5+
class MainActivity : FlutterActivity()

‎adaptive_app/step_04/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

‎adaptive_app/step_04/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎adaptive_app/step_04/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24-
2332CB429A2F7687397896CE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E31DF4301EE3AAE0EEC3499 /* Pods_Runner.framework */; };
2524
331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
2625
335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
2726
33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
2827
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2928
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
3029
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
31-
7B0E3BBDBD871B8776321E1D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0BF5BFB41809E524423F6D1 /* Pods_RunnerTests.framework */; };
30+
754C33D7DD538CA4B9245FF1 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A16363F3C841A671FE533A6 /* Pods_RunnerTests.framework */; };
31+
75E6E416924BB4F6ECF02542 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3AD8B29B155F5745DD25129 /* Pods_Runner.framework */; };
3232
/* End PBXBuildFile section */
3333

3434
/* Begin PBXContainerItemProxy section */
@@ -62,7 +62,7 @@
6262
/* End PBXCopyFilesBuildPhase section */
6363

6464
/* Begin PBXFileReference section */
65-
2E31DF4301EE3AAE0EEC3499 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
65+
21F5A103A9076EB884AEE6B1 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
6666
331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6767
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
6868
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
@@ -79,31 +79,31 @@
7979
33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
8080
33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
8181
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
82-
7053D155ACFB0858C84F04C2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
82+
398C42BBC4A6ED04B81A2E1C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
83+
3A16363F3C841A671FE533A6 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
84+
3A3CF2FB38AD4FB159140847 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
85+
734E1C29EA7D6CA1B19932F0 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
8386
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
84-
82507D8B7DE143A50317D524 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
85-
862A7400A3C2E8073C30A22F /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
8687
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
87-
B5428A6A0824034B71605EB7 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
88-
B642E55A52A222A30521360B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
89-
E0BF5BFB41809E524423F6D1 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90-
E52BFBAF82750EDD54C6081A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
88+
CF1C693E56126C7F30D9DC27 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
89+
F3AD8B29B155F5745DD25129 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
90+
F60DA437E388151AB7686516 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
9191
/* End PBXFileReference section */
9292

9393
/* Begin PBXFrameworksBuildPhase section */
9494
331C80D2294CF70F00263BE5 /* Frameworks */ = {
9595
isa = PBXFrameworksBuildPhase;
9696
buildActionMask = 2147483647;
9797
files = (
98-
7B0E3BBDBD871B8776321E1D /* Pods_RunnerTests.framework in Frameworks */,
98+
754C33D7DD538CA4B9245FF1 /* Pods_RunnerTests.framework in Frameworks */,
9999
);
100100
runOnlyForDeploymentPostprocessing = 0;
101101
};
102102
33CC10EA2044A3C60003C045 /* Frameworks */ = {
103103
isa = PBXFrameworksBuildPhase;
104104
buildActionMask = 2147483647;
105105
files = (
106-
2332CB429A2F7687397896CE /* Pods_Runner.framework in Frameworks */,
106+
75E6E416924BB4F6ECF02542 /* Pods_Runner.framework in Frameworks */,
107107
);
108108
runOnlyForDeploymentPostprocessing = 0;
109109
};
@@ -137,7 +137,7 @@
137137
331C80D6294CF71000263BE5 /* RunnerTests */,
138138
33CC10EE2044A3C60003C045 /* Products */,
139139
D73912EC22F37F3D000D13A0 /* Frameworks */,
140-
B989015D088337045B444540 /* Pods */,
140+
669FF290FA952C5AB5574D89 /* Pods */,
141141
);
142142
sourceTree = "<group>";
143143
};
@@ -185,15 +185,15 @@
185185
path = Runner;
186186
sourceTree = "<group>";
187187
};
188-
B989015D088337045B444540 /* Pods */ = {
188+
669FF290FA952C5AB5574D89 /* Pods */ = {
189189
isa = PBXGroup;
190190
children = (
191-
E52BFBAF82750EDD54C6081A /* Pods-Runner.debug.xcconfig */,
192-
7053D155ACFB0858C84F04C2 /* Pods-Runner.release.xcconfig */,
193-
B642E55A52A222A30521360B /* Pods-Runner.profile.xcconfig */,
194-
82507D8B7DE143A50317D524 /* Pods-RunnerTests.debug.xcconfig */,
195-
862A7400A3C2E8073C30A22F /* Pods-RunnerTests.release.xcconfig */,
196-
B5428A6A0824034B71605EB7 /* Pods-RunnerTests.profile.xcconfig */,
191+
398C42BBC4A6ED04B81A2E1C /* Pods-Runner.debug.xcconfig */,
192+
F60DA437E388151AB7686516 /* Pods-Runner.release.xcconfig */,
193+
734E1C29EA7D6CA1B19932F0 /* Pods-Runner.profile.xcconfig */,
194+
3A3CF2FB38AD4FB159140847 /* Pods-RunnerTests.debug.xcconfig */,
195+
21F5A103A9076EB884AEE6B1 /* Pods-RunnerTests.release.xcconfig */,
196+
CF1C693E56126C7F30D9DC27 /* Pods-RunnerTests.profile.xcconfig */,
197197
);
198198
name = Pods;
199199
path = Pods;
@@ -202,8 +202,8 @@
202202
D73912EC22F37F3D000D13A0 /* Frameworks */ = {
203203
isa = PBXGroup;
204204
children = (
205-
2E31DF4301EE3AAE0EEC3499 /* Pods_Runner.framework */,
206-
E0BF5BFB41809E524423F6D1 /* Pods_RunnerTests.framework */,
205+
F3AD8B29B155F5745DD25129 /* Pods_Runner.framework */,
206+
3A16363F3C841A671FE533A6 /* Pods_RunnerTests.framework */,
207207
);
208208
name = Frameworks;
209209
sourceTree = "<group>";
@@ -215,7 +215,7 @@
215215
isa = PBXNativeTarget;
216216
buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
217217
buildPhases = (
218-
9F6266F2717F512831975696 /* [CP] Check Pods Manifest.lock */,
218+
FB50BD472F8A791A5D828B44 /* [CP] Check Pods Manifest.lock */,
219219
331C80D1294CF70F00263BE5 /* Sources */,
220220
331C80D2294CF70F00263BE5 /* Frameworks */,
221221
331C80D3294CF70F00263BE5 /* Resources */,
@@ -234,13 +234,13 @@
234234
isa = PBXNativeTarget;
235235
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
236236
buildPhases = (
237-
9DCFCCE4539CFD3C012C14EF /* [CP] Check Pods Manifest.lock */,
237+
3AC9718EBA2223B5B4EA92B0 /* [CP] Check Pods Manifest.lock */,
238238
33CC10E92044A3C60003C045 /* Sources */,
239239
33CC10EA2044A3C60003C045 /* Frameworks */,
240240
33CC10EB2044A3C60003C045 /* Resources */,
241241
33CC110E2044A8840003C045 /* Bundle Framework */,
242242
3399D490228B24CF009A79C7 /* ShellScript */,
243-
8D12D63DEACB8119AF22982A /* [CP] Embed Pods Frameworks */,
243+
38663780583486333E80B0C0 /* [CP] Embed Pods Frameworks */,
244244
);
245245
buildRules = (
246246
);
@@ -361,7 +361,7 @@
361361
shellPath = /bin/sh;
362362
shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
363363
};
364-
8D12D63DEACB8119AF22982A /* [CP] Embed Pods Frameworks */ = {
364+
38663780583486333E80B0C0 /* [CP] Embed Pods Frameworks */ = {
365365
isa = PBXShellScriptBuildPhase;
366366
buildActionMask = 2147483647;
367367
files = (
@@ -378,7 +378,7 @@
378378
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
379379
showEnvVarsInLog = 0;
380380
};
381-
9DCFCCE4539CFD3C012C14EF /* [CP] Check Pods Manifest.lock */ = {
381+
3AC9718EBA2223B5B4EA92B0 /* [CP] Check Pods Manifest.lock */ = {
382382
isa = PBXShellScriptBuildPhase;
383383
buildActionMask = 2147483647;
384384
files = (
@@ -400,7 +400,7 @@
400400
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
401401
showEnvVarsInLog = 0;
402402
};
403-
9F6266F2717F512831975696 /* [CP] Check Pods Manifest.lock */ = {
403+
FB50BD472F8A791A5D828B44 /* [CP] Check Pods Manifest.lock */ = {
404404
isa = PBXShellScriptBuildPhase;
405405
buildActionMask = 2147483647;
406406
files = (
@@ -473,7 +473,7 @@
473473
/* Begin XCBuildConfiguration section */
474474
331C80DB294CF71000263BE5 /* Debug */ = {
475475
isa = XCBuildConfiguration;
476-
baseConfigurationReference = 82507D8B7DE143A50317D524 /* Pods-RunnerTests.debug.xcconfig */;
476+
baseConfigurationReference = 3A3CF2FB38AD4FB159140847 /* Pods-RunnerTests.debug.xcconfig */;
477477
buildSettings = {
478478
BUNDLE_LOADER = "$(TEST_HOST)";
479479
CURRENT_PROJECT_VERSION = 1;
@@ -488,7 +488,7 @@
488488
};
489489
331C80DC294CF71000263BE5 /* Release */ = {
490490
isa = XCBuildConfiguration;
491-
baseConfigurationReference = 862A7400A3C2E8073C30A22F /* Pods-RunnerTests.release.xcconfig */;
491+
baseConfigurationReference = 21F5A103A9076EB884AEE6B1 /* Pods-RunnerTests.release.xcconfig */;
492492
buildSettings = {
493493
BUNDLE_LOADER = "$(TEST_HOST)";
494494
CURRENT_PROJECT_VERSION = 1;
@@ -503,7 +503,7 @@
503503
};
504504
331C80DD294CF71000263BE5 /* Profile */ = {
505505
isa = XCBuildConfiguration;
506-
baseConfigurationReference = B5428A6A0824034B71605EB7 /* Pods-RunnerTests.profile.xcconfig */;
506+
baseConfigurationReference = CF1C693E56126C7F30D9DC27 /* Pods-RunnerTests.profile.xcconfig */;
507507
buildSettings = {
508508
BUNDLE_LOADER = "$(TEST_HOST)";
509509
CURRENT_PROJECT_VERSION = 1;

‎adaptive_app/step_04/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

‎adaptive_app/step_04/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies:
3838
http: ^1.2.2
3939
provider: ^6.1.2
4040
url_launcher: ^6.3.1
41-
flex_color_scheme: ^8.0.1
42-
go_router: ^14.6.0
41+
flex_color_scheme: ^8.0.2
42+
go_router: ^14.6.2
4343

4444
dev_dependencies:
4545
flutter_test:

‎adaptive_app/step_05/android/app/src/main/kotlin/com/example/adaptive_app/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package com.example.adaptive_app
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity()
5+
class MainActivity : FlutterActivity()

0 commit comments

Comments
 (0)