From 22be924b394a63a39e87241c2b3740963e02d4f3 Mon Sep 17 00:00:00 2001 From: Hakkyu Kim Date: Wed, 18 May 2022 12:13:32 +0900 Subject: [PATCH] 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. --- .github/labeler.yml | 8 +++- .../integration_test/example_test.dart | 3 +- packages/sqflite/example/lib/main.dart | 2 + .../sqflite/example/lib/manual_test_page.dart | 42 ++++++++++--------- packages/sqflite/example/lib/model/item.dart | 4 +- .../sqflite/example/lib/open_test_page.dart | 3 +- .../sqflite/example/lib/src/item_widget.dart | 1 + .../example/lib/src/main_item_widget.dart | 1 + packages/sqflite/example/lib/test_page.dart | 1 + .../sqflite/example/lib/type_test_page.dart | 1 + packages/sqflite/example/pubspec.yaml | 7 +++- .../lib/src/platform_view_tizen.dart | 12 ++++-- 12 files changed, 53 insertions(+), 32 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index fe5a7283a..52561c402 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -31,10 +31,12 @@ - packages/permission_handler/**/* 'p: sensors_plus': - packages/sensors_plus/**/* -'p: shared_preferences': - - packages/shared_preferences/**/* 'p: share_plus': - packages/share_plus/**/* +'p: shared_preferences': + - packages/shared_preferences/**/* +'p: sqflite': + - packages/sqflite/**/* 'p: tizen_app_control': - packages/tizen_app_control/**/* 'p: tizen_app_manager': @@ -43,6 +45,8 @@ - packages/tizen_audio_manager/**/* 'p: tizen_log': - packages/tizen_log/**/* +'p: tizen_notification': + - packages/tizen_notification/**/* 'p: tizen_package_manager': - packages/tizen_package_manager/**/* 'p: url_launcher': diff --git a/packages/integration_test/example/integration_test/example_test.dart b/packages/integration_test/example/integration_test/example_test.dart index 8daf8c8f6..a9591a3c5 100644 --- a/packages/integration_test/example/integration_test/example_test.dart +++ b/packages/integration_test/example/integration_test/example_test.dart @@ -18,8 +18,7 @@ import 'package:integration_test_example/main.dart' as app; void main() { final IntegrationTestWidgetsFlutterBinding binding = - IntegrationTestWidgetsFlutterBinding.ensureInitialized() - as IntegrationTestWidgetsFlutterBinding; + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('verify text', (WidgetTester tester) async { // Build our app and trigger a frame. app.main(); diff --git a/packages/sqflite/example/lib/main.dart b/packages/sqflite/example/lib/main.dart index b460a322e..25d2d5d32 100644 --- a/packages/sqflite/example/lib/main.dart +++ b/packages/sqflite/example/lib/main.dart @@ -27,6 +27,7 @@ class MyApp extends StatefulWidget { // This widget is the root of your application. @override + // ignore: library_private_types_in_public_api _MyAppState createState() => _MyAppState(); } @@ -133,6 +134,7 @@ class MyHomePage extends StatefulWidget { final String? title; @override + // ignore: library_private_types_in_public_api _MyHomePageState createState() => _MyHomePageState(); } diff --git a/packages/sqflite/example/lib/manual_test_page.dart b/packages/sqflite/example/lib/manual_test_page.dart index 2e45ebe3f..110ad2f93 100644 --- a/packages/sqflite/example/lib/manual_test_page.dart +++ b/packages/sqflite/example/lib/manual_test_page.dart @@ -5,10 +5,11 @@ import 'package:sqflite/sqflite.dart'; // ignore: implementation_imports import 'package:sqflite/src/factory_mixin.dart' as impl; import 'package:sqflite/utils/utils.dart'; -import 'package:sqflite_tizen_example/model/item.dart'; import 'package:sqflite_tizen_example/src/item_widget.dart'; import 'package:sqflite_tizen_example/utils.dart'; +import 'model/item.dart'; + // ignore_for_file: avoid_print /// Manual test page. @@ -17,6 +18,7 @@ class ManualTestPage extends StatefulWidget { const ManualTestPage({Key? key}) : super(key: key); @override + // ignore: library_private_types_in_public_api _ManualTestPageState createState() => _ManualTestPageState(); } @@ -43,7 +45,7 @@ class _ManualTestPageState extends State { await database?.setVersion(version + 1); } - late List items; + late List items; late List itemWidgets; Future pop() async { @@ -53,53 +55,53 @@ class _ManualTestPageState extends State { @override void didChangeDependencies() { super.didChangeDependencies(); - items = [ - MenuItem('openDatabase', () async { + items = [ + SqfMenuItem('openDatabase', () async { await _openDatabase(); }, summary: 'Open the database'), - MenuItem('BEGIN EXCLUSIVE', () async { + SqfMenuItem('BEGIN EXCLUSIVE', () async { final db = await _openDatabase(); await db.execute('BEGIN EXCLUSIVE'); }, summary: 'Execute than exit or hot-restart the application. Open the database if needed'), - MenuItem('close', () async { + SqfMenuItem('close', () async { await _closeDatabase(); }, summary: 'Execute after starting then exit the app using the back button on Android and restart from the launcher.'), - MenuItem('delete', () async { + SqfMenuItem('delete', () async { await _deleteDatabase(); }, summary: 'Try open (then optionally) delete, exit or hot-restart then delete then open'), - MenuItem('log level: none', () async { + SqfMenuItem('log level: none', () async { // ignore: deprecated_member_use await Sqflite.devSetOptions( // ignore: deprecated_member_use SqfliteOptions(logLevel: sqfliteLogLevelNone)); }, summary: 'No logs'), - MenuItem('log level: sql', () async { + SqfMenuItem('log level: sql', () async { // ignore: deprecated_member_use await Sqflite.devSetOptions( // ignore: deprecated_member_use SqfliteOptions(logLevel: sqfliteLogLevelSql)); }, summary: 'Log sql command and basic database operation'), - MenuItem('log level: verbose', () async { + SqfMenuItem('log level: verbose', () async { // ignore: deprecated_member_use await Sqflite.devSetOptions( // ignore: deprecated_member_use SqfliteOptions(logLevel: sqfliteLogLevelVerbose)); }, summary: 'Verbose logs, for debugging'), - MenuItem('Get info', () async { + SqfMenuItem('Get info', () async { final factory = databaseFactory as impl.SqfliteDatabaseFactoryMixin; final info = await factory.getDebugInfo(); print(info.toString()); }, summary: 'Implementation info (dev only)'), - MenuItem('Increment version', () async { + SqfMenuItem('Increment version', () async { await _incrementVersion(); }, summary: 'Implementation info (dev only)'), - MenuItem('Multiple db', () async { + SqfMenuItem('Multiple db', () async { await Navigator.of(context).push(MaterialPageRoute(builder: (_) { return const MultipleDbTestPage(); })); @@ -114,7 +116,7 @@ class _ManualTestPageState extends State { item, (item) async { final stopwatch = Stopwatch()..start(); - final future = (item as MenuItem).run(); + final future = (item as SqfMenuItem).run(); setState(() {}); await future; // always add a small delay @@ -185,6 +187,7 @@ class SimpleDbTestPage extends StatefulWidget { final String dbName; @override + // ignore: library_private_types_in_public_api _SimpleDbTestPageState createState() => _SimpleDbTestPageState(); } @@ -233,11 +236,12 @@ class _SimpleDbTestPageState extends State { final result = firstIntValue(await db.query('test', columns: ['COUNT(*)'])); // Temp for nnbd successfull lint - // ignore: deprecated_member_use - Scaffold.of(context).showSnackBar(SnackBar( - content: Text('$result records'), - duration: const Duration(milliseconds: 700), - )); + if (mounted) { + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text('$result records'), + duration: const Duration(milliseconds: 700), + )); + } } final items = [ diff --git a/packages/sqflite/example/lib/model/item.dart b/packages/sqflite/example/lib/model/item.dart index 2d50d0a7a..a6437ea97 100644 --- a/packages/sqflite/example/lib/model/item.dart +++ b/packages/sqflite/example/lib/model/item.dart @@ -28,9 +28,9 @@ class Item { } /// Menu item implementation. -class MenuItem extends Item { +class SqfMenuItem extends Item { /// Menu item implementation. - MenuItem(String name, this.body, {this.summary}) : super(name) { + SqfMenuItem(String name, this.body, {this.summary}) : super(name) { state = ItemState.none; } diff --git a/packages/sqflite/example/lib/open_test_page.dart b/packages/sqflite/example/lib/open_test_page.dart index e15994e58..d04d717f1 100644 --- a/packages/sqflite/example/lib/open_test_page.dart +++ b/packages/sqflite/example/lib/open_test_page.dart @@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/services.dart'; import 'package:path/path.dart'; -import 'package:pedantic/pedantic.dart'; import 'package:sqflite/sqflite.dart'; import 'package:sqflite/src/database_mixin.dart' // ignore: implementation_imports show @@ -142,7 +141,7 @@ class OpenTestPage extends TestPage { test('Databases path', () async { final databasesPath = await factory.getDatabasesPath(); // On Android we know it is current a 'databases' folder in the package folder - print('databasesPath: ' + databasesPath); + print('databasesPath: $databasesPath'); if (Platform.isAndroid) { expect(basename(databasesPath), 'databases'); } else if (Platform.isIOS) { diff --git a/packages/sqflite/example/lib/src/item_widget.dart b/packages/sqflite/example/lib/src/item_widget.dart index 8eaab0d61..80c4f601c 100644 --- a/packages/sqflite/example/lib/src/item_widget.dart +++ b/packages/sqflite/example/lib/src/item_widget.dart @@ -18,6 +18,7 @@ class ItemWidget extends StatefulWidget { final Function(Item item) onTap; // = Function(MainItem item); @override + // ignore: library_private_types_in_public_api _ItemWidgetState createState() => _ItemWidgetState(); } diff --git a/packages/sqflite/example/lib/src/main_item_widget.dart b/packages/sqflite/example/lib/src/main_item_widget.dart index cbd8be05f..03696db7d 100644 --- a/packages/sqflite/example/lib/src/main_item_widget.dart +++ b/packages/sqflite/example/lib/src/main_item_widget.dart @@ -14,6 +14,7 @@ class MainItemWidget extends StatefulWidget { final Function(MainItem item) onTap; // = Function(MainItem item); @override + // ignore: library_private_types_in_public_api _MainItemWidgetState createState() => _MainItemWidgetState(); } diff --git a/packages/sqflite/example/lib/test_page.dart b/packages/sqflite/example/lib/test_page.dart index a9ee73cd2..2a056e801 100644 --- a/packages/sqflite/example/lib/test_page.dart +++ b/packages/sqflite/example/lib/test_page.dart @@ -51,6 +51,7 @@ class TestPage extends StatefulWidget { } @override + // ignore: library_private_types_in_public_api _TestPageState createState() => _TestPageState(); } diff --git a/packages/sqflite/example/lib/type_test_page.dart b/packages/sqflite/example/lib/type_test_page.dart index 98d16923b..4b37c2a9d 100644 --- a/packages/sqflite/example/lib/type_test_page.dart +++ b/packages/sqflite/example/lib/type_test_page.dart @@ -244,6 +244,7 @@ class TypeTestPage extends TestPage { } /// Out internal data. + // ignore: library_private_types_in_public_api final _Data data = _Data(); /// Get the value field from a given id diff --git a/packages/sqflite/example/pubspec.yaml b/packages/sqflite/example/pubspec.yaml index b15b0e914..24ae45e82 100644 --- a/packages/sqflite/example/pubspec.yaml +++ b/packages/sqflite/example/pubspec.yaml @@ -6,11 +6,17 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: + path: any + collection: any flutter: sdk: flutter sqflite: ^2.0.0 + sqflite_common: sqflite_tizen: path: ../ + synchronized: + matcher: + meta: dev_dependencies: pedantic: ^1.11.0 @@ -24,7 +30,6 @@ dev_dependencies: integration_test_tizen: path: ../../integration_test/ test: - matcher: '>=0.12.10-nullsafety.3 <2.0.0' process_run: '>=0.11.0+2' flutter: diff --git a/packages/webview_flutter/lib/src/platform_view_tizen.dart b/packages/webview_flutter/lib/src/platform_view_tizen.dart index 7bc568f55..6ce37260a 100644 --- a/packages/webview_flutter/lib/src/platform_view_tizen.dart +++ b/packages/webview_flutter/lib/src/platform_view_tizen.dart @@ -24,6 +24,7 @@ class TizenView extends StatefulWidget { this.gestureRecognizers, this.creationParams, this.creationParamsCodec, + this.clipBehavior = Clip.hardEdge, }) : assert(viewType != null), assert(hitTestBehavior != null), assert(creationParams == null || creationParamsCodec != null), @@ -36,6 +37,7 @@ class TizenView extends StatefulWidget { final Set>? gestureRecognizers; final dynamic creationParams; final MessageCodec? creationParamsCodec; + final Clip clipBehavior; @override State createState() => _TizenWebViewState(); @@ -57,10 +59,11 @@ class _TizenWebViewState extends State { focusNode: _focusNode, onFocusChange: _onFocusChange, child: _TizenPlatformTextureView( - controller: _controller, - hitTestBehavior: widget.hitTestBehavior, - gestureRecognizers: - widget.gestureRecognizers ?? _emptyRecognizersSet), + controller: _controller, + hitTestBehavior: widget.hitTestBehavior, + gestureRecognizers: widget.gestureRecognizers ?? _emptyRecognizersSet, + clipBehavior: widget.clipBehavior, + ), ); } @@ -615,5 +618,6 @@ class _TizenPlatformTextureView extends LeafRenderObjectWidget { renderObject.viewController = controller; renderObject.hitTestBehavior = hitTestBehavior; renderObject.updateGestureRecognizers(gestureRecognizers); + renderObject.clipBehavior = clipBehavior; } }