Merge pull request alibaba#119 from Nealyang/master

fix: fix code conflict
wcnmtx · Feb 2, 2019 · 722c1e4 · 722c1e4
2 parents 7aeaac5 + c5d41fb
commit 722c1e4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		084A20882202E4FD00428FF5 /* flutter go.png in Resources */ = {isa = PBXBuildFile; fileRef = 084A20872202E4FD00428FF5 /* flutter go.png */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
 		333E5DAE7FC10AC69FEC26C0 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA792F029EDD7A11295D192 /* libPods-Runner.a */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
@@ -42,7 +41,10 @@
 		084A20872202E4FD00428FF5 /* flutter go.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "flutter go.png"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+<<<<<<< HEAD
+=======
 		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
+>>>>>>> 12990ce0e83473226cfb16ad9c682c065856d684
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };

diff --git a/lib/components/full_screen_code_dialog.dart b/lib/components/full_screen_code_dialog.dart
@@ -43,16 +43,23 @@ class _FullScreenCodeDialogState extends State<FullScreenCodeDialog> {
     if (_exampleCode == null) {
       body = const Center(child: CircularProgressIndicator());
     } else {
-      body = SingleChildScrollView(
-        child: Padding(
-          padding: const EdgeInsets.all(16.0),
-          child: RichText(
-            text: TextSpan(
+      Widget _codeWidget;
+      try{
+        DartSyntaxHighlighter(style).format(_exampleCode);
+        _codeWidget = RichText(
+          text: TextSpan(
                 style: const TextStyle(fontFamily: 'monospace', fontSize: 10.0),
                 children: <TextSpan>[
                   DartSyntaxHighlighter(style).format(_exampleCode)
-                ]),
-          ),
+                ],),
+        );
+      }catch (err){
+        _codeWidget = Text(_exampleCode);
+      }
+      body = SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: _codeWidget,
         ),
       );
     }

diff --git a/lib/widgets/elements/Form/Slider/Slider/index.dart b/lib/widgets/elements/Form/Slider/Slider/index.dart
@@ -46,10 +46,6 @@ const contentB = '''
 ### **高级用法**
 > 自定义Slider 样式
 
-<<<<<<< HEAD
-如果当前Slider样式 无法满足需求, 可以通过 **SliderTheme** 定制复杂样式
-
-=======
 如果当前Slider样式 无法满足需求, 可以通过 ** SliderTheme ** 定制复杂样式
 
 ```
@@ -69,7 +65,6 @@ const contentB = '''
 )
 
 ```
->>>>>>> ccb5c9e42883b23266fb95b9caf4e958d817ff48
 
 ### **基本实例**
 

diff --git a/lib/widgets/elements/Form/Slider/SliderTheme/index.dart b/lib/widgets/elements/Form/Slider/SliderTheme/index.dart
@@ -21,9 +21,6 @@ const contentA = '''
 
 > 通过更改sliderTheme.data, 修改Slider总体样式
 
-<<<<<<< HEAD
-具体属性, 请查阅: SliderThemeData.data.
-=======
 基本属性参考以下代码: 
 
 ```
@@ -50,7 +47,6 @@ const contentA = '''
 ),
 
 ```
->>>>>>> ccb5c9e42883b23266fb95b9caf4e958d817ff48
 
 ### **基本实例**
 

diff --git a/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart b/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart
@@ -1,9 +1,8 @@
-/*
- * @Author: 一凨 
- * @Date: 2018-11-28 20:09:40 
- * @Last Modified by: 一凨
- * @Last Modified time: 2018-11-28 20:10:32
- */
+/// @Author: 一凨 
+/// @Date: 2018-11-28 20:09:40 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2018-11-28 20:10:32
+
 import 'package:flutter/material.dart';
 
 class ExpandedDemo extends StatelessWidget {

diff --git a/lib/widgets/elements/Frame/Expanded/index.dart b/lib/widgets/elements/Frame/Expanded/index.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import '../../../../model/widget.dart';
+
+import 'package:flutter_go/model/widget.dart';
 
 import './Expanded/index.dart' as Expanded;