Merge branch 'home_page' into 'diplomatic-quarter-live'

Home page

See merge request Cloud_Solution/diplomatic-quarter!91

lib/core/viewModels/qr_view_model.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
-
-// import 'package:barcode_scan/platform_wrapper.dart';
+import 'package:barcode_scan_fix/barcode_scan.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
 import 'package:diplomaticquarterapp/core/model/qr/qr_parking_model.dart';
 import 'package:diplomaticquarterapp/core/service/qr_service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
+
 import '../../locator.dart';
 
 class QrViewModel extends BaseViewModel {
@@ -15,25 +15,25 @@ class QrViewModel extends BaseViewModel {
 
   readQr() async {
     //TODO fix the barcode scan
-    // var result = await BarcodeScanner.scan();
-    // var data = json.decode(result.rawContent);
-    // var qRParkingID = data['QRParkingID'];
-    // setState(ViewState.BusyLocal);
-    // await _qrService.getQRParkingByID(qRParkingID);
-    // if (_qrService.hasError) {
-    //   error = _qrService.error;
-    //   setState(ViewState.ErrorLocal);
-    // } else {
-    //   if (_qrService.qRParkingList.length > 0) {
-    //     qrParkingModel = _qrService.qRParkingList[0];
-    //     await sharedPref.setObject(IS_GO_TO_PARKING, qrParkingModel);
-    //     isSavePark = true;
-    //     setState(ViewState.Idle);
-    //   } else {
-    //     error = "Invalid Qr Code";
-    //     setState(ViewState.ErrorLocal);
-    //   }
-    // }
+    String result = await BarcodeScanner.scan();
+    var data = json.decode(result);
+    var qRParkingID = data['QRParkingID'];
+    setState(ViewState.BusyLocal);
+    await _qrService.getQRParkingByID(qRParkingID);
+    if (_qrService.hasError) {
+      error = _qrService.error;
+      setState(ViewState.ErrorLocal);
+    } else {
+      if (_qrService.qRParkingList.length > 0) {
+        qrParkingModel = _qrService.qRParkingList[0];
+        await sharedPref.setObject(IS_GO_TO_PARKING, qrParkingModel);
+        isSavePark = true;
+        setState(ViewState.Idle);
+      } else {
+        error = "Invalid Qr Code";
+        setState(ViewState.ErrorLocal);
+      }
+    }
   }
 
   getIsSaveParking() async {

lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart

@@ -29,6 +29,11 @@ import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AllHabibMedicalService extends StatefulWidget {
+  //TODO
+  final Function goToMyProfile;
+
+   AllHabibMedicalService({Key key, this.goToMyProfile});
+
   @override
   _AllHabibMedicalServiceState createState() => _AllHabibMedicalServiceState();
 }
@@ -95,12 +100,10 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
                   ),
                 ),
                 ServicesContainer(
-                  onTap: () => Navigator.push(
-                    context,
-                    FadePage(
-                      page: MedicalProfilePage(),
-                    ),
-                  ),
+                  onTap: () {
+                    Navigator.pop(context);
+                    widget.goToMyProfile();
+                  },
                   imageLocation:
                       'assets/images/new-design/my_file_bottom_bar.png',
                   title: TranslationBase.of(context).myMedicalFile,

lib/pages/landing/home_page.dart

@@ -692,7 +692,7 @@ class _HomePageState extends State<HomePage> {
                        //color: Colors.grey[700],
                         width: MediaQuery.of(context).size.width * 0.45,
                         onTap: () => Navigator.push(
-                            context, FadePage(page: AllHabibMedicalService())),
+                            context, FadePage(page: AllHabibMedicalService(goToMyProfile: widget.goToMyProfile,))),
                       ),
                       DashboardItem(
                         opacity:1.0,

pubspec.yaml

@@ -78,8 +78,8 @@ dependencies:
 
   google_maps_flutter: ^1.0.3
 
-  # Qr code Scanner TODO fix it
-  #barcode_scan: ^3.0.1
+  # Qr code Scanner
+  barcode_scan_fix: ^1.0.2
 
   # Rating Stars
   rating_bar: ^0.2.0