From c22b181f42f1931a3c4b9eb6a622b96833491ad6 Mon Sep 17 00:00:00 2001 From: Dat PHAM HOANG Date: Thu, 11 Jan 2024 00:51:16 +0700 Subject: [PATCH] [Android][Disable work manager] Update sending state in view: pending and running (cherry picked from commit a6ebf50c005ccf0355bc64e7af73f801da458a33) --- lib/features/offline_mode/model/sending_state.dart | 2 +- .../presentation/widgets/sending_state_widget.dart | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/features/offline_mode/model/sending_state.dart b/lib/features/offline_mode/model/sending_state.dart index a8569137a..8a9bdb674 100644 --- a/lib/features/offline_mode/model/sending_state.dart +++ b/lib/features/offline_mode/model/sending_state.dart @@ -16,7 +16,7 @@ enum SendingState { case SendingState.waiting: case SendingState.running: case SendingState.success: - return AppLocalizations.of(context).delivering; + return AppLocalizations.of(context).pending; case SendingState.canceled: return AppLocalizations.of(context).canceled; case SendingState.error: diff --git a/lib/features/sending_queue/presentation/widgets/sending_state_widget.dart b/lib/features/sending_queue/presentation/widgets/sending_state_widget.dart index 1fc37939c..0e923ee8d 100644 --- a/lib/features/sending_queue/presentation/widgets/sending_state_widget.dart +++ b/lib/features/sending_queue/presentation/widgets/sending_state_widget.dart @@ -1,7 +1,6 @@ import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/utils/style_utils.dart'; import 'package:core/presentation/views/loading/cupertino_loading_widget.dart'; -import 'package:core/utils/platform_info.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; @@ -34,16 +33,8 @@ class SendingStateWidget extends StatelessWidget { mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, children: [ - if (PlatformInfo.isIOS) - if (sendingState == SendingState.running) - const CupertinoLoadingWidget(size: SendingStateWidgetStyle.iconSize) - else - SvgPicture.asset( - sendingState.getIcon(_imagePath), - fit: BoxFit.fill, - width: SendingStateWidgetStyle.iconSize, - height: SendingStateWidgetStyle.iconSize - ) + if (sendingState == SendingState.running) + const CupertinoLoadingWidget(size: SendingStateWidgetStyle.iconSize) else SvgPicture.asset( sendingState.getIcon(_imagePath),