From c7152d3defeaee70fc3b993fd36174db46d24c7f Mon Sep 17 00:00:00 2001
From: Matthew <matthew.danics@tapmango.com>
Date: Fri, 18 May 2018 09:14:44 -0400
Subject: [PATCH] improved on bug where activity feed would trigger upload
 dialog

---
 lib/main.dart        | 16 ++++++++--------
 lib/upload_page.dart | 10 +++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 5351ad8..a41beda 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -104,9 +104,9 @@ class HomePage extends StatefulWidget {
   _HomePageState createState() => new _HomePageState();
 }
 
-class _HomePageState extends State<HomePage> {
-  PageController _pageController;
+PageController pageController;
 
+class _HomePageState extends State<HomePage> {
   int _page = 0;
   bool triedSilentLogin = false;
 
@@ -154,19 +154,19 @@ class _HomePageState extends State<HomePage> {
                   child: new Feed(),
                 ),
                 new Container(color: Colors.white, child: new SearchPage()),
-
                 new Container(
                   color: Colors.green,
                   child: new Uploader(),
                 ),
-                new Container(color: Colors.white, child: new ActivityFeedPage()),
+                new Container(
+                    color: Colors.white, child: new ActivityFeedPage()),
                 new Container(
                     color: Colors.white,
                     child: new ProfilePage(
                       userId: googleSignIn.currentUser.id,
                     )),
               ],
-              controller: _pageController,
+              controller: pageController,
               physics: new NeverScrollableScrollPhysics(),
               onPageChanged: onPageChanged,
             ),
@@ -214,7 +214,7 @@ class _HomePageState extends State<HomePage> {
 
   void navigationTapped(int page) {
     //Animating Page
-    _pageController.jumpToPage(page);
+    pageController.jumpToPage(page);
   }
 
   void onPageChanged(int page) {
@@ -226,13 +226,13 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
-    _pageController = new PageController();
+    pageController = new PageController();
   }
 
   @override
   void dispose() {
     super.dispose();
-    _pageController.dispose();
+    pageController.dispose();
   }
 }
 
diff --git a/lib/upload_page.dart b/lib/upload_page.dart
index 974e0d6..f7d5859 100644
--- a/lib/upload_page.dart
+++ b/lib/upload_page.dart
@@ -22,22 +22,18 @@ class _Uploader extends State<Uploader> {
   bool promted = false;
 
   @override
-  initState(){
-
-
-    if (file == null && promted == false) {
+  initState() {
+    if (file == null && promted == false && pageController.page == 2) {
       _selectImage();
       setState(() {
         promted = true;
       });
     }
-    print("ss");
+
     super.initState();
   }
 
   Widget build(BuildContext context) {
-
-
     return file == null
         ? new IconButton(
             icon: new Icon(Icons.file_upload), onPressed: _selectImage)