Skip to content

Commit a6d1cb0

Browse files
committed
Update namer
1 parent 8135419 commit a6d1cb0

File tree

63 files changed

+75
-95
lines changed

Some content is hidden

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

63 files changed

+75
-95
lines changed

namer/codelab_rebuild.yaml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ steps:
150150
patch-u: |
151151
--- b/namer/step_04_a_widget/lib/main.dart
152152
+++ a/namer/step_04_a_widget/lib/main.dart
153-
@@ -37,8 +37,14 @@ class MyHomePage extends StatelessWidget {
153+
@@ -36,8 +36,14 @@ class MyHomePage extends StatelessWidget {
154154
return Scaffold(
155155
body: Column(
156156
children: [
@@ -190,10 +190,10 @@ steps:
190190
- name: Add button behavior
191191
path: namer_app/lib/main.dart
192192
patch-u: |
193-
--- a/namer_app/lib/main.dart
194-
+++ b/namer_app/lib/main.dart
195-
@@ -27,6 +27,11 @@ class MyApp extends StatelessWidget {
196-
193+
--- b/namer/step_04_b_behavior/lib/main.dart
194+
+++ a/namer/step_04_b_behavior/lib/main.dart
195+
@@ -26,6 +26,11 @@ class MyApp extends StatelessWidget {
196+
197197
class MyAppState extends ChangeNotifier {
198198
var current = WordPair.random();
199199
+
@@ -202,9 +202,9 @@ steps:
202202
+ notifyListeners();
203203
+ }
204204
}
205-
205+
206206
class MyHomePage extends StatelessWidget {
207-
@@ -41,7 +46,7 @@ class MyHomePage extends StatelessWidget {
207+
@@ -40,7 +45,7 @@ class MyHomePage extends StatelessWidget {
208208
Text(appState.current.asLowerCase),
209209
ElevatedButton(
210210
onPressed: () {
@@ -282,7 +282,7 @@ steps:
282282
patch-u: |
283283
--- b/namer/step_05_a_pair/lib/main.dart
284284
+++ a/namer/step_05_a_pair/lib/main.dart
285-
@@ -38,12 +38,13 @@ class MyHomePage extends StatelessWidget {
285+
@@ -37,12 +37,13 @@ class MyHomePage extends StatelessWidget {
286286
@override
287287
Widget build(BuildContext context) {
288288
var appState = context.watch<MyAppState>();
@@ -310,7 +310,7 @@ steps:
310310
patch-u: |
311311
--- b/namer/step_05_b_extract/lib/main.dart
312312
+++ a/namer/step_05_b_extract/lib/main.dart
313-
@@ -44,7 +44,7 @@ class MyHomePage extends StatelessWidget {
313+
@@ -43,7 +43,7 @@ class MyHomePage extends StatelessWidget {
314314
body: Column(
315315
children: [
316316
Text('A random AWESOME idea:'),
@@ -319,7 +319,7 @@ steps:
319319
ElevatedButton(
320320
onPressed: () {
321321
appState.getNext();
322-
@@ -56,3 +56,17 @@ class MyHomePage extends StatelessWidget {
322+
@@ -55,3 +55,17 @@ class MyHomePage extends StatelessWidget {
323323
);
324324
}
325325
}
@@ -372,7 +372,7 @@ steps:
372372
patch-u: |
373373
--- a/namer_app/lib/main.dart
374374
+++ b/namer_app/lib/main.dart
375-
@@ -67,6 +67,11 @@ class BigCard extends StatelessWidget {
375+
@@ -66,6 +66,11 @@ class BigCard extends StatelessWidget {
376376
377377
@override
378378
Widget build(BuildContext context) {
@@ -398,7 +398,7 @@ steps:
398398
patch-u: |
399399
--- a/namer_app/lib/main.dart
400400
+++ b/namer_app/lib/main.dart
401-
@@ -67,7 +67,10 @@ class BigCard extends StatelessWidget {
401+
@@ -66,7 +66,10 @@ class BigCard extends StatelessWidget {
402402
403403
@override
404404
Widget build(BuildContext context) {
@@ -422,7 +422,7 @@ steps:
422422
patch-u: |
423423
--- a/namer_app/lib/main.dart
424424
+++ b/namer_app/lib/main.dart
425-
@@ -68,12 +68,15 @@ class BigCard extends StatelessWidget {
425+
@@ -67,12 +67,15 @@ class BigCard extends StatelessWidget {
426426
@override
427427
Widget build(BuildContext context) {
428428
final theme = Theme.of(context);
@@ -452,7 +452,7 @@ steps:
452452
patch-u: |
453453
--- a/namer_app/lib/main.dart
454454
+++ b/namer_app/lib/main.dart
455-
@@ -76,7 +76,11 @@ class BigCard extends StatelessWidget {
455+
@@ -75,7 +75,11 @@ class BigCard extends StatelessWidget {
456456
color: theme.colorScheme.primary,
457457
child: Padding(
458458
padding: const EdgeInsets.all(20),
@@ -478,7 +478,7 @@ steps:
478478
patch-u: |
479479
--- b/namer/step_05_g_center_vertical/lib/main.dart
480480
+++ a/namer/step_05_g_center_vertical/lib/main.dart
481-
@@ -42,6 +42,7 @@ class MyHomePage extends StatelessWidget {
481+
@@ -41,6 +41,7 @@ class MyHomePage extends StatelessWidget {
482482
483483
return Scaffold(
484484
body: Column(
@@ -499,7 +499,7 @@ steps:
499499
patch-u: |
500500
--- b/namer/step_05_h_center_horizontal/lib/main.dart
501501
+++ a/namer/step_05_h_center_horizontal/lib/main.dart
502-
@@ -41,18 +41,20 @@ class MyHomePage extends StatelessWidget {
502+
@@ -40,18 +40,20 @@ class MyHomePage extends StatelessWidget {
503503
var pair = appState.current;
504504
505505
return Scaffold(
@@ -545,7 +545,7 @@ steps:
545545
patch-u: |
546546
--- a/namer_app/lib/main.dart
547547
+++ b/namer_app/lib/main.dart
548-
@@ -45,8 +45,8 @@ class MyHomePage extends StatelessWidget {
548+
@@ -44,8 +44,8 @@ class MyHomePage extends StatelessWidget {
549549
child: Column(
550550
mainAxisAlignment: MainAxisAlignment.center,
551551
children: [
@@ -582,7 +582,7 @@ steps:
582582
patch-u: |
583583
--- a/namer_app/lib/main.dart
584584
+++ b/namer_app/lib/main.dart
585-
@@ -32,6 +32,17 @@ class MyAppState extends ChangeNotifier {
585+
@@ -31,6 +31,17 @@ class MyAppState extends ChangeNotifier {
586586
current = WordPair.random();
587587
notifyListeners();
588588
}
@@ -613,7 +613,7 @@ steps:
613613
patch-u: |
614614
--- a/namer_app/lib/main.dart
615615
+++ b/namer_app/lib/main.dart
616-
@@ -58,11 +58,16 @@ class MyHomePage extends StatelessWidget {
616+
@@ -57,11 +57,16 @@ class MyHomePage extends StatelessWidget {
617617
children: [
618618
BigCard(pair: pair),
619619
SizedBox(height: 10),
@@ -646,9 +646,9 @@ steps:
646646
- name: Add 'Like' button to UI
647647
path: namer_app/lib/main.dart
648648
patch-u: |
649-
--- a/namer_app/lib/main.dart
650-
+++ b/namer_app/lib/main.dart
651-
@@ -51,6 +51,13 @@ class MyHomePage extends StatelessWidget {
649+
--- b/namer/step_06_c_add_like_button/lib/main.dart
650+
+++ a/namer/step_06_c_add_like_button/lib/main.dart
651+
@@ -50,6 +50,13 @@ class MyHomePage extends StatelessWidget {
652652
var appState = context.watch<MyAppState>();
653653
var pair = appState.current;
654654
@@ -662,7 +662,7 @@ steps:
662662
return Scaffold(
663663
body: Center(
664664
child: Column(
665-
@@ -61,6 +68,14 @@ class MyHomePage extends StatelessWidget {
665+
@@ -60,6 +67,14 @@ class MyHomePage extends StatelessWidget {
666666
Row(
667667
mainAxisSize: MainAxisSize.min,
668668
children: [
@@ -722,7 +722,7 @@ steps:
722722
patch-u: |
723723
--- a/namer_app/lib/main.dart
724724
+++ b/namer_app/lib/main.dart
725-
@@ -48,6 +48,43 @@
725+
@@ -47,6 +47,43 @@
726726
class MyHomePage extends StatelessWidget {
727727
@override
728728
Widget build(BuildContext context) {
@@ -766,7 +766,7 @@ steps:
766766
var appState = context.watch<MyAppState>();
767767
var pair = appState.current;
768768
769-
@@ -58,34 +95,32 @@
769+
@@ -57,34 +94,32 @@
770770
icon = Icons.favorite_border;
771771
}
772772
@@ -840,7 +840,7 @@ steps:
840840
patch-u: |
841841
--- a/namer_app/lib/main.dart
842842
+++ b/namer_app/lib/main.dart
843-
@@ -45,7 +45,12 @@ class MyAppState extends ChangeNotifier {
843+
@@ -44,7 +44,12 @@ class MyAppState extends ChangeNotifier {
844844
}
845845
}
846846
@@ -867,7 +867,7 @@ steps:
867867
patch-u: |
868868
--- a/namer_app/lib/main.dart
869869
+++ b/namer_app/lib/main.dart
870-
@@ -51,6 +51,8 @@
870+
@@ -50,6 +50,8 @@
871871
}
872872
873873
class _MyHomePageState extends State<MyHomePage> {
@@ -876,7 +876,7 @@ steps:
876876
@override
877877
Widget build(BuildContext context) {
878878
return Scaffold(
879-
@@ -69,9 +71,11 @@
879+
@@ -68,9 +70,11 @@
880880
label: Text('Favorites'),
881881
),
882882
],
@@ -903,7 +903,7 @@ steps:
903903
patch-u: |
904904
--- b/namer/step_07_d_use_selectedindex/lib/main.dart
905905
+++ a/namer/step_07_d_use_selectedindex/lib/main.dart
906-
@@ -55,6 +55,16 @@ class _MyHomePageState extends State<MyHomePage> {
906+
@@ -54,6 +54,16 @@ class _MyHomePageState extends State<MyHomePage> {
907907
908908
@override
909909
Widget build(BuildContext context) {
@@ -920,7 +920,7 @@ steps:
920920
return Scaffold(
921921
body: Row(
922922
children: [
923-
@@ -82,7 +92,7 @@ class _MyHomePageState extends State<MyHomePage> {
923+
@@ -81,7 +91,7 @@ class _MyHomePageState extends State<MyHomePage> {
924924
Expanded(
925925
child: Container(
926926
color: Theme.of(context).colorScheme.primaryContainer,
@@ -942,7 +942,7 @@ steps:
942942
patch-u: |
943943
--- a/namer_app/lib/main.dart
944944
+++ b/namer_app/lib/main.dart
945-
@@ -65,39 +65,41 @@
945+
@@ -64,39 +64,41 @@
946946
throw UnimplementedError('no widget for $selectedIndex');
947947
}
948948
@@ -1027,7 +1027,7 @@ steps:
10271027
patch-u: |
10281028
--- b/namer/step_08/lib/main.dart
10291029
+++ a/namer/step_08/lib/main.dart
1030-
@@ -60,7 +60,7 @@ class _MyHomePageState extends State<MyHomePage> {
1030+
@@ -59,7 +59,7 @@ class _MyHomePageState extends State<MyHomePage> {
10311031
case 0:
10321032
page = GeneratorPage();
10331033
case 1:
@@ -1036,7 +1036,7 @@ steps:
10361036
default:
10371037
throw UnimplementedError('no widget for $selectedIndex');
10381038
}
1039-
@@ -175,3 +175,31 @@ class BigCard extends StatelessWidget {
1039+
@@ -174,3 +174,31 @@ class BigCard extends StatelessWidget {
10401040
);
10411041
}
10421042
}

namer/step_03/macos/Runner/Configs/AppInfo.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ PRODUCT_NAME = namer_app
1111
PRODUCT_BUNDLE_IDENTIFIER = com.example.namerApp
1212

1313
// The copyright displayed in application information
14-
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
14+
PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved.

namer/step_03/windows/runner/Runner.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ BEGIN
9393
VALUE "FileDescription", "namer_app" "\0"
9494
VALUE "FileVersion", VERSION_AS_STRING "\0"
9595
VALUE "InternalName", "namer_app" "\0"
96-
VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0"
96+
VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0"
9797
VALUE "OriginalFilename", "namer_app.exe" "\0"
9898
VALUE "ProductName", "namer_app" "\0"
9999
VALUE "ProductVersion", VERSION_AS_STRING "\0"

namer/step_04_a_widget/lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class MyApp extends StatelessWidget {
1616
child: MaterialApp(
1717
title: 'Namer App',
1818
theme: ThemeData(
19-
2019
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange),
2120
),
2221
home: MyHomePage(),

namer/step_04_a_widget/macos/Runner/Configs/AppInfo.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ PRODUCT_NAME = namer_app
1111
PRODUCT_BUNDLE_IDENTIFIER = com.example.namerApp
1212

1313
// The copyright displayed in application information
14-
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
14+
PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved.

namer/step_04_a_widget/windows/runner/Runner.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ BEGIN
9393
VALUE "FileDescription", "namer_app" "\0"
9494
VALUE "FileVersion", VERSION_AS_STRING "\0"
9595
VALUE "InternalName", "namer_app" "\0"
96-
VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0"
96+
VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0"
9797
VALUE "OriginalFilename", "namer_app.exe" "\0"
9898
VALUE "ProductName", "namer_app" "\0"
9999
VALUE "ProductVersion", VERSION_AS_STRING "\0"

namer/step_04_b_behavior/lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class MyApp extends StatelessWidget {
1616
child: MaterialApp(
1717
title: 'Namer App',
1818
theme: ThemeData(
19-
2019
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange),
2120
),
2221
home: MyHomePage(),

namer/step_04_b_behavior/macos/Runner/Configs/AppInfo.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ PRODUCT_NAME = namer_app
1111
PRODUCT_BUNDLE_IDENTIFIER = com.example.namerApp
1212

1313
// The copyright displayed in application information
14-
PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved.
14+
PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved.

namer/step_04_b_behavior/windows/runner/Runner.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ BEGIN
9393
VALUE "FileDescription", "namer_app" "\0"
9494
VALUE "FileVersion", VERSION_AS_STRING "\0"
9595
VALUE "InternalName", "namer_app" "\0"
96-
VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0"
96+
VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0"
9797
VALUE "OriginalFilename", "namer_app.exe" "\0"
9898
VALUE "ProductName", "namer_app" "\0"
9999
VALUE "ProductVersion", VERSION_AS_STRING "\0"

namer/step_05_a_pair/lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class MyApp extends StatelessWidget {
1616
child: MaterialApp(
1717
title: 'Namer App',
1818
theme: ThemeData(
19-
2019
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepOrange),
2120
),
2221
home: MyHomePage(),

0 commit comments

Comments
 (0)