null safety checks.. deprecated codes fixes

Author: emmaakachukwu

lib/main.dart

@@ -15,7 +15,7 @@ class MyApp extends StatelessWidget {
       title: 'Wallet App',
       debugShowCheckedModeBanner: false,
       theme: AppTheme.lightTheme.copyWith(
-        textTheme: GoogleFonts.muliTextTheme(
+        textTheme: GoogleFonts.mulishTextTheme(
           Theme.of(context).textTheme,
         ),
       ),
@@ -24,8 +24,8 @@ class MyApp extends StatelessWidget {
           '/transfer': (_) => MoneyTransferPage()
         },
         onGenerateRoute: (RouteSettings settings) {
-          final List<String> pathElements = settings.name.split('/');
-          if (pathElements[0] == '') {
+          final List<String> pathElements = settings.name!.split('/');
+          if (pathElements[0].isEmpty) {
             return null;
           }
           if (pathElements[0] == 'transfer') {

lib/src/pages/homePage.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_wallet_app/src/theme/light_color.dart';
-import 'package:flutter_wallet_app/src/theme/theme.dart';
 import 'package:flutter_wallet_app/src/widgets/balance_card.dart';
 import 'package:flutter_wallet_app/src/widgets/bottom_navigation_bar.dart';
 import 'package:flutter_wallet_app/src/widgets/title_text.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class HomePage extends StatefulWidget {
-  HomePage({Key key}) : super(key: key);
+  HomePage({Key? key}) : super(key: key);
 
   @override
   _HomePageState createState() => _HomePageState();
@@ -24,7 +23,7 @@ class _HomePageState extends State<HomePage> {
         SizedBox(width: 15),
         TitleText(text: "Hello,"),
         Text(' Janth,',
-            style: GoogleFonts.muli(
+            style: GoogleFonts.mulish(
                 fontSize: 18,
                 fontWeight: FontWeight.w600,
                 color: LightColor.navyBlue2)),
@@ -75,8 +74,8 @@ class _HomePageState extends State<HomePage> {
           ),
         ),
         Text(text,
-            style: GoogleFonts.muli(
-                textStyle: Theme.of(context).textTheme.display1,
+            style: GoogleFonts.mulish(
+                textStyle: Theme.of(context).textTheme.headline4,
                 fontSize: 15,
                 fontWeight: FontWeight.w600,
                 color: Color(0xff76797e))),
@@ -120,7 +119,7 @@ class _HomePageState extends State<HomePage> {
             borderRadius: BorderRadius.all(Radius.circular(10)),
           ),
           child: Text('-20 MLR',
-              style: GoogleFonts.muli(
+              style: GoogleFonts.mulish(
                   fontSize: 12,
                   fontWeight: FontWeight.bold,
                   color: LightColor.navyBlue2))),

lib/src/pages/money_transfer_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter_wallet_app/src/theme/light_color.dart';
 import 'package:flutter_wallet_app/src/widgets/title_text.dart';
 
 class MoneyTransferPage extends StatefulWidget {
-  MoneyTransferPage({Key key}) : super(key: key);
+  MoneyTransferPage({Key? key}) : super(key: key);
 
   @override
   _MoneyTransferPageState createState() => _MoneyTransferPageState();

lib/src/theme/theme.dart

@@ -10,12 +10,12 @@ class AppTheme {
     backgroundColor: LightColor.background,
     primaryColor: LightColor.navyBlue1,
     cardTheme: CardTheme(color: LightColor.navyBlue2),
-    textTheme: TextTheme(display1: TextStyle(color: LightColor.black)),
+    textTheme: TextTheme(headline4: TextStyle(color: LightColor.black)),
     iconTheme: IconThemeData(color: LightColor.navyBlue2),
     bottomAppBarColor: LightColor.background,
     dividerColor: LightColor.lightGrey,
     primaryTextTheme: TextTheme(
-      body1: TextStyle(color:LightColor.titleTextColor)
+      bodyText2: TextStyle(color:LightColor.titleTextColor)
     )
   );
 

lib/src/widgets/balance_card.dart

@@ -3,7 +3,7 @@ import 'package:flutter_wallet_app/src/theme/light_color.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class BalanceCard extends StatelessWidget {
-  const BalanceCard({Key key}) : super(key: key);
+  const BalanceCard({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -34,8 +34,8 @@ class BalanceCard extends StatelessWidget {
                       children: <Widget>[
                         Text(
                           '6,354',
-                          style: GoogleFonts.muli(
-                              textStyle: Theme.of(context).textTheme.display1,
+                          style: GoogleFonts.mulish(
+                              textStyle: Theme.of(context).textTheme.headline4,
                               fontSize: 35,
                               fontWeight: FontWeight.w800,
                               color: LightColor.yellow2),
@@ -54,8 +54,8 @@ class BalanceCard extends StatelessWidget {
                       children: <Widget>[
                         Text(
                           'Eq:',
-                          style: GoogleFonts.muli(
-                              textStyle: Theme.of(context).textTheme.display1,
+                          style: GoogleFonts.mulish(
+                              textStyle: Theme.of(context).textTheme.headline4,
                               fontSize: 15,
                               fontWeight: FontWeight.w600,
                               color: LightColor.lightNavyBlue),

lib/src/widgets/bottom_navigation_bar.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_wallet_app/src/theme/light_color.dart';
 
 class BottomNavigation extends StatelessWidget {
-  const BottomNavigation({Key key}) : super(key: key);
+  const BottomNavigation({Key? key}) : super(key: key);
   BottomNavigationBarItem _icons(IconData icon){
     return BottomNavigationBarItem(
       icon: Icon(icon,),
-      title: Text('')
+      label: ''
     );
   }
   @override

lib/src/widgets/customRoute.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 
 class CustomRoute<T> extends MaterialPageRoute<T> {
-  CustomRoute({WidgetBuilder builder, RouteSettings settings})
-      : super(builder: builder, settings: settings);
+  CustomRoute({WidgetBuilder? builder, RouteSettings? settings})
+      : super(builder: builder!, settings: settings);
   @override
   Widget buildTransitions(BuildContext context, Animation<double> animation,
       Animation<double> secondaryAnimation, Widget child) {
-    if (settings.isInitialRoute) {
+    if (settings.name != null) {
       return child;
     }
     return FadeTransition(

lib/src/widgets/title_text.dart

@@ -7,15 +7,15 @@ class TitleText extends StatelessWidget {
   final double fontSize;
   final Color color;
   const TitleText(
-      {Key key,
-      this.text,
+      {Key? key,
+      this.text = '',
       this.fontSize = 18,
       this.color = LightColor.navyBlue2})
       : super(key: key);
   @override
   Widget build(BuildContext context) {
     return Text(text,
-        style: GoogleFonts.muli(
+        style: GoogleFonts.mulish(
             fontSize: fontSize, fontWeight: FontWeight.w800, color: color));
   }
 }