From f0b52833cc4727d381382172420019f79a1dd335 Mon Sep 17 00:00:00 2001
From: Abdulrahman <abdulrahmanabusnena01@gmail.com>
Date: Wed, 7 Aug 2024 21:37:46 +0200
Subject: [PATCH] git commit

---
 lib/feed.dart                          | 28 +++++++++-----------------
 lib/image_post.dart                    |  4 ----
 lib/main.dart                          |  4 ++--
 lib/{ => pages}/edit_profile_page.dart |  0
 lib/{ => pages}/profile_page.dart      |  0
 lib/{ => pages}/search_page.dart       |  0
 lib/{ => pages}/upload_page.dart       |  0
 pubspec.yaml                           |  2 +-
 8 files changed, 12 insertions(+), 26 deletions(-)
 rename lib/{ => pages}/edit_profile_page.dart (100%)
 rename lib/{ => pages}/profile_page.dart (100%)
 rename lib/{ => pages}/search_page.dart (100%)
 rename lib/{ => pages}/upload_page.dart (100%)

diff --git a/lib/feed.dart b/lib/feed.dart
index 1e4bf69..5b1a94b 100644
--- a/lib/feed.dart
+++ b/lib/feed.dart
@@ -20,16 +20,10 @@ class _Feed extends State<Feed> with AutomaticKeepAliveClientMixin<Feed> {
   }
 
   buildFeed() {
-    if (feedData != null) {
-      return ListView(
-        children: feedData,
-      );
-    } else {
-      return Container(
-          alignment: FractionalOffset.center,
-          child: CircularProgressIndicator());
+    return ListView(
+      children: feedData,
+    );
     }
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -62,17 +56,13 @@ class _Feed extends State<Feed> with AutomaticKeepAliveClientMixin<Feed> {
     SharedPreferences prefs = await SharedPreferences.getInstance();
     String json = prefs.getString("feed");
 
-    if (json != null) {
-      List<Map<String, dynamic>> data =
-          jsonDecode(json).cast<Map<String, dynamic>>();
-      List<ImagePost> listOfPosts = _generateFeed(data);
-      setState(() {
-        feedData = listOfPosts;
-      });
-    } else {
-      _getFeed();
+    List<Map<String, dynamic>> data =
+        jsonDecode(json).cast<Map<String, dynamic>>();
+    List<ImagePost> listOfPosts = _generateFeed(data);
+    setState(() {
+      feedData = listOfPosts;
+    });
     }
-  }
 
   _getFeed() async {
     print("Staring getFeed");
diff --git a/lib/image_post.dart b/lib/image_post.dart
index 1e26fc8..787f768 100644
--- a/lib/image_post.dart
+++ b/lib/image_post.dart
@@ -161,10 +161,6 @@ class _ImagePost extends State<ImagePost> {
   }
 
   buildPostHeader({String ownerId}) {
-    if (ownerId == null) {
-      return Text("owner error");
-    }
-
     return FutureBuilder(
         future: FirebaseFirestore.instance
             .collection('insta_users')
diff --git a/lib/main.dart b/lib/main.dart
index 9f6a317..59e6fc0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -219,7 +219,7 @@ class _HomePageState extends State<HomePage> {
       silentLogin(context);
     }
 
-    if (setupNotifications == false && currentUserModel != null) {
+    if (setupNotifications == false) {
       setUpNotifications();
     }
 
@@ -231,7 +231,7 @@ class _HomePageState extends State<HomePage> {
       }
     });
 
-    return (googleSignIn.currentUser == null || currentUserModel == null)
+    return (googleSignIn.currentUser == null)
         ? buildLoginPage()
         : Scaffold(
             body: PageView(
diff --git a/lib/edit_profile_page.dart b/lib/pages/edit_profile_page.dart
similarity index 100%
rename from lib/edit_profile_page.dart
rename to lib/pages/edit_profile_page.dart
diff --git a/lib/profile_page.dart b/lib/pages/profile_page.dart
similarity index 100%
rename from lib/profile_page.dart
rename to lib/pages/profile_page.dart
diff --git a/lib/search_page.dart b/lib/pages/search_page.dart
similarity index 100%
rename from lib/search_page.dart
rename to lib/pages/search_page.dart
diff --git a/lib/upload_page.dart b/lib/pages/upload_page.dart
similarity index 100%
rename from lib/upload_page.dart
rename to lib/pages/upload_page.dart
diff --git a/pubspec.yaml b/pubspec.yaml
index bde0a18..9505c14 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A new Flutter application.
 version: 1.2.3+1
 
 environment:
-  sdk: '>=2.10.0 <3.0.0'
+  sdk: '>=3.4.3 <4.0.0'
 
 dependencies:
   flutter: