Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix issues

Browse Source
dev_v2.8_copy
Elham Rababh 4 years ago
parent 79103a5c84
commit 4b89b78ab4
6 changed files with 30 additions and 88 deletions
Show Stats Download Patch File Download Diff File

4
ios/Runner.xcodeproj/project.pbxproj
Unescape Escape View File

@ -295,11 +295,9 @@
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
"${BUILT_PRODUCTS_DIR}/flutter_flexible_toast/flutter_flexible_toast.framework",
"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
"${BUILT_PRODUCTS_DIR}/hexcolor/hexcolor.framework",
"${BUILT_PRODUCTS_DIR}/imei_plugin/imei_plugin.framework",
"${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
@ -334,11 +332,9 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_flexible_toast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hexcolor.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/imei_plugin.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",

21
lib/core/service/AnalyticsService.dart
Unescape Escape View File

@ -1,16 +1,15 @@
// import 'package:firebase_analytics/firebase_analytics.dart';
// import 'package:firebase_analytics/observer.dart';
import 'package:flutter/cupertino.dart';
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:firebase_analytics/observer.dart';
class AnalyticsService {
// final FirebaseAnalytics _analytics = FirebaseAnalytics();
//
// FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics);
//
final FirebaseAnalytics _analytics = FirebaseAnalytics();
FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics);
Future logEvent({required String eventCategory, required String eventAction}) async {
// await _analytics.logEvent(name: 'event', parameters: {
// "eventCategory": eventCategory,
// "eventAction": eventAction,
// });
await _analytics.logEvent(name: 'event', parameters: {
"eventCategory": eventCategory,
"eventAction": eventAction,
});
}
}

2
lib/main.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class MyApp extends StatelessWidget {
),
navigatorKey: locator<NavigationService>().navigatorKey,
navigatorObservers: [
// locator<AnalyticsService>().getAnalyticsObserver(),
locator<AnalyticsService>().getAnalyticsObserver(),
],
initialRoute: INIT_ROUTE,
routes: routes,

6
lib/screens/qr_reader/QR_reader_screen.dart
Unescape Escape View File

@ -1,9 +1,8 @@
// import 'package:barcode_scan_fix/barcode_scan.dart';
import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/scan_qr_view_model.dart';
import 'package:doctor_app_flutter/locator.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
@ -82,8 +81,7 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
}
_scanQrAndGetPatient(BuildContext context, ScanQrViewModel model) async {
// var result = await BarcodeScanner.scan();
var result="";
var result = (await BarcodeScanner.scan()).rawContent;
if (result != "") {
List<String> listOfParams = result.split(',');
int patientID = 0;

76
lib/util/dr_app_toast_msg.dart
Unescape Escape View File

@ -1,78 +1,26 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:flutter/material.dart';
import 'package:flutter_flexible_toast/flutter_flexible_toast.dart';
import 'package:fluttertoast/fluttertoast.dart';
class DrAppToastMsg {
void showLongToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
toastLength: Toast.LENGTH_LONG,
);
}
static void showSuccesToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
Fluttertoast.showToast(
msg: msg,
toastLength: Toast.LENGTH_SHORT,
gravity: ToastGravity.TOP,
// timeInSecForIosWeb: timeInSeconds,
backgroundColor: Colors.green,
icon: ICON.SUCCESS,
fontSize: 16,
imageSize: 35,
textColor: Colors.white);
textColor: Colors.white,
fontSize: 16);
}
static void showErrorToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
Fluttertoast.showToast(
msg: msg,
toastLength: Toast.LENGTH_SHORT,
toastGravity: ToastGravity.TOP,
gravity: ToastGravity.TOP,
backgroundColor: Colors.red,
icon: ICON.CLOSE,
fontSize: 16,
imageSize: 35,
timeInSeconds: 912,
textColor: Colors.white);
}
static void showShortToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
toastLength: Toast.LENGTH_SHORT,
icon: ICON.INFO,
timeInSeconds: 1);
}
static void showTopShortToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
toastLength: Toast.LENGTH_SHORT,
toastGravity: ToastGravity.TOP,
icon: ICON.WARNING,
timeInSeconds: 1);
}
static void showCenterShortToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
toastLength: Toast.LENGTH_SHORT,
toastGravity: ToastGravity.CENTER,
icon: ICON.WARNING,
timeInSeconds: 1);
}
static void showCenterShortLoadingToast(msg) {
FlutterFlexibleToast.showToast(
message: msg,
toastLength: Toast.LENGTH_LONG,
toastGravity: ToastGravity.BOTTOM,
icon: ICON.LOADING,
radius: 20,
elevation: 10,
textColor: Colors.white,
timeInSeconds: 2);
}
static void cancelToast(msg) {
FlutterFlexibleToast.cancel();
fontSize: 16);
}
}

9
pubspec.yaml
Unescape Escape View File

@ -34,8 +34,9 @@ dependencies:
http: ^0.13.0
provider: ^6.0.1
shared_preferences: ^2.0.6
imei_plugin: ^1.2.0
flutter_flexible_toast: ^0.1.4
# imei_plugin: ^1.2.0
# flutter_flexible_toast: ^0.1.4
fluttertoast: ^8.0.8
local_auth: ^1.1.6
http_interceptor: ^0.4.1
@ -53,7 +54,7 @@ dependencies:
expandable: ^5.0.1
# Qr code Scanner
# barcode_scan_fix: ^1.0.2
barcode_scan2: ^4.1.4
# permissions
permission_handler: ^8.0.1
device_info: ^2.0.2
@ -73,7 +74,7 @@ dependencies:
# Firebase
firebase_messaging: ^10.0.1
# firebase_analytics : ^8.3.4
firebase_analytics : ^8.3.4
#GIF image
flutter_gifimage: ^1.0.1

Write Preview
Loading…
Cancel
Save