UCO-Projects
/
uco-mobile-poc
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'ui fixes' (#15) from ui_fixes into pre_developmnet_branch

Browse Source 
Reviewed-on: https://ct.mfsys.com.pk/UCO-Projects/uco-mobile-poc/pulls/15
development
Waqas Khurshid 3 days ago
parent e1c77f40e0 eef086327d
commit ca36fc9a06
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
lib/app/core/constants/url_constants.dart
Unescape Escape View File

@ -1,7 +1,8 @@
import 'package:uco_mobile_poc/app/core/utils/url_encryption.dart'; import 'package:uco_mobile_poc/app/core/utils/url_encryption.dart';
class UrlContants { 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 // FMFI
// static const baseUrl = "https://uco.mfsys.ca"; // FMFI // static const baseUrl = "https://uco.mfsys.ca"; // FMFI
// public interface SecurityURI { // public interface SecurityURI {

10
lib/app/models/u_recived_responce_model.dart
Unescape Escape View File

@ -26,6 +26,8 @@ class UReceivedResponseData {
// String daysToExpire = ""; // String daysToExpire = "";
String expSgtGntrdate = ""; String expSgtGntrdate = "";
String otdTrancomment ="";
UReceivedResponseData({ UReceivedResponseData({
this.id = 0, this.id = 0,
@ -54,6 +56,8 @@ class UReceivedResponseData {
this.crPcrCurrshort = "", this.crPcrCurrshort = "",
// this.daysToExpire = "", // this.daysToExpire = "",
this.expSgtGntrdate = "", this.expSgtGntrdate = "",
this.otdTrancomment="",
}); });
factory UReceivedResponseData.fromMap(Map<String, dynamic> map) { factory UReceivedResponseData.fromMap(Map<String, dynamic> map) {
@ -84,6 +88,8 @@ class UReceivedResponseData {
crPcrCurrshort: map['crPcrCurrshort'] ?? "", crPcrCurrshort: map['crPcrCurrshort'] ?? "",
// daysToExpire: map['daysToExpire'] ?? "", // daysToExpire: map['daysToExpire'] ?? "",
expSgtGntrdate: map['expSgtGntrdate'] ?? "", expSgtGntrdate: map['expSgtGntrdate'] ?? "",
otdTrancomment: map['otdTrancomment']??"",
); );
} }
@ -115,11 +121,13 @@ class UReceivedResponseData {
'crPcrCurrshort': crPcrCurrshort, 'crPcrCurrshort': crPcrCurrshort,
// 'daysToExpire': daysToExpire, // 'daysToExpire': daysToExpire,
'expSgtGntrdate': expSgtGntrdate, 'expSgtGntrdate': expSgtGntrdate,
'otdTrancomment': otdTrancomment,
}; };
} }
@override @override
String toString() { 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}';
} }
} }

8
lib/app/modules/login/views/login_screen_view.dart
Unescape Escape View File

@ -120,8 +120,8 @@ class LoginScreenView extends GetView<LoginScreenController> {
enableInteractiveSelection: false, enableInteractiveSelection: false,
refKey: FormFieldConstants.instance().getFormKey("${className}userNameField"), refKey: FormFieldConstants.instance().getFormKey("${className}userNameField"),
controller: FormFieldConstants.instance().getController("${className}userNameField"), controller: FormFieldConstants.instance().getController("${className}userNameField"),
hintText: "enter email", hintText: "Enter Email",
labelText: "Email", labelText: "Email*",
inputFormatters: [LengthLimitingTextInputFormatter(FieldUtils.userNameFieldLength)], inputFormatters: [LengthLimitingTextInputFormatter(FieldUtils.userNameFieldLength)],
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
), ),
@ -129,8 +129,8 @@ class LoginScreenView extends GetView<LoginScreenController> {
enableInteractiveSelection: false, enableInteractiveSelection: false,
refKey: FormFieldConstants.instance().getFormKey("${className}passwordField"), refKey: FormFieldConstants.instance().getFormKey("${className}passwordField"),
controller: FormFieldConstants.instance().getController("${className}passwordField"), controller: FormFieldConstants.instance().getController("${className}passwordField"),
hintText: "enter password", hintText: "Enter Password",
labelText: "Password", labelText: "Password*",
keyboardType: TextInputType.visiblePassword, keyboardType: TextInputType.visiblePassword,
requiredPasswordIcon: true, requiredPasswordIcon: true,
isPassword: true, isPassword: true,

2
lib/app/modules/u_received/views/u_received_view.dart
Unescape Escape View File

@ -147,7 +147,7 @@ class UReceivedView extends GetView<UReceivedController> {
Expanded( Expanded(
child: Text( child: Text(
data.toString(), data.otdTrancomment.toString(),
style: Theme.of( style: Theme.of(
context, context,
).textTheme.labelSmall, ).textTheme.labelSmall,

5
lib/app/modules/u_send/views/u_send_view.dart
Unescape Escape View File

@ -127,7 +127,7 @@ class USendView extends GetView<USendController> {
), ),
), ),
// readOnly: true, // readOnly: true,
showCursor: false, showCursor: true,
onClick: () { onClick: () {
controller.selectContact(); controller.selectContact();
}, },
@ -169,11 +169,12 @@ class USendView extends GetView<USendController> {
controller: FormFieldConstants.instance().getController("${className}identityEmailField"), controller: FormFieldConstants.instance().getController("${className}identityEmailField"),
labelText: TranslationKeys.makeTranslation(TranslationKeys.textEmail), labelText: TranslationKeys.makeTranslation(TranslationKeys.textEmail),
hintText: "Enter your email", hintText: "Enter your email",
onChanged: (val) { onChanged: (val) {
controller.recipientCardNameField.clear(); controller.recipientCardNameField.clear();
}, },
// readOnly: true, // readOnly: true,
showCursor: false, showCursor: true,
onClick: () { onClick: () {
controller.selectContact(); controller.selectContact();
}, },

16
pubspec.lock
Unescape Escape View File

@ -165,10 +165,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.4.1" version: "1.4.0"
checked_yaml: checked_yaml:
dependency: transitive dependency: transitive
description: description:
@ -1020,18 +1020,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.19" version: "0.12.17"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.13.0" version: "0.11.1"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -1521,10 +1521,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.10" version: "0.7.7"
timer_count_down: timer_count_down:
dependency: "direct main" dependency: "direct main"
description: description:

Write Preview
Loading…
Cancel
Save