Skip to content

Commit

Permalink
add linter and bump version to 0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lejard-h committed Aug 1, 2018
1 parent 4b25f8f commit 4958b02
Show file tree
Hide file tree
Showing 6 changed files with 232 additions and 96 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,14 @@
# 0.2.0

- update sdk
- prevent negative webview height in scaffold
- handle type error in getCookies
- Support file upload via WebView on Android
- fix WebviewScaffold crash on iOS
- Scrollbar functionality to Web view
- Add support of HTTP errors
- Add headers when loading url

# 0.1.6

- fix onStateChanged
Expand Down
121 changes: 120 additions & 1 deletion analysis_options.yaml
@@ -1,2 +1,121 @@
analyzer:
strong-mode: true

linter:
rules:
# these rules are documented on and in the same order as
# the Dart Lint rules page to make maintenance easier
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
- always_declare_return_types
- always_put_control_body_on_new_line
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
- always_require_non_null_named_parameters
# - always_specify_types
- annotate_overrides
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
- avoid_as
# - avoid_bool_literals_in_conditional_expressions # not yet tested
# - avoid_catches_without_on_clauses # we do this commonly
# - avoid_catching_errors # we do this commonly
- avoid_classes_with_only_static_members
# - avoid_double_and_int_checks # only useful when targeting JS runtime
- avoid_empty_else
- avoid_field_initializers_in_const_classes
# - avoid_function_literals_in_foreach_calls
- avoid_init_to_null
# - avoid_js_rounded_ints # only useful when targeting JS runtime
- avoid_null_checks_in_equality_operators
# - avoid_positional_boolean_parameters # not yet tested
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
- avoid_relative_lib_imports
- avoid_renaming_method_parameters
- avoid_return_types_on_setters
# - avoid_returning_null # we do this commonly
# - avoid_returning_this # https://github.com/dart-lang/linter/issues/842
# - avoid_setters_without_getters # not yet tested
# - avoid_single_cascade_in_expression_statements # not yet tested
- avoid_slow_async_io
# - avoid_types_as_parameter_names # https://github.com/dart-lang/linter/pull/954/files
# - avoid_types_on_closure_parameters # conflicts with always_specify_types
# - avoid_unused_constructor_parameters # https://github.com/dart-lang/linter/pull/847
- await_only_futures
- camel_case_types
- cancel_subscriptions
# - cascade_invocations # not yet tested
# - close_sinks # https://github.com/flutter/flutter/issues/5789
# - comment_references # blocked on https://github.com/dart-lang/dartdoc/issues/1153
# - constant_identifier_names # https://github.com/dart-lang/linter/issues/204
- control_flow_in_finally
- directives_ordering
- empty_catches
- empty_constructor_bodies
- empty_statements
- hash_and_equals
- implementation_imports
# - invariant_booleans # https://github.com/flutter/flutter/issues/5790
- iterable_contains_unrelated_type
# - join_return_with_assignment # not yet tested
- library_names
- library_prefixes
- list_remove_unrelated_type
# - literal_only_boolean_expressions # https://github.com/flutter/flutter/issues/5791
- no_adjacent_strings_in_list
- no_duplicate_case_values
- non_constant_identifier_names
# - omit_local_variable_types # opposite of always_specify_types
# - one_member_abstracts # too many false positives
# - only_throw_errors # https://github.com/flutter/flutter/issues/5792
- overridden_fields
- package_api_docs
- package_names
- package_prefixed_library_names
# - parameter_assignments # we do this commonly
- prefer_adjacent_string_concatenation
- prefer_asserts_in_initializer_lists
- prefer_bool_in_asserts
- prefer_collection_literals
- prefer_conditional_assignment
- prefer_const_constructors
- prefer_const_constructors_in_immutables
- prefer_const_declarations
- prefer_const_literals_to_create_immutables
# - prefer_constructors_over_static_methods # not yet tested
- prefer_contains
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_locals
# - prefer_foreach
# - prefer_function_declarations_over_variables # not yet tested
- prefer_initializing_formals
# - prefer_interpolation_to_compose_strings # not yet tested
# - prefer_iterable_whereType # https://github.com/dart-lang/sdk/issues/32463
- prefer_is_empty
- prefer_is_not_empty
- prefer_single_quotes
- prefer_typing_uninitialized_variables
- recursive_getters
- slash_for_doc_comments
- sort_constructors_first
- sort_unnamed_constructors_first
- super_goes_last
- test_types_in_equals
- throw_in_finally
# - type_annotate_public_apis # subset of always_specify_types
- type_init_formals
# - unawaited_futures # https://github.com/flutter/flutter/issues/5793
- unnecessary_brace_in_string_interps
- unnecessary_getters_setters
# - unnecessary_lambdas # https://github.com/dart-lang/linter/issues/498
- unnecessary_null_aware_assignments
- unnecessary_null_in_if_null_operators
- unnecessary_overrides
- unnecessary_parenthesis
# - unnecessary_statements # not yet tested
- unnecessary_this
- unrelated_type_equality_checks
- use_rethrow_when_possible
# - use_setters_to_change_properties # not yet tested
# - use_string_buffers # https://github.com/dart-lang/linter/pull/664
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
- valid_regexps
# - void_checks # not yet tested
61 changes: 31 additions & 30 deletions example/lib/main.dart
Expand Up @@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';

const kAndroidUserAgent =
"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Mobile Safari/537.36";
'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Mobile Safari/537.36';

String selectedUrl = "https://flutter.io";
String selectedUrl = 'https://flutter.io';

void main() {
runApp(new MyApp());
Expand All @@ -22,11 +22,11 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue,
),
routes: {
"/": (_) => new MyHomePage(title: "Flutter WebView Demo"),
"/widget": (_) => new WebviewScaffold(
'/': (_) => const MyHomePage(title: 'Flutter WebView Demo'),
'/widget': (_) => new WebviewScaffold(
url: selectedUrl,
appBar: new AppBar(
title: new Text("Widget webview"),
title: const Text('Widget webview'),
),
withZoom: true,
withLocalStorage: true,
Expand All @@ -37,7 +37,7 @@ class MyApp extends StatelessWidget {
}

class MyHomePage extends StatefulWidget {
MyHomePage({Key key, this.title}) : super(key: key);
const MyHomePage({Key key, this.title}) : super(key: key);

final String title;

Expand All @@ -60,17 +60,17 @@ class _MyHomePageState extends State<MyHomePage> {

StreamSubscription<WebViewHttpError> _onHttpError;

TextEditingController _urlCtrl = new TextEditingController(text: selectedUrl);
final _urlCtrl = new TextEditingController(text: selectedUrl);

TextEditingController _codeCtrl =
new TextEditingController(text: "window.navigator.userAgent");
final _codeCtrl =
new TextEditingController(text: 'window.navigator.userAgent');

GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey();
final _scaffoldKey = new GlobalKey<ScaffoldState>();

final _history = [];

@override
initState() {
void initState() {
super.initState();

flutterWebviewPlugin.close();
Expand All @@ -83,16 +83,16 @@ class _MyHomePageState extends State<MyHomePage> {
_onDestroy = flutterWebviewPlugin.onDestroy.listen((_) {
if (mounted) {
// Actions like show a info toast.
_scaffoldKey.currentState
.showSnackBar(new SnackBar(content: new Text("Webview Destroyed")));
_scaffoldKey.currentState.showSnackBar(
const SnackBar(content: const Text('Webview Destroyed')));
}
});

// Add a listener to on url changed
_onUrlChanged = flutterWebviewPlugin.onUrlChanged.listen((String url) {
if (mounted) {
setState(() {
_history.add("onUrlChanged: $url");
_history.add('onUrlChanged: $url');
});
}
});
Expand All @@ -101,15 +101,16 @@ class _MyHomePageState extends State<MyHomePage> {
flutterWebviewPlugin.onStateChanged.listen((WebViewStateChanged state) {
if (mounted) {
setState(() {
_history.add("onStateChanged: ${state.type} ${state.url}");
_history.add('onStateChanged: ${state.type} ${state.url}');
});
}
});

_onHttpError = flutterWebviewPlugin.onHttpError.listen((WebViewHttpError error) {
_onHttpError =
flutterWebviewPlugin.onHttpError.listen((WebViewHttpError error) {
if (mounted) {
setState(() {
_history.add("onHttpError: ${error.code} ${error.url}");
_history.add('onHttpError: ${error.code} ${error.url}');
});
}
});
Expand All @@ -133,7 +134,7 @@ class _MyHomePageState extends State<MyHomePage> {
return new Scaffold(
key: _scaffoldKey,
appBar: new AppBar(
title: new Text('Plugin example app'),
title: const Text('Plugin example app'),
),
body: new Column(
mainAxisAlignment: MainAxisAlignment.center,
Expand All @@ -149,41 +150,41 @@ class _MyHomePageState extends State<MyHomePage> {
0.0, 0.0, MediaQuery.of(context).size.width, 300.0),
userAgent: kAndroidUserAgent);
},
child: new Text("Open Webview (rect)"),
child: const Text('Open Webview (rect)'),
),
new RaisedButton(
onPressed: () {
flutterWebviewPlugin.launch(selectedUrl, hidden: true);
},
child: new Text("Open 'hidden' Webview"),
child: const Text('Open "hidden" Webview'),
),
new RaisedButton(
onPressed: () {
flutterWebviewPlugin.launch(selectedUrl);
},
child: new Text("Open Fullscreen Webview"),
child: const Text('Open Fullscreen Webview'),
),
new RaisedButton(
onPressed: () {
Navigator.of(context).pushNamed("/widget");
Navigator.of(context).pushNamed('/widget');
},
child: new Text("Open widget webview"),
child: const Text('Open widget webview'),
),
new Container(
padding: const EdgeInsets.all(24.0),
child: new TextField(controller: _codeCtrl),
),
new RaisedButton(
onPressed: () {
Future<String> future =
final future =
flutterWebviewPlugin.evalJavascript(_codeCtrl.text);
future.then((String result) {
setState(() {
_history.add("eval: $result");
_history.add('eval: $result');
});
});
},
child: new Text("Eval some javascript"),
child: const Text('Eval some javascript'),
),
new RaisedButton(
onPressed: () {
Expand All @@ -192,19 +193,19 @@ class _MyHomePageState extends State<MyHomePage> {
});
flutterWebviewPlugin.close();
},
child: new Text("Close"),
child: const Text('Close'),
),
new RaisedButton(
onPressed: () {
flutterWebviewPlugin.getCookies().then((m) {
setState(() {
_history.add("cookies: $m");
_history.add('cookies: $m');
});
});
},
child: new Text("Cookies"),
child: const Text('Cookies'),
),
new Text(_history.join("\n"))
new Text(_history.join('\n'))
],
),
);
Expand Down

0 comments on commit 4958b02

Please sign in to comment.