Skip to content

Commit 4031197

Browse files
domesticmousedomesticmouse
committed
Update next-gen-ui for flutter beta
1 parent 3180040 commit 4031197

File tree

91 files changed

+3004
-142
lines changed

Some content is hidden

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

91 files changed

+3004
-142
lines changed

‎next-gen-ui/codelab_rebuild.yaml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,13 +1452,7 @@ steps:
14521452
void paint(Canvas canvas, Size size) {
14531453
double fov = v64.mix(pi / 4.3, pi / 2.0, config.zoom.clamp(0.0, 1.0));
14541454

1455-
v64.Vector3 colorToVector3(Color c) =>
1456-
v64.Vector3(
1457-
c.red.toDouble(),
1458-
c.green.toDouble(),
1459-
c.blue.toDouble(),
1460-
) /
1461-
255.0;
1455+
v64.Vector3 colorToVector3(Color c) => v64.Vector3(c.r, c.g, c.b);
14621456

14631457
v64.Vector3 lightLumP = colorToVector3(config.lightColor).normalized() *
14641458
max(0.0, config.lightBrightness);
@@ -1666,6 +1660,15 @@ steps:
16661660
- name: Build Web app
16671661
path: next_gen_ui
16681662
flutter: build web
1663+
- name: Build iOS app
1664+
path: next_gen_ui
1665+
flutter: build ios --simulator
1666+
- name: Build Android app
1667+
path: next_gen_ui
1668+
flutter: build apk
1669+
- name: Build macOS app
1670+
path: next_gen_ui
1671+
flutter: build macos
16691672
- name: Copy to step_01
16701673
copydir:
16711674
from: next_gen_ui
@@ -3400,6 +3403,15 @@ steps:
34003403
- name: Build Web app
34013404
path: next_gen_ui
34023405
flutter: build web
3406+
- name: Build iOS app
3407+
path: next_gen_ui
3408+
flutter: build ios --simulator
3409+
- name: Build Android app
3410+
path: next_gen_ui
3411+
flutter: build apk
3412+
- name: Build macOS app
3413+
path: next_gen_ui
3414+
flutter: build macos
34033415
- name: Copy to step_06
34043416
copydir:
34053417
from: next_gen_ui

‎next-gen-ui/step_01/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1313
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
14+
95B86EC706B280ECBF05B340 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F29266F85C81E223DE38826F /* Pods_RunnerTests.framework */; };
1415
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1516
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1617
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
18+
E9B1620F2EF5AF6175681809 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE20D8731F5AC68BA1712A5A /* Pods_Runner.framework */; };
1719
/* End PBXBuildFile section */
1820

1921
/* Begin PBXContainerItemProxy section */
@@ -45,23 +47,40 @@
4547
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
4648
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4749
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
50+
531021BCFBF6DEA7A588EEFB /* 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>"; };
51+
5C244634881A8C4BD75C5C03 /* 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>"; };
4852
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4953
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5054
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
55+
8094A5C0BD3F742D973F4EBB /* 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>"; };
5156
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5257
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
5358
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5459
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5560
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5661
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5762
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
63+
D324E46E5A8253E05C3A901E /* 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>"; };
64+
DC699C7AADC6A46B95166F6E /* 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>"; };
65+
DE20D8731F5AC68BA1712A5A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66+
F29266F85C81E223DE38826F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
67+
FFE5027C7AD199E12A7AF98E /* 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>"; };
5868
/* End PBXFileReference section */
5969

6070
/* Begin PBXFrameworksBuildPhase section */
71+
344BA4708047A433A26140BD /* Frameworks */ = {
72+
isa = PBXFrameworksBuildPhase;
73+
buildActionMask = 2147483647;
74+
files = (
75+
95B86EC706B280ECBF05B340 /* Pods_RunnerTests.framework in Frameworks */,
76+
);
77+
runOnlyForDeploymentPostprocessing = 0;
78+
};
6179
97C146EB1CF9000F007C117D /* Frameworks */ = {
6280
isa = PBXFrameworksBuildPhase;
6381
buildActionMask = 2147483647;
6482
files = (
83+
E9B1620F2EF5AF6175681809 /* Pods_Runner.framework in Frameworks */,
6584
);
6685
runOnlyForDeploymentPostprocessing = 0;
6786
};
@@ -76,6 +95,20 @@
7695
path = RunnerTests;
7796
sourceTree = "<group>";
7897
};
98+
6655F551DEE09BD8E2ABAAD2 /* Pods */ = {
99+
isa = PBXGroup;
100+
children = (
101+
8094A5C0BD3F742D973F4EBB /* Pods-Runner.debug.xcconfig */,
102+
5C244634881A8C4BD75C5C03 /* Pods-Runner.release.xcconfig */,
103+
DC699C7AADC6A46B95166F6E /* Pods-Runner.profile.xcconfig */,
104+
531021BCFBF6DEA7A588EEFB /* Pods-RunnerTests.debug.xcconfig */,
105+
FFE5027C7AD199E12A7AF98E /* Pods-RunnerTests.release.xcconfig */,
106+
D324E46E5A8253E05C3A901E /* Pods-RunnerTests.profile.xcconfig */,
107+
);
108+
name = Pods;
109+
path = Pods;
110+
sourceTree = "<group>";
111+
};
79112
9740EEB11CF90186004384FC /* Flutter */ = {
80113
isa = PBXGroup;
81114
children = (
@@ -94,6 +127,8 @@
94127
97C146F01CF9000F007C117D /* Runner */,
95128
97C146EF1CF9000F007C117D /* Products */,
96129
331C8082294A63A400263BE5 /* RunnerTests */,
130+
6655F551DEE09BD8E2ABAAD2 /* Pods */,
131+
AB471AC81B5F3E3EAC08510D /* Frameworks */,
97132
);
98133
sourceTree = "<group>";
99134
};
@@ -121,15 +156,26 @@
121156
path = Runner;
122157
sourceTree = "<group>";
123158
};
159+
AB471AC81B5F3E3EAC08510D /* Frameworks */ = {
160+
isa = PBXGroup;
161+
children = (
162+
DE20D8731F5AC68BA1712A5A /* Pods_Runner.framework */,
163+
F29266F85C81E223DE38826F /* Pods_RunnerTests.framework */,
164+
);
165+
name = Frameworks;
166+
sourceTree = "<group>";
167+
};
124168
/* End PBXGroup section */
125169

126170
/* Begin PBXNativeTarget section */
127171
331C8080294A63A400263BE5 /* RunnerTests */ = {
128172
isa = PBXNativeTarget;
129173
buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
130174
buildPhases = (
175+
C143E5EEC573FBD89B16A658 /* [CP] Check Pods Manifest.lock */,
131176
331C807D294A63A400263BE5 /* Sources */,
132177
331C807F294A63A400263BE5 /* Resources */,
178+
344BA4708047A433A26140BD /* Frameworks */,
133179
);
134180
buildRules = (
135181
);
@@ -145,6 +191,7 @@
145191
isa = PBXNativeTarget;
146192
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
147193
buildPhases = (
194+
3AAEDA8BA83E71CC34259A37 /* [CP] Check Pods Manifest.lock */,
148195
9740EEB61CF901F6004384FC /* Run Script */,
149196
97C146EA1CF9000F007C117D /* Sources */,
150197
97C146EB1CF9000F007C117D /* Frameworks */,
@@ -222,6 +269,28 @@
222269
/* End PBXResourcesBuildPhase section */
223270

224271
/* Begin PBXShellScriptBuildPhase section */
272+
3AAEDA8BA83E71CC34259A37 /* [CP] Check Pods Manifest.lock */ = {
273+
isa = PBXShellScriptBuildPhase;
274+
buildActionMask = 2147483647;
275+
files = (
276+
);
277+
inputFileListPaths = (
278+
);
279+
inputPaths = (
280+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
281+
"${PODS_ROOT}/Manifest.lock",
282+
);
283+
name = "[CP] Check Pods Manifest.lock";
284+
outputFileListPaths = (
285+
);
286+
outputPaths = (
287+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
288+
);
289+
runOnlyForDeploymentPostprocessing = 0;
290+
shellPath = /bin/sh;
291+
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";
292+
showEnvVarsInLog = 0;
293+
};
225294
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
226295
isa = PBXShellScriptBuildPhase;
227296
alwaysOutOfDate = 1;
@@ -253,6 +322,28 @@
253322
shellPath = /bin/sh;
254323
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
255324
};
325+
C143E5EEC573FBD89B16A658 /* [CP] Check Pods Manifest.lock */ = {
326+
isa = PBXShellScriptBuildPhase;
327+
buildActionMask = 2147483647;
328+
files = (
329+
);
330+
inputFileListPaths = (
331+
);
332+
inputPaths = (
333+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
334+
"${PODS_ROOT}/Manifest.lock",
335+
);
336+
name = "[CP] Check Pods Manifest.lock";
337+
outputFileListPaths = (
338+
);
339+
outputPaths = (
340+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
341+
);
342+
runOnlyForDeploymentPostprocessing = 0;
343+
shellPath = /bin/sh;
344+
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";
345+
showEnvVarsInLog = 0;
346+
};
256347
/* End PBXShellScriptBuildPhase section */
257348

258349
/* Begin PBXSourcesBuildPhase section */
@@ -378,6 +469,7 @@
378469
};
379470
331C8088294A63A400263BE5 /* Debug */ = {
380471
isa = XCBuildConfiguration;
472+
baseConfigurationReference = 531021BCFBF6DEA7A588EEFB /* Pods-RunnerTests.debug.xcconfig */;
381473
buildSettings = {
382474
BUNDLE_LOADER = "$(TEST_HOST)";
383475
CODE_SIGN_STYLE = Automatic;
@@ -395,6 +487,7 @@
395487
};
396488
331C8089294A63A400263BE5 /* Release */ = {
397489
isa = XCBuildConfiguration;
490+
baseConfigurationReference = FFE5027C7AD199E12A7AF98E /* Pods-RunnerTests.release.xcconfig */;
398491
buildSettings = {
399492
BUNDLE_LOADER = "$(TEST_HOST)";
400493
CODE_SIGN_STYLE = Automatic;
@@ -410,6 +503,7 @@
410503
};
411504
331C808A294A63A400263BE5 /* Profile */ = {
412505
isa = XCBuildConfiguration;
506+
baseConfigurationReference = D324E46E5A8253E05C3A901E /* Pods-RunnerTests.profile.xcconfig */;
413507
buildSettings = {
414508
BUNDLE_LOADER = "$(TEST_HOST)";
415509
CODE_SIGN_STYLE = Automatic;

‎next-gen-ui/step_01/ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎next-gen-ui/step_01/lib/orb_shader/orb_shader_painter.dart‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@ class OrbShaderPainter extends CustomPainter {
2828
void paint(Canvas canvas, Size size) {
2929
double fov = v64.mix(pi / 4.3, pi / 2.0, config.zoom.clamp(0.0, 1.0));
3030

31-
v64.Vector3 colorToVector3(Color c) =>
32-
v64.Vector3(
33-
c.red.toDouble(),
34-
c.green.toDouble(),
35-
c.blue.toDouble(),
36-
) /
37-
255.0;
31+
v64.Vector3 colorToVector3(Color c) => v64.Vector3(c.r, c.g, c.b);
3832

3933
v64.Vector3 lightLumP = colorToVector3(config.lightColor).normalized() *
4034
max(0.0, config.lightBrightness);

0 commit comments

Comments
 (0)