TF-1362: [Presentation] Create UI for all device and Add Action dismiss
This commit is contained in:
@@ -2,7 +2,7 @@ import 'package:core/data/model/source_type/data_source_type.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
|
||||
|
||||
class SpamReportRepositoryImpl extends SpamReportRepository {
|
||||
class SpamReportRepositoryImpl extends StoreLastTimeDismissedSpamReportInteractor {
|
||||
final Map<DataSourceType, SpamReportDataSource> mapDataSource;
|
||||
|
||||
SpamReportRepositoryImpl(this.mapDataSource);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
abstract class SpamReportRepository {
|
||||
abstract class StoreLastTimeDismissedSpamReportInteractor {
|
||||
Future<void> storeLastTimeDismissedSpamReported(DateTime lastTimeDismissedSpamReported);
|
||||
|
||||
Future<DateTime> getLastTimeDismissedSpamReported();
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
|
||||
class StoreLastTimeDismissedSpamReportLoading extends UIState {}
|
||||
|
||||
class StoreLastTimeDismissedSpamReportSuccess extends UIState {
|
||||
|
||||
StoreLastTimeDismissedSpamReportSuccess();
|
||||
|
||||
@override
|
||||
List<Object> get props => [];
|
||||
}
|
||||
|
||||
class StoreLastTimeDismissedSpamReportFailure extends FeatureFailure {
|
||||
final dynamic exception;
|
||||
|
||||
StoreLastTimeDismissedSpamReportFailure(this.exception);
|
||||
|
||||
@override
|
||||
List<Object> get props => [exception];
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
|
||||
class StoreSpamReportLoading extends UIState {}
|
||||
|
||||
class StoreSpamReportSuccess extends UIState {
|
||||
|
||||
StoreSpamReportSuccess();
|
||||
|
||||
@override
|
||||
List<Object> get props => [];
|
||||
}
|
||||
|
||||
class StoreSpamReportFailure extends FeatureFailure {
|
||||
final dynamic exception;
|
||||
|
||||
StoreSpamReportFailure(this.exception);
|
||||
|
||||
@override
|
||||
List<Object> get props => [exception];
|
||||
}
|
||||
+3
-3
@@ -5,10 +5,10 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_
|
||||
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_last_time_dismissed_spam_reported_state.dart';
|
||||
|
||||
class GetSpamReportInteractor {
|
||||
final SpamReportRepository _spamReportRepository;
|
||||
class GetLastTimeDismissedSpamReportInteractor {
|
||||
final StoreLastTimeDismissedSpamReportInteractor _spamReportRepository;
|
||||
|
||||
GetSpamReportInteractor(this._spamReportRepository);
|
||||
GetLastTimeDismissedSpamReportInteractor(this._spamReportRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute() async* {
|
||||
try {
|
||||
+5
-5
@@ -2,20 +2,20 @@ import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/spam_report_repository.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/store_spam_report_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart';
|
||||
|
||||
class StoreSpamReportInteractor {
|
||||
final SpamReportRepository _spamReportRepository;
|
||||
final StoreLastTimeDismissedSpamReportInteractor _spamReportRepository;
|
||||
|
||||
StoreSpamReportInteractor(this._spamReportRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(DateTime lastTimeDismissedSpamReported) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(StoreSpamReportLoading());
|
||||
yield Right<Failure, Success>(StoreLastTimeDismissedSpamReportLoading());
|
||||
await _spamReportRepository.storeLastTimeDismissedSpamReported(lastTimeDismissedSpamReported);
|
||||
yield Right<Failure, Success>(StoreSpamReportSuccess());
|
||||
yield Right<Failure, Success>(StoreLastTimeDismissedSpamReportSuccess());
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(StoreSpamReportFailure(e));
|
||||
yield Left<Failure, Success>(StoreLastTimeDismissedSpamReportFailure(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -81,6 +81,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/download/download_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/quotas/presentation/quotas_controller_bindings.dart';
|
||||
import 'package:tmail_ui_user/features/search/domain/usecases/refresh_changes_search_email_interactor.dart';
|
||||
@@ -126,6 +127,7 @@ class MailboxDashBoardBindings extends BaseBindings {
|
||||
Get.find<SaveRecentSearchInteractor>(),
|
||||
Get.find<GetAllRecentSearchLatestInteractor>(),
|
||||
));
|
||||
Get.put(SpamReportController());
|
||||
Get.put(MailboxDashBoardController(
|
||||
Get.find<LogoutOidcInteractor>(),
|
||||
Get.find<DeleteAuthorityOidcInteractor>(),
|
||||
@@ -281,7 +283,7 @@ class MailboxDashBoardBindings extends BaseBindings {
|
||||
Get.lazyPut<AccountRepository>(() => Get.find<AccountRepositoryImpl>());
|
||||
Get.lazyPut<AuthenticationOIDCRepository>(() => Get.find<AuthenticationOIDCRepositoryImpl>());
|
||||
Get.lazyPut<ComposerCacheRepository>(() => Get.find<ComposerCacheRepositoryImpl>());
|
||||
Get.lazyPut<SpamReportRepository>(() => Get.find<SpamReportRepositoryImpl>());
|
||||
Get.lazyPut<StoreLastTimeDismissedSpamReportInteractor>(() => Get.find<SpamReportRepositoryImpl>());
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
+2
@@ -57,6 +57,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/bindings/m
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/download/download_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/download/download_task_state.dart';
|
||||
@@ -114,6 +115,7 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
final DownloadController downloadController = Get.find<DownloadController>();
|
||||
final NetworkConnectionController networkConnectionController = Get.find<NetworkConnectionController>();
|
||||
final AppGridDashboardController appGridDashboardController = Get.find<AppGridDashboardController>();
|
||||
final SpamReportController spamReportController = Get.find<SpamReportController>();
|
||||
|
||||
final MoveToMailboxInteractor _moveToMailboxInteractor;
|
||||
final DeleteEmailPermanentlyInteractor _deleteEmailPermanentlyInteractor;
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import 'package:get/get_rx/get_rx.dart';
|
||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||
|
||||
class SpamReportController extends BaseController {
|
||||
|
||||
final dismissedSpamReported = RxBool(false);
|
||||
|
||||
@override
|
||||
void onDone() {}
|
||||
|
||||
void dismissSpamReportAction() {
|
||||
dismissedSpamReported.value = true;
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailb
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
|
||||
@@ -41,6 +42,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
||||
final SearchController searchController = Get.find<SearchController>();
|
||||
final AppGridDashboardController appGridDashboardController = Get.find<AppGridDashboardController>();
|
||||
final mailBoxDashboardController = Get.find<MailboxDashBoardController>();
|
||||
final spamReportController = Get.find<SpamReportController>();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -105,6 +107,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
||||
children: [
|
||||
SizedBox(child: MailboxView(), width: responsiveUtils.defaultSizeMenu),
|
||||
Expanded(child: Column(children: [
|
||||
_buildSpamReportBoxWebWidget(context),
|
||||
_buildEmptyTrashButton(context),
|
||||
const QuotasWarningBannerWidget(
|
||||
margin: EdgeInsets.only(right: 16, top: 8),
|
||||
@@ -196,7 +199,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
||||
|
||||
Widget _buildThreadViewForWebDesktop(BuildContext context) {
|
||||
return Container(
|
||||
margin: const EdgeInsets.only(right: 16, top: 16, bottom: 16),
|
||||
margin: const EdgeInsets.only(right: 16, top: 8, bottom: 16),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
border: Border.all(color: AppColor.colorBorderBodyThread, width: 1),
|
||||
@@ -692,4 +695,76 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Widget _buildSpamReportBoxWebWidget(BuildContext context) {
|
||||
return Obx(() {
|
||||
if (spamReportController.dismissedSpamReported.value) {
|
||||
return const SizedBox(
|
||||
height: 8,
|
||||
);
|
||||
}
|
||||
return Container(
|
||||
height: 84,
|
||||
margin: const EdgeInsets.only(right: 16, top: 16),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: AppColor.colorBorderBodyThread, width: 1),
|
||||
color: AppColor.colorSpamReportBox.withOpacity(0.12)),
|
||||
child: Stack(
|
||||
alignment: AlignmentDirectional.center,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
imagePaths.icInfoCircleOutline,
|
||||
width: 28,
|
||||
height: 28,
|
||||
color: AppColor.primaryColor,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text(
|
||||
AppLocalizations.of(context).countNewSpamEmails(5),
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
color: AppColor.primaryColor,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
],
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 32,
|
||||
),
|
||||
child: buildTextButton(
|
||||
AppLocalizations.of(context).showDetails,
|
||||
height: 36,
|
||||
width: 115,
|
||||
textStyle: const TextStyle(
|
||||
fontSize: 15,
|
||||
color: AppColor.primaryColor,
|
||||
fontWeight: FontWeight.w400),
|
||||
backgroundColor: AppColor.colorCreateNewIdentityButton,
|
||||
radius: 10,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
top: 16,
|
||||
right: 16,
|
||||
child: buildSVGIconButton(
|
||||
icon: imagePaths.icCloseComposer,
|
||||
onTap: () => spamReportController.dismissSpamReportAction(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -34,6 +34,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart';
|
||||
import 'package:tmail_ui_user/features/search/presentation/search_email_bindings.dart';
|
||||
@@ -117,6 +118,10 @@ class ThreadController extends BaseController with EmailActionController {
|
||||
|
||||
SearchQuery? get searchQuery => searchController.searchEmailFilter.value.text;
|
||||
|
||||
RxList<PresentationEmail> get emailList => mailboxDashBoardController.emailsInCurrentMailbox;
|
||||
|
||||
SpamReportController get spamReportController => mailboxDashBoardController.spamReportController;
|
||||
|
||||
ThreadController(
|
||||
this._getEmailsInMailboxInteractor,
|
||||
this._refreshChangesEmailsInMailboxInteractor,
|
||||
|
||||
@@ -61,6 +61,7 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
... [
|
||||
_buildAppBarNormal(context),
|
||||
_buildSearchBarView(context),
|
||||
_buildSpamReportBoxWidget(context),
|
||||
const QuotasWarningBannerWidget(),
|
||||
_buildVacationNotificationMessage(context),
|
||||
],
|
||||
@@ -654,4 +655,101 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Widget _buildSpamReportBoxWidget(BuildContext context) {
|
||||
return Obx(() {
|
||||
if (controller.spamReportController.dismissedSpamReported.value) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
return Container(
|
||||
height: 124,
|
||||
margin: const EdgeInsets.only(right: 16, top: 16, left: 16),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: AppColor.colorBorderBodyThread, width: 1),
|
||||
color: AppColor.colorSpamReportBox.withOpacity(0.12)),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 24),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
_imagePaths.icInfoCircleOutline,
|
||||
width: 28,
|
||||
height: 28,
|
||||
color: AppColor.primaryColor,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Text(
|
||||
AppLocalizations.of(context).countNewSpamEmails(5),
|
||||
style: const TextStyle(
|
||||
fontSize: 16,
|
||||
color: AppColor.primaryColor,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
|
||||
child: Expanded(
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: _spamReportButtonAction(
|
||||
context,
|
||||
AppLocalizations.of(context).showDetails,
|
||||
AppColor.primaryColor,
|
||||
() {}),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
Expanded(
|
||||
child: _spamReportButtonAction(
|
||||
context,
|
||||
AppLocalizations.of(context).dismiss,
|
||||
AppColor.textFieldErrorBorderColor,
|
||||
() => controller.spamReportController
|
||||
.dismissSpamReportAction()),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
Widget _spamReportButtonAction(BuildContext context, String title, Color colorText, Function()? onTap) {
|
||||
return GestureDetector(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
height: 36,
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
color: AppColor.colorCreateNewIdentityButton),
|
||||
child: Expanded(
|
||||
child: Center(
|
||||
child: Text(
|
||||
title,
|
||||
style: TextStyle(
|
||||
fontSize: 15,
|
||||
color: colorText,
|
||||
fontWeight: FontWeight.w400),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user