🗃 Change remote config

🩹 (fix) non critical issues

Author: TheAlphamerc

lib/helper/constant.dart

@@ -4,7 +4,6 @@ class Constants {
   static List<String> dummyProfilePicList = [
     'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ6TaCLCqU4K0ieF27ayjl51NmitWaJAh_X0r1rLX4gMvOe0MDaYw&s',
     'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTFDjXj1F8Ix-rRFgY_r3GerDoQwfiOMXVt-tZdv_Mcou_yIlUC&s',
-    'http://www.azembelani.co.za/wp-content/uploads/2016/07/20161014_58006bf6e7079-3.png',
     'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRzDG366qY7vXN2yng09wb517WTWqp-oua-mMsAoCadtncPybfQ&s',
     'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTq7BgpG1CwOveQ_gEFgOJASWjgzHAgVfyozkIXk67LzN1jnj9I&s',
     'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRPxjRIYT8pG0zgzKTilbko-MOv8pSnmO63M9FkOvfHoR9FvInm&s',

lib/helper/utility.dart

@@ -79,9 +79,13 @@ class Utility {
     }
 
     var dur = DateTime.now().toLocal().difference(dt);
-    if (dur.inDays > 0) {
+    if (dur.inDays > 365) {
+      msg = DateFormat.yMMMd().format(dt);
+    } else if (dur.inDays > 30) {
+      msg = DateFormat.yMMMd().format(dt);
+    } else if (dur.inDays > 0) {
       msg = '${dur.inDays} d';
-      return dur.inDays == 1 ? '1d' : DateFormat("dd MMM").format(dt);
+      return dur.inDays == 1 ? '1d' : DateFormat.MMMd().format(dt);
     } else if (dur.inHours > 0) {
       msg = '${dur.inHours} h';
     } else if (dur.inMinutes > 0) {
@@ -146,8 +150,7 @@ class Utility {
     }
   }
 
-  static void logEvent(String event,
-      {required Map<String, dynamic> parameter}) {
+  static void logEvent(String event, {Map<String, dynamic>? parameter}) {
     kReleaseMode
         ? kAnalytics.logEvent(name: event, parameters: parameter)
         : print("[EVENT]: $event");

lib/model/notificationModel.dart

@@ -6,9 +6,9 @@ class NotificationModel {
   String? id;
   String? tweetKey;
   String? updatedAt;
-  late String? createdAt;
+  String? createdAt;
   late String type;
-  late Map<String, dynamic> data;
+  Map<String, dynamic>? data;
 
   NotificationModel(
       {this.id,
@@ -30,10 +30,6 @@ class NotificationModel {
     createdAt = map["createdAt"];
     this.data = data;
   }
-
-  Map<String, dynamic> toJson() => {
-        "tweetKey": tweetKey,
-      };
 }
 
 extension NotificationModelHelper on NotificationModel {

lib/state/authState.dart

@@ -60,7 +60,7 @@ class AuthState extends AppState {
     notifyListeners();
   }
 
-  databaseInit() {
+  void databaseInit() {
     try {
       if (_profileQuery == null) {
         _profileQuery = kDatabase.child("profile").child(user!.uid);
@@ -135,7 +135,7 @@ class AuthState extends AppState {
   }
 
   /// Create user profile from google login
-  createUserFromGoogleSignIn(User user) {
+  void createUserFromGoogleSignIn(User user) {
     var diff = DateTime.now().difference(user.metadata.creationTime!);
     // Check if user is new or old
     // If user is new then add new user to firebase realtime kDatabase
@@ -193,7 +193,7 @@ class AuthState extends AppState {
   /// `Create` and `Update` user
   /// IF `newUser` is true new user is created
   /// Else existing user will update with new values
-  createUser(UserModel user, {bool newUser = false}) {
+  void createUser(UserModel user, {bool newUser = false}) {
     if (newUser) {
       // Create username by the combination of name and id
       user.userName =
@@ -233,7 +233,7 @@ class AuthState extends AppState {
   }
 
   /// Reload user to get refresh user data
-  reloadUser() async {
+  void reloadUser() async {
     await user!.reload();
     user = _firebaseAuth.currentUser;
     if (user!.emailVerified) {
@@ -308,13 +308,15 @@ class AuthState extends AppState {
           var name = userModel.displayName ?? user!.displayName;
           _firebaseAuth.currentUser!.updateDisplayName(name);
           _firebaseAuth.currentUser!.updatePhotoURL(userModel.profilePic);
+          Utility.logEvent('user_profile_image');
         }
 
         /// upload banner image if not null
         if (bannerImage != null) {
           /// get banner storage path from server
           userModel!.bannerImage = await _uploadFileToStorage(bannerImage,
               'user/profile/${userModel.userName}/${path.basename(bannerImage.path)}');
+          Utility.logEvent('user_banner_image');
         }
 
         if (userModel != null) {
@@ -324,7 +326,7 @@ class AuthState extends AppState {
         }
       }
 
-      Utility.logEvent('update_user', parameter: {});
+      Utility.logEvent('update_user');
     } catch (error) {
       cprint(error, errorIn: 'updateUserProfile');
     }
@@ -333,7 +335,7 @@ class AuthState extends AppState {
   Future<String> _uploadFileToStorage(File file, path) async {
     var task = _firebaseStorage.ref().child(path);
     var status = await task.putFile(file);
-    print(status.state);
+    cprint(status.state);
 
     /// get file storage path from server
     return await task.getDownloadURL();

lib/ui/page/common/sidebar.dart

@@ -255,7 +255,6 @@ class _SidebarMenuState extends State<SidebarMenu> {
                     Navigator.push(
                         context, ProfilePage.getRoute(profileId: state.userId));
                   }),
-                  _menuListRowButton('Lists', icon: AppIcon.lists),
                   _menuListRowButton(
                     'Bookmark',
                     icon: AppIcon.bookmark,
@@ -264,8 +263,8 @@ class _SidebarMenuState extends State<SidebarMenu> {
                       Navigator.push(context, BookmarkPage.getRoute());
                     },
                   ),
+                  _menuListRowButton('Lists', icon: AppIcon.lists),
                   _menuListRowButton('Moments', icon: AppIcon.moments),
-                  _menuListRowButton('Fwitter ads', icon: AppIcon.twitterAds),
                   const Divider(),
                   _menuListRowButton('Settings and privacy', isEnable: true,
                       onPressed: () {

lib/ui/page/common/splash.dart

@@ -39,7 +39,6 @@ class _SplashPageState extends State<SplashPage> {
       cprint("App is updated");
       Future.delayed(const Duration(seconds: 1)).then((_) {
         var state = Provider.of<AuthState>(context, listen: false);
-        // state.authStatus = AuthStatus.NOT_DETERMINED;
         state.getCurrentUser();
       });
     }
@@ -54,25 +53,24 @@ class _SplashPageState extends State<SplashPage> {
   Future<bool> _checkAppVersion() async {
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
     final currentAppVersion = packageInfo.version;
-    final appVersion = await _getAppVersionFromFirebaseConfig();
-    if (appVersion != currentAppVersion) {
+    final buildNo = packageInfo.buildNumber;
+    final config = await _getAppVersionFromFirebaseConfig();
+
+    if (config != null &&
+        config['name'] == currentAppVersion &&
+        config['versions'].contains(int.tryParse(buildNo))) {
+      return true;
+    } else {
       if (kDebugMode) {
         cprint("Latest version of app is not installed on your system");
         cprint(
-            "In debug mode we are not restrict devlopers to redirect to update screen");
+            "This is for testing purpose only. In debug mode update screen will not be open up");
         cprint(
-            "Redirect devs to update screen can put other devs in confusion");
+            "If you are planning to publish app on store then please update app version in firebase config");
         return true;
       }
-      Navigator.pushReplacement(
-        context,
-        MaterialPageRoute(
-          builder: (_) => const UpdateApp(),
-        ),
-      );
+      Navigator.pushReplacement(context, UpdateApp.getRoute());
       return false;
-    } else {
-      return true;
     }
   }
 
@@ -82,20 +80,24 @@ class _SplashPageState extends State<SplashPage> {
   /// you have to add latest app version in firebase remote config
   /// To fetch this key go to project setting in firebase
   /// Open `Remote Config` section in fireabse
-  /// Add [appVersion]  as paramerter key and below json in Default value
-  ///  ``` json
+  /// Add [supportedBuild]  as paramerter key and below json in Default value
+  ///  ```
   ///  {
-  ///    "key": "1.0.0"
+  ///    "supportedBuild":
+  ///    {
+  ///       "name": "<Current Build Version>","
+  ///       "versions": [ <Current Build Version> ]
+  ///     }
   ///  } ```
   /// After adding app version key click on Publish Change button
   /// For package detail check:-  https://pub.dev/packages/firebase_remote_config#-readme-tab-
-  Future<String?> _getAppVersionFromFirebaseConfig() async {
+  Future<Map?> _getAppVersionFromFirebaseConfig() async {
     final RemoteConfig remoteConfig = RemoteConfig.instance;
     await remoteConfig.fetchAndActivate();
     // await remoteConfig.activateFetched();
-    var data = remoteConfig.getString('appVersion');
+    var data = remoteConfig.getString('supportedBuild');
     if (data.isNotEmpty) {
-      return jsonDecode(data)["key"];
+      return jsonDecode(data) as Map;
     } else {
       cprint(
           "Please add your app's current version into Remote config in firebase",

lib/ui/page/common/updateApp.dart

@@ -8,6 +8,12 @@ import 'package:flutter_twitter_clone/widgets/newWidget/title_text.dart';
 class UpdateApp extends StatefulWidget {
   const UpdateApp({Key? key}) : super(key: key);
 
+  static Route<T> getRoute<T>() {
+    return MaterialPageRoute(
+      builder: (_) => UpdateApp(),
+    );
+  }
+
   @override
   _UpdateAppState createState() => _UpdateAppState();
 }

lib/ui/page/feed/composeTweet/composeTweet.dart

@@ -202,9 +202,7 @@ class _ComposeTweetReplyPageState extends State<ComposeTweetPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: CustomAppBar(
-        title: customTitleText(
-          '',
-        ),
+        title: customTitleText(''),
         onActionPressed: _submitButton,
         isCrossButton: true,
         submitButtonText: widget.isTweet
@@ -589,6 +587,7 @@ class _UserList extends StatelessWidget {
                 const BoxConstraints(minHeight: 30, maxHeight: double.infinity),
             child: ListView.builder(
               itemCount: list!.length,
+              physics: ClampingScrollPhysics(),
               itemBuilder: (context, index) {
                 return _UserTile(
                   user: list![index],

lib/ui/page/message/chatListPage.dart

@@ -60,11 +60,12 @@ class _ChatListPageState extends State<ChatListPage> {
         physics: const BouncingScrollPhysics(),
         itemCount: state.chatUserList!.length,
         itemBuilder: (context, index) => _userCard(
-            searchState.userlist!.firstWhere(
-              (x) => x.userId == state.chatUserList![index].key,
-              orElse: () => UserModel(userName: "Unknown"),
-            ),
-            state.chatUserList![index]),
+          searchState.userlist!.firstWhere(
+            (x) => x.userId == state.chatUserList![index].key,
+            orElse: () => UserModel(userName: "Unknown"),
+          ),
+          state.chatUserList![index],
+        ),
         separatorBuilder: (context, index) {
           return const Divider(
             height: 0,
@@ -120,11 +121,17 @@ class _ChatListPageState extends State<ChatListPage> {
           getLastMessage(lastMessage?.message) ?? '@${model.displayName}',
           style:
               TextStyles.onPrimarySubTitleText.copyWith(color: Colors.black54),
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
         ),
         trailing: lastMessage == null
             ? const SizedBox.shrink()
             : Text(
                 Utility.getChatTime(lastMessage.createdAt).toString(),
+                style: TextStyles.onPrimarySubTitleText.copyWith(
+                  color: Colors.black54,
+                  fontSize: 12,
+                ),
               ),
       ),
     );

lib/ui/page/profile/profilePage.dart

@@ -315,13 +315,13 @@ class _ProfilePageState extends State<ProfilePage>
   late TabController _tabController;
 
   void shareProfile(BuildContext context) async {
-    var authstate = context.read<AuthState>();
+    var authstate = context.read<ProfileState>();
     var user = authstate.profileUserModel;
     Utility.createLinkAndShare(
       context,
       "profilePage/${widget.profileId}/",
       socialMetaTagParameters: SocialMetaTagParameters(
-        description: !user!.bio!.contains("Edit profile")
+        description: !user.bio!.contains("Edit profile")
             ? user.bio
             : "Checkout ${user.displayName}'s profile on Fwitter app",
         title: "${user.displayName} is on Fwitter app",