voice search

lib/pages/AlHabibMedicalService/​ health_calculators.dart

@@ -1,6 +1,6 @@
-import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart';
-import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart';
+import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';

lib/widgets/drawer/app_drawer_widget.dart

@@ -7,14 +7,13 @@ import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStat
 import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
-import 'package:diplomaticquarterapp/widgets/data_display/list/flexible_container.dart';
-import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-
+import 'package:smart_progress_bar/smart_progress_bar.dart';
 import '../../config/size_config.dart';
 import 'drawer_item_widget.dart';
 
@@ -328,12 +327,7 @@ class _AppDrawerState extends State<AppDrawer> {
   }
 
   logout() async {
-    // this.sharedPref.remove(USER_PROFILE);
-    // this.sharedPref.remove(IMEI_USER_DATA);
-    // this.sharedPref.remove(TOKEN);
-    // this.sharedPref.remove(LOGIN_TOKEN_ID);
     await sharedPref.clear();
-
     this.user = null;
     Navigator.of(context).pushNamed(HOME);
   }
@@ -365,7 +359,14 @@ class _AppDrawerState extends State<AppDrawer> {
     this
         .familyFileProvider
         .silentLoggin(user)
-        .then((value) => loginAfter(value, context));
+        .then((value) => loginAfter(value, context))
+        .catchError((err) {
+      print(err);
+      AppToast.showErrorToast(message: err);
+      Navigator.of(context).pop();
+    }).showProgressBar(
+            text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+    ;
   }
 
   loginAfter(result, context) {

lib/widgets/others/floating_button_search.dart

@@ -121,7 +121,11 @@ class _FloatingSearchButton extends State<FloatingSearchButton>
           //   position = Offset(250, 400);
           // });
         },
-        left: activeAnimation ? 300 : position.dx,
+        left: activeAnimation
+            ? TranslationBase.of(AppGlobal.context).locale.languageCode == 'en'
+                ? 300
+                : 0
+            : position.dx,
         top: activeAnimation ? -150 : position.dy,
         duration: activeAnimation
             ? const Duration(seconds: 1)