flutter/fluttergram
1
0
Fork 0
mirror of https://github.com/mdanics/fluttergram.git synced 2025-08-06 13:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

improved on bug where activity feed would trigger upload dialog

Browse Source
This commit is contained in:
Matthew
2018-05-18 09:14:44 -04:00
parent a1b9fb59b0
commit c7152d3def
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/main.dart
View File

@ -104,9 +104,9 @@ class HomePage extends StatefulWidget {
_HomePageState createState() => new _HomePageState(); _HomePageState createState() => new _HomePageState();
} }
class _HomePageState extends State<HomePage> { PageController pageController;
PageController _pageController;
class _HomePageState extends State<HomePage> {
int _page = 0; int _page = 0;
bool triedSilentLogin = false; bool triedSilentLogin = false;
@ -154,19 +154,19 @@ class _HomePageState extends State<HomePage> {
child: new Feed(), child: new Feed(),
), ),
new Container(color: Colors.white, child: new SearchPage()), new Container(color: Colors.white, child: new SearchPage()),
new Container( new Container(
color: Colors.green, color: Colors.green,
child: new Uploader(), child: new Uploader(),
), ),
new Container(color: Colors.white, child: new ActivityFeedPage()), new Container(
color: Colors.white, child: new ActivityFeedPage()),
new Container( new Container(
color: Colors.white, color: Colors.white,
child: new ProfilePage( child: new ProfilePage(
userId: googleSignIn.currentUser.id, userId: googleSignIn.currentUser.id,
)), )),
], ],
controller: _pageController, controller: pageController,
physics: new NeverScrollableScrollPhysics(), physics: new NeverScrollableScrollPhysics(),
onPageChanged: onPageChanged, onPageChanged: onPageChanged,
), ),
@ -214,7 +214,7 @@ class _HomePageState extends State<HomePage> {
void navigationTapped(int page) { void navigationTapped(int page) {
//Animating Page //Animating Page
_pageController.jumpToPage(page); pageController.jumpToPage(page);
} }
void onPageChanged(int page) { void onPageChanged(int page) {
@ -226,13 +226,13 @@ class _HomePageState extends State<HomePage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_pageController = new PageController(); pageController = new PageController();
} }
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
_pageController.dispose(); pageController.dispose();
} }
} }

8
lib/upload_page.dart
View File

@ -23,21 +23,17 @@ class _Uploader extends State<Uploader> {
@override @override
initState() { initState() {
if (file == null && promted == false && pageController.page == 2) {
if (file == null && promted == false) {
_selectImage(); _selectImage();
setState(() { setState(() {
promted = true; promted = true;
}); });
} }
print("ss");
super.initState(); super.initState();
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
return file == null return file == null
? new IconButton( ? new IconButton(
icon: new Icon(Icons.file_upload), onPressed: _selectImage) icon: new Icon(Icons.file_upload), onPressed: _selectImage)