merge haroun

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

lib/config/config.dart

@@ -8,7 +8,7 @@ const MAX_SMALL_SCREEN = 660;
 const BASE_URL = 'https://uat.hmgwebservices.com/Services';
 
 const GET_PROJECT = '/Lists.svc/REST/GetProject';
-const BASE_URL = 'https://hmgwebservices.com/';  // Production Environment
+//const BASE_URL = 'https://hmgwebservices.com/';  // Production Environment
 //const BASE_URL = 'https://uat.hmgwebservices.com/';  // UAT Environment
 
 

lib/pages/BookAppointment/BookingOptions.dart

@@ -1,4 +1,5 @@
 import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/CardCommon.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 
 import '../../uitl/translations_delegate_base.dart';
@@ -6,8 +7,8 @@ import '../../uitl/translations_delegate_base.dart';
 class BookingOptions extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return AppScaffold(
-      appBar: AppBar(title: Text(TranslationBase.of(context).bookAppo)) ,
+   //   appBar: AppBar(title: Text(TranslationBase.of(context).bookAppo)) ,
       body: Container(
         margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
         child: Column(

lib/pages/landing/landing_page.dart

@@ -1,3 +1,5 @@
+import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart';
+import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
 import 'package:diplomaticquarterapp/pages/landing/replay_page.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
@@ -55,7 +57,7 @@ class _LandingPageState extends State<LandingPage> {
       body: PageView(
         physics: NeverScrollableScrollPhysics(),
         controller: pageController,
-        children: [HomePage(), ReplayPage(), Container(), Container()],
+        children: [HomePage(), ReplayPage(), Container(), ToDo()],
       ),
       bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab),
     );
@@ -72,7 +74,7 @@ class _LandingPageState extends State<LandingPage> {
       case 3:
         return TranslationBase.of(context).services;
       case 4:
-        return TranslationBase.of(context).bookAppo; // Added Case For Book Appointment button in bottom navbar
+        return TranslationBase.of(context).bookAppo;
     }
   }
 }

lib/services/appointment_services/GetDoctorsList.dart

@@ -1,10 +1,10 @@
-import 'package:diplomaticquarterapp/client/base_app_client.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
 import 'package:diplomaticquarterapp/models/Request.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 
-class DoctorsListService {
+class DoctorsListService extends BaseService{
   AppSharedPreferences sharedPref = AppSharedPreferences();
   AppGlobal appGlobal = new AppGlobal();
 
@@ -37,7 +37,7 @@ class DoctorsListService {
 
     dynamic localRes;
 
-    await BaseAppClient.post(GET_DOCTORS_LIST_URL,
+    await baseAppClient.post(GET_DOCTORS_LIST_URL,
         onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {
@@ -76,7 +76,7 @@ class DoctorsListService {
 
     dynamic localRes;
 
-    await BaseAppClient.post(GET_DOCTORS_LIST_URL,
+    await baseAppClient.post(GET_DOCTORS_LIST_URL,
         onSuccess: (response, statusCode) async {
           localRes = response;
         }, onFailure: (String error, int statusCode) {

lib/services/clinic_services/get_clinic_service.dart

@@ -1,10 +1,11 @@
-import 'package:diplomaticquarterapp/client/base_app_client.dart';
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
+import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart';
 import 'package:diplomaticquarterapp/models/Request.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 
-class ClinicListService {
+class ClinicListService extends BaseService {
   AppSharedPreferences sharedPref = AppSharedPreferences();
   AppGlobal appGlobal = new AppGlobal();
 
@@ -26,7 +27,7 @@ class ClinicListService {
 
     dynamic localRes;
 
-    await BaseAppClient.post(GET_CLINICS_LIST_URL,
+    await baseAppClient.post(GET_CLINICS_LIST_URL,
         onSuccess: (response, statusCode) async {
           localRes = response;
         }, onFailure: (String error, int statusCode) {

lib/widgets/bottom_navigation/bottom_nav_bar.dart

@@ -25,10 +25,10 @@ class _BottomNavBarState extends State<BottomNavBar> {
       _index = index;
 
       // Navigate to Appointment Booking Flow
-      if (_index == 4) navigateToBookingOptions(context);
+     // if (_index == 4) navigateToBookingOptions(context);
 
       // Navigate to upcoming list
-      if (_index == 3) navigateToToDoList(context);
+      //if (_index == 3) navigateToToDoList(context);
     });
   }