From afc03e26e75f73be1b3dd524f6dcde5621bf65e3 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:44:13 +0530 Subject: [PATCH 1/3] ios changes --- .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 21 +++++++++++-------- frontend/mgramseva/ios/Runner/Info.plist | 2 ++ frontend/mgramseva/pubspec.yaml | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/frontend/mgramseva/ios/Flutter/AppFrameworkInfo.plist b/frontend/mgramseva/ios/Flutter/AppFrameworkInfo.plist index 8d4492f97..9625e105d 100644 --- a/frontend/mgramseva/ios/Flutter/AppFrameworkInfo.plist +++ b/frontend/mgramseva/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj b/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj index 71dbe1f88..1b31020e1 100644 --- a/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj +++ b/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj @@ -365,15 +365,16 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; - DEVELOPMENT_TEAM = JP48C27R32; + CURRENT_PROJECT_VERSION = 12; + DEVELOPMENT_TEAM = "JP48C27R32"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.2.14; PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -500,15 +501,16 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; - DEVELOPMENT_TEAM = JP48C27R32; + CURRENT_PROJECT_VERSION = 12; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.2.14; PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -527,15 +529,16 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; - DEVELOPMENT_TEAM = JP48C27R32; + CURRENT_PROJECT_VERSION = 12; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.2.14; PRODUCT_BUNDLE_IDENTIFIER = com.dwss.mgramseva; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/frontend/mgramseva/ios/Runner/Info.plist b/frontend/mgramseva/ios/Runner/Info.plist index e0854222d..375ee5772 100644 --- a/frontend/mgramseva/ios/Runner/Info.plist +++ b/frontend/mgramseva/ios/Runner/Info.plist @@ -69,5 +69,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/frontend/mgramseva/pubspec.yaml b/frontend/mgramseva/pubspec.yaml index f3a612aca..72c088b43 100644 --- a/frontend/mgramseva/pubspec.yaml +++ b/frontend/mgramseva/pubspec.yaml @@ -31,7 +31,7 @@ dependencies: flutter_svg: ^0.22.0 datetime_picker_formfield: ^2.0.0 horizontal_data_table: ^4.1.3 - file_picker: ^4.0.0 + file_picker: ^4.0.3 http: ^0.13.3 provider: ^6.0.0 flutter_spinkit: ^5.0.0 From e3d488281003dfe65b810670026d28b0566c6a16 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:47:27 +0530 Subject: [PATCH 2/3] removed redundant file --- .../lib/utils/Validators/validators.dart | 113 ------------------ 1 file changed, 113 deletions(-) delete mode 100644 frontend/mgramseva/lib/utils/Validators/validators.dart diff --git a/frontend/mgramseva/lib/utils/Validators/validators.dart b/frontend/mgramseva/lib/utils/Validators/validators.dart deleted file mode 100644 index 41f3b1ed3..000000000 --- a/frontend/mgramseva/lib/utils/Validators/validators.dart +++ /dev/null @@ -1,113 +0,0 @@ -import 'package:mgramseva/utils/constants/i18_key_constants.dart'; -import 'package:mgramseva/utils/localization/application_localizations.dart'; -import 'package:mgramseva/utils/global_variables.dart'; - -class Validators { - static validate(value, type) { - if (type == 'Email') { - String pattern = - r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'; - RegExp regex = new RegExp(pattern); - return (regex.hasMatch(value)) ? null : 'Enter a valid Email'; - } else if (type == 'Mobile Number') { - String pattern = r'^([0|\+[0-9]{1,5})?([7-9][0-9]{9})$'; - RegExp regex = new RegExp(pattern); - return (regex.hasMatch(value)) ? null : 'Enter a valid mobile Number'; - } else if (type == 'OTP') { - String pattern = r'^[0-9]+$'; - RegExp regex = new RegExp(pattern); - return (regex.hasMatch(value)) - ? (value.length < 4) - ? 'Enter a valid OTP' - : null - : 'Enter a valid OTP'; - } else if (type == 'Flat Id') { - return (value.length < 3) ? 'Enter a valid Flat Id' : null; - } else if (type == 'CORE_LOGIN_USERNAMEs') { - String pattern = r'^[A-Za-z ]+$'; - RegExp regex = new RegExp(pattern); - return (regex.hasMatch(value)) - ? (value.length < 3) - ? 'Enter a valid Name' - : null - : 'Enter a valid Name'; - } else if (type == 'Password') { - return (value.length < 8) ? 'Please provide 8 characters' : null; - } else if (type == 'Old Password' || - type == 'New Password' || - type == 'Confirm Password') - return (value.length < 8) ? 'Please provide 8 characters' : null; - } - - static String? mobileNumberValidator(String? v) { - if (v!.trim().isEmpty) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_MOBILE_NUMBER)}'; - } else if (!RegExp(r'^[0-9]+$').hasMatch(v)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_NUMBERS_ONLY)}'; - } else if (v.trim().length != 10) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.MOBILE_NUMBER_SHOULD_BE_10_DIGIT)}'; - } - return null; - } - - static String? passwordComparision(String? val, String label, - [String? val1]) { - if (val!.trim().isEmpty) { - return '$label'; - } else if (!(RegExp( - r'^(?=.*?[A-Za-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{6,}$') - .hasMatch(val))) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.INVALID_FORMAT)}'; - } else if (val1 != null && val.trim() != val1.trim()) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.CONFIRM_RECONFIRM_SHOULD_SAME)}'; - } - return null; - } - - static String? meterNumberValidator(String? v) { - if (v!.trim().isEmpty) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_METER_NUMBER)}'; - } else if (!RegExp(r'^[a-zA-Z0-9]+$').hasMatch(v)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_ALPHA_NUMERIC_ONLY)}'; - } - return null; - } - - static String? arrearsPenaltyValidator(String? arrears, String? penalty) { - if ((penalty!.trim().isNotEmpty && int.parse(penalty.trim().toString()) != 0) && (arrears!.trim().isEmpty || int.parse(arrears.trim().toString()) == 0)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ADD_ARREAR_FOR_PENALTY)}'; - } - return null; - } - - static String? amountValidator(String? v) { - if (v!.trim().isEmpty) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.expense.AMOUNT_MENTIONED_IN_THE_BILL)}'; - } else if (double.parse(v) <= 0) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.expense.ENTER_VALID_AMOUNT)}'; - } - return null; - } - - static String? rangeValidatior(String? v, double? inputnum) { - if (v!.trim().isEmpty) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_METER_NUMBER)}'; - } else if (!RegExp(r'^[a-zA-Z0-9]+$').hasMatch(v)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_ALPHA_NUMERIC_ONLY)}'; - } else if (double.parse(v) > (inputnum!)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.PARTIAL_AMT_OUT_OF_RANGE)}'; - } - return null; - } - - static String? partialAmountValidatior(String? v, [double? inputnum]) { - if (v!.trim().isEmpty) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.CANNOT_BE_EMPTY)}'; - } else if (!RegExp(r'^[0-9]+$').hasMatch(v)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.ENTER_NUMBERS_ONLY)}'; - } else if (inputnum != null && double.parse(v) > (inputnum)) { - return '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(i18.validators.AMOUNT_EXCEEDS)}'; - } - return null; - } -} From 57e049ae203ce702ec8e22220e494a4bc4671008 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Fri, 20 Oct 2023 16:04:20 +0530 Subject: [PATCH 3/3] dev team ios --- frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj b/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj index 1b31020e1..a85457607 100644 --- a/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj +++ b/frontend/mgramseva/ios/Runner.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 12; - DEVELOPMENT_TEAM = "JP48C27R32"; + DEVELOPMENT_TEAM = JP48C27R32; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab"; @@ -502,7 +502,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 12; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = JP48C27R32; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab"; @@ -530,7 +530,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 12; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = JP48C27R32; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "mGramSeva Punjab";