Skip to content

Commit 12544b0

Browse files
committed
refactor(update Text & RichText demos and fixed the analysis warnings):
1 parent 5e18365 commit 12544b0

File tree

12 files changed

+58
-132
lines changed

12 files changed

+58
-132
lines changed
Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,16 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter_markdown/flutter_markdown.dart';
32
import '../../../../../common/widget_demo.dart';
43
import 'demo.dart';
54
const String intro = """
6-
# 富文本显示
5+
### **简介**
76
8-
在富文本使用多个不同风格的widget显示文本。要显示的文本使用TextSpan对象树来描述,每个对象都有一个用于该子树的关联样式。文本可能会跨越多行,也可能全部显示在同一行上,具体取决于布局约束。
9-
10-
# 示例代码
11-
12-
```
13-
RichText(
14-
text: TextSpan(
15-
text: 'Hello ',
16-
style: DefaultTextStyle.of(context).style,
17-
children: <TextSpan>[
18-
TextSpan(text: 'bold', style: TextStyle(fontWeight: FontWeight.bold)),
19-
TextSpan(text: ' world!'),
20-
],
21-
),
22-
)
23-
```
24-
25-
# 示例示例
7+
> 具有复杂样式的文本显示组件
268
27-
""";
28-
const String diff = """
29-
# RichText 与 Text.rich 对比
9+
在富文本使用多个不同风格的widget显示文本。要显示的文本使用TextSpan对象树来描述,每个对象都有一个用于该子树的关联样式。文本可能会跨越多行,也可能全部显示在同一行上,具体取决于布局约束。
3010
3111
无论是Text或者Text.rich, 查看源代码发现. 都是由RichText构建出来
3212
33-
## 源码展示
13+
RichText的源码展示
3414
3515
```
3616
// Text 源码
@@ -49,12 +29,14 @@ const String diff = """
4929
return result;
5030
}
5131
```
52-
待补充...
32+
### **基本实例**
33+
34+
""";
35+
const String diff = """
36+
37+
5338
""";
54-
const Map<String, String> markDesc = {
55-
'intro': intro,
56-
'diff': diff
57-
};
39+
5840
class Demo extends StatefulWidget {
5941
static const String routeName = '/element/Form/Text/RichText';
6042
_Demo createState() => _Demo();
@@ -66,14 +48,10 @@ class _Demo extends State<Demo> {
6648
return WidgetDemo(
6749
title: 'Rich Text',
6850
docUrl: 'https://docs.flutter.io/flutter/widgets/RichText-class.html',
69-
codeUrl: '',
70-
contentList: [new Column(
71-
children: <Widget>[
72-
MarkdownBody(data: markDesc['intro']),
73-
RichTextDemo(),
74-
MarkdownBody(data: markDesc['diff']),
75-
],
76-
),
77-
]);
51+
codeUrl: 'elements/Form/Text/RichText/index.dart',
52+
contentList: [
53+
intro,
54+
RichTextDemo(),
55+
]);
7856
}
7957
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* Created with Android Studio.
3+
* User: 三帆
4+
* Date: 20/01/2019
5+
* Time: 22:28
6+
* email: sanfan.hx@alibaba-inc.com
7+
* tartget: CupertinoTabBar
8+
*/
9+
10+
import 'package:flutter/cupertino.dart';
11+
import 'package:flutter/material.dart';
12+
13+
class TextDemo extends StatefulWidget {
14+
_Demo createState() => _Demo();
15+
}
16+
17+
class _Demo extends State<TextDemo> {
18+
int index = 0;
19+
Duration timer = new Duration(minutes: 50);
20+
21+
Widget build(BuildContext context) {
22+
return Text("i'm a text");
23+
}
24+
}
Lines changed: 16 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,30 @@
11
import 'package:flutter/material.dart';
2-
//import 'package:flutter_markdown/flutter_markdown.dart';
32
import '../../../../../common/widget_demo.dart';
4-
import '../../../../../components/markdown.dart';
3+
import 'demo.dart';
54

65
const String intro = """
7-
# 说明
6+
### **简介**
87
98
> 具有某个单一样式的文本显示的widget组件, 显示支持一行或者多行. 默认样式会继承层级最为接近的 *DefaultStyle*
109
当然, 你也可以重新他的样式 将 *DefaultStyle.inherit 设置为 false*
1110
12-
# 示例代码
11+
是最基本的文本显示组件
1312
14-
``` dart
15-
Text(
16-
'Hello, World ! How are you?',
17-
textAlign: TextAlign.center,
18-
overflow: TextOverflow.ellipsis,
19-
style: TextStyle(fontWeight: FontWeight.bold),
20-
)
21-
```
13+
### **基本用法**
14+
在这里介绍一下他的基本属性说明.
2215
23-
# 示例显示
16+
- data Text显示的文本,必填参数 String
17+
- textAlign 文本的对齐方式,可以选择左对齐、右对齐还是居中对齐 TextAlign
18+
- maxLines 文本显示的最大行数 int
19+
- overflow 文本显示的截断方式 TextOverflow
20+
- textScaleFactor 文本的缩放比例 double
21+
- style 用于指定文本显示的样式如颜色、字体、粗细、背景等
2422
2523
26-
""";
27-
28-
const String leftDesc = """
29-
# 示例代码
30-
31-
32-
``` dart
33-
// 左侧布局示例
34-
Text(
35-
"Hello, World! I'm start from left?",
36-
textAlign: TextAlign.left,
37-
overflow: TextOverflow.ellipsis,
38-
style: TextStyle(fontWeight: FontWeight.bold, inherit: true),
39-
),
40-
```
41-
# 示例显示
42-
""";
43-
44-
const String RichDesc = """
45-
46-
# 复杂文本显示
47-
48-
使用 Text.rich 构造函数,Text 组件可以显示具有不同样式的 TextSpan 段落。下面的示例显示每个单词具有不同样式的“Hello beautiful world”。
24+
### **基本示例**
4925
50-
```
51-
Text.rich(
52-
TextSpan(
53-
text: 'Hello', // default text style
54-
children: <TextSpan>[
55-
TextSpan(text: ' beautiful ', style: TextStyle(fontStyle: FontStyle.italic)),
56-
TextSpan(text: 'world', style: TextStyle(fontWeight: FontWeight.bold)),
57-
],
58-
),
59-
)
60-
```
6126
""";
6227

63-
const Map<String, String> markDesc = {
64-
"intro": intro,
65-
"left": leftDesc,
66-
"rich": RichDesc
67-
};
6828
class Demo extends StatefulWidget {
6929
static const String routeName = '/element/Form/Text/Text';
7030
_Demo createState() => _Demo();
@@ -79,38 +39,10 @@ class _Demo extends State<Demo> {
7939
title: "Text",
8040
docUrl: 'flutter/widgets/Text-class.html',
8141
codeUrl: 'elements/Form/Text/Text/index.dart',
82-
contentList: [new Column(
83-
children: <Widget>[
84-
MarkdownBody(markDesc['intro']),
85-
Text(
86-
'Hello, World! How are you?',
87-
textAlign: TextAlign.center,
88-
overflow: TextOverflow.ellipsis,
89-
style: TextStyle(fontWeight: FontWeight.bold),
90-
),
91-
MarkdownBody(markDesc['left']),
92-
Container(
93-
width: 750.0,
94-
color: Color(0xFF0096ef),
95-
child: Text(
96-
"Hello, World! I'm start from left?",
97-
textAlign: TextAlign.left,
98-
overflow: TextOverflow.ellipsis,
99-
style: TextStyle(color: Color(0xffffffff)),
100-
),
101-
),
102-
MarkdownBody( markDesc['rich']),
103-
Text.rich(
104-
TextSpan(
105-
text: 'Hello', // default text style
106-
children: <TextSpan>[
107-
TextSpan(text: ' beautiful ', style: TextStyle(fontStyle: FontStyle.italic)),
108-
TextSpan(text: 'world', style: TextStyle(fontWeight: FontWeight.bold)),
109-
],
110-
),
111-
)
112-
],
113-
)]
42+
contentList: [
43+
intro,
44+
TextDemo(),
45+
]
11446
);
11547
}
11648
}

lib/widgets/themes/Cupertino/CupertinoColors/demo.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ class CupertinoColorsFullDefault extends StatefulWidget {
2626
* */
2727
class _CupertinoColorsFullDefault extends State {
2828

29-
Widget setColorsView(Cupertino_colors){
29+
Widget setColorsView(cupertinoColors){
3030
return Container(
3131
width: MediaQuery.of(context).size.width-100,
3232
padding: const EdgeInsets.all(10.0),
3333
child:Text('activeBlue',style:TextStyle(color:Colors.white)),
34-
decoration:BoxDecoration(color: Cupertino_colors)
34+
decoration:BoxDecoration(color: cupertinoColors)
3535
);
3636
}
3737
@override

lib/widgets/themes/Cupertino/CupertinoNavigationBar/demo.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class CupertinoNavigationBarFullDefault extends StatefulWidget {
2525
* */
2626
class _CupertinoNavigationBarFullDefault extends State {
2727

28-
@override
2928
Widget build2(BuildContext context) {
3029
return SizedBox(
3130
height: MediaQuery.of(context).size.height,

lib/widgets/themes/Cupertino/CupertinoSlider/index.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_go/common/widget_demo.dart';
3-
import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart';
43
import 'demo.dart';
54
const Text0 = '''
65
### **简介**

lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_go/common/widget_demo.dart';
3-
import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart';
43
import 'demo.dart';
54
const Text0 = '''
65
### **简介**

lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_go/common/widget_demo.dart';
3-
import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart';
43
import 'demo.dart';
54
const Text0 = '''
65
### **简介**

lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_go/common/widget_demo.dart';
3-
import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart';
43
import 'demo.dart';
54
const Text0 = '''
65
### **简介**

lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_go/common/widget_demo.dart';
3-
import 'package:flutter_go/widgets/themes/Material/MaterialColor/demo.dart';
43
import 'demo.dart';
54
const Text0 = '''
65
### **简介**

0 commit comments

Comments
 (0)