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

rsg changes

Browse Source
master
tahaalam 2 months ago
parent 4683565d06
commit 0626d5e0e1
44 changed files with 142 additions and 184 deletions
Show Stats Download Patch File Download Diff File

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

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

5
lib/analytics/google-analytics.dart
Unescape Escape View File

@ -28,12 +28,13 @@ var _analytics = FirebaseAnalytics.instance;
_logger(String name, {Map<String, dynamic>? parameters}) async { _logger(String name, {Map<String, dynamic>? parameters}) async {
// return; // return;
Map<String, Object> parameter={};
if (name != null && name.isNotEmpty) { if (name != null && name.isNotEmpty) {
if (name.contains(' ')) name = name.replaceAll(' ', '_'); if (name.contains(' ')) name = name.replaceAll(' ', '_');
// To LowerCase // To LowerCase
if (parameters != null && parameters.isNotEmpty) if (parameters != null && parameters.isNotEmpty)
parameters = parameters.map((key, value) { parameter = parameters.map((key, value) {
final key_ = key.toLowerCase(); final key_ = key.toLowerCase();
var value_ = value; var value_ = value;
if (value is String) value_ = value.toLowerCase(); if (value is String) value_ = value.toLowerCase();
@ -41,7 +42,7 @@ _logger(String name, {Map<String, dynamic>? parameters}) async {
}); });
try { try {
_analytics.logEvent(name: name.trim().toLowerCase(), parameters: parameters).then((value) { _analytics.logEvent(name: name.trim().toLowerCase(), parameters: parameter).then((value) {
// debugPrint('SUCCESS: Google analytics event "$name" sent with parameters $parameters'); // debugPrint('SUCCESS: Google analytics event "$name" sent with parameters $parameters');
}).catchError((error) { }).catchError((error) {
// debugPrint('ERROR: Google analytics event "$name" sent failed'); // debugPrint('ERROR: Google analytics event "$name" sent failed');

1
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
Unescape Escape View File

@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';

9
lib/core/viewModels/project_view_model.dart
Unescape Escape View File

@ -118,11 +118,12 @@ class ProjectViewModel extends BaseViewModel {
ProjectViewModel() { ProjectViewModel() {
try { try {
loadSharedPrefLanguage(); loadSharedPrefLanguage();
subscription = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { subscription = Connectivity().onConnectivityChanged.listen((List<ConnectivityResult> result) {
if (result == ConnectivityResult.mobile) { if (result.contains( ConnectivityResult.mobile)) {
isInternetConnection = true; isInternetConnection = true;
} else if (result == ConnectivityResult.wifi) { } else if (result.contains( ConnectivityResult.wifi)) {
} else if (result == ConnectivityResult.none) { isInternetConnection = true;
} else if (result.contains( ConnectivityResult.none)) {
isInternetConnection = false; isInternetConnection = false;
} }
notifyListeners(); notifyListeners();

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

@ -25,7 +25,7 @@ import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps;
import 'package:google_maps_place_picker_mb/google_maps_place_picker.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'; import 'package:provider/provider.dart';

2
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
Unescape Escape View File

@ -20,7 +20,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmaps;
import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'cmc_location_page.dart'; import 'cmc_location_page.dart';

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

@ -23,7 +23,7 @@ import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker_mb/google_maps_place_picker.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'; import 'package:provider/provider.dart';

2
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
Unescape Escape View File

@ -13,7 +13,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class NewHomeHealthCareStepOnePage extends StatefulWidget { class NewHomeHealthCareStepOnePage extends StatefulWidget {

2
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
Unescape Escape View File

@ -22,7 +22,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker_mb/google_maps_place_picker.dart'; import 'package:google_maps_place_picker_mb_v2/google_maps_place_picker.dart';
import 'location_page.dart'; import 'location_page.dart';

2
lib/pages/DrawerPages/notifications/notifications_page.dart
Unescape Escape View File

@ -118,7 +118,7 @@ class NotificationsPage extends StatelessWidget {
), ),
if (model.notifications[index].messageType == "image") if (model.notifications[index].messageType == "image")
Icon( Icon(
FontAwesomeIcons.image, FontAwesomeIcons.image.data,
color: Color(0xffC9C9C9), color: Color(0xffC9C9C9),
) )
], ],

4
lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
Unescape Escape View File

@ -50,7 +50,7 @@ class RRTLogListItemState extends State<RRTLogListItem> {
_color = Color(0xff359846); _color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) { } else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected //cancel // Rejected
_color = Color(0xffD02127); _color = Color(0xFF14384B);
} }
return BaseView<RRTViewModel>( return BaseView<RRTViewModel>(
onModelReady: (vm) => { onModelReady: (vm) => {
@ -155,7 +155,7 @@ class RRTLogListItemState extends State<RRTLogListItem> {
child: Container( child: Container(
padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14), padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffD02127), color: Color(0xFF14384B),
border: Border.all(color: Colors.white, width: 1), border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),

4
lib/pages/feedback/send_feedback_page.dart
Unescape Escape View File

@ -282,7 +282,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Icon(FontAwesomeIcons.paperclip), Icon(FontAwesomeIcons.paperclip.data),
SizedBox( SizedBox(
width: 8, width: 8,
), ),
@ -298,7 +298,7 @@ class _SendFeedbackPageState extends State<SendFeedbackPage> {
}); });
}, },
child: Icon( child: Icon(
FontAwesomeIcons.trashAlt, FontAwesomeIcons.trashAlt.data,
color: Colors.red[300], color: Colors.red[300],
)) ))
], ],

7
lib/pages/login/forgot-password.dart
Unescape Escape View File

@ -86,20 +86,19 @@ class _ForgotPassword extends State<ForgotPassword> {
}); });
}), }),
const SizedBox(height: 12.0), const SizedBox(height: 12.0),
CloudFlareTurnstile( CloudflareTurnstile(
siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', siteKey: '0x4AAAAAAAkmbvEy63pcxBBt',
baseUrl: BASE_URL, baseUrl: BASE_URL,
options: _options, options: _options,
controller: _controller, controller: _controller,
onTokenRecived: (token) { onTokenReceived: (token) {
setState(() { setState(() {
print("Cloudflare token: $token"); print("Cloudflare token: $token");
_token = token; _token = token;
}); });
}, },
onTokenExpired: () {}, onTokenExpired: () {},
mode: TurnstileMode.managed, onError: (error) {
errorBuilder: (context, error) {
return Text(error.message); return Text(error.message);
}, },
), ),

2
lib/pages/medical/my_trackers/widget/CurvedChartBloodPressure.dart
Unescape Escape View File

@ -112,7 +112,7 @@ class CurvedChartBloodPressure extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/medical/my_trackers/widget/LineChartCurved.dart
Unescape Escape View File

@ -161,7 +161,7 @@ class LineChartCurved extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/medical/my_trackers/widget/MonthCurvedChartBloodPressure.dart
Unescape Escape View File

@ -111,7 +111,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/medical/my_trackers/widget/MonthLineChartCurved.dart
Unescape Escape View File

@ -85,7 +85,7 @@ class MonthLineChartCurved extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/medical/vital_sign/LineChartCurved.dart
Unescape Escape View File

@ -99,7 +99,7 @@ class LineChartCurved extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/medical/vital_sign/LineChartCurvedBloodPressure.dart
Unescape Escape View File

@ -140,7 +140,7 @@ class LineChartCurvedBloodPressure extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor: (tooltip)=>Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

2
lib/pages/pharmacies/compare.dart
Unescape Escape View File

@ -128,7 +128,7 @@ class _slideDetailState extends State<slideDetail> {
child: Align( child: Align(
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: IconButton( child: IconButton(
icon: Icon(FontAwesomeIcons.trashAlt, size: 15), icon: Icon(FontAwesomeIcons.trashAlt.data, size: 15),
onPressed: () { onPressed: () {
setState(() { setState(() {
Provider.of<CompareList>(context, listen: false).deleteItem(widget.data[index].id); Provider.of<CompareList>(context, listen: false).deleteItem(widget.data[index].id);

2
lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
Unescape Escape View File

@ -125,7 +125,7 @@ class ProductAppBar extends StatelessWidget implements PreferredSizeWidget {
width: 10, width: 10,
), ),
IconWithBg( IconWithBg(
icon: FontAwesomeIcons.ellipsisV, icon: FontAwesomeIcons.ellipsisV.data,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
onPress: () { onPress: () {
settingModalBottomSheet(context); settingModalBottomSheet(context);

2
lib/pages/pharmacies/widgets/ProductOrderItem.dart
Unescape Escape View File

@ -44,7 +44,7 @@ class _ProductOrderItemState extends State<ProductOrderItem> {
leading: InkWell( leading: InkWell(
onTap: () => {widget.deleteCartItems!()}, onTap: () => {widget.deleteCartItems!()},
child: Icon( child: Icon(
FontAwesomeIcons.trashAlt, FontAwesomeIcons.trashAlt.data,
size: 15, size: 15,
color: Colors.grey.shade700, color: Colors.grey.shade700,
), ),

3
lib/pages/videocall-webrtc-rnd/js_wrapper/multistreammixer-wrapper.dart
Unescape Escape View File

@ -1,6 +1,7 @@
@JS() @JS()
library streammixer.js; library streammixer.js;
import 'package:js/js.dart'; import 'dart:js_interop';
@JS('multiStreamsMixerFlutter') @JS('multiStreamsMixerFlutter')

2
lib/services/permission/permission_service.dart
Unescape Escape View File

@ -7,7 +7,7 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:geolocator/geolocator.dart' as geo; import 'package:geolocator/geolocator.dart' as geo;
class PermissionService extends BaseService { class PermissionService extends BaseService {
final LocalStorage storage = new LocalStorage("permission"); final LocalStorage storage = localStorage;
geo.LocationPermission? locationPermission; geo.LocationPermission? locationPermission;
AppGlobal appGlobal = new AppGlobal(); AppGlobal appGlobal = new AppGlobal();

1
lib/splashPage.dart
Unescape Escape View File

@ -18,6 +18,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart'; import 'package:flutter_zoom_videosdk/native/zoom_videosdk.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'core/service/AuthenticatedUserObject.dart'; import 'core/service/AuthenticatedUserObject.dart';

2
lib/theme/colors.dart
Unescape Escape View File

@ -10,7 +10,7 @@ class CustomColors {
static const Color darkGrey = Color(0xFF222222); static const Color darkGrey = Color(0xFF222222);
static const Color black = Color(0xFF141414); static const Color black = Color(0xFF141414);
static const Color white = Color(0xFFFFFFFF); static const Color white = Color(0xFFFFFFFF);
static const Color accentColor = Color(0xFFD02127); static const Color accentColor = Color(0xFF14384B);
static const Color lightGreyColor = Color(0xFFE2E2E2); static const Color lightGreyColor = Color(0xFFE2E2E2);
static const Color devider = Color(0xFFE5E5E5); static const Color devider = Color(0xFFE5E5E5);
static const Color darkGreyColor = Color(0xFFC9C9C9); static const Color darkGreyColor = Color(0xFFC9C9C9);

2
lib/theme/theme_value.dart
Unescape Escape View File

@ -120,7 +120,7 @@ bwThemes({fontName}) {
// subtitle1: TextStyle(color: Colors.red[900]), // subtitle1: TextStyle(color: Colors.red[900]),
), ),
tabBarTheme: TabBarTheme(labelColor: Colors.red[900]), tabBarTheme: TabBarThemeData(labelColor: Colors.red[900]),
disabledColor: Colors.grey[800], disabledColor: Colors.grey[800],
// errorColor: Color.fromRGBO(235, 80, 60, 1.0), // errorColor: Color.fromRGBO(235, 80, 60, 1.0),

6
lib/uitl/LocalNotification.dart
Unescape Escape View File

@ -32,7 +32,7 @@ class LocalNotification {
var initializationSettingsIOS = DarwinInitializationSettings(); var initializationSettingsIOS = DarwinInitializationSettings();
var initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsIOS); var initializationSettings = InitializationSettings(android: initializationSettingsAndroid, iOS: initializationSettingsIOS);
await flutterLocalNotificationsPlugin.initialize( await flutterLocalNotificationsPlugin.initialize(
initializationSettings, settings: initializationSettings,
onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) { onDidReceiveNotificationResponse: (NotificationResponse notificationResponse) {
switch (notificationResponse.notificationResponseType) { switch (notificationResponse.notificationResponseType) {
case NotificationResponseType.selectedNotification: case NotificationResponseType.selectedNotification:
@ -112,7 +112,7 @@ class LocalNotification {
); );
var iOSPlatformChannelSpecifics = DarwinNotificationDetails(); var iOSPlatformChannelSpecifics = DarwinNotificationDetails();
var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics); var platformChannelSpecifics = NotificationDetails(android: androidPlatformChannelSpecifics, iOS: iOSPlatformChannelSpecifics);
await flutterLocalNotificationsPlugin.show(25613, title, subtitle, platformChannelSpecifics, payload: payload).catchError((err) { await flutterLocalNotificationsPlugin.show(id:25613, title:title, body:subtitle, notificationDetails:platformChannelSpecifics, payload: payload).catchError((err) {
print(err); print(err);
}); });
}); });
@ -182,7 +182,7 @@ class LocalNotification {
} }
Future cancelNotification() async { Future cancelNotification() async {
await flutterLocalNotificationsPlugin.cancel(0); await flutterLocalNotificationsPlugin.cancel(id:0);
} }
Future cancelAllNotifications() async { Future cancelAllNotifications() async {

2
lib/uitl/app_toast.dart
Unescape Escape View File

@ -70,7 +70,7 @@ class AppToast {
child: toast, child: toast,
gravity: ToastGravity.TOP, gravity: ToastGravity.TOP,
toastDuration: Duration(seconds: timeInSeconds), toastDuration: Duration(seconds: timeInSeconds),
positionedToastBuilder: (context, child) { positionedToastBuilder: (context, child,_) {
return Positioned(top: 50, left: 10, right: 10, child: child); return Positioned(top: 50, left: 10, right: 10, child: child);
}); });
// Fluttertoast.showToast(msg: message, toastLength: toastLength, gravity: toastGravity, timeInSecForIosWeb: timeInSeconds, backgroundColor: Colors.red, textColor: textColor, fontSize: fontSize); // Fluttertoast.showToast(msg: message, toastLength: toastLength, gravity: toastGravity, timeInSecForIosWeb: timeInSeconds, backgroundColor: Colors.red, textColor: textColor, fontSize: fontSize);

4
lib/uitl/utils.dart
Unescape Escape View File

@ -105,8 +105,8 @@ class Utils {
static Future<bool> checkConnection({bool bypassConnectionCheck = false}) async { static Future<bool> checkConnection({bool bypassConnectionCheck = false}) async {
if (bypassConnectionCheck) return true; if (bypassConnectionCheck) return true;
//return true; //return true;
ConnectivityResult connectivityResult = await (Connectivity().checkConnectivity()); List<ConnectivityResult> connectivityResult = await (Connectivity().checkConnectivity());
if ((connectivityResult == ConnectivityResult.mobile) || (connectivityResult == ConnectivityResult.wifi)) { if ((connectivityResult.contains(ConnectivityResult.mobile) ) || (connectivityResult.contains(ConnectivityResult.wifi))) {
return true; return true;
} else { } else {
return false; return false;

2
lib/widgets/Loader/gif_loader_container.dart
Unescape Escape View File

@ -19,7 +19,7 @@ class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProv
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
try { try {
controller = GifController(autoPlay: true, onFinish: () {}, loop: true); controller = GifController()..init(autoPlay: true, onFinish: () {}, loop: true);
// controller.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true); // controller.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
} catch (ex) {} } catch (ex) {}
}); });

4
lib/widgets/buttons/defaultButton.dart
Unescape Escape View File

@ -64,14 +64,14 @@ class DefaultButton extends StatelessWidget {
child: Text( child: Text(
"$count", "$count",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xffD02127), letterSpacing: -0.6), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w700, color: Color(0xFF14384B), letterSpacing: -0.6),
), ),
), ),
) )
], ],
), ),
style: TextButton.styleFrom( style: TextButton.styleFrom(
backgroundColor: color ?? const Color(0xffD02127), backgroundColor: color ?? const Color(0xFF14384B),
disabledForegroundColor: disabledColor, disabledForegroundColor: disabledColor,
disabledBackgroundColor: disabledColor, disabledBackgroundColor: disabledColor,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(

2
lib/widgets/charts/show_chart.dart
Unescape Escape View File

@ -101,7 +101,7 @@ class ShowChart extends StatelessWidget {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor:(touchedSpot) => Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,

4
lib/widgets/data_display/medical/LabResult/LineChartCurved.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class LineChartCurvedState extends State<LineChartCurved> {
return LineChartData( return LineChartData(
lineTouchData: LineTouchData( lineTouchData: LineTouchData(
touchTooltipData: LineTouchTooltipData( touchTooltipData: LineTouchTooltipData(
tooltipBgColor: Colors.white, getTooltipColor:(tooltip)=> Colors.white,
), ),
touchCallback: (touchEvent, LineTouchResponse? touchResponse) {}, touchCallback: (touchEvent, LineTouchResponse? touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,
@ -219,7 +219,7 @@ class LineChartCurvedState extends State<LineChartCurved> {
spots: spots, spots: spots,
isCurved: true, isCurved: true,
//preventCurveOverShooting : true, //preventCurveOverShooting : true,
color: Color(0xffD02127), color: Color(0xFF14384B),
barWidth: 1.5, barWidth: 1.5,
isStrokeCapRound: true, isStrokeCapRound: true,
dotData: FlDotData( dotData: FlDotData(

6
lib/widgets/data_display/medical/doctor_card.dart
Unescape Escape View File

@ -102,7 +102,7 @@ class DoctorCard extends StatelessWidget {
: isLiveCareAppointment != null && isLiveCareAppointment == true : isLiveCareAppointment != null && isLiveCareAppointment == true
? Color(0xff2E303A) ? Color(0xff2E303A)
: isInOutPatient != null && isInOutPatient == false : isInOutPatient != null && isInOutPatient == false
? Color(0xffD02127) ? Color(0xFF14384B)
: Color(0xffa9a089), : Color(0xffa9a089),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: projectViewModel!.isArabic ? Radius.circular(0) : Radius.circular(10), topLeft: projectViewModel!.isArabic ? Radius.circular(0) : Radius.circular(10),
@ -238,7 +238,7 @@ class DoctorCard extends StatelessWidget {
return time != null return time != null
? Text( ? Text(
"${time.days ?? 0}:${time.hours ?? 0}:${time.min}:${time.sec}", "${time.days ?? 0}:${time.hours ?? 0}:${time.min}:${time.sec}",
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48, height: 18 / 12), style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.48, height: 18 / 12),
) )
: Container(); : Container();
}, },
@ -330,7 +330,7 @@ class DoctorCard extends StatelessWidget {
} else if (sickLeaveStatus == 2) { } else if (sickLeaveStatus == 2) {
statusColor = Color(0xff359846); statusColor = Color(0xff359846);
} else if (sickLeaveStatus == 3) { } else if (sickLeaveStatus == 3) {
statusColor = Color(0xffD02127); statusColor = Color(0xFF14384B);
} else { } else {
statusColor = Colors.white; statusColor = Colors.white;
} }

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

@ -30,7 +30,7 @@ class HabibLogoWidget extends StatelessWidget {
), ),
Text( Text(
TranslationBase.of(context).patientApp, TranslationBase.of(context).patientApp,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.72), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.72),
), ),
SizedBox(height: 2), SizedBox(height: 2),
], ],

2
lib/widgets/new_design/my_tab_view.dart
Unescape Escape View File

@ -36,7 +36,7 @@ class MyTabView extends StatelessWidget {
Container( Container(
margin: EdgeInsets.only(top: 13), margin: EdgeInsets.only(top: 13),
height: 3, height: 3,
color: value == groupValue ? Color(0xffD02127) : Colors.transparent, color: value == groupValue ? Color(0xFF14384B) : Colors.transparent,
) )
], ],
), ),

2
lib/widgets/others/app_expandable_notifier.dart
Unescape Escape View File

@ -219,7 +219,7 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
FontWeight.w700, FontWeight.w700,
color: widget.isHMC color: widget.isHMC
? Color(0xFF40ACC9) ? Color(0xFF40ACC9)
: Color(0xFFD02127), : Color(0xFF14384B),
letterSpacing: -1.44, letterSpacing: -1.44,
height: 25 / 24), height: 25 / 24),
), ),

2
lib/widgets/others/app_scaffold_widget.dart
Unescape Escape View File

@ -535,7 +535,7 @@ class AppBarWidgetState extends State<AppBarWidget> {
: Container(), : Container(),
if (widget.showHomeAppBarIcon!) if (widget.showHomeAppBarIcon!)
IconButton( IconButton(
icon: Icon(FontAwesomeIcons.home), icon: Icon(FontAwesomeIcons.home.data),
color: Colors.white, color: Colors.white,
onPressed: () { onPressed: () {
Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route<dynamic> r) => false); Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route<dynamic> r) => false);

2
lib/widgets/others/not_auh_page.dart
Unescape Escape View File

@ -114,7 +114,7 @@ class _NotAutPageState extends State<NotAutPage> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48),
), ),
style: TextButton.styleFrom( style: TextButton.styleFrom(
backgroundColor: Color(0xffD02127), backgroundColor: Color(0xFF14384B),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
), ),

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

@ -175,7 +175,7 @@ class SMSOTP {
children: <TextSpan>[ children: <TextSpan>[
TextSpan( TextSpan(
text: displayTime, text: displayTime,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.48), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xFF14384B), letterSpacing: -0.48),
), ),
], ],
), ),

2
lib/widgets/pharmacy/product_tile.dart
Unescape Escape View File

@ -177,7 +177,7 @@ class productTile extends StatelessWidget {
child: Column( child: Column(
children: [ children: [
IconButton( IconButton(
icon: Icon(FontAwesomeIcons.trashAlt, size: 15), icon: Icon(FontAwesomeIcons.trashAlt.data, size: 15),
onPressed: () { onPressed: () {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
// deleteFromWishlistFunction(productID); // deleteFromWishlistFunction(productID);

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

@ -14,7 +14,7 @@ import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as googleMap; import 'package:google_maps_flutter/google_maps_flutter.dart' as googleMap;
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker_mb/google_maps_place_picker.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'; import 'package:provider/provider.dart';

206
pubspec.yaml
Unescape Escape View File

@ -1,201 +1,157 @@
name: diplomaticquarterapp name: diplomaticquarterapp
description: A new Flutter application. description: A new Flutter application.
version: 4.6.014+1 #version: 4.6.030+1
version: 4.6.0984+40500984
environment: environment:
sdk: ">=3.0.0 <3.13.0" # sdk: ">=3.0.0 <3.13.0"
sdk: ">=3.6.0 <4.0.0"
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
# Localizations # Localizations
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
# intl: ^0.18.1
intl: ^0.19.0
# webview_flutter: ^2.0.4
webview_flutter: ^4.8.0 webview_flutter: ^4.8.0
app_links: ^6.4.0
# http client http: ^1.4.0
http: ^0.13.4 connectivity_plus: 6.1.0
#connectivity: ^3.0.6
connectivity_plus: ^5.0.1
async: ^2.8.1 async: ^2.8.1
audio_wave: ^0.1.4 audio_wave: ^0.1.4
# audio_session: ^0.1.13
# State Management
provider: ^6.0.5 provider: ^6.0.5
#Dependency Injection #Dependency Injection
get_it: ^7.2.0 get_it: ^8.0.3
health: ^13.1.1
#Google Fit & Apple HealthKit fl_chart: ^1.0.0
# health: ^3.0.3 camera: ^0.11.2
health: ^11.1.0 permission_handler: ^12.0.0+1
# pedometer: ^4.0.2
#chart
fl_chart: ^0.64.0
#Camera Preview
camera: ^0.10.1
# Permissions
permission_handler: ^11.1.0
# Flutter Html View
flutter_html: ^3.0.0-beta.2 flutter_html: ^3.0.0-beta.2
flutter_widget_from_html: ^0.17.0
flutter_widget_from_html: ^0.15.3
# Pagnation # Pagnation
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
# Native
local_auth: ^2.1.7 local_auth: ^2.1.7
localstorage: ^4.0.0+1 localstorage: ^6.0.0
maps_launcher: ^2.0.1 maps_launcher: ^3.0.0+1
# url_launcher: ^6.0.15
url_launcher: ^6.3.1 url_launcher: ^6.3.1
url_launcher_ios: ^6.3.2 url_launcher_ios: ^6.3.2
shared_preferences: ^2.0.0 shared_preferences: ^2.5.3
# flutter_flexible_toast: ^0.1.4 # fluttertoast: ^8.0.8
fluttertoast: ^8.0.8 fluttertoast: ^8.2.12
firebase_messaging: 14.1.0
firebase_analytics: ^10.0.5
# Progress bar
flutter_progress_hud: ^2.0.2 flutter_progress_hud: ^2.0.2
percent_indicator: ^4.2.3 percent_indicator: ^4.2.3
# Icons # Icons
font_awesome_flutter: any font_awesome_flutter: any
cupertino_icons: ^1.0.0 cupertino_icons: ^1.0.0
image_picker: ^1.1.2
# Image Attachments
image_picker: ^1.0.4
#GIF image
# flutter_gifimage: ^1.0.1
#flutter_gif: any
photo_view: any photo_view: any
gif_view: ^0.3.1 gif_view: ^1.0.3
# flutter_webrtc: any
# UI Reqs
expandable: ^5.0.1 expandable: ^5.0.1
# charts
flutter_charts: ^0.5.2 flutter_charts: ^0.5.2
google_maps_flutter: ^2.1.1 google_maps_flutter: ^2.12.3
# huawei_map: ^6.11.2+304
# Huawei huawei_map:
huawei_map: ^6.11.0+304 git:
huawei_push: ^6.5.0+300 url: https://github.com/fleoparra/hms-flutter-plugin.git
path: flutter-hms-map
# Qr code Scanner TODO fix it huawei_push:
location: ^5.0.3 git:
barcode_scan2: 4.3.2 url: https://github.com/crasowas/hms-flutter-plugin.git
path: flutter-hms-push
# Rating Stars # huawei_push: ^6.12.0+303
# 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
flutter_rating_bar: ^4.0.1 flutter_rating_bar: ^4.0.1
syncfusion_flutter_calendar: ^29.2.11+1
# Calendar # timezone: 0.10.1
# syncfusion_flutter_calendar: ^23.1.42
syncfusion_flutter_calendar: ^24.1.47
# SVG Images # SVG Images
flutter_svg: ^2.0.8 flutter_svg: ^2.0.8
#Calendar Events
manage_calendar_events: 2.0.3 manage_calendar_events: 2.0.3
# icalendar_plus: ^0.0.6
#InAppBrowser
flutter_inappwebview: ^6.1.5 flutter_inappwebview: ^6.1.5
#Circular progress bar for reverse timer
circular_countdown_timer: ^0.2.0 circular_countdown_timer: ^0.2.0
just_audio: ^0.10.4
#Just Audio to play ringing for incoming video call
just_audio: ^0.9.30
#hijri
hijri: ^3.0.0 hijri: ^3.0.0
#datetime_picker
flutter_datetime_picker_plus: ^2.1.0 flutter_datetime_picker_plus: ^2.1.0
carousel_pro_nullsafety: ^2.0.0 carousel_pro_nullsafety: ^2.0.0
flutter_local_notifications: any flutter_local_notifications: any
device_calendar: ^4.3.3 device_calendar: ^4.3.3
geolocator: ^9.0.2 geolocator: ^14.0.2
geocoding: ^2.0.1 geolocator_android: ^5.0.2
geocoding: ^4.0.0
jiffy: ^6.2.1 jiffy: ^6.2.1
#Flutter WebRTC #Flutter WebRTC
#flutter_webrtc: ^0.9.7 screen_brightness: ^2.1.5
screen_brightness: ^0.2.2+1
google_maps_place_picker_mb: ^3.0.0
map_launcher: ^3.0.1 map_launcher: ^3.0.1
flutter_countdown_timer: ^4.1.0 flutter_countdown_timer: ^4.1.0
carousel_slider: ^5.0.0 carousel_slider: ^5.0.0
#Dependencies for video call implementation #Dependencies for video call implementation
native_device_orientation: ^1.0.0 native_device_orientation: ^2.0.3
# wakelock: ^0.6.2 # wakelock: ^0.6.2
wakelock_plus: ^1.1.4 wakelock_plus: ^1.3.2
after_layout: ^1.1.0 after_layout: ^1.1.0
cached_network_image: ^3.3.0 cached_network_image: ^3.4.1
flutter_tts: ^3.6.1 flutter_tts: ^4.2.3
# vibration: ^1.7.3 flutter_nfc_kit: ^3.6.0
flutter_nfc_kit: ^3.3.1
#geofencing: any
speech_to_text: ^6.1.1
#geofencing: any
speech_to_text: ^7.2.0
in_app_update: ^4.2.2 in_app_update: ^4.2.2
in_app_review: ^2.0.10
in_app_review: ^2.0.3
badges: ^3.1.2 badges: ^3.1.2
# flutter_app_icon_badge: ^2.0.0
# dropdown_search: 5.0.6
youtube_player_flutter: ^9.1.0 youtube_player_flutter: ^9.1.0
# shimmer: ^3.0.0 # shimmer: ^3.0.0
# carousel_slider: ^4.0.0
# flutter_staggered_grid_view: ^0.7.0
huawei_hmsavailability: ^6.11.0+301 huawei_hmsavailability: ^6.11.0+301
huawei_location: ^6.11.0+301 huawei_location: ^6.11.0+301
share_plus: ^10.0.2 share_plus: ^11.0.0
# Marker Animation
auto_size_text: ^3.0.0 auto_size_text: ^3.0.0
equatable: ^2.0.3 equatable: ^2.0.3
wave: ^0.2.0 wave: ^0.2.0
sms_otp_auto_verify: ^2.1.0 sms_otp_auto_verify: ^2.2.0
# flutter_ios_voip_kit: ^0.1.0 google_api_availability: ^5.0.1
google_api_availability: ^4.0.0 open_filex: ^4.7.0
open_filex: ^4.3.2
path_provider: ^2.0.8 path_provider: ^2.0.8
amazon_payfort: ^1.1.3 amazon_payfort: ^1.1.4
logger: ^2.0.2+1 logger: ^2.0.2+1
network_info_plus: any network_info_plus: any
flutter_zoom_videosdk: 1.12.10 flutter_zoom_videosdk: 1.12.10
dart_jsonwebtoken: ^2.14.0 dart_jsonwebtoken: ^3.2.0
win32: ^5.5.4 win32: ^5.5.4
firebase_crashlytics: ^4.3.8
firebase_crashlytics: ^3.0.0 firebase_messaging: ^15.2.8
firebase_analytics: ^11.5.1
cloudflare_turnstile: ^2.0.1 cloudflare_turnstile: ^3.2.0
app_links: ^6.4.0 device_info_plus: ^11.5.0
device_info_plus: ^10.1.2 lottie: ^3.3.1
# app_links: ^6.4.0 google_fonts: ^6.2.1
# vital_sign_camera:
# path: ./packages/vital_sign_camera google_maps_place_picker_mb_v2: ^1.0.1
# vital_sign_camera:
# path: ./packages/vital_sign_camera
readmore: ^3.0.0
dependency_overrides: dependency_overrides:
intl: ^0.20.2
flutter_plugin_android_lifecycle: 2.0.27
image_picker_android: 0.8.12+22
video_player_android: 2.8.10
timezone: ^0.10.1
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
@ -270,9 +226,9 @@ flutter:
# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.eot
# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf # - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.otf
- asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf - asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf
# - asset: assets/fonts/ar/Cairo-Light/Cairo-Light.woff
weight: 400 weight: 400
- asset: assets/fonts/ar/Cairo-Regular/Cairo-Regular.ttf
weight: 500
- asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.eot
- asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.otf - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.otf
- asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.ttf - asset: assets/fonts/ar/Cairo-Bold/Cairo-Bold.ttf

Write Preview
Loading…
Cancel
Save