From 0ac7a0f2f1472fdb93728606f6a8b1669367c0a3 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikander.saleem@cloudsolutions.com.sa>
Date: Tue, 27 Sep 2022 10:58:35 +0300
Subject: [PATCH] home page navigation added from any screen.

---
 lib/main.dart             | 9 ++++-----
 lib/ui/common_appbar.dart | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index ad39cc7..4120b96 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_analytics/observer.dart';
-import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:tangheem/ui/screens/bookmark_screen.dart';
@@ -109,16 +108,16 @@ class Application extends StatelessWidget {
         } catch (ex) {
           print("Analytics:$ex");
         }
-        return goToNavigation(className);
+        return goToNavigation(className, settings);
       },
     );
   }
 
-  PageRoute goToNavigation(var className) {
+  PageRoute goToNavigation(var className, settings) {
     if (Platform.isIOS) {
-      return CupertinoPageRoute(builder: (context) => className);
+      return CupertinoPageRoute(builder: (context) => className, settings: settings);
     }
-    return MaterialPageRoute(builder: (context) => className);
+    return MaterialPageRoute(builder: (context) => className, settings: settings);
   }
 
   ThemeData lightTheme() {
diff --git a/lib/ui/common_appbar.dart b/lib/ui/common_appbar.dart
index af7e66e..213a420 100644
--- a/lib/ui/common_appbar.dart
+++ b/lib/ui/common_appbar.dart
@@ -137,7 +137,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
                     ),
                   if (!widget.showDrawer)
                     IconButton(
-                      icon: Icon(widget.showDrawer ? Icons.home : Icons.home, color: ColorConsts.textGrey),
+                      icon: Icon(Icons.home, color: ColorConsts.textGrey),
                       padding: EdgeInsets.only(left: 16),
                       onPressed: () {
                         Navigator.popUntil(context, ModalRoute.withName(HomeScreen.routeName));