Merge pull request #211 from lielb100/null_safety

Null safety

Author: TheAlphamerc

android/build.gradle

@@ -5,8 +5,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.10'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

lib/helper/customRoute.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'routes.dart';
 
 class CustomRoute<T> extends MaterialPageRoute<T> {
-  CustomRoute({WidgetBuilder builder, RouteSettings settings})
+  CustomRoute({required WidgetBuilder builder, RouteSettings? settings})
       : super(builder: builder, settings: settings);
 
   @override
@@ -21,7 +21,7 @@ class CustomRoute<T> extends MaterialPageRoute<T> {
 }
 
 class SlideLeftRoute<T> extends MaterialPageRoute<T> {
-  SlideLeftRoute({WidgetBuilder builder, RouteSettings settings})
+  SlideLeftRoute({required WidgetBuilder builder, RouteSettings? settings})
       : super(builder: builder, settings: settings);
   @override
   Widget buildTransitions(BuildContext context, Animation<double> animation,
@@ -31,7 +31,7 @@ class SlideLeftRoute<T> extends MaterialPageRoute<T> {
       return child;
     }
     return SlideTransition(
-      position: new Tween<Offset>(
+      position: Tween<Offset>(
         begin: const Offset(1.0, 0.0),
         end: Offset.zero,
       ).animate(

lib/helper/routes.dart

@@ -1,9 +1,12 @@
+// ignore_for_file: prefer_const_constructors
+
 import 'package:flutter/material.dart';
 import 'package:flutter_twitter_clone/ui/page/Auth/selectAuthMethod.dart';
 import 'package:flutter_twitter_clone/ui/page/Auth/verifyEmail.dart';
 import 'package:flutter_twitter_clone/ui/page/common/splash.dart';
 import 'package:flutter_twitter_clone/ui/page/feed/composeTweet/composeTweet.dart';
 import 'package:flutter_twitter_clone/ui/page/feed/composeTweet/state/composeTweetState.dart';
+import 'package:flutter_twitter_clone/ui/page/homePage.dart';
 import 'package:flutter_twitter_clone/ui/page/message/conversationInformation/conversationInformation.dart';
 import 'package:flutter_twitter_clone/ui/page/message/newMessagePage.dart';
 import 'package:flutter_twitter_clone/ui/page/profile/follow/followerListPage.dart';
@@ -30,25 +33,24 @@ import '../ui/page/Auth/signup.dart';
 import '../ui/page/feed/feedPostDetail.dart';
 import '../ui/page/feed/imageViewPage.dart';
 import '../ui/page/message/chatScreenPage.dart';
-import '../ui/page/profile/EditProfilePage.dart';
 import '../ui/page/profile/profilePage.dart';
 import '../widgets/customWidgets.dart';
 
 class Routes {
   static dynamic route() {
     return {
-      'SplashPage': (BuildContext context) => SplashPage(),
+      'SplashPage': (BuildContext context) => const SplashPage(),
     };
   }
 
-  static void sendNavigationEventToFirebase(String path) {
+  static void sendNavigationEventToFirebase(String? path) {
     if (path != null && path.isNotEmpty) {
       // analytics.setCurrentScreen(screenName: path);
     }
   }
 
-  static Route onGenerateRoute(RouteSettings settings) {
-    final List<String> pathElements = settings.name.split('/');
+  static Route? onGenerateRoute(RouteSettings settings) {
+    final List<String> pathElements = settings.name!.split('/');
     if (pathElements[0] != '' || pathElements.length == 1) {
       return null;
     }
@@ -75,105 +77,104 @@ class Routes {
             builder: (BuildContext context) => FeedPostDetail(
                   postId: postId,
                 ),
-            settings: RouteSettings(name: 'FeedPostDetail'));
+            settings: const RouteSettings(name: 'FeedPostDetail'));
       case "ProfilePage":
         String profileId;
         if (pathElements.length > 2) {
           profileId = pathElements[2];
+          return CustomRoute<bool>(
+              builder: (BuildContext context) => ProfilePage(
+                    profileId: profileId,
+                  ));
         }
-        return CustomRoute<bool>(
-            builder: (BuildContext context) => ProfilePage(
-                  profileId: profileId,
-                ));
+        return CustomRoute(builder: (BuildContext context) => const HomePage());
+
       case "CreateFeedPage":
         return CustomRoute<bool>(
             builder: (BuildContext context) =>
                 ChangeNotifierProvider<ComposeTweetState>(
                   create: (_) => ComposeTweetState(),
-                  child: ComposeTweetPage(isRetweet: false, isTweet: true),
+                  child:
+                      const ComposeTweetPage(isRetweet: false, isTweet: true),
                 ));
       case "WelcomePage":
         return CustomRoute<bool>(
-            builder: (BuildContext context) => WelcomePage());
+            builder: (BuildContext context) => const WelcomePage());
       case "SignIn":
         return CustomRoute<bool>(builder: (BuildContext context) => SignIn());
       case "SignUp":
         return CustomRoute<bool>(builder: (BuildContext context) => Signup());
       case "ForgetPasswordPage":
         return CustomRoute<bool>(
-            builder: (BuildContext context) => ForgetPasswordPage());
+            builder: (BuildContext context) => const ForgetPasswordPage());
       case "SearchPage":
         return CustomRoute<bool>(
             builder: (BuildContext context) => SearchPage());
       case "ImageViewPge":
         return CustomRoute<bool>(
-            builder: (BuildContext context) => ImageViewPge());
+            builder: (BuildContext context) => const ImageViewPge());
       case "ChatScreenPage":
         return CustomRoute<bool>(
-            builder: (BuildContext context) => ChatScreenPage());
+            builder: (BuildContext context) => const ChatScreenPage());
       case "NewMessagePage":
         return CustomRoute<bool>(
           builder: (BuildContext context) => NewMessagePage(),
         );
       case "SettingsAndPrivacyPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => SettingsAndPrivacyPage(),
-        );
-      case "AccountSettingsPage":
-        return CustomRoute<bool>(
-          builder: (BuildContext context) => AccountSettingsPage(),
+          builder: (BuildContext context) => const SettingsAndPrivacyPage(),
         );
       case "AccountSettingsPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => AccountSettingsPage(),
+          builder: (BuildContext context) => const AccountSettingsPage(),
         );
       case "PrivacyAndSaftyPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => PrivacyAndSaftyPage(),
+          builder: (BuildContext context) => const PrivacyAndSaftyPage(),
         );
       case "NotificationPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => NotificationPage(),
+          builder: (BuildContext context) => const NotificationPage(),
         );
       case "ContentPrefrencePage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => ContentPrefrencePage(),
+          builder: (BuildContext context) => const ContentPrefrencePage(),
         );
       case "DisplayAndSoundPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => DisplayAndSoundPage(),
+          builder: (BuildContext context) => const DisplayAndSoundPage(),
         );
       case "DirectMessagesPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => DirectMessagesPage(),
+          builder: (BuildContext context) => const DirectMessagesPage(),
         );
       case "TrendsPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => TrendsPage(),
+          builder: (BuildContext context) => const TrendsPage(),
         );
       case "DataUsagePage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => DataUsagePage(),
+          builder: (BuildContext context) => const DataUsagePage(),
         );
       case "AccessibilityPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => AccessibilityPage(),
+          builder: (BuildContext context) => const AccessibilityPage(),
         );
       case "ProxyPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => ProxyPage(),
+          builder: (BuildContext context) => const ProxyPage(),
         );
       case "AboutPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => AboutPage(),
+          builder: (BuildContext context) => const AboutPage(),
         );
       case "ConversationInformation":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => ConversationInformation(),
+          builder: (BuildContext context) => const ConversationInformation(),
         );
       case "FollowingListPage":
         return CustomRoute<bool>(
-          builder: (BuildContext context) => FollowingListPage(),
+          builder: (BuildContext context) => const FollowingListPage(),
         );
       case "FollowerListPage":
         return CustomRoute<bool>(
@@ -184,19 +185,21 @@ class Routes {
           builder: (BuildContext context) => VerifyEmailPage(),
         );
       default:
-        return onUnknownRoute(RouteSettings(name: '/Feature'));
+        return onUnknownRoute(const RouteSettings(name: '/Feature'));
     }
   }
 
   static Route onUnknownRoute(RouteSettings settings) {
     return MaterialPageRoute(
-      builder: (_) => Scaffold(
+      builder: (context) => Scaffold(
         appBar: AppBar(
-          title: customTitleText(settings.name.split('/')[1]),
+          title: customTitleText(
+            settings.name!.split('/')[1],
+          ),
           centerTitle: true,
         ),
         body: Center(
-          child: Text('${settings.name.split('/')[1]} Comming soon..'),
+          child: Text('${settings.name!.split('/')[1]} Comming soon..'),
         ),
       ),
     );

lib/helper/shared_prefrence_helper.dart

@@ -12,23 +12,22 @@ class SharedPreferenceHelper {
     return _singleton;
   }
 
-  Future<String> getUserName() async {
+  Future<String?> getUserName() async {
     return (await SharedPreferences.getInstance())
         .getString(UserPreferenceKey.UserName.toString());
   }
 
   Future clearPreferenceValues() async {
-    await (SharedPreferences.getInstance())
-      ..clear();
+    (await SharedPreferences.getInstance()).clear();
   }
 
-  Future<void> saveUserProfile(UserModel user) async {
+  Future<bool> saveUserProfile(UserModel user) async {
     return (await SharedPreferences.getInstance()).setString(
         UserPreferenceKey.UserProfile.toString(), json.encode(user.toJson()));
   }
 
-  Future<UserModel> getUserProfile() async {
-    final jsonString = (await SharedPreferences.getInstance())
+  Future<UserModel?> getUserProfile() async {
+    final String? jsonString = (await SharedPreferences.getInstance())
         .getString(UserPreferenceKey.UserProfile.toString());
     if (jsonString == null) return null;
     return UserModel.fromJson(json.decode(jsonString));
@@ -39,8 +38,9 @@ class SharedPreferenceHelper {
         .setString(key, json.encode(model.toJson()));
   }
 
-  Future<LinkMediaInfo> getLinkMediaInfo(String key) async {
-    final jsonString = (await SharedPreferences.getInstance()).getString(key);
+  Future<LinkMediaInfo?> getLinkMediaInfo(String key) async {
+    final String? jsonString =
+        (await SharedPreferences.getInstance()).getString(key);
     if (jsonString == null) {
       return null;
     }