Merge branch 'develop' into welcome

This commit is contained in:
sanfan.hx
2019-01-15 10:42:12 +08:00
3 changed files with 37 additions and 17 deletions

View File

@ -6,14 +6,14 @@ final pages = [
new PageViewModel(
const Color(0xFFcd344f),
//'assets/mountain.png',
'assets/images/p1.png',
'assets/images/p2.png',
'FlutterGo是什么',
'【FlutterGo】 是由"阿里拍卖"前端团队几位 Flutter 粉丝,用业余时间开发的一款,用于 Flutter 教学帮助的App这里没有高大尚的概念只有一个一个亲历的尝试用最直观的方式展示的 Flutter 官方demo',
'assets/images/plane.png'),
new PageViewModel(
const Color(0xFF638de3),
//'assets/world.png',
'assets/images/p2.png',
'assets/images/p1.png',
'FLutterGo的背景',
'🐢 官网文档示例较不够健全,不够直观\n🐞 运行widget demo要到处翻阅资料\n🐌 英文文档翻译生涩难懂,学习资料太少\n',
'assets/images/calendar.png'),

View File

@ -0,0 +1,33 @@
/**
* Created with Android Studio.
* User: 三帆
* Date: 14/01/2019
* Time: 19:02
* email: sanfan.hx@alibaba-inc.com
* tartget: xxx
*/
import 'package:flutter/material.dart';
class Demo extends StatefulWidget {
_Demo createState() => _Demo();
}
class _Demo extends State<Demo> {
Widget build(BuildContext context) {
return Container(
color: Color(0xff000000),
width: 750.0,
child: RichText(
text: TextSpan(
text: 'Hello ',
children: <TextSpan>[
TextSpan(text: 'bold', style: TextStyle(fontWeight: FontWeight.bold, color: Color(0xfffffc42))),
TextSpan(text: ' world!', style: TextStyle(fontStyle: FontStyle.italic)),
],
),
),
);
}
}

View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import '../../../../../common/widget_demo.dart';
import 'demo.dart';
const String intro = """
# 富文本显示
@ -70,20 +70,7 @@ class _Demo extends State<Demo> {
contentList: [new Column(
children: <Widget>[
MarkdownBody(data: markDesc['intro']),
Container(
color: Color(0xff000000),
width: 750.0,
child: RichText(
text: TextSpan(
text: 'Hello ',
// style: TextStyle(fontWeight: FontWeight.normal, inherit: true, fontSize: 44),
children: <TextSpan>[
TextSpan(text: 'bold', style: TextStyle(fontWeight: FontWeight.bold, color: Color(0xfffffc42))),
TextSpan(text: ' world!', style: TextStyle(fontStyle: FontStyle.italic)),
],
),
),
),
Demo(),
MarkdownBody(data: markDesc['diff']),
],
),