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

color changes

Browse Source
master
tahaalam 2 months ago
parent 0626d5e0e1
commit 93a645691a
18 changed files with 122 additions and 108 deletions
Show Stats Download Patch File Download Diff File

5
android/gradle.properties
Unescape Escape View File

@ -1,8 +1,9 @@
org.gradle.jvmargs=-Xmx4096m
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
#android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
android.suppressUnsupportedCompileSdk=33
MAPBOX_USER_NAME = "mapbox"
MAPBOX_DOWNLOADS_TOKEN="sk.eyJ1IjoicndhaWQiLCJhIjoiY2x6NWo0bTMzMWZodzJrcGZpemYzc3Z4dSJ9.uSSZuwNSGCcCdPAiORECmg"
#MAPBOX_DOWNLOADS_TOKEN="pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ"
#MAPBOX_DOWNLOADS_TOKEN="pk.eyJ1IjoicndhaWQiLCJhIjoiY2x5cGo4aHNjMGNsbTJyc2djempobGQxaSJ9.RCaC6WrUt4A4YnZNfxnONQ"
kotlin.jvm.target.validation.mode = IGNORE

2
android/gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -1,6 +1,6 @@
#Mon May 18 15:37:56 AST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

36
android/settings.gradle
Unescape Escape View File

@ -1,17 +1,29 @@
include ':app'
include ':vital-sign-engine'
project(':vital-sign-engine').projectDir = new File('/Users/mohamedmekawy/Documents/Work/DiplomaticQuarter_3.16/packages/vital_sign_camera/android/libs')
pluginManagement {
def flutterSdkPath = {
def properties = new java.util.Properties()
file("local.properties").withInputStream { properties.load(it) }
def sdk = properties.getProperty("flutter.sdk")
assert sdk != null : "flutter.sdk not set in local.properties"
return sdk
}()
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
includeBuild("${flutterSdkPath}/packages/flutter_tools/gradle")
def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
maven { url = uri("https://developer.huawei.com/repo/") }
}
}
plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.9.1" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
id "com.google.gms.google-services" version "4.4.2" apply false
}
include ':app'
include ':vital-sign-engine'
project(':vital-sign-engine').projectDir = new java.io.File('/Users/mohamedmekawy/Documents/Work/DiplomaticQuarter_3.16/packages/vital_sign_camera/android/libs')

2
lib/Constants.dart
Unescape Escape View File

@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
final Color? secondaryColor = Colors.red[800];
final Color? secondaryColor = const Color(0xFF14384B);
final Color? dividerColor = Colors.grey[600];

12
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/cmc_location_page.dart
Unescape Escape View File

@ -24,9 +24,10 @@ import 'package:flutter/material.dart';
// import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart';
import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart';
import 'package:gms_check/gms_check.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps;
import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
// import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:provider/provider.dart';
class CMCLocationPage extends StatefulWidget {
@ -55,11 +56,11 @@ class _CMCLocationPageState extends State<CMCLocationPage> {
);
late gmaps.LatLng currentPostion;
AppSharedPreferences sharedPref = AppSharedPreferences();
late HmsApiAvailability hmsApiAvailability;
// late HmsApiAvailability hmsApiAvailability;
@override
void initState() {
hmsApiAvailability = HmsApiAvailability();
// hmsApiAvailability = HmsApiAvailability();
checkIsHuawei();
appMap = AppMap(
@ -93,10 +94,7 @@ class _CMCLocationPageState extends State<CMCLocationPage> {
}
checkIsHuawei() async {
await hmsApiAvailability!.isHMSAvailable().then((value) {
isHuawei = value == 0 ? true : false;
});
print(isHuawei);
isHuawei = !((await GmsCheck().checkGmsAvailability()) ?? true);
setState(() {});
}

12
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart
Unescape Escape View File

@ -22,9 +22,10 @@ import 'package:flutter/material.dart';
// import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart';
import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart';
import 'package:gms_check/gms_check.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
// import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:provider/provider.dart';
class LocationPage extends StatefulWidget {
@ -59,12 +60,12 @@ class _LocationPageState extends State<LocationPage> {
// Completer<GoogleMapController> mapController = Completer();
late Placemark selectedPlace;
late HmsApiAvailability hmsApiAvailability;
// late HmsApiAvailability hmsApiAvailability;
late ProjectViewModel projectViewModel;
@override
void initState() {
hmsApiAvailability = HmsApiAvailability();
// hmsApiAvailability = HmsApiAvailability();
if (latitude == 0.0 && longitude == 0.0) {
showCurrentLocation = true;
}
@ -237,9 +238,8 @@ class _LocationPageState extends State<LocationPage> {
// isHuawei = await FlutterHmsGmsAvailability.isHmsAvailable;
// print(isHuawei);
// setState(() {});
await hmsApiAvailability.isHMSAvailable().then((value) {
isHuawei = value == 0 ? true : false;
});
isHuawei = !((await GmsCheck().checkGmsAvailability()) ?? true);
print(isHuawei);
setState(() {});
}

11
lib/pages/MyAppointments/widgets/AppointmentActions.dart
Unescape Escape View File

@ -40,7 +40,8 @@ import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profil
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:gms_check/gms_check.dart';
// import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:huawei_map/huawei_map.dart' as hmsMap;
import 'package:intl/intl.dart';
import 'package:map_launcher/map_launcher.dart';
@ -64,7 +65,7 @@ class AppointmentActions extends StatefulWidget {
class _AppointmentActionsState extends State<AppointmentActions> {
List<AppoDetailsButton> appoButtonsList = [];
static bool isHuawei = false;
HmsApiAvailability hmsApiAvailability = HmsApiAvailability();
// HmsApiAvailability hmsApiAvailability = HmsApiAvailability();
@override
void initState() {
@ -508,10 +509,10 @@ class _AppointmentActionsState extends State<AppointmentActions> {
checkIsHuawei() async {
if (Platform.isAndroid) {
await hmsApiAvailability.isHMSAvailable().then((value) {
isHuawei = value == 0 ? true : false;
isHuawei = !((await GmsCheck().checkGmsAvailability()) ?? true);
if(isHuawei){
hmsMap.HuaweiMapInitializer.initializeMap();
});
}
print(isHuawei);
}
}

2
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -405,7 +405,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
sendActivationCode(type) async {
var request = this.getCommonRequest(type: type);
request.sMSSignature = await SMSOTP.getSignature();
request.sMSSignature = "";
GifLoaderDialogUtils.showMyDialog(context);
if (healthId != null || widget.isDubai) {
if (!widget.isDubai) {

14
lib/pages/settings/general_setting.dart
Unescape Escape View File

@ -10,7 +10,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart';
import 'package:screen_brightness/screen_brightness.dart';
// import 'package:screen_brightness/screen_brightness.dart';
class GeneralSettings extends StatefulWidget {
@override
@ -305,12 +305,12 @@ class _GeneralSettings extends State<GeneralSettings> with TickerProviderStateMi
}
setBrightness(double brightness) async {
try {
await ScreenBrightness().setScreenBrightness(brightness);
} catch (e) {
print(e);
throw 'Failed to set brightness';
}
// try {
// await ScreenBrightness().setScreenBrightness(brightness);
// } catch (e) {
// print(e);
// throw 'Failed to set brightness';
// }
}
setVibration(value) {

4
lib/uitl/push-notification-handler.dart
Unescape Escape View File

@ -27,7 +27,7 @@ import 'package:flutter/material.dart';
// import 'package:flutter_ios_voip_kit/flutter_ios_voip_kit.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:get_it/get_it.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
// import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:huawei_push/huawei_push.dart' as h_push;
import 'package:permission_handler/permission_handler.dart';
@ -180,7 +180,7 @@ class PushNotificationHandler {
late BuildContext context;
static final PushNotificationHandler _instance = PushNotificationHandler._internal();
late HmsApiAvailability hmsApiAvailability;
// late HmsApiAvailability hmsApiAvailability;
// final voIPKit = FlutterIOSVoIPKit.instance;

13
lib/widgets/app_map/google_huawei_map.dart
Unescape Escape View File

@ -3,10 +3,10 @@ import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:gms_check/gms_check.dart' show GmsCheck;
import 'package:google_maps_flutter/google_maps_flutter.dart' as googlemap;
// import 'package:flutter_hms_gms_availability/flutter_hms_gms_availability.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:huawei_map/huawei_map.dart' as hmsMap;
class AppMap extends StatefulWidget {
@ -47,20 +47,19 @@ class AppMapState extends State<AppMap> {
Completer<hmsMap.HuaweiMapController> _huaweiMapControllerComp = Completer();
late hmsMap.HuaweiMapController _huaweiMapController;
late HmsApiAvailability hmsApiAvailability;
checkIsHuawei() async {
await hmsApiAvailability.isHMSAvailable().then((value) {
isHuawei = value == 0 ? true : false;
isHuawei = !((await GmsCheck().checkGmsAvailability()) ?? true);
if(isHuawei){
hmsMap.HuaweiMapInitializer.initializeMap();
});
print(isHuawei);
}
setState(() {});
}
@override
void initState() {
hmsApiAvailability = HmsApiAvailability();
if (Platform.isAndroid) checkIsHuawei();
super.initState();
}

2
lib/widgets/avatar/large_avatar.dart
Unescape Escape View File

@ -17,7 +17,7 @@ class LargeAvatar extends StatelessWidget {
LargeAvatar({Key? key, this.name, this.url, this.disableProfileView = false, this.radius = 70.0, this.width = 70, this.height = 60, this.onTap, this.isAppointmentAvatar = false}) : super(key: key);
final String? name;
final Color red = Colors.red;
final Color red = const Color(0xFF14384B);
final String? url;
final bool disableProfileView;
final bool isAppointmentAvatar;

4
lib/widgets/dialogs/select_location_dialog.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class _SelectLocationDialogState extends State<SelectLocationDialog> {
leading: Radio(
value: widget.addresses![index],
groupValue: widget.selectedAddress,
activeColor: Colors.red[800],
activeColor: const Color(0xFF14384B),
onChanged: (value) {
setState(() {
widget.selectedAddress = value;
@ -118,7 +118,7 @@ class _SelectLocationDialogState extends State<SelectLocationDialog> {
fontSize: 14,
fontWeight: FontWeight.w600,
letterSpacing: -0.46,
color: Colors.red,
color: const Color(0xFF14384B),
),
),
),

62
lib/widgets/otp/sms-popup.dart
Unescape Escape View File

@ -9,7 +9,7 @@ import 'package:diplomaticquarterapp/uitl/whatsapp_method_channel.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:provider/provider.dart';
import 'package:sms_otp_auto_verify/sms_otp_auto_verify.dart';
// import 'package:sms_otp_auto_verify/sms_otp_auto_verify.dart';
import '../otp_widget.dart';
@ -103,10 +103,10 @@ class SMSOTP {
child: StatefulBuilder(builder: (context, setState) {
if (displayTime == '') {
startTimer(setState);
if (Platform.isAndroid ) {
if (type == 1) checkSignature();
else if(type == 4) _listenWhatsAppCode();
}
// if (Platform.isAndroid ) {
// if (type == 1) checkSignature();
// else if(type == 4) _listenWhatsAppCode();
// }
}
return Container(
@ -288,26 +288,26 @@ class SMSOTP {
}
}
checkSignature() async {
SmsVerification.startListeningSms().then((message) {
// setState(() {
final intRegex = RegExp(r'\d+', multiLine: true);
var otp = SmsVerification.getCode(message, intRegex);
_pinPutController.text = otp;
onSuccess(otp);
SmsVerification.stopListening();
// });
});
}
// checkSignature() async {
// SmsVerification.startListeningSms().then((message) {
// // setState(() {
// final intRegex = RegExp(r'\d+', multiLine: true);
// var otp = SmsVerification.getCode(message, intRegex);
// _pinPutController.text = otp;
// onSuccess(otp);
// SmsVerification.stopListening();
// // });
// });
// }
void _listenWhatsAppCode(){
WhatsappMethodChannel().startListening().then((message) {
final intRegex = RegExp(r'\d+', multiLine: true);
var otp = SmsVerification.getCode(message, intRegex);
_pinPutController.text = otp;
onSuccess(otp);
});
}
// void _listenWhatsAppCode(){
// WhatsappMethodChannel().startListening().then((message) {
// final intRegex = RegExp(r'\d+', multiLine: true);
// var otp = SmsVerification.getCode(message, intRegex);
// _pinPutController.text = otp;
// onSuccess(otp);
// });
// }
// startLister() {
// var signature = checkSignature();
@ -315,11 +315,11 @@ class SMSOTP {
// print(signature);
// }
static getSignature() async {
if (Platform.isAndroid) {
return await SmsVerification.getAppSignature();
} else {
return null;
}
}
// static getSignature() async {
// if (Platform.isAndroid) {
// return await SmsVerification.getAppSignature();
// } else {
// return null;
// }
// }
}

2
lib/widgets/otp_widget.dart
Unescape Escape View File

@ -60,7 +60,7 @@ class OTPWidget extends StatefulWidget {
this.pinTextAnimatedSwitcherTransition,
this.pinTextAnimatedSwitcherDuration = const Duration(),
this.hasError = false,
this.errorBorderColor = Colors.red,
this.errorBorderColor = const Color(0xFF14384B),
this.onTextChanged,
this.autoFocus = false,
this.focusNode,

16
lib/widgets/pickupLocation/PickupLocationFromMap.dart
Unescape Escape View File

@ -12,10 +12,11 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart';
import 'package:gms_check/gms_check.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as googleMap;
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
import 'package:provider/provider.dart';
class PickupLocationFromMap extends StatefulWidget {
@ -41,7 +42,6 @@ class _PickupLocationFromMapState extends State<PickupLocationFromMap> {
double latitude = 0;
double longitude = 0;
late HmsApiAvailability hmsApiAvailability;
static CameraPosition kGooglePlex = CameraPosition(
target: LatLng(24.126613,45.081137),
@ -51,7 +51,6 @@ class _PickupLocationFromMapState extends State<PickupLocationFromMap> {
@override
void initState() {
if(Platform.isAndroid) {
hmsApiAvailability = HmsApiAvailability();
checkIsHuawei();
}
@ -80,10 +79,13 @@ class _PickupLocationFromMapState extends State<PickupLocationFromMap> {
// isHuawei = await FlutterHmsGmsAvailability.isHmsAvailable;
// print(isHuawei);
// setState(() {});
await hmsApiAvailability.isHMSAvailable().then((value) {
isHuawei = value == 0 ? true : false;
});
print(isHuawei);
isHuawei = !((await GmsCheck().checkGmsAvailability()) ?? true);
// await hmsApiAvailability.isHMSAvailable().then((value) {
// isHuawei = value == 0 ? true : false;
// });
// print(isHuawei);
setState(() {});
}

2
lib/widgets/weather_slider/weather_slider.dart
Unescape Escape View File

@ -11,7 +11,7 @@ class WeatherSlider extends StatelessWidget {
WeatherSlider(this.data, this.projectViewModel);
LinearGradient red = LinearGradient(colors: [Colors.redAccent[100]!, Colors.redAccent]);
LinearGradient red = LinearGradient(colors: [const Color(0xFF14384B), const Color(0xFF14384B)]);
LinearGradient green = LinearGradient(colors: [Colors.greenAccent[100]!, Colors.greenAccent]);
LinearGradient grey = LinearGradient(colors: [Colors.grey[100]!, Colors.grey]);
LinearGradient orange = LinearGradient(colors: [Colors.orangeAccent[100]!, Colors.orange]);

29
pubspec.yaml
Unescape Escape View File

@ -17,7 +17,7 @@ dependencies:
flutter_localizations:
sdk: flutter
webview_flutter: ^4.8.0
webview_flutter: 4.8.0
app_links: ^6.4.0
http: ^1.4.0
connectivity_plus: 6.1.0
@ -40,7 +40,7 @@ dependencies:
maps_launcher: ^3.0.0+1
url_launcher: ^6.3.1
url_launcher_ios: ^6.3.2
shared_preferences: ^2.5.3
shared_preferences: ^2.5.5
# fluttertoast: ^8.0.8
fluttertoast: ^8.2.12
@ -55,24 +55,24 @@ dependencies:
gif_view: ^1.0.3
expandable: ^5.0.1
flutter_charts: ^0.5.2
google_maps_flutter: ^2.12.3
google_maps_flutter: ^2.17.0
# huawei_map: ^6.11.2+304
huawei_map:
git:
url: https://github.com/fleoparra/hms-flutter-plugin.git
path: flutter-hms-map
huawei_push:
git:
url: https://github.com/crasowas/hms-flutter-plugin.git
path: flutter-hms-push
# huawei_push: ^6.12.0+303
# huawei_push:
# git:
# url: https://github.com/crasowas/hms-flutter-plugin.git
# path: flutter-hms-push
huawei_push: ^6.14.0+300
# hijri_gregorian_calendar:
# path: /Users/aamir/StudioProjects/hijri_gregorian_calendar
hijri_gregorian_calendar: ^0.0.3
# Qr code Scanner
location: ^8.0.1
barcode_scan2: ^4.5.1
barcode_scan2: ^4.7.1
flutter_rating_bar: ^4.0.1
syncfusion_flutter_calendar: ^29.2.11+1
# timezone: 0.10.1
@ -87,7 +87,7 @@ dependencies:
hijri: ^3.0.0
flutter_datetime_picker_plus: ^2.1.0
carousel_pro_nullsafety: ^2.0.0
flutter_local_notifications: any
flutter_local_notifications: 21.0.0
device_calendar: ^4.3.3
geolocator: ^14.0.2
geolocator_android: ^5.0.2
@ -95,7 +95,7 @@ dependencies:
jiffy: ^6.2.1
#Flutter WebRTC
screen_brightness: ^2.1.5
# screen_brightness: ^2.1.5
map_launcher: ^3.0.1
flutter_countdown_timer: ^4.1.0
carousel_slider: ^5.0.0
@ -105,7 +105,7 @@ dependencies:
wakelock_plus: ^1.3.2
after_layout: ^1.1.0
cached_network_image: ^3.4.1
flutter_tts: ^4.2.3
flutter_tts: ^4.2.5
flutter_nfc_kit: ^3.6.0
#geofencing: any
@ -116,13 +116,14 @@ dependencies:
youtube_player_flutter: ^9.1.0
# shimmer: ^3.0.0
huawei_hmsavailability: ^6.11.0+301
# huawei_hmsavailability: ^6.11.0+301
gms_check: ^1.0.4
huawei_location: ^6.11.0+301
share_plus: ^11.0.0
auto_size_text: ^3.0.0
equatable: ^2.0.3
wave: ^0.2.0
sms_otp_auto_verify: ^2.2.0
# sms_otp_auto_verify: ^2.2.0
google_api_availability: ^5.0.1
open_filex: ^4.7.0
path_provider: ^2.0.8

Write Preview
Loading…
Cancel
Save