Skip to content

Commit 983edaa

Browse files
committed
update flutter sdk 0.11.3
1 parent adb5b98 commit 983edaa

File tree

11 files changed

+129
-116
lines changed

11 files changed

+129
-116
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
### 编译运行流程
3939

40-
1、配置好Flutter开发环境(目前Flutter SDK 版本 **v0.10.0** 的 Tag ),可参阅 [【搭建环境】](https://flutterchina.club)
40+
1、配置好Flutter开发环境(目前Flutter SDK 版本 **v0.11.3** 的 Tag ),可参阅 [【搭建环境】](https://flutterchina.club)
4141

4242
2、clone代码,执行`Packages get`安装第三方包。(因为某些不可抗力原因,国内可能需要设置代理: [代理环境变量](https://flutterchina.club/setup-windows/))
4343

@@ -59,7 +59,7 @@
5959

6060
4、运行之前请注意下
6161

62-
>### 1、本地Flutter SDK 版本 v0.10.0 以上。2、pubspec.yaml 中的第三方包版本和 pubspec.lock 中的是否对应的上
62+
>### 1、本地Flutter SDK 版本 v0.11.3 以上。2、pubspec.yaml 中的第三方包版本和 pubspec.lock 中的是否对应的上
6363
6464

6565

@@ -97,7 +97,7 @@
9797

9898
### 第三方框架
9999

100-
>当前 Flutter SDK 版本 v0.10.0
100+
>当前 Flutter SDK 版本 v0.11.3
101101
102102
|| 功能 |
103103
| -------------------------- | -------------- |

lib/page/DynamicPage.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class DynamicPage extends StatefulWidget {
2323
_DynamicPageState createState() => _DynamicPageState();
2424
}
2525

26+
// ignore: mixin_inherits_from_not_object
2627
class _DynamicPageState extends State<DynamicPage> with AutomaticKeepAliveClientMixin<DynamicPage>, GSYListState<DynamicPage>, WidgetsBindingObserver {
2728
@override
2829
Future<Null> handleRefresh() async {

lib/page/PushDetailPage.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class PushDetailPage extends StatefulWidget {
3535
_PushDetailPageState createState() => _PushDetailPageState(sha, userName, reposName, needHomeIcon);
3636
}
3737

38+
// ignore: mixin_inherits_from_not_object
3839
class _PushDetailPageState extends State<PushDetailPage> with AutomaticKeepAliveClientMixin<PushDetailPage>, GSYListState<PushDetailPage> {
3940
final String userName;
4041

lib/page/RepositoryDetailIssueListPage.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class RepositoryDetailIssuePage extends StatefulWidget {
2626
_RepositoryDetailIssuePageState createState() => _RepositoryDetailIssuePageState(userName, reposName);
2727
}
2828

29-
// ignore: mixin_inherits_from_not_object
29+
3030
class _RepositoryDetailIssuePageState extends State<RepositoryDetailIssuePage>
31-
with AutomaticKeepAliveClientMixin<RepositoryDetailIssuePage>, GSYListState<RepositoryDetailIssuePage> {
31+
with AutomaticKeepAliveClientMixin<RepositoryDetailIssuePage>, GSYListState<RepositoryDetailIssuePage> { // ignore: mixin_inherits_from_not_object
3232
final String userName;
3333

3434
final String reposName;

lib/page/RepositoryFileListPage.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class RepositoryDetailFileListPage extends StatefulWidget {
3030
RepositoryDetailFileListPageState createState() => RepositoryDetailFileListPageState(userName, reposName);
3131
}
3232

33-
// ignore: mixin_inherits_from_not_object
3433
class RepositoryDetailFileListPageState extends State<RepositoryDetailFileListPage>
34+
// ignore: mixin_inherits_from_not_object
3535
with AutomaticKeepAliveClientMixin<RepositoryDetailFileListPage>, GSYListState<RepositoryDetailFileListPage> {
3636
final String userName;
3737

lib/page/SearchPage.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class SearchPage extends StatefulWidget {
2121
_SearchPageState createState() => _SearchPageState();
2222
}
2323

24+
// ignore: mixin_inherits_from_not_object
2425
class _SearchPageState extends State<SearchPage> with AutomaticKeepAliveClientMixin<SearchPage>, GSYListState<SearchPage> {
2526
int selectIndex = 0;
2627

lib/page/TrendPage.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class TrendPage extends StatefulWidget {
2424
_TrendPageState createState() => _TrendPageState();
2525
}
2626

27+
// ignore: mixin_inherits_from_not_object
2728
class _TrendPageState extends State<TrendPage> with AutomaticKeepAliveClientMixin<TrendPage>, GSYListState<TrendPage> {
2829
static TrendTypeModel selectTime = null;
2930

lib/test/DemoMixins.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class B extends Base {
5353
}
5454
}
5555

56+
// ignore: mixin_inherits_from_not_object, mixin_references_super
5657
class G extends B with A, A2 {
5758

5859
}

lib/widget/BasePersonState.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import 'package:gsy_github_app_flutter/widget/UserItem.dart';
1717
* Date: 2018-08-30
1818
*/
1919

20+
// ignore: mixin_inherits_from_not_object
2021
abstract class BasePersonState<T extends StatefulWidget> extends State<T> with AutomaticKeepAliveClientMixin<T>, GSYListState<T> {
2122
final List<UserOrg> orgList = new List();
2223

lib/widget/webview/WebView.dart

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ class WebView extends StatefulWidget {
2222
/// The web view can be controlled using a `WebViewController` that is passed to the
2323
/// `onWebViewCreated` callback once the web view is created.
2424
///
25-
/// The `gestureRecognizers` and `javaScriptMode` parameters must not be null.
25+
/// The `javaScriptMode` parameter must not be null.
2626
const WebView({
2727
Key key,
2828
this.onWebViewCreated,
2929
this.initialUrl,
3030
this.javaScriptMode = JavaScriptMode.disabled,
31-
this.gestureRecognizers = const <OneSequenceGestureRecognizer>[],
32-
}) : assert(gestureRecognizers != null),
33-
assert(javaScriptMode != null),
31+
this.gestureRecognizers,
32+
}) : assert(javaScriptMode != null),
3433
super(key: key);
3534

3635
/// If not null invoked once the web view is created.
@@ -39,13 +38,13 @@ class WebView extends StatefulWidget {
3938
/// Which gestures should be consumed by the web view.
4039
///
4140
/// It is possible for other gesture recognizers to be competing with the web view on pointer
42-
/// events, e.g if the webview is inside a [ListView] the [ListView] will want to handle
41+
/// events, e.g if the web view is inside a [ListView] the [ListView] will want to handle
4342
/// vertical drags. The web view will claim gestures that are recognized by any of the
4443
/// recognizers on this list.
4544
///
46-
/// When this list is empty, the web view will only handle pointer events for gestures that
45+
/// When this set is empty or null, the web view will only handle pointer events for gestures that
4746
/// were not claimed by any other gesture recognizer.
48-
final List<OneSequenceGestureRecognizer> gestureRecognizers;
47+
final Set<Factory<OneSequenceGestureRecognizer>> gestureRecognizers;
4948

5049
/// The initial URL to load.
5150
final String initialUrl;
@@ -85,6 +84,14 @@ class _WebViewState extends State<WebView> {
8584
creationParamsCodec: const StandardMessageCodec(),
8685
),
8786
);
87+
} else if (defaultTargetPlatform == TargetPlatform.iOS) {
88+
return UiKitView(
89+
viewType: 'plugins.flutter.io/webview',
90+
onPlatformViewCreated: _onPlatformViewCreated,
91+
gestureRecognizers: widget.gestureRecognizers,
92+
creationParams: _CreationParams.fromWidget(widget).toMap(),
93+
creationParamsCodec: const StandardMessageCodec(),
94+
);
8895
}
8996
return Text(
9097
'$defaultTargetPlatform is not yet supported by the webview_flutter plugin');

0 commit comments

Comments
 (0)