Merge branch 'master_new_changes' into aamir_dev

# Conflicts:
#	lib/services/payments_service.dart
#	pubspec.yaml
aamir_dev
Aamir 1 year ago
commit 382207d8b2

@ -48,6 +48,7 @@ class AppDependencies {
injector.registerSingleton<BranchRepo>(() => BranchRepoImp()); injector.registerSingleton<BranchRepo>(() => BranchRepoImp());
injector.registerSingleton<ShippingRepo>(() => ShippingRepoImp()); injector.registerSingleton<ShippingRepo>(() => ShippingRepoImp());
injector.registerSingleton<SettingOptionsRepo>(() => SettingOptionsRepoImp()); injector.registerSingleton<SettingOptionsRepo>(() => SettingOptionsRepoImp());
injector.registerSingleton<Location>(() => LocationService());
// //
} }

@ -21,14 +21,16 @@ class Document {
int? messageStatus; int? messageStatus;
String? message; String? message;
factory Document.fromJson(Map<String, dynamic> json) => Document( factory Document.fromJson(Map<String, dynamic> json) =>
Document(
totalItemsCount: json["totalItemsCount"], totalItemsCount: json["totalItemsCount"],
data: json["data"] == null ? null : List<DocumentData>.from(json["data"].map((x) => DocumentData.fromJson(x))), data: json["data"] == null ? null : List<DocumentData>.from(json["data"].map((x) => DocumentData.fromJson(x))),
messageStatus: json["messageStatus"], messageStatus: json["messageStatus"],
message: json["message"], message: json["message"],
); );
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() =>
{
"totalItemsCount": totalItemsCount, "totalItemsCount": totalItemsCount,
"data": data == null ? null : List<dynamic>.from(data!.map((x) => x.toJson())), "data": data == null ? null : List<dynamic>.from(data!.map((x) => x.toJson())),
"messageStatus": messageStatus, "messageStatus": messageStatus,
@ -50,6 +52,7 @@ class DocumentData {
this.fileExt, this.fileExt,
this.documentName, this.documentName,
this.isLocalFile, this.isLocalFile,
this.description,
}); });
int? id; int? id;
@ -64,22 +67,26 @@ class DocumentData {
String? statusText; String? statusText;
String? documentName; String? documentName;
bool? isLocalFile; bool? isLocalFile;
String? description;
factory DocumentData.fromJson(Map<String, dynamic> json) => DocumentData( factory DocumentData.fromJson(Map<String, dynamic> json) =>
id: json["id"], DocumentData(
serviceProviderId: json["serviceProviderID"], id: json["id"],
documentId: json["documentID"], serviceProviderId: json["serviceProviderID"],
documentUrl: json["documentURL"], documentId: json["documentID"],
status: json["status"], documentUrl: json["documentURL"],
statusText: json["statusText"], status: json["status"],
comment: json["comment"], statusText: json["statusText"],
isActive: json["isActive"], comment: json["comment"],
document: null, isActive: json["isActive"],
fileExt: null, document: null,
documentName: json["documentName"], fileExt: null,
isLocalFile: false); documentName: json["documentName"],
isLocalFile: false,
description: null);
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() =>
{
"id": id, "id": id,
"serviceProviderID": serviceProviderId, "serviceProviderID": serviceProviderId,
"documentID": documentId, "documentID": documentId,

@ -60,6 +60,7 @@ class Subscription {
this.totalAds, this.totalAds,
this.branchesRemaining, this.branchesRemaining,
this.subUsersRemaining, this.subUsersRemaining,
this.subscriptionType,
this.adsRemaining}); this.adsRemaining});
int? id; int? id;
@ -81,6 +82,7 @@ class Subscription {
SubscriptionTypeEnum? subscriptionTypeEnum; SubscriptionTypeEnum? subscriptionTypeEnum;
bool? isMyCurrentPackage; bool? isMyCurrentPackage;
bool? isRenewable; bool? isRenewable;
int? subscriptionType;
int? subscriptionBranches; int? subscriptionBranches;
int? subscriptionSubUsers; int? subscriptionSubUsers;
@ -121,5 +123,6 @@ class Subscription {
branchesRemaining: json["branchesRemaining"], branchesRemaining: json["branchesRemaining"],
subUsersRemaining: json["subUsersRemaining"], subUsersRemaining: json["subUsersRemaining"],
adsRemaining: json["adsRemaining"], adsRemaining: json["adsRemaining"],
subscriptionType: json["subscriptionType"],
); );
} }

@ -2,7 +2,6 @@ import 'dart:io';
import 'package:device_info_plus/device_info_plus.dart'; import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:huawei_fido/huawei_fido.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:local_auth_android/local_auth_android.dart'; import 'package:local_auth_android/local_auth_android.dart';
import 'package:local_auth_darwin/types/auth_messages_ios.dart'; import 'package:local_auth_darwin/types/auth_messages_ios.dart';
@ -61,11 +60,11 @@ class CommonAuthImp implements CommonAuthServices {
return await localAuth.getAvailableBiometrics(); return await localAuth.getAvailableBiometrics();
} }
Future<void> getHuaweiAuth() async { // Future<void> getHuaweiAuth() async {
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin(); // DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo; // AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
// if (androidInfo.brand == "HUAWEI") { // // if (androidInfo.brand == "HUAWEI") {
// huawei.canAuth(); // // huawei.canAuth();
// } // // }
} // }
} }

@ -6,6 +6,7 @@ import 'package:geolocator/geolocator.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:mc_common_app/main.dart'; import 'package:mc_common_app/main.dart';
import 'package:mc_common_app/utils/app_permission_handler.dart'; import 'package:mc_common_app/utils/app_permission_handler.dart';
import 'package:mc_common_app/utils/utils.dart';
abstract class CommonAppServices { abstract class CommonAppServices {
Future<List<File>> pickMultipleImages(); Future<List<File>> pickMultipleImages();

@ -26,16 +26,8 @@ abstract class PaymentService {
class PaymentServiceImp implements PaymentService { class PaymentServiceImp implements PaymentService {
MyInAppBrowser? myInAppBrowser; MyInAppBrowser? myInAppBrowser;
// var inAppBrowserOptions = InAppBrowserClassOptions(
// inAppWebViewGroupOptions:
// InAppWebViewGroupOptions(crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true, transparentBackground: false), ios: IOSInAppWebViewOptions(applePayAPIEnabled: true)),
// crossPlatform: InAppBrowserOptions(hideUrlBar: true, toolbarTopBackgroundColor: Colors.black),
// android: AndroidInAppBrowserOptions(),
// ios:
// IOSInAppBrowserOptions(hideToolbarBottom: true, toolbarBottomBackgroundColor: Colors.white, closeButtonColor: Colors.white, presentationStyle: IOSUIModalPresentationStyle.OVER_FULL_SCREEN));
var inAppBrowserOptions = InAppBrowserClassSettings( var inAppBrowserOptions = InAppBrowserClassSettings(
webViewSettings: InAppWebViewSettings( webViewSettings: InAppWebViewSettings(
useShouldOverrideUrlLoading: false, useShouldOverrideUrlLoading: false,
transparentBackground: false, transparentBackground: false,
@ -113,10 +105,13 @@ class PaymentServiceImp implements PaymentService {
onBrowserLoadStart(onFailure: onFailure, onSuccess: onSuccess, url: url); onBrowserLoadStart(onFailure: onFailure, onSuccess: onSuccess, url: url);
}); });
await myInAppBrowser!.openUrlRequest( await myInAppBrowser!.openUrlRequest(
// Uri.parse(urlRequest) urlRequest: URLRequest(
urlRequest: URLRequest(url: WebUri(urlRequest)), url: WebUri(urlRequest, forceToStringRawValue: true),
allowsCellularAccess: true,
allowsConstrainedNetworkAccess: true,
allowsExpensiveNetworkAccess: true,
),
settings: inAppBrowserOptions, settings: inAppBrowserOptions,
// in: inAppBrowserOptions,
); );
} }

@ -215,9 +215,9 @@ enum ChatTypeEnum {
} }
enum SubscriptionTypeEnum { enum SubscriptionTypeEnum {
current, current, //1
upgrade, upgrade, //2
downgrade, downgrade, //3
} }
enum SubscriptionActionTypeEnum { enum SubscriptionActionTypeEnum {

@ -18,11 +18,11 @@ dependencies:
easy_localization: ^3.0.3 easy_localization: ^3.0.3
http: ^1.2.2 http: ^1.2.2
permission_handler: ^11.3.1 permission_handler: ^11.3.1
flutter_svg: ^2.0.14 flutter_svg: ^2.0.9
sizer: ^3.0.4 sizer: any
fluttertoast: ^8.0.8 fluttertoast: ^8.0.8
shared_preferences: ^2.0.6 shared_preferences: ^2.0.6
file_picker: ^8.0.7 file_picker: ^8.1.2
image_picker: ^1.1.2 image_picker: ^1.1.2
equatable: ^2.0.3 equatable: ^2.0.3
logger: ^2.4.0 logger: ^2.4.0
@ -34,7 +34,7 @@ dependencies:
badges: ^3.0.2 badges: ^3.0.2
carousel_slider: 5.0.0 carousel_slider: 5.0.0
dropdown_button2: ^2.0.0 dropdown_button2: ^2.0.0
flutter_inappwebview: ^6.0.0 flutter_inappwebview: ^6.1.5
country_code_picker: ^3.0.0 country_code_picker: ^3.0.0
table_calendar: ^3.0.9 table_calendar: ^3.0.9
intl: any intl: any
@ -47,8 +47,8 @@ dependencies:
# Firebase Packages # Firebase Packages
firebase_messaging: ^15.0.4 firebase_messaging: ^15.1.3
firebase_core: ^3.3.0 firebase_core: ^3.6.0
flutter_local_notifications: ^18.0.0 flutter_local_notifications: ^18.0.0
@ -61,9 +61,9 @@ dependencies:
# Auth # Auth
local_auth: ^2.2.0 local_auth: ^2.2.0
huawei_fido: ^6.3.0+305 #huawei_fido: ^6.3.0+305
device_info_plus: ^10.1.0 device_info_plus: ^11.0.0
flutter_lints: any
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

Loading…
Cancel
Save