From 2cf2dba8ec734a910b221a9024a7d078b7c5f376 Mon Sep 17 00:00:00 2001 From: "sanfan.hx" Date: Tue, 29 Jan 2019 15:21:03 +0800 Subject: [PATCH] fix(solve conflict): --- lib/widgets/elements/Form/Text/RichText/index.dart | 5 +---- lib/widgets/elements/Form/Text/Text/index.dart | 7 +------ lib/widgets/themes/Cupertino/CupertinoColors/demo.dart | 8 -------- lib/widgets/themes/Cupertino/CupertinoSlider/index.dart | 5 +---- .../Cupertino/CupertinoSliverNavigationBar/index.dart | 4 ---- lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart | 5 +---- lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart | 5 +---- .../themes/Cupertino/CupertinoTabScaffold/index.dart | 5 +---- lib/widgets/themes/Cupertino/CupertinoTabView/index.dart | 4 ---- .../themes/Cupertino/CupertinoTimerPicker/index.dart | 6 ++---- 10 files changed, 8 insertions(+), 46 deletions(-) diff --git a/lib/widgets/elements/Form/Text/RichText/index.dart b/lib/widgets/elements/Form/Text/RichText/index.dart index d74bef29..2ec4aefd 100644 --- 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 index 774df12d..68bbdec3 100644 --- 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 index 8ed9822e..1c5e8d26 100644 --- 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 index 84794ac4..a3b73bd0 100644 --- 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 index d3b4d9dc..6b48e1c5 100644 --- 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 index 911457a0..b86d294a 100644 --- 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 index 511a5a09..ee63deea 100644 --- 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 index b58ecf66..5dcd85e9 100644 --- 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 index 3793299b..5cdb8516 100644 --- 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 index 0c19f2f6..6c882cfa 100644 --- 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 = ''' ### **简介**