Skip to content

Commit 373e963

Browse files
committed
upgrade code to new flutter version
1 parent c8d8e9e commit 373e963

File tree

6 files changed

+112
-57
lines changed

6 files changed

+112
-57
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
/build/
3333

3434
# Web related
35-
lib/generated_plugin_registrant.dart
3635

3736
# Symbolication related
3837
app.*.symbols

lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class MyApp extends StatelessWidget {
2323
final ThemeData _lightTheme = ThemeData(
2424
brightness: Brightness.light,
2525
appBarTheme: AppBarTheme(color: Colors.transparent, shadowColor: Colors.transparent, iconTheme: IconThemeData(color: Colors.black)),
26-
textTheme: TextTheme(headline4: TextStyle(fontWeight: FontWeight.bold, color: Colors.black), bodyText2: TextStyle(fontSize: 16, height: 1.75)),
26+
textTheme: TextTheme(headlineMedium: TextStyle(fontWeight: FontWeight.bold, color: Colors.black), bodySmall: TextStyle(fontSize: 16, height: 1.75)),
2727
);
2828
final ThemeData _darkTheme = ThemeData(
2929
brightness: Brightness.dark,
3030
appBarTheme: AppBarTheme(color: Colors.transparent, shadowColor: Colors.transparent, iconTheme: IconThemeData(color: Colors.white)),
31-
textTheme: TextTheme(headline4: TextStyle(fontWeight: FontWeight.bold, color: Colors.white), bodyText2: TextStyle(fontSize: 16, height: 1.75, color: Colors.grey.shade200)),
31+
textTheme: TextTheme(headlineMedium: TextStyle(fontWeight: FontWeight.bold, color: Colors.white), bodySmall: TextStyle(fontSize: 16, height: 1.75, color: Colors.grey.shade200)),
3232
);
3333

3434
// This widget is the root of your application.

lib/ui/about.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class AboutState extends State<About> with WidgetsBindingObserver {
8585
Padding(padding: const EdgeInsets.all(5)),
8686
Text(
8787
"About",
88-
style: Theme.of(context).textTheme.headline4,
88+
style: Theme.of(context).textTheme.headlineMedium,
8989
),
9090
Padding(padding: const EdgeInsets.all(5)),
9191
Text(
@@ -95,7 +95,7 @@ class AboutState extends State<About> with WidgetsBindingObserver {
9595
Padding(padding: const EdgeInsets.all(10)),
9696
Text(
9797
"Experience Overview",
98-
style: Theme.of(context).textTheme.headline4,
98+
style: Theme.of(context).textTheme.headlineMedium,
9999
),
100100
Padding(padding: const EdgeInsets.all(5)),
101101
Text("C & C++:"),
@@ -182,27 +182,27 @@ class AboutState extends State<About> with WidgetsBindingObserver {
182182
return RichText(
183183
text: TextSpan(children: [
184184
TextSpan(
185-
text: "Resume (", style: Theme.of(context).textTheme.bodyText2),
185+
text: "Resume (", style: Theme.of(context).textTheme.bodySmall),
186186
TextSpan(
187187
text: "View",
188188
style: Theme.of(context)
189189
.textTheme
190-
.bodyText2
190+
.bodySmall
191191
?.merge(TextStyle(color: Colors.blue)),
192192
recognizer: TapGestureRecognizer()..onTap = viewResume,
193193
),
194194
if (!showSingleButton)
195-
TextSpan(text: " / ", style: Theme.of(context).textTheme.bodyText2),
195+
TextSpan(text: " / ", style: Theme.of(context).textTheme.bodySmall),
196196
if (!showSingleButton)
197197
TextSpan(
198198
text: "Download",
199199
style: Theme.of(context)
200200
.textTheme
201-
.bodyText2
201+
.bodySmall
202202
?.merge(TextStyle(color: Colors.blue)),
203203
recognizer: TapGestureRecognizer()..onTap = downloadResume,
204204
),
205-
TextSpan(text: ")", style: Theme.of(context).textTheme.bodyText2),
205+
TextSpan(text: ")", style: Theme.of(context).textTheme.bodySmall),
206206
]),
207207
);
208208
}

lib/ui/projects.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,15 @@ class ProjectsState extends State<Projects> with WidgetsBindingObserver {
8282
children: [
8383
Text(
8484
"Users",
85-
style: Theme.of(context).textTheme.headline4,
85+
style: Theme.of(context).textTheme.headlineMedium,
8686
),
8787
Padding(
8888
padding: EdgeInsets.all(10),
8989
),
9090
MasonryGridView.count(
9191
shrinkWrap: true,
92-
padding: EdgeInsets.only(left: paddingSize/3, right: paddingSize/3),
92+
padding: EdgeInsets.only(
93+
left: paddingSize / 3, right: paddingSize / 3),
9394
physics: ClampingScrollPhysics(),
9495
key: UniqueKey(),
9596
crossAxisCount: min(axisCount, userItems.length),
@@ -103,7 +104,7 @@ class ProjectsState extends State<Projects> with WidgetsBindingObserver {
103104
),
104105
Text(
105106
"Developers",
106-
style: Theme.of(context).textTheme.headline4,
107+
style: Theme.of(context).textTheme.headlineMedium,
107108
),
108109
Padding(
109110
padding: EdgeInsets.all(10),

lib/widgets/project_column.dart

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,15 @@ class ProjectColumn extends StatelessWidget {
1212
final ProjectStatus projectStatus;
1313
final Row? linkRow;
1414

15-
const ProjectColumn({Key? key, this.image, required this.title, required this.description, required this.projectStatus, this.linkRow}) : super(key: key);
15+
const ProjectColumn(
16+
{Key? key,
17+
this.image,
18+
required this.title,
19+
required this.description,
20+
required this.projectStatus,
21+
this.linkRow})
22+
: super(key: key);
23+
1624
///Main widget build method
1725
///Builds the UI on this screen
1826
@override
@@ -22,18 +30,42 @@ class ProjectColumn extends StatelessWidget {
2230
mainAxisAlignment: MainAxisAlignment.start,
2331
mainAxisSize: MainAxisSize.min,
2432
children: [
25-
Padding(padding: EdgeInsets.all(10),),
26-
image != null ? Image(image: image!,) : Container(),
27-
image != null ? Padding(padding: EdgeInsets.all(15),) : Container(),
28-
Text(title, style: Theme.of(context).textTheme.headline6?.merge(TextStyle(fontWeight: FontWeight.bold)), textAlign: TextAlign.center,),
33+
Padding(
34+
padding: EdgeInsets.all(10),
35+
),
36+
image != null
37+
? Image(
38+
image: image!,
39+
)
40+
: Container(),
41+
image != null
42+
? Padding(
43+
padding: EdgeInsets.all(15),
44+
)
45+
: Container(),
46+
Text(
47+
title,
48+
style: Theme.of(context)
49+
.textTheme
50+
.headlineSmall
51+
?.merge(TextStyle(fontWeight: FontWeight.bold)),
52+
textAlign: TextAlign.center,
53+
),
2954
Padding(
3055
padding: const EdgeInsets.all(15.0),
31-
child: Text(description, style: Theme.of(context).textTheme.bodyText2,),
56+
child: Text(
57+
description,
58+
style: Theme.of(context).textTheme.bodySmall,
59+
),
3260
),
3361
buildProjectStatus(context),
3462
Padding(padding: const EdgeInsets.all(10)),
3563
linkRow != null ? linkRow! : Container(),
36-
linkRow != null ? Padding(padding: const EdgeInsets.all(10),) : Container(),
64+
linkRow != null
65+
? Padding(
66+
padding: const EdgeInsets.all(10),
67+
)
68+
: Container(),
3769
// Align(
3870
// alignment: Alignment.centerRight,
3971
// child: Padding(
@@ -70,19 +102,18 @@ class ProjectColumn extends StatelessWidget {
70102
break;
71103
}
72104
return RichText(
73-
text: TextSpan(
74-
children: [
75-
TextSpan(
76-
text: "Project Status: ",
77-
style: Theme.of(context).textTheme.subtitle2,
78-
),
79-
TextSpan(
80-
text: projectString,
81-
style: Theme.of(context).textTheme.subtitle2?.merge(TextStyle(color: color))
82-
)
83-
]
84-
),
105+
text: TextSpan(children: [
106+
TextSpan(
107+
text: "Project Status: ",
108+
style: Theme.of(context).textTheme.headlineSmall,
109+
),
110+
TextSpan(
111+
text: projectString,
112+
style: Theme.of(context)
113+
.textTheme
114+
.headlineSmall
115+
?.merge(TextStyle(color: color)))
116+
]),
85117
);
86118
}
87-
88119
}

pubspec.lock

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.1"
43+
version: "1.18.0"
4444
controller_widgets:
4545
dependency: "direct main"
4646
description:
@@ -105,46 +105,62 @@ packages:
105105
description: flutter
106106
source: sdk
107107
version: "0.0.0"
108-
js:
108+
leak_tracker:
109109
dependency: transitive
110110
description:
111-
name: js
112-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
111+
name: leak_tracker
112+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "0.6.7"
115+
version: "10.0.4"
116+
leak_tracker_flutter_testing:
117+
dependency: transitive
118+
description:
119+
name: leak_tracker_flutter_testing
120+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
121+
url: "https://pub.dev"
122+
source: hosted
123+
version: "3.0.3"
124+
leak_tracker_testing:
125+
dependency: transitive
126+
description:
127+
name: leak_tracker_testing
128+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
129+
url: "https://pub.dev"
130+
source: hosted
131+
version: "3.0.1"
116132
matcher:
117133
dependency: transitive
118134
description:
119135
name: matcher
120-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
136+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
121137
url: "https://pub.dev"
122138
source: hosted
123-
version: "0.12.15"
139+
version: "0.12.16+1"
124140
material_color_utilities:
125141
dependency: transitive
126142
description:
127143
name: material_color_utilities
128-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
144+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
129145
url: "https://pub.dev"
130146
source: hosted
131-
version: "0.2.0"
147+
version: "0.8.0"
132148
meta:
133149
dependency: transitive
134150
description:
135151
name: meta
136-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
152+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
137153
url: "https://pub.dev"
138154
source: hosted
139-
version: "1.9.1"
155+
version: "1.12.0"
140156
path:
141157
dependency: transitive
142158
description:
143159
name: path
144-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
160+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
145161
url: "https://pub.dev"
146162
source: hosted
147-
version: "1.8.3"
163+
version: "1.9.0"
148164
path_provider_linux:
149165
dependency: transitive
150166
description:
@@ -250,26 +266,26 @@ packages:
250266
dependency: transitive
251267
description:
252268
name: source_span
253-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
269+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
254270
url: "https://pub.dev"
255271
source: hosted
256-
version: "1.9.1"
272+
version: "1.10.0"
257273
stack_trace:
258274
dependency: transitive
259275
description:
260276
name: stack_trace
261-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
277+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
262278
url: "https://pub.dev"
263279
source: hosted
264-
version: "1.11.0"
280+
version: "1.11.1"
265281
stream_channel:
266282
dependency: transitive
267283
description:
268284
name: stream_channel
269-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
285+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
270286
url: "https://pub.dev"
271287
source: hosted
272-
version: "2.1.1"
288+
version: "2.1.2"
273289
string_scanner:
274290
dependency: transitive
275291
description:
@@ -290,10 +306,10 @@ packages:
290306
dependency: transitive
291307
description:
292308
name: test_api
293-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
309+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
294310
url: "https://pub.dev"
295311
source: hosted
296-
version: "0.5.1"
312+
version: "0.7.0"
297313
url_launcher:
298314
dependency: "direct main"
299315
description:
@@ -366,6 +382,14 @@ packages:
366382
url: "https://pub.dev"
367383
source: hosted
368384
version: "2.1.4"
385+
vm_service:
386+
dependency: transitive
387+
description:
388+
name: vm_service
389+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
390+
url: "https://pub.dev"
391+
source: hosted
392+
version: "14.2.1"
369393
win32:
370394
dependency: transitive
371395
description:
@@ -383,5 +407,5 @@ packages:
383407
source: hosted
384408
version: "1.0.1"
385409
sdks:
386-
dart: ">=3.0.0 <4.0.0"
387-
flutter: ">=3.10.0"
410+
dart: ">=3.3.0 <4.0.0"
411+
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)