Merge branch 'development' into design-changes

lib/screens/patients/out_patient/out_patient_screen.dart

@@ -132,7 +132,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
                           onTap: () async {
                             setState(() {
                               _activeLocation = _times.indexOf(item);
-                              outPatientFilterType= _activeLocation==0?OutPatientFilterType.Previous:_activeLocation==0?OutPatientFilterType.Today:OutPatientFilterType.NextWeek;
+                              outPatientFilterType= _activeLocation==0?OutPatientFilterType.Previous:_activeLocation==1?OutPatientFilterType.Today:OutPatientFilterType.NextWeek;
                               _controller.text="";
                             });
                             model.searchData("");

lib/util/helpers.dart

@@ -1,6 +1,7 @@
 import 'package:connectivity/connectivity.dart';
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
 import 'package:doctor_app_flutter/screens/auth/login_screen.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
@@ -16,6 +17,7 @@ import '../util/dr_app_toast_msg.dart';
 import 'dr_app_shared_pref.dart';
 
 DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
+
 class Helpers {
   static int cupertinoPickerIndex = 0;
 
@@ -82,7 +84,6 @@ class Helpers {
           style: TextStyle(fontSize: SizeConfig.textMultiplier * 2),
         );
       }).toList(),
-
       itemExtent: 25,
       looping: false,
       onSelectedItemChanged: (int index) {
@@ -100,6 +101,7 @@ class Helpers {
 
     DrAppToastMsg.showErrorToast(localMsg);
   }
+
   static Future<bool> checkConnection() async {
     ConnectivityResult connectivityResult =
         await (Connectivity().checkConnectivity());
@@ -144,8 +146,13 @@ class Helpers {
     String lang = await sharedPref.getString(APP_Language);
     await clearSharedPref();
     sharedPref.setString(APP_Language, lang);
-    Navigator.pushAndRemoveUntil(AppGlobal.CONTEX, FadePage(page: Loginsreen(),), (r) => false);
-
+    ProjectViewModel().isLogin = false;
+    Navigator.pushAndRemoveUntil(
+        AppGlobal.CONTEX,
+        FadePage(
+          page: Loginsreen(),
+        ),
+        (r) => false);
   }
 
   navigateToUpdatePage(String message, String androidLink, iosLink) {