From a893994b471ebcc16b3ce8592186b2f905e7ed7e Mon Sep 17 00:00:00 2001 From: "xj.deng" Date: Tue, 7 May 2019 11:29:46 +0800 Subject: [PATCH 1/3] delete ios file --- ios/Runner.xcworkspace/contents.xcworkspacedata | 10 ---------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -------- .../xcshareddata/WorkspaceSettings.xcsettings | 8 -------- 3 files changed, 26 deletions(-) delete mode 100644 ios/Runner.xcworkspace/contents.xcworkspacedata delete mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 21a3cc14..00000000 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 949b6789..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - BuildSystemType - Original - - From 8ff0988a95589d21fac202d8071126b415274c88 Mon Sep 17 00:00:00 2001 From: "xj.deng" Date: Tue, 7 May 2019 14:17:24 +0800 Subject: [PATCH 2/3] modify bottom tab --- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../contents.xcworkspacedata | 10 ++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ lib/views/first_page/home.dart | 97 +++++++------------ pubspec.lock | 16 +-- 5 files changed, 61 insertions(+), 72 deletions(-) create mode 100644 ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1301f46b..0b53d81f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -353,7 +353,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", + "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..21a3cc14 --- /dev/null +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..949b6789 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Original + + diff --git a/lib/views/first_page/home.dart b/lib/views/first_page/home.dart index efb8b1d5..b073d70f 100644 --- a/lib/views/first_page/home.dart +++ b/lib/views/first_page/home.dart @@ -1,4 +1,3 @@ - /// Created with Android Studio. /// User: 三帆 /// Date: 16/01/2019 @@ -6,7 +5,6 @@ /// email: sanfan.hx@alibaba-inc.com /// target: app首页 - import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_go/utils/shared_preferences.dart'; @@ -36,41 +34,40 @@ class _MyHomePageState extends State SpUtil sp; WidgetControlModel widgetControl = new WidgetControlModel(); SearchHistoryList searchHistoryList; - TabController controller; bool isSearch = false; - String data = '无'; - String data2ThirdPage = '这是传给ThirdPage的值'; String appBarTitle = tabData[0]['text']; + List list = List(); + int _currentIndex = 0; static List tabData = [ - {'text': '业界动态', 'icon': new Icon(Icons.language)}, - {'text': 'WIDGET', 'icon': new Icon(Icons.extension)}, - {'text': '组件收藏', 'icon': new Icon(Icons.favorite)}, - {'text': '关于手册', 'icon': new Icon(Icons.import_contacts)} + {'text': '业界动态', 'icon': Icon(Icons.language)}, + {'text': 'WIDGET', 'icon': Icon(Icons.extension)}, + {'text': '组件收藏', 'icon': Icon(Icons.favorite)}, + {'text': '关于手册', 'icon': Icon(Icons.import_contacts)} ]; - List myTabs = []; + List myTabs = []; @override void initState() { super.initState(); - initSearchHistory(); - controller = new TabController( - initialIndex: 0, vsync: this, length: 4); // 这里的length 决定有多少个底导 submenus for (int i = 0; i < tabData.length; i++) { - myTabs.add(new Tab(text: tabData[i]['text'], icon: tabData[i]['icon'])); + myTabs.add(BottomNavigationBarItem( + icon: tabData[i]['icon'], + title: Text( + tabData[i]['text'], + ), + )); } - controller.addListener(() { - if (controller.indexIsChanging) { - _onTabChange(); - } - }); - Application.controller = controller; + list + ..add(FirstPage()) + ..add(WidgetPage(Provider.db)) + ..add(CollectionPage()) + ..add(FourthPage()); } @override void dispose() { - controller.dispose(); super.dispose(); } @@ -100,7 +97,6 @@ class _MyHomePageState extends State return new SearchInput((value) async { if (value != '') { List list = await widgetControl.search(value); - return list .map((item) => new MaterialSearchResult( value: item.name, @@ -119,52 +115,27 @@ class _MyHomePageState extends State @override Widget build(BuildContext context) { - var db = Provider.db; - return new Scaffold( appBar: new AppBar(title: buildSearchInput(context)), - body: new TabBarView(controller: controller, children: [ - new FirstPage(), - new WidgetPage(db), - new CollectionPage(), - FourthPage() - ]), - bottomNavigationBar: Material( - color: const Color(0xFFF0EEEF), //底部导航栏主题颜色 - child: SafeArea( - child: Container( - height: 65.0, - decoration: BoxDecoration( - color: const Color(0xFFF0F0F0), - boxShadow: [ - BoxShadow( - color: const Color(0xFFd0d0d0), - blurRadius: 3.0, - spreadRadius: 2.0, - offset: Offset(-1.0, -1.0), - ), - ], - ), - child: TabBar( - controller: controller, - indicatorColor: Theme.of(context).primaryColor, - //tab标签的下划线颜色 - // labelColor: const Color(0xFF000000), - indicatorWeight: 3.0, - labelColor: Theme.of(context).primaryColor, - unselectedLabelColor: const Color(0xFF8E8E8E), - tabs: myTabs), - ), - ), + body: list[_currentIndex], + bottomNavigationBar: BottomNavigationBar( + items: myTabs, + //高亮 被点击高亮 + currentIndex: _currentIndex, + //修改 页面 + onTap: _ItemTapped, + //shifting :按钮点击移动效果,超过5个button不支持 + //fixed：固定 + type: BottomNavigationBarType.fixed, + fixedColor: Color(0xFFC91B3A), ), ); } - void _onTabChange() { - if (this.mounted) { - this.setState(() { - appBarTitle = tabData[controller.index]['text']; - }); - } + void _ItemTapped(int index) { + setState(() { + _currentIndex = index; + appBarTitle = tabData[index]['text']; + }); } } diff --git a/pubspec.lock b/pubspec.lock index 9e9bcdd5..5ae4bbf2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.0.8" boolean_selector: dependency: transitive description: @@ -150,7 +150,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.3+1" meta: dependency: transitive description: @@ -171,14 +171,14 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" + version: "1.4.0" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.1" shared_preferences: dependency: "direct main" description: @@ -197,7 +197,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.5.4" sqflite: dependency: "direct main" description: @@ -218,7 +218,7 @@ packages: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "1.6.8" string_scanner: dependency: transitive description: @@ -246,7 +246,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.2" typed_data: dependency: transitive description: @@ -269,5 +269,5 @@ packages: source: hosted version: "2.0.8" sdks: - dart: ">=2.2.0 <3.0.0" + dart: ">=2.1.0 <3.0.0" flutter: ">=1.2.1 <2.0.0" From 540cd7d8a9545698adcfb910b949648c7a44d6fc Mon Sep 17 00:00:00 2001 From: "xj.deng" Date: Tue, 7 May 2019 14:20:50 +0800 Subject: [PATCH 3/3] modify bottom tab --- lib/views/first_page/home.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/views/first_page/home.dart b/lib/views/first_page/home.dart index b073d70f..6d05dd52 100644 --- a/lib/views/first_page/home.dart +++ b/lib/views/first_page/home.dart @@ -127,6 +127,7 @@ class _MyHomePageState extends State //shifting :按钮点击移动效果,超过5个button不支持 //fixed：固定 type: BottomNavigationBarType.fixed, + fixedColor: Color(0xFFC91B3A), ), );