diff --git a/assets/images/ic_not_connection.svg b/assets/images/ic_not_connection.svg index e87d1904c..7f1d446fe 100644 --- a/assets/images/ic_not_connection.svg +++ b/assets/images/ic_not_connection.svg @@ -1,8 +1,3 @@ - - - - - - + diff --git a/core/lib/presentation/views/toast/tmail_toast.dart b/core/lib/presentation/views/toast/tmail_toast.dart index 954aeba66..0a30b44cf 100644 --- a/core/lib/presentation/views/toast/tmail_toast.dart +++ b/core/lib/presentation/views/toast/tmail_toast.dart @@ -109,15 +109,18 @@ class ToastView { ), ); - final Widget toastChild = ToastCard( - child, - Duration(seconds: toastDuration ?? 2), - fadeDuration: 500, - ); _overlayEntry = OverlayEntry( builder: (BuildContext context) => - _showWidgetBasedOnPosition(toastDuration != null ? toastChild : child, toastPosition)); + _showWidgetBasedOnPosition( + toastDuration != null ? + ToastCard( + child, + Duration(seconds: toastDuration), + fadeDuration: 500, + ) + : child, toastPosition, + )); _isVisible = true; overlayState!.insert(_overlayEntry!); diff --git a/lib/features/network_status_handle/presentation/network_connnection_controller.dart b/lib/features/network_status_handle/presentation/network_connnection_controller.dart index e1bff2fb7..307f5d8c3 100644 --- a/lib/features/network_status_handle/presentation/network_connnection_controller.dart +++ b/lib/features/network_status_handle/presentation/network_connnection_controller.dart @@ -16,16 +16,17 @@ class NetworkConnectionController extends BaseController { final AppToast _appToast = Get.find(); final ResponsiveUtils _responsiveUtils = Get.find(); - bool _isEnableShowToastDisConnection = true; + bool _isEnableShowToastDisconnection = true; late StreamSubscription subscription; NetworkConnectionController(this._connectivity); + @override void onReady() { subscription = _connectivity.onConnectivityChanged.listen((ConnectivityResult result) { connectivityResult.value = result; - if (_isEnableShowToastDisConnection && result == ConnectivityResult.none) { + if (_isEnableShowToastDisconnection && result == ConnectivityResult.none) { _showToastLostConnection(); } }) ; @@ -37,6 +38,7 @@ class NetworkConnectionController extends BaseController { subscription.cancel(); super.onClose(); } + @override void onDone() {} @@ -58,7 +60,7 @@ class NetworkConnectionController extends BaseController { AppLocalizations.of(currentContext!).no_internet_connection, actionName: AppLocalizations.of(currentContext!).skip, onActionClick: () { - _isEnableShowToastDisConnection = false; + _isEnableShowToastDisconnection = false; ToastView.dismiss(); }, leadingIcon: SvgPicture.asset( @@ -66,7 +68,7 @@ class NetworkConnectionController extends BaseController { width: 24, height: 24, fit: BoxFit.fill), - backgroundColor: Colors.redAccent, + backgroundColor: AppColor.textFieldErrorBorderColor, textColor: Colors.white, textActionColor: Colors.white, maxWidth: _responsiveUtils.getMaxWidthToast(currentContext!),