fix helper

dev_v2.8_reverting
Elham Rababh 4 years ago
parent a623f5418e
commit ed4f949053

@ -10,9 +10,19 @@ import 'package:flutter/services.dart';
class VideoChannel{
/// channel name
static const _channel = const MethodChannel("Dr.cloudSolution/videoCall");
static openVideoCallScreen({kApiKey, kSessionId, kToken, callDuration, warningDuration,int vcId,String tokenID,
String generalId,int doctorId, String patientName, bool isRecording = false, Function() onCallEnd ,
Function(SessionStatusModel sessionStatusModel) onCallNotRespond ,Function(String error) onFailure, VoidCallback onCallConnected, VoidCallback onCallDisconnected}) async {
static openVideoCallScreen(
{kApiKey,
kSessionId,
kToken,
callDuration,
warningDuration,
int? vcId,
String? tokenID,
String? generalId,
int? doctorId,
required String patientName, bool isRecording = false, Function()? onCallEnd,
Function(SessionStatusModel sessionStatusModel)? onCallNotRespond,
Function(String error)? onFailure, VoidCallback? onCallConnected, VoidCallback? onCallDisconnected}) async {
onCallConnected = onCallConnected ?? (){};
onCallDisconnected = onCallDisconnected ?? (){};
@ -20,10 +30,10 @@ class VideoChannel{
try {
_channel.setMethodCallHandler((call) {
if(call.method == 'onCallConnected'){
onCallConnected();
onCallConnected!();
}
if(call.method == 'onCallDisconnected'){
onCallDisconnected();
onCallDisconnected!();
}
return true as dynamic;
});
@ -44,16 +54,15 @@ class VideoChannel{
"isRecording": isRecording,
},
);
if(result['callResponse'] == 'CallEnd') {
onCallEnd();
if (result['callResponse'] == 'CallEnd') {
onCallEnd!();
} else {
SessionStatusModel sessionStatusModel = SessionStatusModel.fromJson(
Platform.isIOS ? result['sessionStatus'] : json.decode(result['sessionStatus']));
onCallNotRespond!(sessionStatusModel);
}
else {
SessionStatusModel sessionStatusModel = SessionStatusModel.fromJson(Platform.isIOS ?result['sessionStatus'] :json.decode(result['sessionStatus']));
onCallNotRespond(sessionStatusModel);
}
} catch (e) {
onFailure(e.toString());
onFailure!(e.toString());
}
}

@ -48,7 +48,7 @@ class Helpers {
actions: [
AppButton(
onPressed: okFunction(),
title: TranslationBase.of(context).noteConfirm,
title: TranslationBase.of(context).noteConfirm??"",
fontColor: Colors.white,
color: AppGlobal.appGreenColor,
),
@ -56,9 +56,9 @@ class Helpers {
onPressed: () {
Navigator.of(context).pop();
},
title: TranslationBase.of(context).cancel,
title: TranslationBase.of(context).cancel??"",
fontColor: Colors.white,
color: Colors.red[600],
color: Colors.red[600]!,
),
],
),
@ -87,15 +87,14 @@ class Helpers {
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
CupertinoButton(
child: Text(TranslationBase.of(context).cancel,
style: textStyle(context)),
child: Text(TranslationBase.of(context).cancel ?? "", style: textStyle(context)),
onPressed: () {
Navigator.pop(context);
},
),
CupertinoButton(
child: Text(
TranslationBase.of(context).done,
TranslationBase.of(context).done ?? "",
style: textStyle(context),
),
onPressed: () {
@ -328,140 +327,4 @@ class Helpers {
? 8
: 6);
}
static getLabelFromKPI(String kpi) {
if (kpi.indexOf("(") > -1 && kpi.indexOf(")") > -1)
return kpi.substring(kpi.indexOf("(") + 1, kpi.indexOf(")"));
else
return '';
}
static getNameFromKPI(String kpi) {
if (kpi.indexOf("(") > -1)
return kpi.substring(0, kpi.indexOf("("));
else
return kpi;
}
static getBoxTabsBoxDecoration(
{bool isFirst = false,
bool isMiddle = false,
bool isLast = false,
bool isActive = false,
double radius = 6.0, ProjectViewModel projectViewModel}) {
return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.only(
topRight: projectViewModel.isArabic?Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0):Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
topLeft: projectViewModel.isArabic? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0):Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0),
bottomRight: projectViewModel.isArabic? Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0): Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0),
bottomLeft:projectViewModel.isArabic? Radius.circular(isActive
? isFirst || isMiddle
? radius
: 0
: 0): Radius.circular(isActive
? isLast || isMiddle
? radius
: 0
: 0)),
);
}
static getBgTabColor() {
return Color(0xFFEAEAEA);
}
static getTabText({
String title,
bool isActive = false,
}) {
return AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.8,
color: isActive ? Colors.white : AppGlobal.appTextColor,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
);
}
static getTabHeight(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
return screenSize.height * 0.07;
}
static getTabCounter({bool isActive: false, int counter}) {
return Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : AppGlobal.appRedColor,
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : AppGlobal.appRedColor,
fontWeight: FontWeight.w700,
),
),
),
);
}
static String convertToTitleCase(String text) {
if (text == null) {
return null;
}
if (text.length <= 1) {
return text.toUpperCase();
}
// Split string into multiple words
final List<String> words = text.split(' ');
// Capitalize first letter of each words
final capitalizedWords = words.map((word) {
if (word.trim().isNotEmpty) {
final String firstLetter = word.trim().substring(0, 1).toUpperCase();
final String remainingLetters = word.trim().substring(1).toLowerCase();
return '$firstLetter$remainingLetters';
}
return '';
});
// Join/Merge all words back to one String
return capitalizedWords.join(' ');
}
}

@ -42,7 +42,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
{widget.authenticateUser!(AuthMethodTypes.WhatsApp, true)},
label: TranslationBase
.of(context)
.verifyWith+ TranslationBase.of(context).verifyWhatsApp,
.verifyWith!+TranslationBase.of(context)!.verifyWhatsApp!,
);
break;
case AuthMethodTypes.SMS:
@ -51,7 +51,7 @@ class _VerificationMethodsListState extends State<VerificationMethodsList> {
onTap: () => {widget.authenticateUser!(AuthMethodTypes.SMS, true)},
label:TranslationBase
.of(context)
.verifyWith+ TranslationBase.of(context).verifySMS,
.verifyWith+ TranslationBase.of(context)!.verifySMS,
);
break;
case AuthMethodTypes.Fingerprint:

Loading…
Cancel
Save