Skip to content

Commit 2cf2dba

Browse files
hanxu317317hanxu317317
committed
fix(solve conflict):
1 parent 573a85a commit 2cf2dba

File tree

10 files changed

+8
-46
lines changed

10 files changed

+8
-46
lines changed

‎lib/widgets/elements/Form/Text/RichText/index.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import '../../../../../common/widget_demo.dart';
4-
=======
2+
53
import 'package:flutter_markdown/flutter_markdown.dart';
64
import 'package:flutter_go/components/widget_demo.dart';
7-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
85
import 'demo.dart';
96
const String intro = """
107
### **简介**

‎lib/widgets/elements/Form/Text/Text/index.dart‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import '../../../../../common/widget_demo.dart';
4-
import 'demo.dart';
5-
=======
6-
//import 'package:flutter_markdown/flutter_markdown.dart';
72
import 'package:flutter_go/components/widget_demo.dart';
83
import '../../../../../components/markdown.dart';
9-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
4+
import 'demo.dart';
105

116
const String intro = """
127
### **简介**

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

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

29-
<<<<<<< HEAD
30-
Widget setColorsView(cupertinoColors){
31-
return Container(
32-
width: MediaQuery.of(context).size.width-100,
33-
padding: const EdgeInsets.all(10.0),
34-
child:Text('activeBlue',style:TextStyle(color:Colors.white)),
35-
=======
3629
Widget setColorsView(cupertinoColors,String colorName){
3730
return Container(
3831
width: MediaQuery.of(context).size.width-100,
3932
padding: const EdgeInsets.all(10.0),
4033
child:Text(colorName,style:TextStyle(color:Colors.white)),
41-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
4234
decoration:BoxDecoration(color: cupertinoColors)
4335
);
4436
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
2+
53
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
74
import 'demo.dart';
85
const Text0 = '''
96
### **简介**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
52
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
73
import 'demo.dart';
84
const Text0 = '''
95
### **简介**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
52
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
3+
74
import 'demo.dart';
85
const Text0 = '''
96
### **简介**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
52
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
3+
74
import 'demo.dart';
85
const Text0 = '''
96
### **简介**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
52
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
3+
74
import 'demo.dart';
85
const Text0 = '''
96
### **简介**

‎lib/widgets/themes/Cupertino/CupertinoTabView/index.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
52
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
73
import 'demo.dart';
84
const Text0 = '''
95
### **简介**

‎lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import 'package:flutter/material.dart';
2-
<<<<<<< HEAD
3-
import 'package:flutter_go/common/widget_demo.dart';
4-
=======
2+
53
import 'package:flutter_go/components/widget_demo.dart';
6-
>>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
4+
75
import 'demo.dart';
86
const Text0 = '''
97
### **简介**

0 commit comments

Comments
 (0)