flutter/flutter-go
1
0
Fork 0
mirror of https://github.com/alibaba/flutter-go.git synced 2025-06-02 07:47:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(solve conflict):

Browse Source
This commit is contained in:
sanfan.hx
2019-01-29 15:21:03 +08:00
parent 573a85a075
commit 2cf2dba8ec
10 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/widgets/elements/Form/Text/RichText/index.dart
View File

@ -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 = """
### **简介**

7
lib/widgets/elements/Form/Text/Text/index.dart
View File

@ -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 = """
### **简介**

8
lib/widgets/themes/Cupertino/CupertinoColors/demo.dart
View File

@ -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)
);
}

5
lib/widgets/themes/Cupertino/CupertinoSlider/index.dart
View File

@ -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 = '''
### **简介**

4
lib/widgets/themes/Cupertino/CupertinoSliverNavigationBar/index.dart
View File

@ -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 = '''
### **简介**

5
lib/widgets/themes/Cupertino/CupertinoSwitch/index.dart
View File

@ -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 = '''
### **简介**

5
lib/widgets/themes/Cupertino/CupertinoTabBar/index.dart
View File

@ -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 = '''
### **简介**

5
lib/widgets/themes/Cupertino/CupertinoTabScaffold/index.dart
View File

@ -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 = '''
### **简介**

4
lib/widgets/themes/Cupertino/CupertinoTabView/index.dart
View File

@ -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 = '''
### **简介**

6
lib/widgets/themes/Cupertino/CupertinoTimerPicker/index.dart
View File

@ -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 = '''
### **简介**