From fd156f31e810b7576ca08cf1394e50b6c1bf7f59 Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Wed, 9 Feb 2022 15:50:52 +0000 Subject: [PATCH 1/2] Added basic navigation bar --- lib/home.dart | 45 ++++++++++++++++++ lib/main.dart | 108 +++--------------------------------------- test/widget_test.dart | 2 +- 3 files changed, 52 insertions(+), 103 deletions(-) create mode 100644 lib/home.dart diff --git a/lib/home.dart b/lib/home.dart new file mode 100644 index 0000000..b164f41 --- /dev/null +++ b/lib/home.dart @@ -0,0 +1,45 @@ +import 'package:flutter/material.dart'; + +class HomeScreen extends StatefulWidget { + const HomeScreen({Key? key}) : super(key: key); + + @override + _HomeScreenState createState() => _HomeScreenState(); +} + +class _HomeScreenState extends State { + int page = 0; + PageController pageController = PageController(); + + void onBottomBarPressed(int newPage) { + setState(() { + page = newPage; + }); + pageController.jumpToPage(newPage); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: PageView( + controller: pageController, + ), + bottomNavigationBar: BottomNavigationBar( + items: const [ + BottomNavigationBarItem(icon: Icon(Icons.data_usage), label: 'Home'), + BottomNavigationBarItem(icon: Icon(Icons.search), label: 'Search'), + BottomNavigationBarItem(icon: Icon(Icons.location_on_outlined), label: 'Location'), + BottomNavigationBarItem(icon: Icon(Icons.settings), label: 'Settings'), + ], + currentIndex: page, + selectedItemColor: Colors.green, + unselectedItemColor: Colors.black, + backgroundColor: Colors.white, + onTap: onBottomBarPressed, + type: BottomNavigationBarType.fixed, + ) + ); + } +} + + diff --git a/lib/main.dart b/lib/main.dart index 202509b..065a02c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,115 +1,19 @@ import 'package:flutter/material.dart'; +import 'package:leg_barkr_app/home.dart'; void main() { - runApp(const MyApp()); + runApp(const Main()); } -class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); +class Main extends StatelessWidget { + const Main({Key? key}) : super(key: key); - // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // Try running your application with "flutter run". You'll see the - // application has a blue toolbar. Then, without quitting the app, try - // changing the primarySwatch below to Colors.green and then invoke - // "hot reload" (press "r" in the console where you ran "flutter run", - // or simply save your changes to "hot reload" in a Flutter IDE). - // Notice that the counter didn't reset back to zero; the application - // is not restarted. - primarySwatch: Colors.blue, - ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), + theme: ThemeData.light(), + home: HomeScreen() ); } } -class MyHomePage extends StatefulWidget { - const MyHomePage({Key? key, required this.title}) : super(key: key); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Invoke "debug painting" (press "p" in the console, choose the - // "Toggle Debug Paint" action from the Flutter Inspector in Android - // Studio, or the "Toggle Debug Paint" command in Visual Studio Code) - // to see the wireframe for each widget. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headline4, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. - ); - } -} diff --git a/test/widget_test.dart b/test/widget_test.dart index 463c18c..aea54be 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -13,7 +13,7 @@ import 'package:leg_barkr_app/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); + await tester.pumpWidget(const Main()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget); From 3363d514a07d52ec451fe094c6d9edd3ce4a2bc8 Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Wed, 9 Feb 2022 16:06:37 +0000 Subject: [PATCH 2/2] Added functionality for switching between pages --- lib/data.dart | 10 ++++++++++ lib/home.dart | 26 +++++++++++++++++++------- lib/map.dart | 10 ++++++++++ lib/settings.dart | 10 ++++++++++ lib/steps.dart | 10 ++++++++++ 5 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 lib/data.dart create mode 100644 lib/map.dart create mode 100644 lib/settings.dart create mode 100644 lib/steps.dart diff --git a/lib/data.dart b/lib/data.dart new file mode 100644 index 0000000..c34dc40 --- /dev/null +++ b/lib/data.dart @@ -0,0 +1,10 @@ +import 'package:flutter/material.dart'; + +class DataPage extends StatelessWidget { + const DataPage({ Key? key }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text("Data Page"); + } +} \ No newline at end of file diff --git a/lib/home.dart b/lib/home.dart index b164f41..3d4022b 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -1,4 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:leg_barkr_app/data.dart'; +import 'package:leg_barkr_app/steps.dart'; +import 'package:leg_barkr_app/map.dart'; +import 'package:leg_barkr_app/settings.dart'; class HomeScreen extends StatefulWidget { const HomeScreen({Key? key}) : super(key: key); @@ -8,21 +12,27 @@ class HomeScreen extends StatefulWidget { } class _HomeScreenState extends State { - int page = 0; - PageController pageController = PageController(); + int _page = 0; + PageController _pageController = PageController(); - void onBottomBarPressed(int newPage) { + void onBottomBarPressed(int page) { setState(() { - page = newPage; + _page = page; }); - pageController.jumpToPage(newPage); + _pageController.jumpToPage(page); } @override Widget build(BuildContext context) { return Scaffold( body: PageView( - controller: pageController, + controller: _pageController, + children: const [ + DataPage(), + StepsPage(), + MapPage(), + SettingsPage() + ], ), bottomNavigationBar: BottomNavigationBar( items: const [ @@ -31,9 +41,11 @@ class _HomeScreenState extends State { BottomNavigationBarItem(icon: Icon(Icons.location_on_outlined), label: 'Location'), BottomNavigationBarItem(icon: Icon(Icons.settings), label: 'Settings'), ], - currentIndex: page, + currentIndex: _page, selectedItemColor: Colors.green, unselectedItemColor: Colors.black, + showSelectedLabels: true, + showUnselectedLabels: false, backgroundColor: Colors.white, onTap: onBottomBarPressed, type: BottomNavigationBarType.fixed, diff --git a/lib/map.dart b/lib/map.dart new file mode 100644 index 0000000..5530505 --- /dev/null +++ b/lib/map.dart @@ -0,0 +1,10 @@ +import 'package:flutter/material.dart'; + +class MapPage extends StatelessWidget { + const MapPage({ Key? key }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text("Map Page"); + } +} \ No newline at end of file diff --git a/lib/settings.dart b/lib/settings.dart new file mode 100644 index 0000000..62c3525 --- /dev/null +++ b/lib/settings.dart @@ -0,0 +1,10 @@ +import 'package:flutter/material.dart'; + +class SettingsPage extends StatelessWidget { + const SettingsPage({ Key? key }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text("Settings Page"); + } +} \ No newline at end of file diff --git a/lib/steps.dart b/lib/steps.dart new file mode 100644 index 0000000..061f763 --- /dev/null +++ b/lib/steps.dart @@ -0,0 +1,10 @@ +import 'package:flutter/material.dart'; + +class StepsPage extends StatelessWidget { + const StepsPage({ Key? key }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Text("Data Page"); + } +} \ No newline at end of file