diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a07f7df..1f71421f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -44,6 +44,8 @@ android { targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true + } buildTypes { @@ -63,4 +65,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.google.firebase:firebase-messaging:20.1.0" implementation 'pub.devrel:easypermissions:0.4.0' + + } diff --git a/android/build.gradle b/android/build.gradle index 70b3637d..e2e8a05f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.2' } diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d454..3f45ee5b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,5 @@ -org.gradle.jvmargs=-Xmx1536M + android.enableR8=true android.useAndroidX=true android.enableJetifier=true +org.gradle.jvmargs=-Xmx4608m \ No newline at end of file diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index 03ae9919..3e817878 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -101,7 +101,8 @@ class _SearchByDoctorState extends State { } }).catchError((err) { print(err); - }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }).showProgressBar( + text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); } _onDocTextChanged(content) { diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 7100fa5f..526c0f5b 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -1,4 +1,5 @@ import 'package:connectivity/connectivity.dart'; +import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -8,6 +9,7 @@ import 'app_toast.dart'; AppSharedPreferences sharedPref = new AppSharedPreferences(); class Utils { + // static ProgressDialog pr; ///show custom Error Toast /// [message] to show for user @@ -106,4 +108,34 @@ class Utils { var length = loginType == 1 ? 10 : 7; return "([0-9]{" + length.toString() + "})"; } + + static showProgressDialog(context, [String message = "Loading..."]) async { + // pr = ProgressDialog(context, + // type: ProgressDialogType.Normal, isDismissible: false, showLogs: false); + // pr.style( + // message: message, + // borderRadius: 10.0, + // backgroundColor: Colors.white, + // elevation: 10.0, + // insetAnimCurve: Curves.easeInOut, + // progress: 0.0, + // maxProgress: 100.0, + // progressTextStyle: TextStyle( + // color: Colors.black, fontSize: 13.0, fontWeight: FontWeight.w400), + // messageTextStyle: TextStyle( + // color: Colors.black, fontSize: 19.0, fontWeight: FontWeight.w600)); + + // if (!pr.isShowing()) { + // await pr.show(); + // } else { + // await pr.hide(); + // await pr.show(); + // } + } + + static hideProgressDialog() async { + // if (pr.isShowing()) { + // await pr.hide(); + // } + } } diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index d0633b14..edcc1ae2 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -30,6 +30,7 @@ import 'package:speech_to_text/speech_to_text.dart'; import 'package:diplomaticquarterapp/widgets/robo-search/robosearch.dart'; import 'dart:math'; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; +import 'package:diplomaticquarterapp/routes.dart'; class BottomBarSearch extends StatefulWidget { @override @@ -271,19 +272,8 @@ class _SearchBot extends State { // eventProvider.setValue({"doctor_id": understand}); // break; default: - // { - // if (result['ProjectId'] != null && - // result['ClinicId'] != null && - // result['DoctorId'] == 0) { - // getDoctorsList( - // result['ProjectId'], - // result['ClinicId'], - // context, - // ); + Navigator.of(context).pushNamed(HOME); speak(); - //} - //} - break; } diff --git a/pubspec.yaml b/pubspec.yaml index 6dd0ffd7..2d334225 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: A new Flutter application. version: 1.0.0+1 environment: - sdk: ">=1.19.0 <3.0.0" + sdk: ">=2.2.2 <3.0.0" dependencies: flutter: @@ -67,7 +67,7 @@ dependencies: charts_flutter: ^0.9.0 # Qr code Scanner - barcode_scan: ^3.0.1 + barcode_scan: any # Rating Stars rating_bar: ^0.2.0 diff --git a/speech_to_text/android/gradle/local.properties b/speech_to_text/android/gradle/local.properties index b85628e7..71a0a2e4 100644 --- a/speech_to_text/android/gradle/local.properties +++ b/speech_to_text/android/gradle/local.properties @@ -1,2 +1,3 @@ sdk.dir=/Users/stephen.owens/Library/Android/sdk -flutter.sdk=/Users/stephen.owens/Documents/dev/flutter/sdk/flutter \ No newline at end of file +flutter.sdk=/Users/stephen.owens/Documents/dev/flutter/sdk/flutter +org.gradle.jvmargs=-Xmx1536m -Duser.country=US -Duser.language=en \ No newline at end of file