Skip to content

Commit 6baf4b6

Browse files
robmllzerobmllze
committed
+chore: Upgrade dependencies
1 parent fbcfc45 commit 6baf4b6

File tree

6 files changed

+66
-62
lines changed

6 files changed

+66
-62
lines changed

‎.github/scripts/update_changelog.dart

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ Set<_VersionSection> extractSections(String contents) {
7171
.where((e) => e.isNotEmpty);
7272
for (var line in old) {
7373
if (line.contains('Released @')) {
74-
final temp = line.split('Released @').last.trim();
75-
releasedAt = DateTime.tryParse(temp) ?? releasedAt;
74+
releasedAt = parseReleaseDate(line);
7675
} else {
7776
updates.add(line);
7877
}
@@ -155,3 +154,19 @@ int compareVersions(String version1, String version2) {
155154
}
156155
return 0;
157156
}
157+
158+
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
159+
160+
DateTime parseReleaseDate(String line) {
161+
if (line.contains('Released @')) {
162+
final temp = line.split('Released @').last.trim().replaceAll(' (UTC)', '');
163+
final parts = temp.split('/');
164+
if (parts.length == 2) {
165+
final month = int.tryParse(parts[0]) ?? 1;
166+
final year = int.tryParse(parts[1]) ?? DateTime.now().year;
167+
return DateTime.utc(year, month);
168+
}
169+
}
170+
171+
return DateTime.now().toUtc();
172+
}

‎lib/src/gen_screen_access_app.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13+
// ignore_for_file: invalid_use_of_visible_for_testing_member
14+
1315
import 'package:df_gen_core/df_gen_core.dart';
1416
import 'package:df_generate_dart_models_core/df_generate_dart_models_core.dart';
1517
import 'package:df_screen_core/df_screen_core.dart';
@@ -96,8 +98,7 @@ Future<void> genScreenAccessApp(
9698
'Looking for files..',
9799
);
98100
final filePathStream0 = PathExplorer(inputPath).exploreFiles();
99-
final filePathStream1 =
100-
filePathStream0.where((e) => _isAllowedFileName(e.path));
101+
final filePathStream1 = filePathStream0.where((e) => _isAllowedFileName(e.path));
101102
List<FilePathExplorerFinding> findings;
102103
try {
103104
findings = await filePathStream1.toList();
@@ -126,11 +127,13 @@ Future<void> genScreenAccessApp(
126127
printWhite,
127128
'Reading template at: $template...',
128129
);
129-
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(
130-
template,
131-
);
130+
final result = await MdTemplateUtility.i
131+
.readTemplateFromPathOrUrl(
132+
template,
133+
)
134+
.value;
132135

133-
if (result.isErr) {
136+
if (result.isErr()) {
134137
spinner.stop();
135138
_print(
136139
printRed,
@@ -241,8 +244,7 @@ class TemplateInterpolator2<T> {
241244
}
242245
}
243246

244-
final _interpolator =
245-
TemplateInterpolator2<ClassInsight<GenerateScreenBindings>>(
247+
final _interpolator = TemplateInterpolator2<ClassInsight<GenerateScreenBindings>>(
246248
{
247249
'___SCREEN_MAKERS___': (insight) {
248250
final a = insight.className.toPascalCase();

‎lib/src/gen_screen_app.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13+
// ignore_for_file: invalid_use_of_visible_for_testing_member
14+
1315
import 'package:df_gen_core/df_gen_core.dart';
1416
import 'package:df_gen_core/df_gen_core.dart' as df_gen_core;
1517
import 'package:df_generate_dart_models_core/df_generate_dart_models_core.dart';
@@ -28,8 +30,7 @@ Future<void> genScreenApp(
2830
}) async {
2931
final parser = CliParser(
3032
title: 'dev-cetera.com/df/tools',
31-
description:
32-
'A tool for generating screen/page files for Flutter projects.',
33+
description: 'A tool for generating screen/page files for Flutter projects.',
3334
example: 'gen-screen -i .',
3435
additional:
3536
'For contributions, error reports and information, visit: https://github.com/dev-cetera.',
@@ -95,11 +96,13 @@ Future<void> genScreenApp(
9596
printWhite,
9697
'Reading template at: $template...',
9798
);
98-
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(
99-
template,
100-
);
99+
final result = await MdTemplateUtility.i
100+
.readTemplateFromPathOrUrl(
101+
template,
102+
)
103+
.value;
101104

102-
if (result.isErr) {
105+
if (result.isErr()) {
103106
spinner.stop();
104107
_print(
105108
printRed,

‎lib/src/gen_screen_bindings_app.dart

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
1111
//.title~
1212

13+
// ignore_for_file: invalid_use_of_visible_for_testing_member
14+
1315
import 'package:df_gen_core/df_gen_core.dart';
1416
import 'package:df_generate_dart_models_core/df_generate_dart_models_core.dart';
1517
import 'package:df_screen_core/df_screen_core.dart';
@@ -96,8 +98,7 @@ Future<void> genScreenBindingsApp(
9698
'Looking for Dart files..',
9799
);
98100
final filePathStream0 = PathExplorer(inputPath).exploreFiles();
99-
final filePathStream1 =
100-
filePathStream0.where((e) => _isAllowedFileName(e.path));
101+
final filePathStream1 = filePathStream0.where((e) => _isAllowedFileName(e.path));
101102
List<FilePathExplorerFinding> findings;
102103
try {
103104
findings = await filePathStream1.toList();
@@ -126,11 +127,13 @@ Future<void> genScreenBindingsApp(
126127
printWhite,
127128
'Reading template at: $template...',
128129
);
129-
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(
130-
template,
131-
);
130+
final result = await MdTemplateUtility.i
131+
.readTemplateFromPathOrUrl(
132+
template,
133+
)
134+
.value;
132135

133-
if (result.isErr) {
136+
if (result.isErr()) {
134137
spinner.stop();
135138
_print(
136139
printRed,
@@ -225,8 +228,7 @@ bool _isAllowedFileName(String e) {
225228

226229
extension _ClassInsightExtension on ClassInsight<GenerateScreenBindings> {
227230
StringCaseType get stringCaseType {
228-
return StringCaseType.values.valueOf(annotation.keyStringCase) ??
229-
StringCaseType.CAMEL_CASE;
231+
return StringCaseType.values.valueOf(annotation.keyStringCase) ?? StringCaseType.CAMEL_CASE;
230232
}
231233
}
232234

@@ -241,17 +243,14 @@ String _screenSegment(ClassInsight<ModelGenerateScreenBindings> insight) {
241243
final path = insight.annotation.path ?? '';
242244
final screenSegment = p.joinAll(
243245
[
244-
path.isNotEmpty && path.startsWith(RegExp(r'[\\/]'))
245-
? path.substring(1)
246-
: path,
246+
path.isNotEmpty && path.startsWith(RegExp(r'[\\/]')) ? path.substring(1) : path,
247247
screenKey,
248248
],
249249
);
250250
return screenSegment;
251251
}
252252

253-
final _interpolator =
254-
TemplateInterpolator<ClassInsight<GenerateScreenBindings>>(
253+
final _interpolator = TemplateInterpolator<ClassInsight<GenerateScreenBindings>>(
255254
{
256255
'___SCREEN_KEY___': _screenKey,
257256
'___SCREEN_SEGMENT___': _screenSegment,
@@ -276,20 +275,16 @@ final _interpolator =
276275
return '/$screenSegment';
277276
},
278277
'___IS_ACCESSIBLE_ONLY_IF_LOGGED_IN_AND_VERIFIED___': (insight) {
279-
return (insight.annotation.isAccessibleOnlyIfLoggedInAndVerified ?? false)
280-
.toString();
278+
return (insight.annotation.isAccessibleOnlyIfLoggedInAndVerified ?? false).toString();
281279
},
282280
'___IS_ACCESSIBLE_ONLY_IF_LOGGED_IN___': (insight) {
283-
return (insight.annotation.isAccessibleOnlyIfLoggedIn ?? false)
284-
.toString();
281+
return (insight.annotation.isAccessibleOnlyIfLoggedIn ?? false).toString();
285282
},
286283
'___IS_ACCESSIBLE_ONLY_IF_LOGGED_OUT___': (insight) {
287-
return (insight.annotation.isAccessibleOnlyIfLoggedOut ?? false)
288-
.toString();
284+
return (insight.annotation.isAccessibleOnlyIfLoggedOut ?? false).toString();
289285
},
290286
'___IS_ALWAYS_ACCESSIBLE___': (insight) {
291-
final a =
292-
insight.annotation.isAccessibleOnlyIfLoggedInAndVerified ?? false;
287+
final a = insight.annotation.isAccessibleOnlyIfLoggedInAndVerified ?? false;
293288
final b = insight.annotation.isAccessibleOnlyIfLoggedIn ?? false;
294289
final c = insight.annotation.isAccessibleOnlyIfLoggedOut ?? false;
295290
if (a && b) {
@@ -326,10 +321,8 @@ final _interpolator =
326321
return b.toString();
327322
},
328323
'___IP0___': (insight) {
329-
final params = insight.annotation.internalParameters
330-
?.map((e) => FieldUtils.ofOrNull(e))
331-
.nonNulls ??
332-
{};
324+
final params =
325+
insight.annotation.internalParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
333326
if (params.isNotEmpty) {
334327
final a = params.map((e) {
335328
final fieldName = e.fieldPath!.join('_').toCamelCase();
@@ -354,10 +347,8 @@ final _interpolator =
354347
}
355348
},
356349
'___IP1___': (insight) {
357-
final params = insight.annotation.internalParameters
358-
?.map((e) => FieldUtils.ofOrNull(e))
359-
.nonNulls ??
360-
{};
350+
final params =
351+
insight.annotation.internalParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
361352
if (params.isNotEmpty) {
362353
final a = params.map((e) {
363354
final fieldName = e.fieldPath!.join('_').toCamelCase();
@@ -374,10 +365,8 @@ final _interpolator =
374365
}
375366
},
376367
'___IP2___': (insight) {
377-
final params = insight.annotation.internalParameters
378-
?.map((e) => FieldUtils.ofOrNull(e))
379-
.nonNulls ??
380-
{};
368+
final params =
369+
insight.annotation.internalParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
381370
if (params.isNotEmpty) {
382371
final a = params.map((e) {
383372
final fieldName = e.fieldPath!.join('_').toCamelCase();
@@ -391,10 +380,8 @@ final _interpolator =
391380
}
392381
},
393382
'___QP0___': (insight) {
394-
final params = insight.annotation.queryParameters
395-
?.map((e) => FieldUtils.ofOrNull(e))
396-
.nonNulls ??
397-
{};
383+
final params =
384+
insight.annotation.queryParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
398385
if (params.isNotEmpty) {
399386
final a = params.map((e) {
400387
final fieldName = e.fieldPath!.join('_').toCamelCase();
@@ -419,10 +406,8 @@ final _interpolator =
419406
}
420407
},
421408
'___QP1___': (insight) {
422-
final params = insight.annotation.queryParameters
423-
?.map((e) => FieldUtils.ofOrNull(e))
424-
.nonNulls ??
425-
{};
409+
final params =
410+
insight.annotation.queryParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
426411
if (params.isNotEmpty) {
427412
final a = params.map((e) {
428413
final fieldName = e.fieldPath!.join('_').toCamelCase();
@@ -436,10 +421,8 @@ final _interpolator =
436421
}
437422
},
438423
'___QP2___': (insight) {
439-
final params = insight.annotation.queryParameters
440-
?.map((e) => FieldUtils.ofOrNull(e))
441-
.nonNulls ??
442-
{};
424+
final params =
425+
insight.annotation.queryParameters?.map((e) => FieldUtils.ofOrNull(e)).nonNulls ?? {};
443426
if (params.isNotEmpty) {
444427
final a = params.map((e) {
445428
final fieldName = e.fieldPath!.join('_').toCamelCase();

‎pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
name: df_generate_screen
1414
description: A tool to generate ready-made screen templates for your Flutter app (uses df_sceen)
15-
version: 0.6.4
15+
version: 0.6.5
1616
repository: https://github.com/dev-cetera/df_generate_screen
1717
funding:
1818
- https://www.buymeacoffee.com/dev_cetera

‎templates/v1/_bindings.g.dart.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ base class ____WIDGET_NAME___ extends Screen {
191191
const ____WIDGET_NAME___({
192192
required super.key,
193193
required super.extra,
194+
// ignore: unused_element_parameter
194195
super.controllerTimeout = Duration.zero,
195196
});
196197

0 commit comments

Comments
 (0)