Skip to content

Commit 9b5d643

Browse files
committed
build with Flutter 2.8
1 parent 91cc4dc commit 9b5d643

24 files changed

+202
-78
lines changed

Flutter/json_to_dart/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'dart:math';
22

33
import 'package:flutter/material.dart';
4-
import 'package:hive/hive.dart';
4+
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
55
import 'package:hive_flutter/hive_flutter.dart';
66
import 'package:nested/nested.dart';
77
import 'package:oktoast/oktoast.dart';
88
import 'package:provider/provider.dart';
9-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
9+
1010
import 'models/config.dart';
1111
import 'models/json_to_dart_controller.dart';
1212
import 'navigator/navigator.dart';

Flutter/json_to_dart/lib/models/config.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:convert';
22

33
import 'package:flutter/cupertino.dart';
4-
import 'package:flutter/foundation.dart';
54
import 'package:hive/hive.dart';
65
import 'package:json_to_dart/utils/enums.dart';
76
part 'config.g.dart';

Flutter/json_to_dart/lib/models/dart_object.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import 'dart:async';
2+
3+
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
24
import 'package:json_to_dart/i18n.dart';
35
import 'package:json_to_dart/models/config.dart';
46
import 'package:json_to_dart/utils/camel_under_score_converter.dart';
57
import 'package:json_to_dart/utils/dart_helper.dart';
68
import 'package:json_to_dart/utils/enums.dart';
79
import 'package:json_to_dart/utils/my_string_buffer.dart';
810
import 'package:json_to_dart/utils/string_helper.dart';
9-
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
1011
import 'package:tuple/tuple.dart';
1112

1213
import 'config.dart';

Flutter/json_to_dart/lib/models/dart_property.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'package:equatable/equatable.dart';
2-
import 'package:json_to_dart/utils/enums.dart';
32
import 'package:json_to_dart/utils/camel_under_score_converter.dart';
43
import 'package:json_to_dart/utils/dart_helper.dart';
4+
import 'package:json_to_dart/utils/enums.dart';
55
import 'package:json_to_dart/utils/my_string_buffer.dart';
66
import 'package:json_to_dart/utils/string_helper.dart';
7+
78
import 'config.dart';
89

910
// ignore: must_be_immutable
@@ -71,7 +72,7 @@ class DartProperty extends Equatable {
7172
} else {
7273
result = stringFormat('List<{0}>', <String>[result]);
7374
}
74-
if (temp is List && temp.isNotEmpty) {
75+
if (temp.isNotEmpty) {
7576
temp = temp.first;
7677
} else {
7778
break;
@@ -105,7 +106,7 @@ class DartProperty extends Equatable {
105106
type = 'List<$type>';
106107
copy = 'e.map(($type e)=> $copy).toList()';
107108
}
108-
if (temp is List && temp.isNotEmpty) {
109+
if (temp.isNotEmpty) {
109110
temp = temp.first;
110111
}
111112
}
@@ -137,7 +138,7 @@ class DartProperty extends Equatable {
137138
}
138139
dynamic temp = value;
139140
while (temp is List) {
140-
if (temp is List && temp.isNotEmpty) {
141+
if (temp.isNotEmpty) {
141142
temp = temp.first;
142143
} else {
143144
break;
@@ -160,7 +161,7 @@ class DartProperty extends Equatable {
160161
int count = 0;
161162
String? result;
162163
while (temp is List) {
163-
if (temp is List && temp.isNotEmpty) {
164+
if (temp.isNotEmpty) {
164165
temp = temp.first;
165166
} else {
166167
temp = null;

Flutter/json_to_dart/lib/models/json_to_dart_controller.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import 'dart:convert';
22

33
import 'package:dart_style/dart_style.dart';
44
import 'package:flutter/foundation.dart';
5-
import 'package:intl/intl.dart';
65
import 'package:flutter/material.dart';
76
import 'package:flutter/services.dart';
8-
import 'package:oktoast/oktoast.dart';
7+
import 'package:intl/intl.dart';
8+
import 'package:json_to_dart/i18n.dart';
99
import 'package:json_to_dart/models/config.dart';
1010
import 'package:json_to_dart/utils/camel_under_score_converter.dart';
1111
import 'package:json_to_dart/utils/dart_helper.dart';
1212
import 'package:json_to_dart/utils/my_string_buffer.dart';
13-
import 'package:json_to_dart/i18n.dart';
13+
import 'package:oktoast/oktoast.dart';
1414

1515
import 'dart_object.dart';
1616

Flutter/json_to_dart/lib/pages/json_text_field.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
2-
import 'package:json_to_dart/i18n.dart';
32
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
3+
import 'package:json_to_dart/i18n.dart';
44
import 'package:json_to_dart/models/json_to_dart_controller.dart';
55
import 'package:json_to_dart/style/color.dart';
66
import 'package:provider/provider.dart';

Flutter/json_to_dart/lib/pages/setting.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
3+
import 'package:json_to_dart/i18n.dart';
34
import 'package:json_to_dart/models/config.dart';
45
import 'package:json_to_dart/models/json_to_dart_controller.dart';
56
import 'package:json_to_dart/style/color.dart';
@@ -8,7 +9,6 @@ import 'package:json_to_dart/utils/enums.dart';
89
import 'package:json_to_dart/widget/button.dart';
910
import 'package:json_to_dart/widget/checkBox.dart';
1011
import 'package:json_to_dart/widget/picker.dart';
11-
import 'package:json_to_dart/i18n.dart';
1212
import 'package:provider/provider.dart';
1313

1414
class SettingWidget extends StatefulWidget {

Flutter/json_to_dart/lib/style/color.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:ui';
2-
31
import 'package:flutter/material.dart';
42

53
class ColorPlate {

Flutter/json_to_dart/lib/utils/dart_helper.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import '../models/dart_property.dart';
55
import 'enums.dart';
66

77
class DartHelper {
8+
const DartHelper._();
89
static const String classHeader = 'class {0} {';
910
static const String classFooter = '}';
1011

0 commit comments

Comments
 (0)