Skip to content

Commit bad3e63

Browse files
committed
fix something
1 parent 6b2d55c commit bad3e63

5 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎lib/page/MyPage.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:flutter_redux/flutter_redux.dart';
66
import 'package:gsy_github_app_flutter/common/config/Config.dart';
77
import 'package:gsy_github_app_flutter/common/dao/EventDao.dart';
88
import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
9+
import 'package:gsy_github_app_flutter/common/utils/EventUtils.dart';
910
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
1011
import 'package:gsy_github_app_flutter/widget/GSYPullLoadWidget.dart';
1112
import 'package:gsy_github_app_flutter/widget/UserHeader.dart';
@@ -74,7 +75,10 @@ class _MyPageState extends State<MyPage> with AutomaticKeepAliveClientMixin {
7475
if (index == 0) {
7576
return new UserHeaderItem(userInfo);
7677
}
77-
return new EventItem(pullLoadWidgetControl.dataList[index - 1]);
78+
EventViewModel eventViewModel = pullLoadWidgetControl.dataList[index - 1];
79+
return new EventItem(pullLoadWidgetControl.dataList[index - 1], onPressed: () {
80+
EventUtils.ActionUtils(context, eventViewModel.eventMap, "");
81+
});
7882
}
7983

8084
Store<GSYState> _getStore() {

‎lib/page/RepositoryDetailPage.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage> with Automa
7171
],
7272
backgroundColor: GSYColors.primarySwatch,
7373
indicatorColor: Colors.white,
74-
title: userName + "/" + reposName);
74+
title: reposName);
7575
}
7676
}

‎lib/page/TrendPage.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:async';
22

33
import 'package:flutter/material.dart';
44
import 'package:gsy_github_app_flutter/common/dao/ReposDao.dart';
5+
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
56
import 'package:gsy_github_app_flutter/widget/GSYPullLoadWidget.dart';
67
import 'package:gsy_github_app_flutter/widget/ReposItem.dart';
78

@@ -49,7 +50,9 @@ class _TrendPageState extends State<TrendPage> with AutomaticKeepAliveClientMixi
4950
}
5051

5152
_renderItem(ReposViewModel e) {
52-
return new ReposItem(e);
53+
return new ReposItem(e, onPressed: () {
54+
NavigatorUtils.goReposDetail(context, e.ownerName, e.repositoryName);
55+
});
5356
}
5457

5558
@override

‎lib/widget/EventItem.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EventItem extends StatelessWidget {
2222
Widget des = (eventViewModel.actionDes == null || eventViewModel.actionDes.length == 0)
2323
? new Container()
2424
: new Container(
25-
child: new Text(eventViewModel.actionDes, style: GSYConstant.subSmallText),
25+
child: new Text(eventViewModel.actionDes, style: GSYConstant.subSmallText, maxLines: 3,),
2626
margin: new EdgeInsets.only(top: 6.0, bottom: 2.0),
2727
alignment: Alignment.topLeft);
2828
return new Container(

‎lib/widget/ReposHeaderItem.dart‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,20 @@ class ReposHeaderItem extends StatelessWidget {
4040
onPressed: () {},
4141
child: new Text(reposHeaderViewModel.ownerName, style: GSYConstant.normalTextMitWhite),
4242
),
43-
new Text(" / ", style: GSYConstant.normalTextMitWhite),
44-
new Text(reposHeaderViewModel.repositoryName, style: GSYConstant.normalTextMitWhite),
43+
new Text(" /", style: GSYConstant.normalTextMitWhite),
44+
new Text(" " + reposHeaderViewModel.repositoryName, style: GSYConstant.normalTextMitWhite),
4545
],
4646
),
4747
new Padding(padding: new EdgeInsets.all(5.0)),
4848
new Row(
4949
children: <Widget>[
50-
new Text(reposHeaderViewModel.repositoryType, style: GSYConstant.subLightSmallText),
50+
new Text(reposHeaderViewModel.repositoryType != null ? reposHeaderViewModel.repositoryType : "--",
51+
style: GSYConstant.subLightSmallText),
5152
new Container(width: 5.3, height: 1.0),
52-
new Text(reposHeaderViewModel.repositorySize, style: GSYConstant.subLightSmallText),
53+
new Text(reposHeaderViewModel.repositorySize != null ? reposHeaderViewModel.repositorySize : "--",
54+
style: GSYConstant.subLightSmallText),
5355
new Container(width: 5.3, height: 1.0),
54-
new Text(reposHeaderViewModel.license, style: GSYConstant.subLightSmallText),
56+
new Text(reposHeaderViewModel.license != null ? reposHeaderViewModel.license : "--", style: GSYConstant.subLightSmallText),
5557
],
5658
),
5759
new Padding(padding: new EdgeInsets.all(5.0)),

0 commit comments

Comments
 (0)