fix(solve conflict):

alibaba · Jan 29, 2019 · 2cf2dba · 2cf2dba
1 parent 573a85a
commit 2cf2dba
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 46 deletions.
diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart
@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import '../../../../../common/widget_demo.dart';
-=======
+
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
 import 'demo.dart';
 const String intro = """
 ### **简介**

diff --git a/lib/widgets/elements/Form/Text/Text/index.dart b/lib/widgets/elements/Form/Text/Text/index.dart
@@ -1,12 +1,7 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import '../../../../../common/widget_demo.dart';
-import 'demo.dart';
-=======
-//import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_go/components/widget_demo.dart';
 import '../../../../../components/markdown.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
+import 'demo.dart';
 
 const String intro = """
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart b/lib/widgets/themes/Cupertino/CupertinoColors/demo.dart
@@ -26,19 +26,11 @@ class CupertinoColorsFullDefault extends StatefulWidget {
 * */
 class _CupertinoColorsFullDefault extends State {
 
-<<<<<<< HEAD
-  Widget setColorsView(cupertinoColors){
-    return Container(
-        width: MediaQuery.of(context).size.width-100,
-        padding: const EdgeInsets.all(10.0),
-        child:Text('activeBlue',style:TextStyle(color:Colors.white)),
-=======
   Widget setColorsView(cupertinoColors,String colorName){
     return Container(
         width: MediaQuery.of(context).size.width-100,
         padding: const EdgeInsets.all(10.0),
         child:Text(colorName,style:TextStyle(color:Colors.white)),
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
         decoration:BoxDecoration(color: cupertinoColors)
     );
   }

diff --git a/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart b/lib/widgets/themes/Cupertino/CupertinoSlider/index.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
+
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart
@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart b/lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
+
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
+
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
+
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart b/lib/widgets/themes/Cupertino/CupertinoTabView/index.dart
@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
 import 'demo.dart';
 const Text0 = '''
 ### **简介**

diff --git a/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart b/lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
-import 'package:flutter_go/common/widget_demo.dart';
-=======
+
 import 'package:flutter_go/components/widget_demo.dart';
->>>>>>> acfe8f6ed8390dc540a1082bba09f887030e69aa
+
 import 'demo.dart';
 const Text0 = '''
 ### **简介**