Skip to content
This repository has been archived by the owner on Feb 5, 2024. It is now read-only.

Commit

Permalink
bottomNavBar updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhruvilp
dhruvilp committed Feb 19, 2019
1 parent bd2e9ad commit 1dc1d09
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 76 deletions.
13 changes: 9 additions & 4 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Expand Up @@ -179,6 +179,7 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = M8DY28XM67;
LastSwiftMigration = 0910;
};
};
Expand Down Expand Up @@ -380,8 +381,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand All @@ -394,7 +396,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = S8QB4VV633;
DEVELOPMENT_TEAM = M8DY28XM67;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -459,7 +461,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -507,8 +509,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -523,6 +526,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = M8DY28XM67;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -551,6 +555,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = M8DY28XM67;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
2 changes: 2 additions & 0 deletions ios/Runner/Info.plist
View file
Expand Up @@ -41,5 +41,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSCameraUsageDescription</key>
<string>Allow camera access?</string>
</dict>
</plist>
5 changes: 2 additions & 3 deletions lib/main.dart
View file
Expand Up @@ -6,12 +6,11 @@ import 'colors.dart';
import 'package:hidden_drawer_menu/hidden_drawer/hidden_drawer_menu.dart';
import 'package:hidden_drawer_menu/menu/item_hidden_menu.dart';
import 'package:hidden_drawer_menu/hidden_drawer/screen_hidden_drawer.dart';
import 'package:HackRU/screens/tabs.dart';
import 'package:HackRU/screens/about.dart';
import 'package:HackRU/screens/map.dart';
import 'package:HackRU/screens/help.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';

import 'package:HackRU/screens/home.dart';

void main() => runApp(Main());

Expand Down Expand Up @@ -48,7 +47,7 @@ class _MyHomePageState extends State<MyHomePage> {
colorTextUnSelected: white.withOpacity(0.5),
colorLineSelected: mintgreen_light,
),
Tabs()));
Home()));

items.add(new ScreenHiddenDrawer(
new ItemHiddenMenu(
Expand Down
132 changes: 65 additions & 67 deletions lib/screens/tabs.dart → lib/screens/home.dart
View file
@@ -1,25 +1,26 @@
import 'package:HackRU/screens/login.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:groovin_material_icons/groovin_material_icons.dart';
import 'package:HackRU/colors.dart';
import 'package:HackRU/tabs/announcements.dart' as _firstTab;
import 'package:HackRU/tabs/timer.dart' as _secondTab;
import 'package:HackRU/tabs/events.dart' as _thirdTab;
import 'package:HackRU/screens/login.dart';
import 'package:groovin_material_icons/groovin_material_icons.dart';

class Home extends StatefulWidget {
static const String routeName = '/material/bottom_navigation';

class Tabs extends StatefulWidget {
@override
TabsState createState() => new TabsState();
_HomeState createState() => _HomeState();
}

class TabsState extends State<Tabs> {

PageController _tabController;

class _HomeState extends State<Home>
with TickerProviderStateMixin {
BottomNavigationBarType _type = BottomNavigationBarType.shifting;
int _tab = 0;
var _title_app = null;
var _title_icon = null;
int _tab = 0;
PageController _tabController;

@override
void initState() {
Expand All @@ -28,63 +29,6 @@ class TabsState extends State<Tabs> {
this._title_app = TabItems[0].title;
}



@override
Widget build (BuildContext context) => new Scaffold(

//Content of tabs
body: new PageView(
controller: _tabController,
onPageChanged: onTabChanged,
children: <Widget>[
new _firstTab.Announcements(),
new _secondTab.Timer(),
new _thirdTab.Events(),
],
),

floatingActionButton: FloatingActionButton(
onPressed: (){
Navigator.push(context,
MaterialPageRoute(builder: (context) => Login()),
);
},
tooltip: 'QR Code',
child: Icon(GroovinMaterialIcons.qrcode, size: 30,),
foregroundColor: mintgreen_light,
backgroundColor: bluegrey,
),

//Tabs
bottomNavigationBar: Theme.of(context).platform == TargetPlatform.iOS ?
new CupertinoTabBar(
activeColor: green_tab,
currentIndex: _tab,
onTap: onTap,
items: TabItems.map((TabItem) {
return new BottomNavigationBarItem(
title: new Text(TabItem.title),
icon: new Icon(TabItem.icon),
);
}).toList(),
):

new BottomNavigationBar(
currentIndex: _tab,
onTap: onTap,
fixedColor: green_tab,
type: BottomNavigationBarType.fixed,
items: TabItems.map((TabItem) {
return new BottomNavigationBarItem(
title: new Text(TabItem.title),
icon: new Icon(TabItem.icon),
);
}).toList(),
), //

);

void onTap(int tab){
_tabController.jumpToPage(tab);
}
Expand All @@ -107,6 +51,60 @@ class TabsState extends State<Tabs> {
_tabController.dispose();
}

@override
Widget build(BuildContext context) {
final BottomNavigationBar bottomNavBar = BottomNavigationBar(
items: TabItems.map((TabItem) {
return new BottomNavigationBarItem(
backgroundColor: bluegrey_dark,
title: new Text(TabItem.title),
icon: new Icon(TabItem.icon),
);
}).toList(),
currentIndex: _tab,
type: _type,
onTap: onTap,
fixedColor: mintgreen_light,
);

return Scaffold(
body: new PageView(
controller: _tabController,
onPageChanged: onTabChanged,
children: <Widget>[
new _firstTab.Announcements(),
new _secondTab.Timer(),
new _thirdTab.Events(),
],
),
floatingActionButton: FloatingActionButton(
onPressed: (){
Navigator.push(context,
MaterialPageRoute(builder: (context) => Login()),
);
},
tooltip: 'QR Code',
child: Icon(GroovinMaterialIcons.qrcode, size: 30,),
foregroundColor: mintgreen_light,
backgroundColor: bluegrey,
),
bottomNavigationBar: Theme.of(context).platform == TargetPlatform.iOS ?
new CupertinoTabBar(
backgroundColor: bluegrey_dark,
activeColor: mintgreen_light,
currentIndex: _tab,
onTap: onTap,
items: TabItems.map((TabItem) {
return new BottomNavigationBarItem(
title: new Text(TabItem.title),
icon: new Icon(TabItem.icon),
);
}).toList(),
):
bottomNavBar,
);
}

}

class TabItem {
Expand Down
3 changes: 2 additions & 1 deletion lib/tabs/announcements.dart
View file
Expand Up @@ -65,7 +65,8 @@ class AnnouncementsState extends State<Announcements> {
)
),
);
}),
}
),
);
}

Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Expand Up @@ -5,7 +5,7 @@ author: HackRU RnD Flutter Team [Dhruvil Patel & Sean Lane]
homepage: https://github.com/HackRU/OneAppFlutter

environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"
sdk: ">=2.1.0-dev.68.0 <3.0.0"

dependencies:
flutter:
Expand Down

0 comments on commit 1dc1d09

Please sign in to comment.