Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen.

lib/pages/AlHabibMedicalService/h2o/h2o_page.dart

@@ -1,12 +1,18 @@
 import 'dart:ui';
 
+import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h20_setting.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/month_page.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/today_page.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/week_page.dart';
+import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
+import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
+import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@@ -18,14 +24,16 @@ class H2OPage extends StatefulWidget {
   _H2OPageState createState() => _H2OPageState();
 }
 
-class _H2OPageState extends State<H2OPage>
-    with SingleTickerProviderStateMixin {
+class _H2OPageState extends State<H2OPage> with SingleTickerProviderStateMixin {
   TabController _tabController;
 
   @override
   void initState() {
     super.initState();
-    _tabController = TabController(length: 3, vsync: this,);
+    _tabController = TabController(
+      length: 3,
+      vsync: this,
+    );
   }
 
   @override
@@ -43,6 +51,7 @@ class _H2OPageState extends State<H2OPage>
         appBarTitle: TranslationBase.of(context).waterTracker,
         showHomeAppBarIcon: false,
         baseViewModel: model,
+        isHelp: true,
         appBarIcons: [
           IconButton(
             icon: Image.asset("assets/images/new-design/setting_gear_icon.png"),
@@ -129,6 +138,39 @@ class _H2OPageState extends State<H2OPage>
               )
             ],
           ),
+          bottomNavigationBar: BottomNavBar(
+            changeIndex: (index) {
+              if (index == 0) {
+                IS_VOICE_COMMAND_CLOSED = false;
+              } else if (index == 1) {
+                Navigator.push(
+                    context,
+                    FadePage(
+                        page: AppScaffold(
+                            appBarTitle: TranslationBase.of(context).medicalProfile,
+                            isShowAppBar: true,
+                            showHomeAppBarIcon: false,
+                            appBarIcons: [
+                              IconButton(
+                                icon: Image.asset("assets/images/new-design/setting_gear_icon.png"),
+                                color: Colors.white,
+                                onPressed: () => Navigator.of(context).pushNamed(
+                                  SETTINGS,
+                                ),
+                              ),
+                            ],
+                            body: MedicalProfilePage())));
+              } else if (index == 2) {
+                Navigator.of(context).pushNamedAndRemoveUntil(HOME, (Route<dynamic> route) => false);
+              } else if (index == 3) {
+                Navigator.of(context).pushNamed(MY_FAMILIY);
+              } else if (index == 4) {
+                Navigator.push(context, FadePage(page: ToDo(isShowAppBar: false)));
+              }
+            },
+            showHomeIcon: true,
+            index: 0,
+          ),
         ),
       ),
     );

lib/widgets/bottom_navigation/bottom_nav_bar.dart

@@ -21,7 +21,8 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 class BottomNavBar extends StatefulWidget {
   final ValueChanged<int> changeIndex;
   final int index;
-  BottomNavBar({Key key, this.changeIndex, this.index}) : super(key: key);
+  final bool showHomeIcon;
+  BottomNavBar({Key key, this.changeIndex, this.index, this.showHomeIcon = false}) : super(key: key);
 
   @override
   _BottomNavBarState createState() => _BottomNavBarState();
@@ -33,7 +34,7 @@ class _BottomNavBarState extends State<BottomNavBar> {
   var event = RobotProvider();
   _changeIndex(int index) async {
     widget.changeIndex(index);
-    if (_index == 0) {
+    if (index == 0) {
       event.setValue({'isRobotVisible': 'true'});
     }
   }
@@ -72,16 +73,27 @@ class _BottomNavBarState extends State<BottomNavBar> {
                 ),
                 if (widget.index == 0)
                   Expanded(
-                    child: SizedBox(
-                      height: 50,
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: <Widget>[
-                          SizedBox(height: 22),
-                        ],
-                      ),
-                    ),
+                    child: (widget.showHomeIcon)
+                        ? SizedBox(
+                          child: BottomNavigationItem(
+                              icon: Icons.home_outlined,
+                              activeIcon: Icons.home_outlined,
+                              changeIndex: _changeIndex,
+                              index: widget.index,
+                              currentIndex: 2,
+                              name: TranslationBase.of(context).home,
+                            ),
+                        )
+                        : SizedBox(
+                            height: 50,
+                            child: Column(
+                              mainAxisSize: MainAxisSize.min,
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: <Widget>[
+                                SizedBox(height: 22),
+                              ],
+                            ),
+                          ),
                   ),
                 if (widget.index != 0 && projectViewModel.havePrivilege(34))
                   BottomNavigationItem(