flutter/flutter-go
1
0
Fork 0
mirror of https://github.com/alibaba/flutter-go.git synced 2025-05-20 22:36:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dev/yisheng

Browse Source 
# Conflicts:
#	lib/views/fourth_page.dart
This commit is contained in:
ryan730
2019-01-14 22:57:45 +08:00
parent 77246e5b70 a348af7cee
commit e80739e661
14 changed files with 207 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/common/example_code_parser.dart
View File

@ -14,8 +14,6 @@ import 'package:flutter/services.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:flutter/material.dart';
const String _kStartTag = '// START ';
const String _kEndTag = '// END';
Map<String, String> _exampleCode;
String _code;
@ -38,7 +36,6 @@ Future<void> _parseExampleCode(context,String filePath, AssetBundle bundle) asyn
try {
code = await bundle.loadString('lib/widgets/$filePath');
} catch (err) {
print('${Application.github['widgetsURL']} $filePath');
Navigator.of(context).pop();
_launchURL(Application.github['widgetsURL'] + filePath);
}

23
lib/common/list_view_item.dart
View File

@ -1,5 +1,14 @@
/*
* @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 'package:url_launcher/url_launcher.dart';
import '../routers/application.dart';
import '../routers/routers.dart';
import 'dart:core';
class ListViewItem extends StatelessWidget {
final String itemUrl;
@ -9,15 +18,6 @@ class ListViewItem extends StatelessWidget {
const ListViewItem({Key key, this.itemUrl, this.itemTitle, this.data})
: super(key: key);
void _launchURL(String url, BuildContext context) async {
if (await canLaunch(url)) {
await launch(url);
} else {
throw 'Could not launch $url';
}
}
@override
Widget build(BuildContext context) {
@ -27,7 +27,8 @@ class ListViewItem extends StatelessWidget {
margin: new EdgeInsets.symmetric(horizontal: 10.0, vertical: 6.0),
child: ListTile(
onTap: () {
_launchURL(itemUrl, context);
// _launchURL(itemUrl, context);
Application.router.navigateTo(context, '${Routes.webViewPage}?title=${Uri.encodeComponent(itemTitle)}&url=${Uri.encodeComponent(itemUrl)}');
},
title: Padding(
child: Text(

1
lib/common/provider.dart
View File

@ -46,7 +46,6 @@ class Provider {
for(int i = 0; i < expectTables.length; i++) {
if (!tables.contains(expectTables[i])) {
print("table lost in app");
return false;
}
}

41
lib/common/widget_demo.dart
View File

@ -4,17 +4,14 @@
* 新widget详情页模板
*/
import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
import '../routers/application.dart';
import '../routers/routers.dart';
import '../components/markdown.dart';
import '../model/collection.dart';
import '../widgets/index.dart';
import 'package:fluttertoast/fluttertoast.dart';
import '../event/event-bus.dart';
import '../event/event-model.dart';
import './full_screen_code_dialog.dart';
import '../routers/application.dart';
import '../routers/routers.dart';
import 'dart:core';
class WidgetDemo extends StatefulWidget {
@ -40,10 +37,9 @@ class WidgetDemo extends StatefulWidget {
class _WidgetDemoState extends State<WidgetDemo> {
bool _hasCollected = false;
CollectionControlModel _collectionControl = new CollectionControlModel();
Color _collectionColor;
var _collectionIcons;
List widgetDemosList = new WidgetDemoList().getDemos();
String _router = '';
String _collText = '';
void showInSnackBar(String value) {
Fluttertoast.showToast(
@ -55,13 +51,6 @@ class _WidgetDemoState extends State<WidgetDemo> {
textColor: Colors.white);
}
void _launchURL(String url) async {
if (await canLaunch(url)) {
await launch(url);
} else {
throw 'Could not launch $url';
}
}
List<Widget> _buildContent() {
List<Widget> _list = [
@ -143,24 +132,20 @@ class _WidgetDemoState extends State<WidgetDemo> {
void _selectValue(value){
if(value == 'doc'){
_launchURL(widget.docUrl);
// _launchURL(widget.docUrl);
Application.router.navigateTo(context, '${Routes.webViewPage}?title=${Uri.encodeComponent(widget.title)} Doc&&url=${Uri.encodeComponent(widget.docUrl)}');
}else if(value =='code'){
// _launchURL(Application.github['widgetsURL'] + widget.codeUrl);
Application.router.navigateTo(context, '${Routes.codeView}?filePath=${Uri.encodeComponent(widget.codeUrl)}');
}else{
_getCollection();
}
}
@override
Widget build(BuildContext context) {
if (_hasCollected) {
_collectionColor = Colors.red;
_collText='取消收藏';
_collectionIcons = Icons.favorite;
} else {
_collectionColor =null;
_collText='组件收藏';
_collectionIcons = Icons.favorite_border;
}
return Scaffold(
appBar: AppBar(
@ -173,6 +158,11 @@ class _WidgetDemoState extends State<WidgetDemo> {
},
icon: Icon(Icons.home),
),
new IconButton(
tooltip: 'collection',
onPressed: _getCollection,
icon: Icon(_collectionIcons),
),
PopupMenuButton<String>(
onSelected: _selectValue,
itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
@ -191,15 +181,6 @@ class _WidgetDemoState extends State<WidgetDemo> {
title: Text('查看Demo'),
),
),
const PopupMenuDivider(),
PopupMenuItem<String>(
value: 'collection',
child: ListTile(
leading: Icon(Icons.star,size: 22.0,color: _collectionColor,),
title: Text(_collText),
),
),
],
),
],

17
lib/components/fourth_page_feature/pages.dart
View File

@ -1,16 +1,17 @@
import 'package:flutter/material.dart';
import '../../routers/application.dart';
import '../../routers/routers.dart';
final pages = [
new PageViewModel(
const Color(0xFFC91B3A),
const Color(0xFFcd344f),
//'assets/mountain.png',
'assets/images/p1.png',
'FlutterGo是什么？',
'【FlutterGo】 是由"阿里拍卖"前端团队几位 Flutter 粉丝，用业余时间开发的一款，Flutter 教学练习帮助App，这里没有高大尚的概念，只有一个一个亲历的尝试，用最直观的方式展示的 Flutter 官方demo',
'【FlutterGo】 是由"阿里拍卖"前端团队几位 Flutter 粉丝，用业余时间开发的一款，用于 Flutter 教学帮助的App，这里没有高大尚的概念，只有一个一个亲历的尝试，用最直观的方式展示的 Flutter 官方demo',
'assets/images/plane.png'),
new PageViewModel(
const Color(0xFF548CFF),
const Color(0xFF638de3),
//'assets/world.png',
'assets/images/p2.png',
'FLutterGo的背景',
@ -39,9 +40,9 @@ class Page extends StatelessWidget {
return RaisedButton.icon(
onPressed: () {
if(type == 'start'){
Navigator.popUntil(context, ModalRoute.withName('/'));
//Navigator.popUntil(context, ModalRoute.withName('/'));
}else if(type == 'goGithub'){
Navigator.popUntil(context, ModalRoute.withName('/'));
Application.router.navigateTo(context, '${Routes.webViewPage}?title=${Uri.encodeComponent(txt)} Doc&&url=${Uri.encodeComponent("https://github.com/alibaba/flutter-go")}');
}
},
elevation: 10.0,
@ -80,7 +81,7 @@ class Page extends StatelessWidget {
new Transform(
transform: new Matrix4.translationValues(0.0, 30.0 * (1.0 - percentVisible) ,0.0),
child: new Padding(
padding: new EdgeInsets.only(top: 10.0, bottom: 0.0),
padding: new EdgeInsets.only(top: 10.0, bottom: 10.0),
child: new Text(
viewModel.title,
style: new TextStyle(
@ -111,7 +112,7 @@ class Page extends StatelessWidget {
alignment: MainAxisAlignment.center,
children: <Widget>[
creatButton(context,'开始使用',Icons.add_circle_outline,'start'),
creatButton(context,'GitHub',Icons.arrow_forward,'goGitHub'),
creatButton(context,'GitHub',Icons.arrow_forward,'goGithub'),
],)
]),
));

4
lib/main.dart
View File

@ -168,8 +168,8 @@ class _MyHomePageState extends State<MyHomePage>
tabs: <Tab>[
Tab(text: '业界动态', icon: Icon(Icons.language)),
Tab(text: '组件', icon: Icon(Icons.extension)),
Tab(text: '组件收藏', icon: Icon(Icons.star)),
Tab(text: '关于手册', icon: Icon(Icons.favorite)),
Tab(text: '组件收藏', icon: Icon(Icons.favorite)),
Tab(text: '关于手册', icon: Icon(Icons.line_weight)),
],
),
),

36
lib/routers/router_handler.dart
View File

@ -3,24 +3,32 @@ import 'package:fluro/fluro.dart';
import '../views/category.dart';
import '../widgets/404.dart';
import '../common/full_screen_code_dialog.dart';
import '../views/web_view_page.dart';
var categoryHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
String name = params["type"]?.first;
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
String name = params["type"]?.first;
return new CategoryHome(name);
},
);
return new CategoryHome(name);
},
);
var widgetNotFoundHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
return new WidgetNotFound();
}
);
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
return new WidgetNotFound();
});
var fullScreenCodeDialog = new Handler(
handlerFunc: (BuildContext context,Map<String, List<String>> params){
String path = params['filePath']?.first;
return new FullScreenCodeDialog(filePath: path,);
}
);
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
String path = params['filePath']?.first;
return new FullScreenCodeDialog(
filePath: path,
);
});
var webViewPageHand = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
String title = params['title']?.first;
String url = params['url']?.first;
return new WebViewPage(url, title);
});

2
lib/routers/routers.dart
View File

@ -8,6 +8,7 @@ class Routes {
static String root = "/";
static String widgetDemo = '/widget-demo';
static String codeView = '/code-view';
static String webViewPage = '/web-view-page';
static void configureRoutes(Router router) {
List widgetDemosList = new WidgetDemoList().getDemos();
@ -19,6 +20,7 @@ class Routes {
router.define('/category/:type', handler: categoryHandler);
router.define('/category/error/404', handler: widgetNotFoundHandler);
router.define(codeView,handler:fullScreenCodeDialog);
router.define(webViewPage,handler:webViewPageHand);
widgetDemosList.forEach((demo) {
Handler handler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {

37
lib/views/collection_page.dart
View File

@ -2,11 +2,12 @@
* @Author: 一凨
* @Date: 2019-01-08 17:12:58
* @Last Modified by: 一凨
* @Last Modified time: 2019-01-08 20:14:56
* @Last Modified time: 2019-01-14 20:02:46
*/
import 'package:flutter/material.dart';
import '../model/collection.dart';
import '../routers/application.dart';
import '../routers/routers.dart';
import '../event/event-bus.dart';
import '../event/event-model.dart';
import 'package:event_bus/event_bus.dart';
@ -15,8 +16,7 @@ class CollectionPage extends StatefulWidget {
_CollectionPageState createState() => _CollectionPageState();
}
class _CollectionPageState extends State<CollectionPage>
with AutomaticKeepAliveClientMixin {
class _CollectionPageState extends State<CollectionPage> {
_CollectionPageState() {
final eventBus = new EventBus();
ApplicationEvent.event = eventBus;
@ -24,9 +24,7 @@ class _CollectionPageState extends State<CollectionPage>
CollectionControlModel _collectionControl = new CollectionControlModel();
List<Collection> _collectionList = [];
ScrollController _scrollController = new ScrollController();
@override
bool get wantKeepAlive => true;
var _icons;
@override
void initState() {
@ -76,8 +74,17 @@ class _CollectionPageState extends State<CollectionPage>
),
);
}
if (_collectionList[index - 1].router.contains('http')) {
if (_collectionList[index - 1].name.endsWith('Doc')) {
_icons = Icons.library_books;
} else {
_icons = Icons.bookmark;
}
} else {
_icons = Icons.extension;
}
return Container(
padding: const EdgeInsets.all(10.0),
padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 5.0),
margin: const EdgeInsets.only(bottom: 7.0),
decoration: BoxDecoration(
color: Colors.white,
@ -91,15 +98,26 @@ class _CollectionPageState extends State<CollectionPage>
],
),
child: ListTile(
leading: Icon(
_icons,
size: 30.0,
color: Theme.of(context).primaryColor,
),
title: Text(
_collectionList[index - 1].name,
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 17.0),
),
trailing:
Icon(Icons.keyboard_arrow_right, color: Colors.grey, size: 30.0),
onTap: () {
Application.router
.navigateTo(context, "${_collectionList[index - 1].router}");
if (_collectionList[index - 1].router.contains('http')) {
Application.router.navigateTo(context,
'${Routes.webViewPage}?title=${Uri.encodeComponent(_collectionList[index - 1].name)}&url=${Uri.encodeComponent(_collectionList[index - 1].router)}');
} else {
Application.router
.navigateTo(context, "${_collectionList[index - 1].router}");
}
},
),
);
@ -107,7 +125,6 @@ class _CollectionPageState extends State<CollectionPage>
@override
Widget build(BuildContext context) {
super.build(context);
if (_collectionList.length == 0) {
return ListView(
children: <Widget>[

120
lib/views/web_view_page.dart Normal file
View File

@ -0,0 +1,120 @@
/*
* @Author: 一凨
* @Date: 2019-01-14 17:44:47
* @Last Modified by: 一凨
* @Last Modified time: 2019-01-14 19:47:14
*/
import 'package:flutter/material.dart';
import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
import '../model/collection.dart';
import '../event/event-bus.dart';
import '../event/event-model.dart';
import 'package:fluttertoast/fluttertoast.dart';
class WebViewPage extends StatefulWidget {
final String url;
final String title;
WebViewPage(this.url, this.title);
_WebViewPageState createState() => _WebViewPageState();
}
class _WebViewPageState extends State<WebViewPage> {
bool _hasCollected = false;
String _router = '';
var _collectionIcons;
CollectionControlModel _collectionControl = new CollectionControlModel();
void showInSnackBar(String value) {
Fluttertoast.showToast(
msg: value,
toastLength: Toast.LENGTH_SHORT,
gravity: ToastGravity.CENTER,
timeInSecForIos: 1,
backgroundColor: Colors.grey,
textColor: Colors.white);
}
@override
void initState() {
super.initState();
_collectionControl.getRouterByName(widget.title.trim()).then((list) {
list.forEach((item) {
if(widget.title.trim() == item['name']){
_router = item['router'];
}
});
if (mounted) {
setState(() {
_hasCollected = list.length > 0;
});
}
});
}
// 点击收藏按钮
_getCollection() {
if (_hasCollected) {
// 删除操作
_collectionControl.deleteByName(widget.title.trim()).then((result) {
if (result > 0 && this.mounted) {
setState(() {
_hasCollected = false;
});
showInSnackBar('已取消收藏');
if (ApplicationEvent.event != null) {
ApplicationEvent.event
.fire(CollectionEvent(widget.title, _router, true));
}
return;
}
print('删除错误');
});
} else {
// 插入操作
_collectionControl
.insert(Collection(name: widget.title.trim(), router: widget.url))
.then((result) {
if (this.mounted) {
setState(() {
_hasCollected = true;
});
if (ApplicationEvent.event != null) {
ApplicationEvent.event
.fire(CollectionEvent(widget.title, _router, false));
}
showInSnackBar('收藏成功');
}
});
}
}
@override
Widget build(BuildContext context) {
if (_hasCollected) {
_collectionIcons = Icons.favorite;
} else {
_collectionIcons = Icons.favorite_border;
}
return WebviewScaffold(
url: widget.url,
appBar: AppBar(
title: Text(widget.title),
actions: <Widget>[
new IconButton(
tooltip: 'goBack home',
onPressed: _getCollection,
icon: Icon(_collectionIcons,),
),
],
),
withZoom: false,
withLocalStorage: true,
withJavascript: true,
);
}
}

1
lib/widgets/elements/Form/Button/PopupMenuButton/demo.dart
View File

@ -96,7 +96,6 @@ class PopupMenuButtonCustom extends StatelessWidget {
: super();
@override
Widget build(BuildContext context) {
print('onSelected1:${widget.options}');
final String selectStr = widget.options['defaultSelect'];
return PopupMenuButton(
//如果提供，则用于此按钮的widget。

5
lib/widgets/elements/Form/Input/TextField/text_field_demo.dart
View File

@ -1,9 +1,6 @@
import 'package:flutter/material.dart';
/*
* 基本示例
*
*/
// 基本示例
class DefaultTextField extends StatelessWidget {
@override
Widget build(BuildContext context) {

1
lib/widgets/elements/Media/Image/MemoryImage/memory_image_demo.dart
View File

@ -20,7 +20,6 @@ class _MemoryImageDemoState extends State<MemoryImageDemo> {
super.initState();
rootBundle.load('assets/images/food01.jpeg').then((data) {
if (mounted) {
print(data);
setState(() {
bytes = data.buffer.asUint8List();
});

1
pubspec.yaml
View File

@ -29,6 +29,7 @@ dependencies:
# 本地存储、收藏功能
shared_preferences: ^0.4.3
dio: ^1.0.6
flutter_webview_plugin: ^0.3.0+2
dev_dependencies:
flutter_test: