Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
4a4e303a
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4a4e303a
编写于
7月 22, 2015
作者:
C
Collin Jackson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix build
上级
470a8c77
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
50 deletion
+2
-50
sky/sdk/example/fitness/lib/feed.dart
sky/sdk/example/fitness/lib/feed.dart
+1
-49
sky/sdk/example/fitness/lib/fitness_item.dart
sky/sdk/example/fitness/lib/fitness_item.dart
+1
-1
未找到文件。
sky/sdk/example/fitness/lib/feed.dart
浏览文件 @
4a4e303a
...
...
@@ -49,56 +49,7 @@ class FitnessItemList extends Component {
}
class
FeedFragment
extends
StatefulComponent
{
<<<<<<<
HEAD:
sky
/
sdk
/
example
/
fitness
/
lib
/
feed
.
dart
FeedFragment
({
this
.
navigator
,
this
.
userData
,
this
.
onItemCreated
,
this
.
onItemDeleted
});
=======
MeasurementRow
({
Measurement
measurement
,
this
.
onDismissed
})
:
this
.
measurement
=
measurement
,
super
(
key:
new
Key
.
stringify
(
measurement
.
when
));
final
Measurement
measurement
;
final
MeasurementHandler
onDismissed
;
static
const
double
kHeight
=
79.0
;
Widget
build
()
{
List
<
Widget
>
children
=
[
new
Flexible
(
child:
new
Text
(
measurement
.
displayWeight
,
style:
const
TextStyle
(
textAlign:
TextAlign
.
right
)
)
),
new
Flexible
(
child:
new
Text
(
measurement
.
displayDate
,
style:
Theme
.
of
(
this
).
text
.
caption
.
copyWith
(
textAlign:
TextAlign
.
right
)
)
)
];
return
new
Dismissable
(
key:
new
Key
.
stringify
(
measurement
.
when
),
onDismissed:
()
=>
onDismissed
(
measurement
),
child:
new
Card
(
child:
new
Container
(
height:
kHeight
,
padding:
const
EdgeDims
.
all
(
8.0
),
child:
new
Flex
(
children
,
alignItems:
FlexAlignItems
.
baseline
,
textBaseline:
DefaultTextStyle
.
of
(
this
).
textBaseline
)
)
)
);
}
}
class
HomeFragment
extends
StatefulComponent
{
HomeFragment
({
this
.
navigator
,
this
.
userData
,
this
.
onMeasurementCreated
,
this
.
onMeasurementDeleted
});
>>>>>>>
dk
/
master:
sky
/
sdk
/
example
/
fitness
/
lib
/
home
.
dart
Navigator
navigator
;
List
<
FitnessItem
>
userData
;
...
...
@@ -247,6 +198,7 @@ class HomeFragment extends StatefulComponent {
if
(!
_isShowingSnackBar
)
return
null
;
return
new
SnackBar
(
showing:
_isShowingSnackBar
,
content:
new
Text
(
"Item deleted."
),
actions:
[
new
SnackBarAction
(
label:
"UNDO"
,
onPressed:
_handleUndo
)]
);
...
...
sky/sdk/example/fitness/lib/fitness_item.dart
浏览文件 @
4a4e303a
...
...
@@ -24,7 +24,7 @@ abstract class FitnessItemRow extends Component {
FitnessItemRow
({
FitnessItem
item
,
this
.
onDismissed
})
:
this
.
item
=
item
,
super
(
key:
item
.
when
.
toString
(
));
super
(
key:
new
Key
(
item
.
when
.
toString
()
));
final
FitnessItem
item
;
final
FitnessItemHandler
onDismissed
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录