Skip to content

Commit 547f7d4

Browse files
committed
增加用户页面sliver效果
1 parent b63d7c7 commit 547f7d4

9 files changed

Lines changed: 518 additions & 346 deletions

File tree

‎ios/Podfile.lock‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,26 @@ EXTERNAL SOURCES:
9898
:path: ".symlinks/plugins/webview_flutter/ios"
9999

100100
SPEC CHECKSUMS:
101-
android_intent: 96848466ee23479bdb64dc5fa04e8fe1f59200aa
102-
connectivity: d5992e3758d68b1c4b12d6e012fe0813f1aa1645
103-
device_info: 76ce0b32e13034d1883be4a382433648f9dcee63
104-
Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
105-
flutter_lottie: b8300e2b6ca2e420508be3a7449e722a8a095d9a
106-
flutter_statusbar: a563eb9416256f17660646aceb2314b113127da9
107-
flutter_webview_plugin: 116575b48572029304775b768e9f15ebfc316274
108-
fluttertoast: 0a20dcbbb8ecfd1a61b6285651ff2d5989d033fb
101+
android_intent: 73316069cd1f6aac919df1c6e640cad190fd5e8b
102+
connectivity: c72716e202a1225ec4810740d5cb56b8ae3bf4cc
103+
device_info: 3ebad48f726348f69abd802f3334a8d1ed795fbd
104+
Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
105+
flutter_lottie: c1fd7e92e771209f8b623119646c15201c5e8c87
106+
flutter_statusbar: aa4982b847304a72c5ac8439a9f37861b662c6bb
107+
flutter_webview_plugin: ed9e8a6a96baf0c867e90e1bce2673913eeac694
108+
fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
109109
FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
110110
lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062
111-
package_info: d7c98b64f60add4c2908b9d94d82a45d3c8827ad
112-
path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
113-
permission_handler: 413e66dbc5125c31069f21d18b975c1048906ec4
111+
package_info: 78cabb3c322943c55d39676f4a5bfc748c01d055
112+
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
113+
permission_handler: 73cfc10e081c379c1dcc19cd0040c77e500fa936
114114
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
115-
share: 222b5dcc8031238af9d7de91149df65bad1aef75
116-
shared_preferences: 5a1d487c427ee18fcd3ea1f2a131569481834b53
117-
sqflite: d1612813fa7db7c667bed9f1d1b508deffc56999
118-
url_launcher: 92b89c1029a0373879933c21642958c874539095
119-
webview_flutter: 9bd234c07e99632356cba112df56fd1d47d6b6e3
115+
share: 7d22fe8baedfe93aefd864bf0b73f29711fbb0a3
116+
shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523
117+
sqflite: ff1d9da63c06588cc8d1faf7256d741f16989d5a
118+
url_launcher: 0067ddb8f10d36786672aa0722a21717dba3a298
119+
webview_flutter: 1aa7604e6cdb451a9b7ed2c37d5454c0b440246b
120120

121121
PODFILE CHECKSUM: 7765ea4305eaab0b3dfd384c7de11902aa3195fd
122122

123-
COCOAPODS: 1.5.3
123+
COCOAPODS: 1.6.1

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
files = (
533533
);
534534
inputPaths = (
535-
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
535+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
536536
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
537537
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
538538
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
@@ -575,7 +575,7 @@
575575
);
576576
runOnlyForDeploymentPostprocessing = 0;
577577
shellPath = /bin/sh;
578-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
578+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
579579
showEnvVarsInLog = 0;
580580
};
581581
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {

‎lib/page/my_page.dart‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:gsy_github_app_flutter/common/redux/gsy_state.dart';
77
import 'package:gsy_github_app_flutter/common/redux/user_redux.dart';
88
import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
99
import 'package:gsy_github_app_flutter/widget/base_person_state.dart';
10-
import 'package:gsy_github_app_flutter/widget/gsy_pull_load_widget.dart';
10+
import 'package:gsy_github_app_flutter/widget/nested/gsy_nested_pull_load_widget.dart';
1111
import 'package:redux/redux.dart';
1212

1313
/**
@@ -78,7 +78,8 @@ class _MyPageState extends BasePersonState<MyPage> {
7878
if (getUserType() == "Organization") {
7979
return await UserDao.getMemberDao(_getUserName(), page);
8080
}
81-
return await EventDao.getEventDao(_getUserName(), page: page, needDb: page <= 1);
81+
return await EventDao.getEventDao(_getUserName(),
82+
page: page, needDb: page <= 1);
8283
}
8384

8485
@override
@@ -115,7 +116,7 @@ class _MyPageState extends BasePersonState<MyPage> {
115116
bool get isRefreshFirst => false;
116117

117118
@override
118-
bool get needHeader => true;
119+
bool get needHeader => false;
119120

120121
@override
121122
void didChangeDependencies() {
@@ -130,14 +131,22 @@ class _MyPageState extends BasePersonState<MyPage> {
130131
super.build(context); // See AutomaticKeepAliveClientMixin.
131132
return new StoreBuilder<GSYState>(
132133
builder: (context, store) {
133-
return GSYPullLoadWidget(
134+
return GSYNestedPullLoadWidget(
134135
pullLoadWidgetControl,
135-
(BuildContext context, int index) => renderItem(index, store.state.userInfo, beStaredCount, notifyColor, () {
136+
(BuildContext context, int index) => renderItem(
137+
index, store.state.userInfo, beStaredCount, notifyColor, () {
136138
_refreshNotify();
137139
}, orgList),
138140
handleRefresh,
139141
onLoadMore,
140-
refreshKey: refreshIndicatorKey,
142+
refreshKey: refreshIKey,
143+
headerSliverBuilder: (context, _) {
144+
return sliverBuilder(
145+
context, _, store.state.userInfo, notifyColor, beStaredCount,
146+
() {
147+
_refreshNotify();
148+
});
149+
},
141150
);
142151
},
143152
);

‎lib/page/person_page.dart‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'package:gsy_github_app_flutter/widget/base_person_state.dart';
1212
import 'package:gsy_github_app_flutter/widget/gsy_common_option_widget.dart';
1313
import 'package:gsy_github_app_flutter/widget/gsy_pull_load_widget.dart';
1414
import 'package:gsy_github_app_flutter/widget/gsy_title_bar.dart';
15+
import 'package:gsy_github_app_flutter/widget/nested/gsy_nested_pull_load_widget.dart';
1516

1617
/**
1718
* 个人详情
@@ -99,27 +100,28 @@ class _PersonState extends BasePersonState<PersonPage> {
99100
var focusRes = await UserDao.checkFollowDao(userName);
100101
if (isShow) {
101102
setState(() {
102-
focus = (focusRes != null && focusRes.result) ? CommonUtils.getLocale(context).user_focus : CommonUtils.getLocale(context).user_un_focus;
103+
focus = (focusRes != null && focusRes.result)
104+
? CommonUtils.getLocale(context).user_focus
105+
: CommonUtils.getLocale(context).user_un_focus;
103106
focusStatus = (focusRes != null && focusRes.result);
104107
});
105108
}
106109
}
107110

108-
109111
_getUserName() {
110112
if (userInfo == null) {
111113
return new User.empty();
112114
}
113115
return userInfo.login;
114116
}
115117

116-
117118
_getDataLogic() async {
118119
if (userInfo.type == "Organization") {
119120
return await UserDao.getMemberDao(_getUserName(), page);
120121
}
121122
getUserOrg(_getUserName());
122-
return await EventDao.getEventDao(_getUserName(), page: page, needDb: page <= 1);
123+
return await EventDao.getEventDao(_getUserName(),
124+
page: page, needDb: page <= 1);
123125
}
124126

125127
@override
@@ -137,10 +139,11 @@ class _PersonState extends BasePersonState<PersonPage> {
137139
bool get isRefreshFirst => true;
138140

139141
@override
140-
bool get needHeader => true;
142+
bool get needHeader => false;
141143

142144
@override
143145
Widget build(BuildContext context) {
146+
super.build(context);
144147
return new Scaffold(
145148
appBar: new AppBar(
146149
title: GSYTitleBar(
@@ -154,7 +157,8 @@ class _PersonState extends BasePersonState<PersonPage> {
154157
return;
155158
}
156159
if (userInfo.type == "Organization") {
157-
Fluttertoast.showToast(msg: CommonUtils.getLocale(context).user_focus_no_support);
160+
Fluttertoast.showToast(
161+
msg: CommonUtils.getLocale(context).user_focus_no_support);
158162
return;
159163
}
160164
CommonUtils.showLoadingDialog(context);
@@ -163,12 +167,17 @@ class _PersonState extends BasePersonState<PersonPage> {
163167
_getFocusStatus();
164168
});
165169
}),
166-
body: GSYPullLoadWidget(
170+
body: GSYNestedPullLoadWidget(
167171
pullLoadWidgetControl,
168-
(BuildContext context, int index) => renderItem(index, userInfo, beStaredCount, null, null, orgList),
172+
(BuildContext context, int index) =>
173+
renderItem(index, userInfo, beStaredCount, null, null, orgList),
169174
handleRefresh,
170175
onLoadMore,
171-
refreshKey: refreshIndicatorKey,
176+
refreshKey: refreshIKey,
177+
headerSliverBuilder: (context, _) {
178+
return sliverBuilder(
179+
context, _, userInfo, null, beStaredCount, null);
180+
},
172181
));
173182
}
174183
}

‎lib/page/repostory_detail_info_page.dart‎

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import 'dart:async';
2-
import 'dart:math' as math;
32

43
import 'package:flutter/material.dart';
54
import 'package:flutter/rendering.dart';
65
import 'package:gsy_github_app_flutter/common/dao/repos_dao.dart';
76
import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart';
8-
import 'package:gsy_github_app_flutter/common/model/Repository.dart';
97
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
108
import 'package:gsy_github_app_flutter/common/utils/event_utils.dart';
119
import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
1210
import 'package:gsy_github_app_flutter/page/repository_detail_page.dart';
1311
import 'package:gsy_github_app_flutter/widget/event_item.dart';
1412
import 'package:gsy_github_app_flutter/widget/gsy_common_option_widget.dart';
1513
import 'package:gsy_github_app_flutter/widget/gsy_list_state.dart';
16-
import 'package:gsy_github_app_flutter/widget/gsy_pull_load_widget.dart';
1714
import 'package:gsy_github_app_flutter/widget/gsy_select_item_widget.dart';
1815
import 'package:gsy_github_app_flutter/widget/nested/gsy_nested_pull_load_widget.dart';
16+
import 'package:gsy_github_app_flutter/widget/nested/gsy_sliver_header_delegate.dart';
1917
import 'package:gsy_github_app_flutter/widget/nested/nested_refresh.dart';
2018
import 'package:gsy_github_app_flutter/widget/repos_header_item.dart';
2119
import 'package:scoped_model/scoped_model.dart';
@@ -184,7 +182,7 @@ class ReposDetailInfoPageState extends State<ReposDetailInfoPage>
184182
return <Widget>[
185183
///头部信息
186184
SliverPersistentHeader(
187-
delegate: _InfoHeaderDelegate(
185+
delegate: GSYSliverHeaderDelegate(
188186
maxHeight: headerSize,
189187
minHeight: headerSize,
190188
snapConfig: FloatingHeaderSnapConfiguration(
@@ -207,7 +205,7 @@ class ReposDetailInfoPageState extends State<ReposDetailInfoPage>
207205
///动态放大缩小的选择案件
208206
SliverPersistentHeader(
209207
pinned: true,
210-
delegate: _InfoHeaderDelegate(
208+
delegate: GSYSliverHeaderDelegate(
211209
maxHeight: 60,
212210
minHeight: 60,
213211
changeSize: true,
@@ -252,51 +250,4 @@ class ReposDetailInfoPageState extends State<ReposDetailInfoPage>
252250
),
253251
];
254252
}
255-
}
256-
257-
///动态头部处理
258-
class _InfoHeaderDelegate extends SliverPersistentHeaderDelegate {
259-
_InfoHeaderDelegate(
260-
{@required this.minHeight,
261-
@required this.maxHeight,
262-
@required this.snapConfig,
263-
this.child,
264-
this.builder,
265-
this.changeSize = false});
266-
267-
final double minHeight;
268-
final double maxHeight;
269-
final Widget child;
270-
final Builder builder;
271-
final bool changeSize;
272-
final FloatingHeaderSnapConfiguration snapConfig;
273-
AnimationController animationController;
274-
275-
@override
276-
double get minExtent => minHeight;
277-
278-
@override
279-
double get maxExtent => math.max(maxHeight, minHeight);
280-
281-
@override
282-
Widget build(
283-
BuildContext context, double shrinkOffset, bool overlapsContent) {
284-
if (builder != null) {
285-
return builder(context, shrinkOffset, overlapsContent);
286-
}
287-
return child;
288-
}
289-
290-
@override
291-
bool shouldRebuild(_InfoHeaderDelegate oldDelegate) {
292-
return maxHeight != oldDelegate.maxHeight ||
293-
minHeight != oldDelegate.minHeight ||
294-
child != oldDelegate.child;
295-
}
296-
297-
@override
298-
FloatingHeaderSnapConfiguration get snapConfiguration => snapConfig;
299-
}
300-
301-
typedef Widget Builder(
302-
BuildContext context, double shrinkOffset, bool overlapsContent);
253+
}

‎lib/page/trend_page.dart‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'dart:async';
2-
import 'dart:math' as math;
32

43
import 'package:flutter/material.dart';
54
import 'package:flutter/rendering.dart';
@@ -12,6 +11,7 @@ import 'package:gsy_github_app_flutter/common/style/gsy_style.dart';
1211
import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
1312
import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
1413
import 'package:gsy_github_app_flutter/widget/gsy_card_item.dart';
14+
import 'package:gsy_github_app_flutter/widget/nested/gsy_sliver_header_delegate.dart';
1515
import 'package:gsy_github_app_flutter/widget/nested/nested_refresh.dart';
1616
import 'package:gsy_github_app_flutter/widget/repos_item.dart';
1717
import 'package:redux/redux.dart';
@@ -240,7 +240,7 @@ class _TrendPageState extends State<TrendPage>
240240
///动态放大缩小的选择案件
241241
SliverPersistentHeader(
242242
pinned: true,
243-
delegate: _InfoHeaderDelegate(
243+
delegate: GSYSliverHeaderDelegate(
244244
maxHeight: 65,
245245
minHeight: 65,
246246
changeSize: true,
@@ -300,48 +300,3 @@ trendType(BuildContext context) {
300300
TrendTypeModel("C#", "c%23"),
301301
];
302302
}
303-
304-
///动态头部处理
305-
class _InfoHeaderDelegate extends SliverPersistentHeaderDelegate {
306-
_InfoHeaderDelegate(
307-
{@required this.minHeight,
308-
@required this.maxHeight,
309-
@required this.snapConfig,
310-
this.child,
311-
this.builder,
312-
this.changeSize = false});
313-
314-
final double minHeight;
315-
final double maxHeight;
316-
final Widget child;
317-
final Builder builder;
318-
final bool changeSize;
319-
final FloatingHeaderSnapConfiguration snapConfig;
320-
AnimationController animationController;
321-
322-
@override
323-
double get minExtent => minHeight;
324-
325-
@override
326-
double get maxExtent => math.max(maxHeight, minHeight);
327-
328-
@override
329-
Widget build(
330-
BuildContext context, double shrinkOffset, bool overlapsContent) {
331-
if (builder != null) {
332-
return builder(context, shrinkOffset, overlapsContent);
333-
}
334-
return child;
335-
}
336-
337-
@override
338-
bool shouldRebuild(_InfoHeaderDelegate oldDelegate) {
339-
return true;
340-
}
341-
342-
@override
343-
FloatingHeaderSnapConfiguration get snapConfiguration => snapConfig;
344-
}
345-
346-
typedef Widget Builder(
347-
BuildContext context, double shrinkOffset, bool overlapsContent);

0 commit comments

Comments
 (0)