Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dart analyze issues #384

Merged
merged 3 commits into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
- packages/permission_handler/**/*
'p: sensors_plus':
- packages/sensors_plus/**/*
swift-kim marked this conversation as resolved.
Show resolved Hide resolved
'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':
Expand All @@ -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':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions packages/sqflite/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down Expand Up @@ -133,6 +134,7 @@ class MyHomePage extends StatefulWidget {
final String? title;

@override
// ignore: library_private_types_in_public_api
_MyHomePageState createState() => _MyHomePageState();
}

Expand Down
42 changes: 23 additions & 19 deletions packages/sqflite/example/lib/manual_test_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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();
}

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

late List<MenuItem> items;
late List<SqfMenuItem> items;
late List<ItemWidget> itemWidgets;

Future<bool> pop() async {
Expand All @@ -53,53 +55,53 @@ class _ManualTestPageState extends State<ManualTestPage> {
@override
void didChangeDependencies() {
super.didChangeDependencies();
items = <MenuItem>[
MenuItem('openDatabase', () async {
items = <SqfMenuItem>[
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();
}));
Expand All @@ -114,7 +116,7 @@ class _ManualTestPageState extends State<ManualTestPage> {
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
Expand Down Expand Up @@ -185,6 +187,7 @@ class SimpleDbTestPage extends StatefulWidget {
final String dbName;

@override
// ignore: library_private_types_in_public_api
_SimpleDbTestPageState createState() => _SimpleDbTestPageState();
}

Expand Down Expand Up @@ -233,11 +236,12 @@ class _SimpleDbTestPageState extends State<SimpleDbTestPage> {
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 = <Widget>[
Expand Down
4 changes: 2 additions & 2 deletions packages/sqflite/example/lib/model/item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 1 addition & 2 deletions packages/sqflite/example/lib/open_test_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions packages/sqflite/example/lib/src/item_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions packages/sqflite/example/lib/src/main_item_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions packages/sqflite/example/lib/test_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class TestPage extends StatefulWidget {
}

@override
// ignore: library_private_types_in_public_api
_TestPageState createState() => _TestPageState();
}

Expand Down
1 change: 1 addition & 0 deletions packages/sqflite/example/lib/type_test_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion packages/sqflite/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
12 changes: 8 additions & 4 deletions packages/webview_flutter/lib/src/platform_view_tizen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -36,6 +37,7 @@ class TizenView extends StatefulWidget {
final Set<Factory<OneSequenceGestureRecognizer>>? gestureRecognizers;
final dynamic creationParams;
final MessageCodec<dynamic>? creationParamsCodec;
final Clip clipBehavior;

@override
State<TizenView> createState() => _TizenWebViewState();
Expand All @@ -57,10 +59,11 @@ class _TizenWebViewState extends State<TizenView> {
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,
),
);
}

Expand Down Expand Up @@ -615,5 +618,6 @@ class _TizenPlatformTextureView extends LeafRenderObjectWidget {
renderObject.viewController = controller;
renderObject.hitTestBehavior = hitTestBehavior;
renderObject.updateGestureRecognizers(gestureRecognizers);
renderObject.clipBehavior = clipBehavior;
}
}