From eef086327db2a3fc72244c5984b7ce052984f888 Mon Sep 17 00:00:00 2001 From: Saman Waqar Date: Fri, 15 May 2026 17:34:14 +0500 Subject: [PATCH] ui fixes --- lib/app/core/constants/url_constants.dart | 3 ++- lib/app/models/u_recived_responce_model.dart | 10 +++++++++- .../modules/login/views/login_screen_view.dart | 8 ++++---- .../u_received/views/u_received_view.dart | 2 +- lib/app/modules/u_send/views/u_send_view.dart | 5 +++-- pubspec.lock | 16 ++++++++-------- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/app/core/constants/url_constants.dart b/lib/app/core/constants/url_constants.dart index b99bc94..73b63bd 100644 --- a/lib/app/core/constants/url_constants.dart +++ b/lib/app/core/constants/url_constants.dart @@ -1,7 +1,8 @@ import 'package:uco_mobile_poc/app/core/utils/url_encryption.dart'; class UrlContants { - static const baseUrl = "http://192.168.0.250:8888"; + // static const baseUrl = "http://192.168.0.250:8888"; + static const baseUrl = "https://uco.mfsys.ca"; // FMFI // static const baseUrl = "https://uco.mfsys.ca"; // FMFI // public interface SecurityURI { diff --git a/lib/app/models/u_recived_responce_model.dart b/lib/app/models/u_recived_responce_model.dart index 0a5dcb8..032ba5b 100644 --- a/lib/app/models/u_recived_responce_model.dart +++ b/lib/app/models/u_recived_responce_model.dart @@ -26,6 +26,8 @@ class UReceivedResponseData { // String daysToExpire = ""; String expSgtGntrdate = ""; + String otdTrancomment =""; + UReceivedResponseData({ this.id = 0, @@ -54,6 +56,8 @@ class UReceivedResponseData { this.crPcrCurrshort = "", // this.daysToExpire = "", this.expSgtGntrdate = "", + this.otdTrancomment="", + }); factory UReceivedResponseData.fromMap(Map map) { @@ -84,6 +88,8 @@ class UReceivedResponseData { crPcrCurrshort: map['crPcrCurrshort'] ?? "", // daysToExpire: map['daysToExpire'] ?? "", expSgtGntrdate: map['expSgtGntrdate'] ?? "", + otdTrancomment: map['otdTrancomment']??"", + ); } @@ -115,11 +121,13 @@ class UReceivedResponseData { 'crPcrCurrshort': crPcrCurrshort, // 'daysToExpire': daysToExpire, 'expSgtGntrdate': expSgtGntrdate, + 'otdTrancomment': otdTrancomment, + }; } @override String toString() { - return 'UReceivedResponseData{id: $id, porOrgacode: $porOrgacode, drMbmBkmsnumber: $drMbmBkmsnumber, crMbmBkmsnumber: $crMbmBkmsnumber, sgtReceiveNodeId: $sgtReceiveNodeId, sgtSentNodeId: $sgtSentNodeId, batAcnttranReversed: $batAcnttranReversed, dmpProdcode: $dmpProdcode, drmbmBkmstitle: $drmbmBkmstitle, drpcrCurrdesc: $drpcrCurrdesc, cmpCustcode: $cmpCustcode, drPcrCurrcode: $drPcrCurrcode, crMbmBkmstitle: $crMbmBkmstitle, crPcrCurrdesc: $crPcrCurrdesc, crPcrCurrcode: $crPcrCurrcode, sgtSentGntrnumber: $sgtSentGntrnumber, drSgtGntrdate: $drSgtGntrdate, crSgtGntrdate: $crSgtGntrdate, sgtGntramt: $sgtGntramt, batAcnttranSend: $batAcnttranSend, batAcnttranReceived: $batAcnttranReceived, sgtReceiveGntrnumber: $sgtReceiveGntrnumber, drPcrCurrshort: $drPcrCurrshort, crPcrCurrshort: $crPcrCurrshort, expSgtGntrdate: $expSgtGntrdate}'; + return 'UReceivedResponseData{id: $id, porOrgacode: $porOrgacode, drMbmBkmsnumber: $drMbmBkmsnumber, crMbmBkmsnumber: $crMbmBkmsnumber, sgtReceiveNodeId: $sgtReceiveNodeId, sgtSentNodeId: $sgtSentNodeId, batAcnttranReversed: $batAcnttranReversed, dmpProdcode: $dmpProdcode, drmbmBkmstitle: $drmbmBkmstitle, drpcrCurrdesc: $drpcrCurrdesc, cmpCustcode: $cmpCustcode, drPcrCurrcode: $drPcrCurrcode, crMbmBkmstitle: $crMbmBkmstitle, crPcrCurrdesc: $crPcrCurrdesc, crPcrCurrcode: $crPcrCurrcode, sgtSentGntrnumber: $sgtSentGntrnumber, drSgtGntrdate: $drSgtGntrdate, crSgtGntrdate: $crSgtGntrdate, sgtGntramt: $sgtGntramt, batAcnttranSend: $batAcnttranSend, batAcnttranReceived: $batAcnttranReceived, sgtReceiveGntrnumber: $sgtReceiveGntrnumber, drPcrCurrshort: $drPcrCurrshort, crPcrCurrshort: $crPcrCurrshort, expSgtGntrdate: $expSgtGntrdate,otdTrancomment: $otdTrancomment}'; } } diff --git a/lib/app/modules/login/views/login_screen_view.dart b/lib/app/modules/login/views/login_screen_view.dart index 176e143..ebb3653 100644 --- a/lib/app/modules/login/views/login_screen_view.dart +++ b/lib/app/modules/login/views/login_screen_view.dart @@ -120,8 +120,8 @@ class LoginScreenView extends GetView { enableInteractiveSelection: false, refKey: FormFieldConstants.instance().getFormKey("${className}userNameField"), controller: FormFieldConstants.instance().getController("${className}userNameField"), - hintText: "enter email", - labelText: "Email", + hintText: "Enter Email", + labelText: "Email*", inputFormatters: [LengthLimitingTextInputFormatter(FieldUtils.userNameFieldLength)], keyboardType: TextInputType.emailAddress, ), @@ -129,8 +129,8 @@ class LoginScreenView extends GetView { enableInteractiveSelection: false, refKey: FormFieldConstants.instance().getFormKey("${className}passwordField"), controller: FormFieldConstants.instance().getController("${className}passwordField"), - hintText: "enter password", - labelText: "Password", + hintText: "Enter Password", + labelText: "Password*", keyboardType: TextInputType.visiblePassword, requiredPasswordIcon: true, isPassword: true, diff --git a/lib/app/modules/u_received/views/u_received_view.dart b/lib/app/modules/u_received/views/u_received_view.dart index 6d0dcd8..d612215 100644 --- a/lib/app/modules/u_received/views/u_received_view.dart +++ b/lib/app/modules/u_received/views/u_received_view.dart @@ -147,7 +147,7 @@ class UReceivedView extends GetView { Expanded( child: Text( - data.toString(), + data.otdTrancomment.toString(), style: Theme.of( context, ).textTheme.labelSmall, diff --git a/lib/app/modules/u_send/views/u_send_view.dart b/lib/app/modules/u_send/views/u_send_view.dart index a5dc163..771a755 100644 --- a/lib/app/modules/u_send/views/u_send_view.dart +++ b/lib/app/modules/u_send/views/u_send_view.dart @@ -127,7 +127,7 @@ class USendView extends GetView { ), ), // readOnly: true, - showCursor: false, + showCursor: true, onClick: () { controller.selectContact(); }, @@ -169,11 +169,12 @@ class USendView extends GetView { controller: FormFieldConstants.instance().getController("${className}identityEmailField"), labelText: TranslationKeys.makeTranslation(TranslationKeys.textEmail), hintText: "Enter your email", + onChanged: (val) { controller.recipientCardNameField.clear(); }, // readOnly: true, - showCursor: false, + showCursor: true, onClick: () { controller.selectContact(); }, diff --git a/pubspec.lock b/pubspec.lock index 54b4fc0..26c610c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: characters - sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -1020,18 +1020,18 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.13.0" + version: "0.11.1" meta: dependency: transitive description: @@ -1521,10 +1521,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.7" timer_count_down: dependency: "direct main" description: