Skip to content

Commit 22be924

Browse files
authored
Fix dart analyze issues (#384)
* Fix dart analyze * Add sqflite label * Remove some ignore directives - Sort entries in labeler alphabetically. - Add missing tizen_notification label.
1 parent 6707534 commit 22be924

File tree

12 files changed

+53
-32
lines changed

12 files changed

+53
-32
lines changed

.github/labeler.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
- packages/permission_handler/**/*
3232
'p: sensors_plus':
3333
- packages/sensors_plus/**/*
34-
'p: shared_preferences':
35-
- packages/shared_preferences/**/*
3634
'p: share_plus':
3735
- packages/share_plus/**/*
36+
'p: shared_preferences':
37+
- packages/shared_preferences/**/*
38+
'p: sqflite':
39+
- packages/sqflite/**/*
3840
'p: tizen_app_control':
3941
- packages/tizen_app_control/**/*
4042
'p: tizen_app_manager':
@@ -43,6 +45,8 @@
4345
- packages/tizen_audio_manager/**/*
4446
'p: tizen_log':
4547
- packages/tizen_log/**/*
48+
'p: tizen_notification':
49+
- packages/tizen_notification/**/*
4650
'p: tizen_package_manager':
4751
- packages/tizen_package_manager/**/*
4852
'p: url_launcher':

packages/integration_test/example/integration_test/example_test.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import 'package:integration_test_example/main.dart' as app;
1818

1919
void main() {
2020
final IntegrationTestWidgetsFlutterBinding binding =
21-
IntegrationTestWidgetsFlutterBinding.ensureInitialized()
22-
as IntegrationTestWidgetsFlutterBinding;
21+
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
2322
testWidgets('verify text', (WidgetTester tester) async {
2423
// Build our app and trigger a frame.
2524
app.main();

packages/sqflite/example/lib/main.dart

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class MyApp extends StatefulWidget {
2727
// This widget is the root of your application.
2828

2929
@override
30+
// ignore: library_private_types_in_public_api
3031
_MyAppState createState() => _MyAppState();
3132
}
3233

@@ -133,6 +134,7 @@ class MyHomePage extends StatefulWidget {
133134
final String? title;
134135

135136
@override
137+
// ignore: library_private_types_in_public_api
136138
_MyHomePageState createState() => _MyHomePageState();
137139
}
138140

packages/sqflite/example/lib/manual_test_page.dart

+23-19
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import 'package:sqflite/sqflite.dart';
55
// ignore: implementation_imports
66
import 'package:sqflite/src/factory_mixin.dart' as impl;
77
import 'package:sqflite/utils/utils.dart';
8-
import 'package:sqflite_tizen_example/model/item.dart';
98
import 'package:sqflite_tizen_example/src/item_widget.dart';
109
import 'package:sqflite_tizen_example/utils.dart';
1110

11+
import 'model/item.dart';
12+
1213
// ignore_for_file: avoid_print
1314

1415
/// Manual test page.
@@ -17,6 +18,7 @@ class ManualTestPage extends StatefulWidget {
1718
const ManualTestPage({Key? key}) : super(key: key);
1819

1920
@override
21+
// ignore: library_private_types_in_public_api
2022
_ManualTestPageState createState() => _ManualTestPageState();
2123
}
2224

@@ -43,7 +45,7 @@ class _ManualTestPageState extends State<ManualTestPage> {
4345
await database?.setVersion(version + 1);
4446
}
4547

46-
late List<MenuItem> items;
48+
late List<SqfMenuItem> items;
4749
late List<ItemWidget> itemWidgets;
4850

4951
Future<bool> pop() async {
@@ -53,53 +55,53 @@ class _ManualTestPageState extends State<ManualTestPage> {
5355
@override
5456
void didChangeDependencies() {
5557
super.didChangeDependencies();
56-
items = <MenuItem>[
57-
MenuItem('openDatabase', () async {
58+
items = <SqfMenuItem>[
59+
SqfMenuItem('openDatabase', () async {
5860
await _openDatabase();
5961
}, summary: 'Open the database'),
60-
MenuItem('BEGIN EXCLUSIVE', () async {
62+
SqfMenuItem('BEGIN EXCLUSIVE', () async {
6163
final db = await _openDatabase();
6264
await db.execute('BEGIN EXCLUSIVE');
6365
},
6466
summary:
6567
'Execute than exit or hot-restart the application. Open the database if needed'),
66-
MenuItem('close', () async {
68+
SqfMenuItem('close', () async {
6769
await _closeDatabase();
6870
},
6971
summary:
7072
'Execute after starting then exit the app using the back button on Android and restart from the launcher.'),
71-
MenuItem('delete', () async {
73+
SqfMenuItem('delete', () async {
7274
await _deleteDatabase();
7375
},
7476
summary:
7577
'Try open (then optionally) delete, exit or hot-restart then delete then open'),
76-
MenuItem('log level: none', () async {
78+
SqfMenuItem('log level: none', () async {
7779
// ignore: deprecated_member_use
7880
await Sqflite.devSetOptions(
7981
// ignore: deprecated_member_use
8082
SqfliteOptions(logLevel: sqfliteLogLevelNone));
8183
}, summary: 'No logs'),
82-
MenuItem('log level: sql', () async {
84+
SqfMenuItem('log level: sql', () async {
8385
// ignore: deprecated_member_use
8486
await Sqflite.devSetOptions(
8587
// ignore: deprecated_member_use
8688
SqfliteOptions(logLevel: sqfliteLogLevelSql));
8789
}, summary: 'Log sql command and basic database operation'),
88-
MenuItem('log level: verbose', () async {
90+
SqfMenuItem('log level: verbose', () async {
8991
// ignore: deprecated_member_use
9092
await Sqflite.devSetOptions(
9193
// ignore: deprecated_member_use
9294
SqfliteOptions(logLevel: sqfliteLogLevelVerbose));
9395
}, summary: 'Verbose logs, for debugging'),
94-
MenuItem('Get info', () async {
96+
SqfMenuItem('Get info', () async {
9597
final factory = databaseFactory as impl.SqfliteDatabaseFactoryMixin;
9698
final info = await factory.getDebugInfo();
9799
print(info.toString());
98100
}, summary: 'Implementation info (dev only)'),
99-
MenuItem('Increment version', () async {
101+
SqfMenuItem('Increment version', () async {
100102
await _incrementVersion();
101103
}, summary: 'Implementation info (dev only)'),
102-
MenuItem('Multiple db', () async {
104+
SqfMenuItem('Multiple db', () async {
103105
await Navigator.of(context).push(MaterialPageRoute(builder: (_) {
104106
return const MultipleDbTestPage();
105107
}));
@@ -114,7 +116,7 @@ class _ManualTestPageState extends State<ManualTestPage> {
114116
item,
115117
(item) async {
116118
final stopwatch = Stopwatch()..start();
117-
final future = (item as MenuItem).run();
119+
final future = (item as SqfMenuItem).run();
118120
setState(() {});
119121
await future;
120122
// always add a small delay
@@ -185,6 +187,7 @@ class SimpleDbTestPage extends StatefulWidget {
185187
final String dbName;
186188

187189
@override
190+
// ignore: library_private_types_in_public_api
188191
_SimpleDbTestPageState createState() => _SimpleDbTestPageState();
189192
}
190193

@@ -233,11 +236,12 @@ class _SimpleDbTestPageState extends State<SimpleDbTestPage> {
233236
final result =
234237
firstIntValue(await db.query('test', columns: ['COUNT(*)']));
235238
// Temp for nnbd successfull lint
236-
// ignore: deprecated_member_use
237-
Scaffold.of(context).showSnackBar(SnackBar(
238-
content: Text('$result records'),
239-
duration: const Duration(milliseconds: 700),
240-
));
239+
if (mounted) {
240+
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
241+
content: Text('$result records'),
242+
duration: const Duration(milliseconds: 700),
243+
));
244+
}
241245
}
242246

243247
final items = <Widget>[

packages/sqflite/example/lib/model/item.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class Item {
2828
}
2929

3030
/// Menu item implementation.
31-
class MenuItem extends Item {
31+
class SqfMenuItem extends Item {
3232
/// Menu item implementation.
33-
MenuItem(String name, this.body, {this.summary}) : super(name) {
33+
SqfMenuItem(String name, this.body, {this.summary}) : super(name) {
3434
state = ItemState.none;
3535
}
3636

packages/sqflite/example/lib/open_test_page.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
55
import 'package:flutter/services.dart' show rootBundle;
66
import 'package:flutter/services.dart';
77
import 'package:path/path.dart';
8-
import 'package:pedantic/pedantic.dart';
98
import 'package:sqflite/sqflite.dart';
109
import 'package:sqflite/src/database_mixin.dart' // ignore: implementation_imports
1110
show
@@ -142,7 +141,7 @@ class OpenTestPage extends TestPage {
142141
test('Databases path', () async {
143142
final databasesPath = await factory.getDatabasesPath();
144143
// On Android we know it is current a 'databases' folder in the package folder
145-
print('databasesPath: ' + databasesPath);
144+
print('databasesPath: $databasesPath');
146145
if (Platform.isAndroid) {
147146
expect(basename(databasesPath), 'databases');
148147
} else if (Platform.isIOS) {

packages/sqflite/example/lib/src/item_widget.dart

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class ItemWidget extends StatefulWidget {
1818
final Function(Item item) onTap; // = Function(MainItem item);
1919

2020
@override
21+
// ignore: library_private_types_in_public_api
2122
_ItemWidgetState createState() => _ItemWidgetState();
2223
}
2324

packages/sqflite/example/lib/src/main_item_widget.dart

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class MainItemWidget extends StatefulWidget {
1414
final Function(MainItem item) onTap; // = Function(MainItem item);
1515

1616
@override
17+
// ignore: library_private_types_in_public_api
1718
_MainItemWidgetState createState() => _MainItemWidgetState();
1819
}
1920

packages/sqflite/example/lib/test_page.dart

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class TestPage extends StatefulWidget {
5151
}
5252

5353
@override
54+
// ignore: library_private_types_in_public_api
5455
_TestPageState createState() => _TestPageState();
5556
}
5657

packages/sqflite/example/lib/type_test_page.dart

+1
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ class TypeTestPage extends TestPage {
244244
}
245245

246246
/// Out internal data.
247+
// ignore: library_private_types_in_public_api
247248
final _Data data = _Data();
248249

249250
/// Get the value field from a given id

packages/sqflite/example/pubspec.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ environment:
66
sdk: ">=2.12.0 <3.0.0"
77

88
dependencies:
9+
path: any
10+
collection: any
911
flutter:
1012
sdk: flutter
1113
sqflite: ^2.0.0
14+
sqflite_common:
1215
sqflite_tizen:
1316
path: ../
17+
synchronized:
18+
matcher:
19+
meta:
1420

1521
dev_dependencies:
1622
pedantic: ^1.11.0
@@ -24,7 +30,6 @@ dev_dependencies:
2430
integration_test_tizen:
2531
path: ../../integration_test/
2632
test:
27-
matcher: '>=0.12.10-nullsafety.3 <2.0.0'
2833
process_run: '>=0.11.0+2'
2934

3035
flutter:

packages/webview_flutter/lib/src/platform_view_tizen.dart

+8-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class TizenView extends StatefulWidget {
2424
this.gestureRecognizers,
2525
this.creationParams,
2626
this.creationParamsCodec,
27+
this.clipBehavior = Clip.hardEdge,
2728
}) : assert(viewType != null),
2829
assert(hitTestBehavior != null),
2930
assert(creationParams == null || creationParamsCodec != null),
@@ -36,6 +37,7 @@ class TizenView extends StatefulWidget {
3637
final Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers;
3738
final dynamic creationParams;
3839
final MessageCodec<dynamic>? creationParamsCodec;
40+
final Clip clipBehavior;
3941

4042
@override
4143
State<TizenView> createState() => _TizenWebViewState();
@@ -57,10 +59,11 @@ class _TizenWebViewState extends State<TizenView> {
5759
focusNode: _focusNode,
5860
onFocusChange: _onFocusChange,
5961
child: _TizenPlatformTextureView(
60-
controller: _controller,
61-
hitTestBehavior: widget.hitTestBehavior,
62-
gestureRecognizers:
63-
widget.gestureRecognizers ?? _emptyRecognizersSet),
62+
controller: _controller,
63+
hitTestBehavior: widget.hitTestBehavior,
64+
gestureRecognizers: widget.gestureRecognizers ?? _emptyRecognizersSet,
65+
clipBehavior: widget.clipBehavior,
66+
),
6467
);
6568
}
6669

@@ -615,5 +618,6 @@ class _TizenPlatformTextureView extends LeafRenderObjectWidget {
615618
renderObject.viewController = controller;
616619
renderObject.hitTestBehavior = hitTestBehavior;
617620
renderObject.updateGestureRecognizers(gestureRecognizers);
621+
renderObject.clipBehavior = clipBehavior;
618622
}
619623
}

0 commit comments

Comments
 (0)