diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..e38b34a 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..f2e7d3f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..854c0b1 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..bf6c55d 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..f06ef3b 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/lib/app/core/config/server_request.dart b/lib/app/core/config/server_request.dart index 94064db..d5a19c2 100644 --- a/lib/app/core/config/server_request.dart +++ b/lib/app/core/config/server_request.dart @@ -56,7 +56,7 @@ class ServerRequest { static late BaseOptions _baseOptions; static void _initRequest(RequestAttr attr) { - _baseOptions = BaseOptions(baseUrl: attr.url, connectTimeout: 15000, receiveTimeout: 9000); + _baseOptions = BaseOptions(baseUrl: attr.url, connectTimeout: 15000, receiveTimeout: 90000); _baseOptions.contentType = Headers.jsonContentType; if (attr.headers.isNotEmpty) { diff --git a/lib/app/core/constants/app_assets.dart b/lib/app/core/constants/app_assets.dart index f330c86..21a653f 100644 --- a/lib/app/core/constants/app_assets.dart +++ b/lib/app/core/constants/app_assets.dart @@ -6,7 +6,7 @@ class AppAssets { static const lg_logo_black = "assets/$ORGANIZATION/logo/lg_logo_black.svg"; static const lg_mfsys = "assets/$ORGANIZATION/logo/lg_mfsys.png"; static const lg_bank = "assets/$ORGANIZATION/logo/lg_bank.png"; - static const uc_logo = "assets/$ORGANIZATION/logo/uc_logo.png"; + static const uc_logo = "assets/$ORGANIZATION/logo/ic_launcher.png"; static const ic_dashboard_logo = "assets/$ORGANIZATION/logo/ic_dashboard_logo.svg"; static const lg_back_arrow = "assets/$ORGANIZATION/logo/lg_back_arrow.svg"; static const u_receive = "assets/$ORGANIZATION/logo/u_receive.svg"; diff --git a/lib/app/modules/add_new_account/controllers/add_new_account_controller.dart b/lib/app/modules/add_new_account/controllers/add_new_account_controller.dart index a68e79e..139418c 100644 --- a/lib/app/modules/add_new_account/controllers/add_new_account_controller.dart +++ b/lib/app/modules/add_new_account/controllers/add_new_account_controller.dart @@ -16,7 +16,6 @@ import '../../../models/product_model.dart'; import '../../../routes/app_pages.dart'; import '../../dashboard/controllers/dashboard_screen_controller.dart'; - class AddNewAccountController extends GetxController { BuildContext context = Get.context as BuildContext; @@ -44,7 +43,10 @@ class AddNewAccountController extends GetxController { /// Validate Function of contorller bool validate() { - bool isValid = FieldValidation.validateAll([nameAddressField, currencyCodesField]); + bool isValid = FieldValidation.validateAll([ + nameAddressField, + currencyCodesField, + ]); return isValid; } @@ -58,9 +60,13 @@ class AddNewAccountController extends GetxController { return; } - currencyList = ProductDepositModel.productListFromJson(productResponse.response); + currencyList = ProductDepositModel.productListFromJson( + productResponse.response, + ); - currencyListDropDown = currencyList.map((e) => DropDown(e.dmpProdcode, e.dmpProddesc, e)).toList(); + currencyListDropDown = currencyList + .map((e) => DropDown(e.dmpProdcode, e.dmpProddesc, e)) + .toList(); dropDownValue = currencyListDropDown.first; @@ -91,20 +97,27 @@ class AddNewAccountController extends GetxController { ServerResponse response = await repository.addNewAccount(request); + if (response.errorCode == "ERR_ACC_0012") { + Toasty.error("Account for the product already exists"); + return; + } + if (response.isError) { Toasty.error(response.errorMsg); return; } CustomDialog.showSuccessDialog( - description: "Thank you so much, Your new account has been created successfully", - onTapPositive: () { - transitionUpdate.value++; + description: + "Thank you so much, Your new account has been created successfully", + onTapPositive: () { + transitionUpdate.value++; - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context, rootNavigator: true).pop(); - Get.offAllNamed(Routes.DASHBOARD_SCREEN); - }); + Get.offAllNamed(Routes.DASHBOARD_SCREEN); + }, + ); clearText(); } diff --git a/pubspec.yaml b/pubspec.yaml index daed5bd..2ddb5a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,7 +65,7 @@ dependencies: getwidget: 4.0.0 flutter_rounded_date_picker: 3.0.4 calendar_date_picker2: 1.0.2 - json_serializable: 6.7.1 + json_serializable: ^6.8.0 buttons_tabbar: 1.3.8 google_maps_flutter: 2.14.0 path_provider: 2.1.3 @@ -91,6 +91,8 @@ dependencies: pointycastle: ^3.9.1 flutter_dotenv: ^5.1.0 + + dev_dependencies: flutter_test: sdk: flutter @@ -101,19 +103,16 @@ dev_dependencies: # package. See that file for information about deactivating specific lint # rules and activating additional ones. flutter_lints: ^6.0.0 + flutter_launcher_icons: ^0.14.3 + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter packages. flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: assets: - assets/ - assets/uco/ @@ -122,6 +121,28 @@ flutter: - assets/uco/logo/ - assets/.en + fonts: + - family: Inter + fonts: + - asset: fonts/Inter-Black.ttf + - asset: fonts/Inter-Bold.ttf + - asset: fonts/Inter-ExtraBold.ttf + - asset: fonts/Inter-ExtraLight.ttf + - asset: fonts/Inter-Light.ttf + - asset: fonts/Inter-Medium.ttf + - asset: fonts/Inter-Regular.ttf + - asset: fonts/Inter-SemiBold.ttf + - asset: fonts/Inter-Thin.ttf + + - family: Poppins + fonts: + - asset: fonts/Poppins-Regular.ttf + - asset: fonts/Poppins-Medium.ttf + +flutter_launcher_icons: + android: true + ios: true + image_path: "assets/uco/logo/ic_launcher.png" # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/to/resolution-aware-images @@ -149,6 +170,8 @@ flutter: fonts: - asset: fonts/Poppins-Regular.ttf - asset: fonts/Poppins-Medium.ttf + + # style: italic # - family: Trajan Pro # fonts: