Merge branch 'develop' into develop

mayankbaluni · Feb 19, 2019 · 8d3b8ec · 8d3b8ec
2 parents a84b49b + 5f1ed65
commit 8d3b8ec
Show file tree

Hide file tree

Showing 88 changed files with 366 additions and 446 deletions.
diff --git a/lib/components/cate_card.dart b/lib/components/cate_card.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import '../model/cat.dart';
 import '../resources/widget_name_to_icon.dart';
 import '../components/widget_item_container.dart';

diff --git a/lib/components/category.dart b/lib/components/category.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+
 import '../routers/application.dart';
 import '../model/cat.dart';
 import '../model/widget.dart';

diff --git a/lib/components/disclaimer_msg.dart b/lib/components/disclaimer_msg.dart
@@ -1,14 +1,14 @@
-/**
- * Created with Android Studio.
- * User: 一晟
- * Date: 2019/1/12
- * Time: 下午9:19
- * email: [email protected]
- */
+/// Created with Android Studio.
+/// User: 一晟
+/// Date: 2019/1/12
+/// Time: 下午9:19
+/// email: [email protected]
+
+import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'dart:async';
+
 
 const disclaimerText1 =
     '\r\r\r\r\r\r本APP属于个人的非赢利性开源项目，以供开源社区使用，凡本APP转载的所有的文章 、图片、音频、视频文件等资料的版权归版权所有人所有，本APP采用的非本站原创文章及图片等内容无法一一和版权者联系，如果本网所选内容的文章作者及编辑认为其作品不宜上网供大家浏览，或不应无偿使用请及时用电子邮件或电话通知我们，以迅速采取适当措施，避免给双方造成不必要的经济损失。';

diff --git a/lib/components/full_screen_code_dialog.dart b/lib/components/full_screen_code_dialog.dart
@@ -1,10 +1,10 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-14 11:42:32 
- * @Last Modified by: 一凨
- * @Last Modified time: 2019-01-14 14:42:00
- */
+/// @Author: 一凨 
+/// @Date: 2019-01-14 11:42:32 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-14 14:42:00
+
 import 'package:flutter/material.dart';
+
 import 'package:flutter_go/utils/example_code_parser.dart';
 import 'package:flutter_go/utils/syntax_highlighter.dart';
 

diff --git a/lib/components/home_banner.dart b/lib/components/home_banner.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
+
 import '../model/story.dart';
 
 class HomeBanner extends StatefulWidget {

diff --git a/lib/components/list_refresh.dart b/lib/components/list_refresh.dart
@@ -5,9 +5,10 @@
 /// email: [email protected]
 /// target: ListRefresh 的示例
 
-import 'package:flutter/material.dart';
 import 'dart:async';
 
+import 'package:flutter/material.dart';
+
 class ListRefresh extends StatefulWidget {
   final renderItem;
   final requestApi;

diff --git a/lib/components/list_view_item.dart b/lib/components/list_view_item.dart
@@ -1,9 +1,8 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-14 17:53:54 
- * @Last Modified by: 一凨
- * @Last Modified time: 2019-01-14 17:57:51
- */
+/// @Author: 一凨 
+/// @Date: 2019-01-14 17:53:54 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-14 17:57:51
+
 import 'package:flutter/material.dart';
 import '../routers/application.dart';
 import '../routers/routers.dart';

diff --git a/lib/components/markdown.dart b/lib/components/markdown.dart
@@ -1,7 +1,8 @@
 import 'package:flutter_markdown/flutter_markdown.dart' as md;
-import 'package:flutter_go/utils/high_light_code.dart';
 import 'package:flutter/material.dart';
 
+import 'package:flutter_go/utils/high_light_code.dart';
+
 /// 使用方法
 /// MarkdownBody(markdown)
 final hightlighter = new HighLight();

diff --git a/lib/components/pagination.dart b/lib/components/pagination.dart
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
 import './home_banner.dart';
 import '../model/story.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class Pagination extends StatelessWidget {
   static final String routeName = '/material/page-selector';

diff --git a/lib/components/search_input.dart b/lib/components/search_input.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:fluro/fluro.dart';
 import 'package:meta/meta.dart';

diff --git a/lib/components/widget_demo.dart b/lib/components/widget_demo.dart
@@ -1,17 +1,17 @@
-/**
- * @author Nealyang
- * 
- * 新widget详情页模板
- */
+/// @author Nealyang
+/// 新widget详情页模板
+
+import 'dart:core';
+
 import 'package:flutter/material.dart';
+
 import '../routers/application.dart';
 import '../routers/routers.dart';
 import '../components/markdown.dart';
 import '../model/collection.dart';
 import '../widgets/index.dart';
 import '../event/event_bus.dart';
 import '../event/event_model.dart';
-import 'dart:core';
 
 class WidgetDemo extends StatefulWidget {
   final List<dynamic> contentList;

diff --git a/lib/components/widget_item.dart b/lib/components/widget_item.dart
@@ -1,7 +1,7 @@
-/**
- * @author 一凨
- */
+/// @author 一凨
+
 import 'package:flutter/material.dart';
+
 import 'package:flutter_go/utils/style.dart';
 import 'package:flutter_go/resources/widget_name_to_icon.dart';
 

diff --git a/lib/components/widget_item_container.dart b/lib/components/widget_item_container.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import './widget_item.dart';
 import '../routers/application.dart';
 import '../widgets/index.dart';

diff --git a/lib/main.dart b/lib/main.dart
@@ -3,6 +3,7 @@ import 'package:fluro/fluro.dart';
 import 'package:flutter/rendering.dart';
 import 'routers/routers.dart';
 import 'routers/application.dart';
+
 import 'package:flutter_go/utils/provider.dart';
 import 'package:flutter_go/utils/shared_preferences.dart';
 import 'package:flutter_go/views/first_page/home.dart';

diff --git a/lib/model/base.dart b/lib/model/base.dart
@@ -1,6 +1,5 @@
 import 'package:sqflite/sqflite.dart';
 
-
 class BaseModel{
     Database db;
     final String table = '';

diff --git a/lib/model/cat.dart b/lib/model/cat.dart
@@ -1,5 +1,6 @@
 
 import 'dart:async';
+
 import 'package:flutter_go/utils/sql.dart';
 
 abstract class CatInterface{

diff --git a/lib/model/collection.dart b/lib/model/collection.dart
@@ -1,10 +1,10 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-07 16:24:42 
- * @Last Modified by: 一凨
- * @Last Modified time: 2019-01-08 17:37:42
- */
+/// @Author: 一凨 
+/// @Date: 2019-01-07 16:24:42 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-08 17:37:42
+
 import 'dart:async';
+
 import 'package:flutter_go/utils/sql.dart';
 
 abstract class CollectionInterface {

diff --git a/lib/model/widget.dart b/lib/model/widget.dart
@@ -1,8 +1,10 @@
 
 import 'dart:async';
-import 'package:flutter_go/utils/sql.dart';
+
 import "package:flutter/material.dart";
 
+import 'package:flutter_go/utils/sql.dart';
+
 abstract class WidgetInterface {
   int get id;
 

diff --git a/lib/resources/shared_preferences_keys.dart b/lib/resources/shared_preferences_keys.dart
@@ -1,3 +1,4 @@
+
 // Created with Android Studio.
 // User: 三帆
 // Date: 31/01/2019
@@ -6,6 +7,7 @@
 // target:  xxx
 //
 
+
 //enum DateType {
 //  Int,
 //  Double,

diff --git a/lib/routers/application.dart b/lib/routers/application.dart
@@ -1,6 +1,8 @@
-import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
+import 'package:fluro/fluro.dart';
+
 import 'package:flutter_go/utils/shared_preferences.dart';
+
 class Application {
   static Router router;
   static TabController controller;

diff --git a/lib/routers/router_handler.dart b/lib/routers/router_handler.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fluro/fluro.dart';
+
 import 'package:flutter_go/components/category.dart';
 import '../widgets/404.dart';
 import 'package:flutter_go/components/full_screen_code_dialog.dart';

diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart
@@ -1,6 +1,7 @@
 
 import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
+
 import '../widgets/index.dart';
 import './router_handler.dart';
 

diff --git a/lib/utils/example_code_parser.dart b/lib/utils/example_code_parser.dart
@@ -1,19 +1,16 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-14 11:42:36 
- * @Last Modified by: 一凨
- * @Last Modified time: 2019-01-14 16:53:11
- */
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/// @Author: 一凨 
+/// @Date: 2019-01-14 11:42:36 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-14 16:53:11
 
 import 'dart:async';
-import 'package:flutter_go/routers/application.dart';
+
 import 'package:flutter/services.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter/material.dart';
 
+import 'package:flutter_go/routers/application.dart';
+
 
 Map<String, String> _exampleCode;
 String _code;

diff --git a/lib/utils/net_utils.dart b/lib/utils/net_utils.dart
@@ -1,6 +1,8 @@
-import 'package:dio/dio.dart';
 import 'dart:async';
 
+import 'package:dio/dio.dart';
+
+
 var dio = new Dio();
 
 class NetUtils {

diff --git a/lib/utils/provider.dart b/lib/utils/provider.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:typed_data';
+
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:flutter/services.dart' show rootBundle;
+
 //const createSql = {
 //  'cat': """
 //      CREATE TABLE "cat" (

diff --git a/lib/utils/shared_preferences.dart b/lib/utils/shared_preferences.dart
@@ -1,6 +1,8 @@
 
 import 'dart:async';
+
 import 'package:shared_preferences/shared_preferences.dart';
+
 export 'package:flutter_go/resources/shared_preferences_keys.dart';
 
 /// 用来做shared_preferences的存储

diff --git a/lib/utils/sql.dart b/lib/utils/sql.dart
@@ -1,9 +1,8 @@
-import './provider.dart';
 import 'dart:async';
-import 'package:sqflite/sqflite.dart';
-
 
+import 'package:sqflite/sqflite.dart';
 
+import './provider.dart';
 
 class BaseModel{
   Database db;

diff --git a/lib/utils/syntax_highlighter.dart b/lib/utils/syntax_highlighter.dart
@@ -1,12 +1,7 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-14 11:42:39 
- * @Last Modified by:   一凨 
- * @Last Modified time: 2019-01-14 11:42:39 
- */
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/// @Author: 一凨 
+/// @Date: 2019-01-14 11:42:39 
+/// @Last Modified by:   一凨 
+/// @Last Modified time: 2019-01-14 11:42:39 
 
 import 'package:flutter/material.dart';
 import 'package:string_scanner/string_scanner.dart';

diff --git a/lib/views/collection_page/collection_page.dart b/lib/views/collection_page/collection_page.dart
@@ -1,16 +1,17 @@
-/*
- * @Author: 一凨 
- * @Date: 2019-01-08 17:12:58 
- * @Last Modified by: 一凨
- * @Last Modified time: 2019-01-14 20:13:28
- */
+/// @Author: 一凨 
+/// @Date: 2019-01-08 17:12:58 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-14 20:13:28
+
 import 'package:flutter/material.dart';
+import 'package:event_bus/event_bus.dart';
+
 import 'package:flutter_go/model/collection.dart';
 import 'package:flutter_go/routers/application.dart';
 import 'package:flutter_go/routers/routers.dart';
 import 'package:flutter_go/event/event_bus.dart';
 import 'package:flutter_go/event/event_model.dart';
-import 'package:event_bus/event_bus.dart';
+
 
 class CollectionPage extends StatefulWidget {
   _CollectionPageState createState() => _CollectionPageState();

diff --git a/lib/views/first_page/first_page.dart b/lib/views/first_page/first_page.dart
@@ -1,12 +1,13 @@
 import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:flutter_go/components/list_view_item.dart';
 import 'package:flutter_go/components/list_refresh.dart' as listComp;
 import 'package:flutter_go/components/pagination.dart';
 import 'package:flutter_go/views/first_page/first_page_item.dart';
 import 'package:flutter_go/components/disclaimer_msg.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_go/utils/net_utils.dart';
 
 GlobalKey<DisclaimerMsgState> key;

diff --git a/lib/views/first_page/first_page_item.dart b/lib/views/first_page/first_page_item.dart
@@ -1,11 +1,9 @@
-/**
- * Created with Android Studio.
- * User: 一晟
- * Date: 2019/1/5
- * Time: 下午10:20
- * email: [email protected]
- * target: FirstPageItem
- */
+/// Created with Android Studio.
+/// User: 一晟
+/// Date: 2019/1/5
+/// Time: 下午10:20
+/// email: [email protected]
+/// target: FirstPageItem
 
 import 'package:flutter_go/utils/util.dart';