Skip to content

Commit 6a50f07

Browse files
sveinbjorntsveinbjornt
committed
Use super.key syntax introduced in Dart 2.19, updated xcodeproj
1 parent b402826 commit 6a50f07

File tree

11 files changed

+28
-32
lines changed

11 files changed

+28
-32
lines changed

‎ios/Runner.xcodeproj/project.pbxproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
isa = PBXProject;
174174
attributes = {
175175
BuildIndependentTargetsInParallel = YES;
176-
LastUpgradeCheck = 1430;
176+
LastUpgradeCheck = 1520;
177177
ORGANIZATIONNAME = "";
178178
TargetAttributes = {
179179
97C146ED1CF9000F007C117D = {
@@ -353,6 +353,7 @@
353353
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
354354
ENABLE_NS_ASSERTIONS = NO;
355355
ENABLE_STRICT_OBJC_MSGSEND = YES;
356+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
356357
GCC_C_LANGUAGE_STANDARD = gnu99;
357358
GCC_NO_COMMON_BLOCKS = YES;
358359
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -437,6 +438,7 @@
437438
DEBUG_INFORMATION_FORMAT = dwarf;
438439
ENABLE_STRICT_OBJC_MSGSEND = YES;
439440
ENABLE_TESTABILITY = YES;
441+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
440442
GCC_C_LANGUAGE_STANDARD = gnu99;
441443
GCC_DYNAMIC_NO_PIC = NO;
442444
GCC_NO_COMMON_BLOCKS = YES;
@@ -493,6 +495,7 @@
493495
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
494496
ENABLE_NS_ASSERTIONS = NO;
495497
ENABLE_STRICT_OBJC_MSGSEND = YES;
498+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
496499
GCC_C_LANGUAGE_STANDARD = gnu99;
497500
GCC_NO_COMMON_BLOCKS = YES;
498501
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎lib/asr.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Widget _buildASREngineList(BuildContext context) {
5454
}
5555

5656
class ASRSelectionRoute extends StatelessWidget {
57-
const ASRSelectionRoute({Key? key}) : super(key: key);
57+
const ASRSelectionRoute({super.key});
5858

5959
@override
6060
Widget build(BuildContext context) {

‎lib/button.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class SessionButtonWidget extends StatelessWidget {
8585
final EmblaSession? session;
8686
final void Function() onTap;
8787

88-
const SessionButtonWidget(this.context, this.session, this.onTap, {Key? key}) : super(key: key);
88+
const SessionButtonWidget(this.context, this.session, this.onTap, {super.key});
8989

9090
@override
9191
Widget build(BuildContext context) {

‎lib/info.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ ListView _buildVersionInfoWidgetList(BuildContext context) {
188188

189189
/// Route for displaying app and device information
190190
class VersionRoute extends StatelessWidget {
191-
const VersionRoute({Key? key}) : super(key: key);
191+
const VersionRoute({super.key});
192192

193193
@override
194194
Widget build(BuildContext context) {

‎lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void main() async {
125125
}
126126

127127
class EmblaApp extends StatelessWidget {
128-
const EmblaApp({Key? key}) : super(key: key);
128+
const EmblaApp({super.key});
129129

130130
@override
131131
Widget build(BuildContext context) {

‎lib/menu.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ListView _buildMenu(BuildContext context) {
9292

9393
/// Menu route shown when user presses the hamburger menu in session route.
9494
class MenuRoute extends StatelessWidget {
95-
const MenuRoute({Key? key}) : super(key: key);
95+
const MenuRoute({super.key});
9696

9797
@override
9898
Widget build(BuildContext context) {

‎lib/session.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ BuildContext? sessionContext;
6666

6767
// Main widget for session view
6868
class SessionRoute extends StatefulWidget {
69-
const SessionRoute({Key? key}) : super(key: key);
69+
const SessionRoute({super.key});
7070

7171
@override
7272
State<StatefulWidget> createState() => SessionRouteState();
@@ -524,7 +524,7 @@ class SessionTextAreaWidget extends StatelessWidget {
524524
final String text;
525525
final String? imageURL;
526526

527-
const SessionTextAreaWidget(this.text, this.imageURL, {Key? key}) : super(key: key);
527+
const SessionTextAreaWidget(this.text, this.imageURL, {super.key});
528528

529529
@override
530530
Widget build(BuildContext context) {

‎lib/settings.dart

+14-21
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ class SettingsSwitchWidget extends StatefulWidget {
5858
final void Function()? onChanged; // Callback
5959

6060
const SettingsSwitchWidget(
61-
{Key? key, required this.label, required this.prefKey, this.enabled = true, this.onChanged})
62-
: super(key: key);
61+
{super.key, required this.label, required this.prefKey, this.enabled = true, this.onChanged});
6362

6463
@override
6564
SettingsSwitchWidgetState createState() => SettingsSwitchWidgetState();
@@ -108,8 +107,7 @@ class SettingsPrivacySwitchWidget extends StatefulWidget {
108107
final void Function()? onChanged; // Callback
109108

110109
const SettingsPrivacySwitchWidget(
111-
{Key? key, required this.label, required this.prefKey, this.onChanged})
112-
: super(key: key);
110+
{super.key, required this.label, required this.prefKey, this.onChanged});
113111

114112
@override
115113
SettingsPrivacySwitchWidgetState createState() => SettingsPrivacySwitchWidgetState();
@@ -182,14 +180,13 @@ class SettingsSliderWidget extends StatefulWidget {
182180
final void Function(double)? onChangeEnd;
183181

184182
const SettingsSliderWidget(
185-
{Key? key,
183+
{super.key,
186184
required this.label,
187185
required this.prefKey,
188186
required this.minValue,
189187
required this.maxValue,
190188
required this.stepSize,
191-
this.onChangeEnd})
192-
: super(key: key);
189+
this.onChangeEnd});
193190

194191
@override
195192
SettingsSliderWidgetState createState() => SettingsSliderWidgetState();
@@ -244,12 +241,11 @@ class SettingsButtonPromptWidget extends StatelessWidget {
244241
final void Function() handler;
245242

246243
const SettingsButtonPromptWidget(
247-
{Key? key,
244+
{super.key,
248245
required this.label,
249246
required this.alertText,
250247
required this.buttonTitle,
251-
required this.handler})
252-
: super(key: key);
248+
required this.handler});
253249

254250
Future<void> _showPromptDialog(BuildContext context) async {
255251
String? r = await showAlertDialog(
@@ -286,8 +282,7 @@ class SettingsServerSelectionWidget extends StatefulWidget {
286282
final List<List<String>> items;
287283
final String prefKey;
288284

289-
const SettingsServerSelectionWidget({Key? key, required this.items, required this.prefKey})
290-
: super(key: key);
285+
const SettingsServerSelectionWidget({super.key, required this.items, required this.prefKey});
291286

292287
@override
293288
SettingsServerSelectionWidgetState createState() => SettingsServerSelectionWidgetState();
@@ -370,8 +365,7 @@ class SettingsLabelValueWidget extends StatelessWidget {
370365
final String value;
371366
final dynamic onTapRoute;
372367

373-
const SettingsLabelValueWidget(this.label, this.value, {this.onTapRoute, Key? key})
374-
: super(key: key);
368+
const SettingsLabelValueWidget(this.label, this.value, {this.onTapRoute, super.key});
375369

376370
@override
377371
Widget build(BuildContext context) {
@@ -409,7 +403,7 @@ class SettingsLabelValueWidget extends StatelessWidget {
409403
class SettingsFullTextLabelWidget extends StatelessWidget {
410404
final String label;
411405

412-
const SettingsFullTextLabelWidget(this.label, {Key? key}) : super(key: key);
406+
const SettingsFullTextLabelWidget(this.label, {super.key});
413407

414408
@override
415409
Widget build(BuildContext context) {
@@ -424,7 +418,7 @@ class SettingsFullTextLabelWidget extends StatelessWidget {
424418
class SettingsAsyncFullTextLabelWidget extends StatelessWidget {
425419
final Future<String> future;
426420

427-
const SettingsAsyncFullTextLabelWidget(this.future, {Key? key}) : super(key: key);
421+
const SettingsAsyncFullTextLabelWidget(this.future, {super.key});
428422

429423
@override
430424
Widget build(BuildContext context) {
@@ -446,8 +440,7 @@ class SettingsAsyncLabelValueWidget extends StatelessWidget {
446440
final Future<String> future;
447441
final Widget? onTapRoute;
448442

449-
const SettingsAsyncLabelValueWidget(this.label, this.future, {this.onTapRoute, Key? key})
450-
: super(key: key);
443+
const SettingsAsyncLabelValueWidget(this.label, this.future, {this.onTapRoute, super.key});
451444

452445
@override
453446
Widget build(BuildContext context) {
@@ -466,7 +459,7 @@ class SettingsAsyncLabelValueWidget extends StatelessWidget {
466459
class SettingsVoiceSelectionWidget extends StatefulWidget {
467460
final String label;
468461

469-
const SettingsVoiceSelectionWidget({Key? key, required this.label}) : super(key: key);
462+
const SettingsVoiceSelectionWidget({super.key, required this.label});
470463

471464
@override
472465
SettingsVoiceSelectionWidgetState createState() => SettingsVoiceSelectionWidgetState();
@@ -503,7 +496,7 @@ class SettingsVoiceSelectionWidgetState extends State<SettingsVoiceSelectionWidg
503496
class SettingsASRSelectionWidget extends StatefulWidget {
504497
final String label;
505498

506-
const SettingsASRSelectionWidget({Key? key, required this.label}) : super(key: key);
499+
const SettingsASRSelectionWidget({super.key, required this.label});
507500

508501
@override
509502
SettingsASRSelectionWidgetState createState() => SettingsASRSelectionWidgetState();
@@ -640,7 +633,7 @@ List<Widget> _settings(BuildContext context, void Function() refreshCallback) {
640633

641634
/// The main settings route
642635
class SettingsRoute extends StatefulWidget {
643-
const SettingsRoute({Key? key}) : super(key: key);
636+
const SettingsRoute({super.key});
644637

645638
@override
646639
State<StatefulWidget> createState() => SettingsRouteState();

‎lib/voices.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Widget _buildVoiceList(BuildContext context) {
6060
}
6161

6262
class VoiceSelectionRoute extends StatelessWidget {
63-
const VoiceSelectionRoute({Key? key}) : super(key: key);
63+
const VoiceSelectionRoute({super.key});
6464

6565
@override
6666
Widget build(BuildContext context) {

‎lib/web.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Future<void> preloadHTMLDocuments() async {
5151
class WebViewRoute extends StatefulWidget {
5252
final String initialURL;
5353

54-
const WebViewRoute({Key? key, required this.initialURL}) : super(key: key);
54+
const WebViewRoute({super.key, required this.initialURL});
5555

5656
@override
5757
WebViewRouteState createState() => WebViewRouteState();

0 commit comments

Comments
 (0)