🗃️ Change following list schema

TheAlphamerc · TheAlphamerc · commit 21d341fba563 · 2020-03-29T15:30:33.000+05:30
1.:card_file_box: Following db tabale is moved in profile table.
2.:fire: Fetch following method removed.
3.:zap: FOllowing widget changed to statless widget.
4. :sparkles: Add view profile of follower/ following.
5.:sparkles: Add user list view who liked tweet.
6.:sparkles: Add nested profile view feature.
diff --git a/lib/helper/utility.dart b/lib/helper/utility.dart
@@ -1,5 +1,6 @@
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_database/firebase_database.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_twitter_clone/widgets/customWidgets.dart';
 import 'package:flutter_twitter_clone/widgets/newWidget/customLoader.dart';
@@ -170,7 +171,12 @@ void cprint(dynamic data, {String errorIn, String event}) {
 }
 
 void logEvent(String event, {Map<String, dynamic> parameter}) {
-  kAnalytics.logEvent(name: event, parameters: parameter);
+   kReleaseMode ? kAnalytics.logEvent(name: event, parameters: parameter) : print("[EVENT]: $event");
+}
+
+void debugLog(String log, {dynamic param = ""}){
+  final String time = DateFormat("mm:ss:mmm").format(DateTime.now());
+  print("[$time][Log]: $log, $param");
 }
 
 void share(String message, {String subject}) {
diff --git a/lib/model/user.dart b/lib/model/user.dart
@@ -65,6 +65,13 @@ class User {
      });
    }
    followers = followersList != null ? followersList.length : null;
+   if(map['followingList'] != null){
+      followingList = List<String>();
+      map['followingList'].forEach((value){
+         followingList.add(value);
+     });
+   }
+   following = followingList != null ? followingList.length : null;
   }
   toJson() {
     return {
@@ -80,11 +87,12 @@ class User {
       'location': location,
       'createdAt': createdAt,
       'followers': followersList != null ? followersList.length : null,
-      'following': following,
+      'following': followersList!= null ? followersList.length : null,
       'userName': userName,
       'webSite': webSite,
       'isVerified': isVerified ?? false,
-      'followerList' : followersList
+      'followerList' : followersList,
+      'followingList':followingList
     };
   }
 
@@ -104,7 +112,7 @@ class User {
       int following,
       String webSite,
       bool isVerified,
-      List<String> followingList
+      List<String> followingList,
       }) {
     return User(
         email: email ?? this.email,
@@ -122,7 +130,7 @@ class User {
         userId: userId ?? this.userId,
         userName: userName ?? this.userName,
         webSite: webSite ?? this.webSite,
-        followersList: followersList ?? this.followersList
+        followersList: followersList ?? this.followersList,
         );
   }
 
diff --git a/lib/page/common/sidebar.dart b/lib/page/common/sidebar.dart
@@ -118,7 +118,7 @@ class _SidebarMenuState extends State<SidebarMenu> {
     return InkWell(
       onTap: () {
         var authstate = Provider.of<AuthState>(context);
-        authstate.profileFollowingList = [];
+        // authstate.profileFollowingList = [];
         authstate.getProfileUser();
         _navigateTo(navigateTo);
       },
diff --git a/lib/page/common/widget/userListWidget.dart b/lib/page/common/widget/userListWidget.dart
@@ -34,9 +34,13 @@ class UserListWidget extends StatelessWidget {
         children: <Widget>[
           ListTile(
               onTap: () {
-                // Navigator.of(context).pushNamed('/ProfilePage/' + user?.userId);
+                Navigator.of(context).pushNamed('/ProfilePage/' + user?.userId);
               },
               leading: RippleButton(
+                onPressed: () {
+                  Navigator.of(context)
+                      .pushNamed('/ProfilePage/' + user?.userId);
+                },
                 borderRadius: BorderRadius.all(Radius.circular(60)),
                 child: customImage(context, user.profilePic, height: 60),
               ),
diff --git a/lib/page/feed/feedPage.dart b/lib/page/feed/feedPage.dart
@@ -69,8 +69,8 @@ class _FeedPageState extends State<FeedPage> {
     if (!state.isBusy && state.feedlist != null && state.feedlist.isNotEmpty) {
       list = state.feedlist.where((x) {
         if (x.user.userId == authstate.userId ||
-            (authstate.userfollowingList != null &&
-                authstate.userfollowingList.contains(x.user.userId))) {
+            (authstate.userModel?.followingList != null &&
+                authstate.userModel.followingList.contains(x.user.userId))) {
           return true;
         } else {
           return false;
diff --git a/lib/page/profile/follow/followingListPage.dart b/lib/page/profile/follow/followingListPage.dart
@@ -4,29 +4,13 @@ import 'package:flutter_twitter_clone/page/common/usersListPage.dart';
 import 'package:flutter_twitter_clone/state/authState.dart';
 import 'package:provider/provider.dart';
 
-class FollowingListPage extends StatefulWidget {
-  FollowingListPage({Key key}) : super(key: key);
-
-  @override
-  _FollowingListPageState createState() => _FollowingListPageState();
-}
-
-class _FollowingListPageState extends State<FollowingListPage> {
-  @override
-  void initState() {
-    var authstate = Provider.of<AuthState>(context, listen: false);
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      authstate.getFollowingUser();
-    });
-  }
-
+class FollowingListPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     var state = Provider.of<AuthState>(context);
     return UsersListPage(
-        pageTitle: 'Followers',
-        userList: state.profileFollowingList,
+        pageTitle: 'Following',
+        userList: state.profileUserModel.followingList,
         appBarIcon: AppIcon.follow,
         emptyScreenText:
             '${state?.profileUserModel?.userName ?? state.userModel.userName} isn\'t follow anyone',
diff --git a/lib/page/profile/profilePage.dart b/lib/page/profile/profilePage.dart
@@ -49,7 +49,7 @@ class _ProfilePageState extends State<ProfilePage> {
       iconTheme: IconThemeData(color: Colors.white),
       backgroundColor: Colors.transparent,
       actions: <Widget>[
-        authstate.profileUserModel == null
+        authstate.isbusy
             ? SizedBox.shrink()
             : PopupMenuButton<Choice>(
                 onSelected: (d) {},
@@ -64,7 +64,7 @@ class _ProfilePageState extends State<ProfilePage> {
               ),
       ],
       flexibleSpace: FlexibleSpaceBar(
-        background: authstate.profileUserModel == null
+        background: authstate.isbusy
             ? SizedBox.shrink()
             : Stack(
                 children: <Widget>[
@@ -235,6 +235,17 @@ class _ProfilePageState extends State<ProfilePage> {
     }
   }
 
+  /// This meathod called when user pressed back button
+  /// When profile page is about to close
+  /// Maintain minimum user's profile in profile page list
+  Future<bool> _onWillPop() async {
+    final state = Provider.of<AuthState>(context, listen: false);
+
+    /// It will remove last user's profile from profileUserModelList
+    state.removeLastUser();
+    return true;
+  }
+
   @override
   Widget build(BuildContext context) {
     var state = Provider.of<FeedState>(context);
@@ -244,72 +255,74 @@ class _ProfilePageState extends State<ProfilePage> {
     if (state.feedlist != null && state.feedlist.length > 0) {
       list = state.feedlist.where((x) => x.userId == id).toList();
     }
-    return Scaffold(
-      backgroundColor: list != null && list.isNotEmpty
-          ? TwitterColor.mystic
-          : TwitterColor.white,
-      floatingActionButton: isMyProfile ? _floatingActionButton() : null,
-      body: CustomScrollView(
-        physics: ClampingScrollPhysics(),
-        slivers: <Widget>[
-          getAppbar(),
-          authstate.profileUserModel == null
-              ? _emptyBox()
-              : SliverToBoxAdapter(
-                  child: Container(
-                    color: Colors.white,
-                    child: authstate.profileUserModel == null
-                        ? SizedBox.shrink()
-                        : UserNameRowWidget(
-                            user: authstate.profileUserModel,
-                            isMyProfile: isMyProfile,
-                          ),
-                  ),
-                ),
-          SliverList(
-            delegate: SliverChildListDelegate(
-              authstate.profileUserModel == null
-                  ? [
-                      Container(
-                        height: fullHeight(context) - 180,
-                        child: CustomScreenLoader(
-                          height: double.infinity,
-                          width: fullWidth(context),
-                          backgroundColor: Colors.white,
-                        )
-                      )
-                    ]
-                  : list == null || list.length < 1
-                      ? [
-                          Container(
-                            padding:
-                                EdgeInsets.only(top: 50, left: 30, right: 30),
-                            child: NotifyText(
-                              title: isMyProfile
-                                  ? 'You haven\'t post any Tweet yet'
-                                  : '${authstate.profileUserModel.userName} hasn\'t Tweeted yet',
-                              subTitle: isMyProfile
-                                  ? 'Tap tweet button to add new'
-                                  : 'Once he\'ll do, they will be shown up here',
+    return WillPopScope(
+      onWillPop: _onWillPop,
+      child: Scaffold(
+        backgroundColor: list != null && list.isNotEmpty
+            ? TwitterColor.mystic
+            : TwitterColor.white,
+        floatingActionButton: isMyProfile ? _floatingActionButton() : null,
+        body: CustomScrollView(
+          physics: ClampingScrollPhysics(),
+          slivers: <Widget>[
+            getAppbar(),
+            authstate.isbusy
+                ? _emptyBox()
+                : SliverToBoxAdapter(
+                    child: Container(
+                      color: Colors.white,
+                      child: authstate.isbusy
+                          ? SizedBox.shrink()
+                          : UserNameRowWidget(
+                              user: authstate.profileUserModel,
+                              isMyProfile: isMyProfile,
                             ),
-                          )
-                        ]
-                      : list
-                          .map(
-                            (x) => Container(
-                              color: TwitterColor.white,
-                              child: Tweet(
-                                model: x,
-                                isDisplayOnProfile: true,
-                                trailing: TweetBottomSheet().tweetOptionIcon(
-                                    context, x, TweetType.Tweet),
+                    ),
+                  ),
+            SliverList(
+              delegate: SliverChildListDelegate(
+                authstate.isbusy
+                    ? [
+                        Container(
+                            height: fullHeight(context) - 180,
+                            child: CustomScreenLoader(
+                              height: double.infinity,
+                              width: fullWidth(context),
+                              backgroundColor: Colors.white,
+                            ))
+                      ]
+                    : list == null || list.length < 1
+                        ? [
+                            Container(
+                              padding:
+                                  EdgeInsets.only(top: 50, left: 30, right: 30),
+                              child: NotifyText(
+                                title: isMyProfile
+                                    ? 'You haven\'t post any Tweet yet'
+                                    : '${authstate.profileUserModel.userName} hasn\'t Tweeted yet',
+                                subTitle: isMyProfile
+                                    ? 'Tap tweet button to add new'
+                                    : 'Once he\'ll do, they will be shown up here',
                               ),
-                            ),
-                          )
-                          .toList(),
-            ),
-          )
-        ],
+                            )
+                          ]
+                        : list
+                            .map(
+                              (x) => Container(
+                                color: TwitterColor.white,
+                                child: Tweet(
+                                  model: x,
+                                  isDisplayOnProfile: true,
+                                  trailing: TweetBottomSheet().tweetOptionIcon(
+                                      context, x, TweetType.Tweet),
+                                ),
+                              ),
+                            )
+                            .toList(),
+              ),
+            )
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/state/authState.dart b/lib/state/authState.dart
