From ff2fe725b5260b660de3f93f9877a8f1de25b02d Mon Sep 17 00:00:00 2001 From: clopezr1 Date: Fri, 21 Feb 2020 16:34:33 -0500 Subject: [PATCH 1/6] Removed Bottom Nav Bar --- lib/home_widget.dart | 29 +---------------------------- lib/main.dart | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/lib/home_widget.dart b/lib/home_widget.dart index 174614d..a80d49e 100644 --- a/lib/home_widget.dart +++ b/lib/home_widget.dart @@ -20,7 +20,6 @@ class Home extends StatelessWidget { @override Widget build(BuildContext context) { - int _currentBodyIndex = 0; Item selectedSport; return StatefulBuilder( @@ -52,33 +51,7 @@ class Home extends StatelessWidget { ), backgroundColor: _curSport[1], ), - body: _children[_currentBodyIndex], - bottomNavigationBar: BottomNavigationBar( - type: BottomNavigationBarType.fixed, - onTap: (int index) { - setState(() { - _currentBodyIndex = index; - }); - }, - currentIndex: _currentBodyIndex, - items: [ - BottomNavigationBarItem( - icon: new Icon(Icons.home), - title: new Text("Home"), - ), - BottomNavigationBarItem( - icon: new Icon(Icons.calendar_today), - title: new Text("Schedule")), - BottomNavigationBarItem( - icon: new Icon(Icons.table_chart), - title: new Text("Scores")), - BottomNavigationBarItem( - icon: new Icon(Icons.assessment), - title: new Text("Standings")), - BottomNavigationBarItem( - icon: new Icon(Icons.more_horiz), title: new Text("More")) - ], - ), + body: _children[2], )); } } diff --git a/lib/main.dart b/lib/main.dart index 2edca9a..aad7acc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'home_widget2.dart'; +import 'home_widget.dart'; void main() => runApp(App()); From 9364ce971831959bec6bc1356c59aa129c78ae3e Mon Sep 17 00:00:00 2001 From: clopezr1 Date: Wed, 26 Feb 2020 13:30:55 -0500 Subject: [PATCH 2/6] Changed main to be able to point to routes, and file restructuring --- android/.gitignore | 3 ++ lib/common/theme.dart | 0 lib/home_widget.dart | 64 ------------------------------------ lib/main.dart | 13 +++++--- lib/screens/home_widget.dart | 51 ++++++++++++++++++++++++++++ lib/screens/sport.dart | 57 ++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 69 deletions(-) create mode 100644 lib/common/theme.dart delete mode 100644 lib/home_widget.dart create mode 100644 lib/screens/home_widget.dart create mode 100644 lib/screens/sport.dart diff --git a/android/.gitignore b/android/.gitignore index bc2100d..418812e 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -5,3 +5,6 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +/android/app/src/debug/gen +/android/app/src/main/gen +/android/app/src/profile/gen \ No newline at end of file diff --git a/lib/common/theme.dart b/lib/common/theme.dart new file mode 100644 index 0000000..e69de29 diff --git a/lib/home_widget.dart b/lib/home_widget.dart deleted file mode 100644 index a80d49e..0000000 --- a/lib/home_widget.dart +++ /dev/null @@ -1,64 +0,0 @@ -import 'package:flutter/material.dart'; -import 'placeholder_widget.dart'; - -class Home extends StatelessWidget { - final List _curSport = ['FootBall', Colors.green]; - - final List colorList = [ - const Item("FootBall", Colors.red), - const Item("Soccer", Colors.pinkAccent), - const Item('Baseball', Colors.yellow), - ]; - - final List _children = [ - PlaceholderWidget(Colors.white), - PlaceholderWidget(Colors.orange), - PlaceholderWidget(Colors.blue), - PlaceholderWidget(Colors.red), - PlaceholderWidget(Colors.black38), - ]; - - @override - Widget build(BuildContext context) { - Item selectedSport; - - return StatefulBuilder( - builder: (context, StateSetter setState) => Scaffold( - appBar: AppBar( - centerTitle: true, - title: DropdownButton( - value: selectedSport, - icon: Icon(Icons.arrow_drop_down), - iconSize: 24, - style: TextStyle(color: Colors.black), - iconEnabledColor: Colors.white, - onChanged: (Item value) { - setState(() { - selectedSport = value; - _curSport[0] = selectedSport.name; - _curSport[1] = selectedSport.color; - }); - }, - items: colorList.map>((Item item) { - return DropdownMenuItem( - value: item, - child: SizedBox( - width: 100, - child: Text(item.name), - ), - ); - }).toList(), - ), - backgroundColor: _curSport[1], - ), - body: _children[2], - )); - } -} - -class Item { - const Item(this.name, this.color); - - final String name; - final Color color; -} diff --git a/lib/main.dart b/lib/main.dart index aad7acc..3ea11af 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,16 +1,19 @@ import 'package:flutter/material.dart'; -import 'home_widget.dart'; +import 'screens/home_widget.dart'; +import 'screens/sport.dart'; void main() => runApp(App()); -class App extends StatelessWidget{ +class App extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( debugShowCheckedModeBanner: false, - home: Home(), + initialRoute: '/', + routes: { + '/': (context) => Home(), + '/Sport': (context) => Sport(), + }, ); } } - - diff --git a/lib/screens/home_widget.dart b/lib/screens/home_widget.dart new file mode 100644 index 0000000..efedd67 --- /dev/null +++ b/lib/screens/home_widget.dart @@ -0,0 +1,51 @@ +import 'package:flutter/material.dart'; +import '../placeholder_widget.dart'; + +class Home extends StatelessWidget { + final List _children = [ + PlaceholderWidget(Colors.white), + PlaceholderWidget(Colors.orange), + PlaceholderWidget(Colors.blue), + PlaceholderWidget(Colors.red), + PlaceholderWidget(Colors.black38), + ]; + + @override + Widget build(BuildContext context) { + return StatefulBuilder( + builder: (context, StateSetter setState) => Scaffold( + appBar: AppBar( + centerTitle: false, + title: Text("49ers"), + ), + body: _children[4], + floatingActionButton: FloatingActionButton( + backgroundColor: Colors.green, + child: Icon(Icons.arrow_forward_ios), + onPressed: () => Navigator.pushNamed(context, '/Sport'), + ), + drawer: Drawer( + child: ListView( + children: [ + DrawerHeader( + child: Text( + 'Drawer Header', + style: TextStyle( + color: Colors.white, + fontSize: 24, + ), + ), + decoration: BoxDecoration( + color: Colors.green, + ), + ), + ListTile( + leading: Icon(Icons.message), + title: Text('Messages'), + ), + ], + ), + ), + )); + } +} diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart new file mode 100644 index 0000000..a56e759 --- /dev/null +++ b/lib/screens/sport.dart @@ -0,0 +1,57 @@ +import 'package:flutter/material.dart'; + +class Sport extends StatelessWidget { + final List _curSport = ['FootBall', Colors.green]; + + final List colorList = [ + const Item("FootBall", Colors.red), + const Item("Soccer", Colors.pinkAccent), + const Item('Baseball', Colors.yellow), + ]; + + @override + Widget build(BuildContext context) { + Item selectedSport; + + return StatefulBuilder( + builder: (context, StateSetter setState) => Scaffold( + appBar: AppBar( + title: DropdownButton( + value: selectedSport, + icon: Icon(Icons.arrow_drop_down), + iconSize: 24, + style: TextStyle(color: Colors.black), + iconEnabledColor: Colors.white, + onChanged: (Item value) { + setState(() { + selectedSport = value; + _curSport[0] = selectedSport.name; + _curSport[1] = selectedSport.color; + }); + }, + items: colorList.map>((Item item) { + return DropdownMenuItem( + value: item, + child: SizedBox( + width: 100, + child: Text(item.name), + ), + ); + }).toList(), + ), + backgroundColor: _curSport[1], + ), + body: Center( + child: Text("Sports Page Body"), + ), + ), + ); + } +} + +class Item { + const Item(this.name, this.color); + + final String name; + final Color color; +} From 658305aa8dbc061d786d94567f783ca325f30657 Mon Sep 17 00:00:00 2001 From: Carlos Lopez-Rosario Date: Thu, 27 Feb 2020 20:11:33 -0500 Subject: [PATCH 3/6] 150 --- lib/screens/sport.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index ed6e248..5bdf7ad 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -86,7 +86,7 @@ class Sport extends StatelessWidget { value: item, child: SizedBox( child: Text(item.name), - width: 110, + width: 150, ), ); }).toList(), From 54e5770138814c0ff438c8c0c8157832f73042a2 Mon Sep 17 00:00:00 2001 From: Max Mohr Date: Thu, 27 Feb 2020 20:40:23 -0500 Subject: [PATCH 4/6] Update sport.dart changed weird naming convention. --- lib/screens/sport.dart | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index 5bdf7ad..3b32bf6 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -2,15 +2,17 @@ import 'package:flutter/material.dart'; import '../news/feed.dart'; class Sport extends StatelessWidget { - final List _curSport = ['FootBall', Colors.green]; - final List colorList = [ + static final List colorList = [ const Item('FootBall', Colors.green), const Item("BasketBall", Colors.red), const Item("Soccer", Colors.pinkAccent), const Item('Baseball', Colors.orange), ]; + Item _curSport = colorList[0]; + + final feed = Feed(); // was var not final @override @@ -22,14 +24,14 @@ class Sport extends StatelessWidget { appBar: AppBar( centerTitle: false, title: buildDropdownButton(selectedSport, setState), - backgroundColor: _curSport[1], + backgroundColor: _curSport.color, ), body: ListView( children: [ - HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport[0])), - HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport[0])), - HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport[0])), - HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport[0])), + HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport.name)), + HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport.name)), + HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport.name)), + HorizontalNewsFeed(newsFeed: feed, title: Text(_curSport.name)), ], ), drawer: Drawer( @@ -70,15 +72,13 @@ class Sport extends StatelessWidget { style: TextStyle(color: Colors.black, fontSize: 28), iconEnabledColor: Colors.white, hint: Text( - _curSport[0], + _curSport.name, style: TextStyle( color: Colors.white, fontSize: 28, fontWeight: FontWeight.bold), ), onChanged: (Item value) { setState(() { - selectedSport = value; - _curSport[0] = selectedSport.name; - _curSport[1] = selectedSport.color; + _curSport = value; }); }, items: colorList.map>((Item item) { @@ -86,7 +86,7 @@ class Sport extends StatelessWidget { value: item, child: SizedBox( child: Text(item.name), - width: 150, + width: 110, ), ); }).toList(), From 842ab0e6ae50c1d088ad89bb3f0f7fdddd7b298e Mon Sep 17 00:00:00 2001 From: Carlos Lopez-Rosario Date: Thu, 27 Feb 2020 20:46:42 -0500 Subject: [PATCH 5/6] 150 --- lib/screens/sport.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index 3b32bf6..f4528ca 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -12,7 +12,6 @@ class Sport extends StatelessWidget { Item _curSport = colorList[0]; - final feed = Feed(); // was var not final @override @@ -86,7 +85,7 @@ class Sport extends StatelessWidget { value: item, child: SizedBox( child: Text(item.name), - width: 110, + width: 150, ), ); }).toList(), From fca43bddd1388a93267e2b02d0afba044a926ca0 Mon Sep 17 00:00:00 2001 From: Max Mohr Date: Thu, 27 Feb 2020 21:05:09 -0500 Subject: [PATCH 6/6] second update overwrote your commit and not sure how to amend. Revised name changes. --- lib/screens/sport.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index f4528ca..2d7d1ae 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -12,6 +12,7 @@ class Sport extends StatelessWidget { Item _curSport = colorList[0]; + final feed = Feed(); // was var not final @override