From 9b3601f06afb99a96c7137e9d164212376837fd3 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 8 Dec 2025 10:49:00 +0300 Subject: [PATCH] Update to Stores for Fixed Asset Disposal, VersionID 9.4 --- lib/app_state/app_state.dart | 2 +- lib/classes/consts.dart | 10 ++++----- lib/ui/landing/dashboard_screen.dart | 3 ++- lib/ui/landing/widget/services_widget.dart | 2 +- lib/widgets/bottom_sheet.dart | 26 +++++----------------- pubspec.yaml | 7 +++--- 6 files changed, 19 insertions(+), 31 deletions(-) diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index e68e169..3dfd812 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -90,7 +90,7 @@ class AppState { String get getHuaweiPushToken => _huaweiPushToken; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 9.3, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 9.4, mobileType: Platform.isAndroid ? "android" : "ios"); void setPostParamsInitConfig() { isAuthenticated = false; diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart index cfc240f..dbec87d 100644 --- a/lib/classes/consts.dart +++ b/lib/classes/consts.dart @@ -4,15 +4,15 @@ class ApiConsts { // static String baseUrl = "http://10.200.204.11"; // Local server // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server - static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver - // static String baseUrl = "http://10.201.204.101:2024"; + // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver + // static String baseUrl = "http://10.201.204.101:2024"; // static String baseUrl = "https://webservices.hmg.com"; // PreProd // static String baseUrl = "https://hmgwebservices.com"; // Live server - // static String baseUrl = "https://mohemm.hmg.com"; // New Live server + static String baseUrl = "https://mohemm.hmg.com"; // New Live server // - // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver - // static String baseUrl = "http://10.20.200.111:1010/"; + // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver + // static String baseUrl = "http://10.20.200.111:1010/"; // static String baseUrl = "https://webservices.hmg.com"; // PreProd // static String baseUrl = "https://mohemm.hmg.com"; diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index 8b14f2c..3122d17 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -164,7 +164,8 @@ class _DashboardScreenState extends State with WidgetsBindingOb if (!cProvider.disbaleChatForThisUser && !isFromInit) checkHubCon(); _refreshController.refreshCompleted(); - await data.fetchTicketBooking(); + // await data.fetchTicketBooking(); + // if (data.ticketBookingResponse != null && !data.ticketBookingResponse!.success) { // // data.fetchTicketBalance(); // } diff --git a/lib/ui/landing/widget/services_widget.dart b/lib/ui/landing/widget/services_widget.dart index deea7e9..879173b 100644 --- a/lib/ui/landing/widget/services_widget.dart +++ b/lib/ui/landing/widget/services_widget.dart @@ -257,9 +257,9 @@ class ServicesWidget extends StatelessWidget { } } else { if (menuEntry.menuName == "HMG_TICKET_REQUESTS") { - Utils.showLoading(context); //Ticket Work if (pro.ticketBookingResponse != null && pro.ticketBookingResponse!.success) { + Utils.showLoading(context); SSOAuthModel? ssoToken = await pro.fetchSSOAuthRedirection(clientID: pro.ticketBookingResponse!.clientId); if (ssoToken != null) { dynamic url = await pro.fetchURLRedirection(token: ssoToken.data!.accessToken!); diff --git a/lib/widgets/bottom_sheet.dart b/lib/widgets/bottom_sheet.dart index 7db0935..d5cb271 100644 --- a/lib/widgets/bottom_sheet.dart +++ b/lib/widgets/bottom_sheet.dart @@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; +import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; void showMyBottomSheet(BuildContext context, {required Widget child, required VoidCallback callBackFunc, String? type}) { @@ -65,14 +66,7 @@ void showMyBottomSheet(BuildContext context, {required Widget child, required Vo Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - title ?? "Details", - style: const TextStyle( - color: Color(0xff2BB8A6), - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), + (title ?? "Details").toText14(isBold: true, color: Color(0xff2BB8A6)), IconButton( icon: const Icon(Icons.close, color: Colors.black54, size: 20), onPressed: () { @@ -83,20 +77,12 @@ void showMyBottomSheet(BuildContext context, {required Widget child, required Vo ), const Divider(height: 1, color: Colors.grey), const SizedBox(height: 12), - // ---- Scrollable Content ---- Expanded( child: SingleChildScrollView( - child: Text( - (val?.isEmpty ?? true) - ? "--" - : val.toString(), - style: TextStyle( - color: MyColors.normalTextColor, - fontSize: 14, - height: 1.4, - ), - ), + child: ((val?.isEmpty ?? true) + ? "--" + : val.toString()).toText14(), ), ), SizedBox( @@ -112,7 +98,7 @@ void showMyBottomSheet(BuildContext context, {required Widget child, required Vo onPressed: () { Navigator.pop(context); }, - child: Text( + child: Text( LocaleKeys.close.tr(), style: const TextStyle( color: Colors.white, diff --git a/pubspec.yaml b/pubspec.yaml index 7e97774..0149086 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,8 +17,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.6.8+300078 -#version: 3.9.1+1 +#version: 3.6.8+300078 +version: 3.9.2+1 environment: sdk: ^3.7.0 @@ -139,12 +139,13 @@ dependencies: #todo its for temporary purpose, later will remove this. dotted_border: ^2.0.0+3 webview_flutter: ^4.13.0 + nfc_manager: ^3.2.0 # saf: ^1.0.3+4 dependency_overrides: - nfc_manager: ^3.2.0 +# nfc_manager: 3.2.0 # firebase_core_platform_interface: 4.5.1