eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix line size menu item setting

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit d4e4ce83bad46403c93e8ddc06e5e2b02c5dd8b1)
This commit is contained in:
dab246
2023-12-06 14:48:21 +07:00
committed by Dat H. Pham
parent 1d6724edab
commit 06b426975f
3 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
+7 -7
View File
@@ -23,7 +23,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
padding: SettingsUtils.getPaddingInFirstLevel(context, controller.responsiveUtils), padding: SettingsUtils.getPaddingInFirstLevel(context, controller.responsiveUtils),
titlePadding: const EdgeInsetsDirectional.only(start: 16))), titlePadding: const EdgeInsetsDirectional.only(start: 16))),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -35,7 +35,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.profiles) () => controller.selectSettings(AccountMenuItem.profiles)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -50,7 +50,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.emailRules) () => controller.selectSettings(AccountMenuItem.emailRules)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -70,7 +70,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.forward) () => controller.selectSettings(AccountMenuItem.forward)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -90,7 +90,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.vacation) () => controller.selectSettings(AccountMenuItem.vacation)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -108,7 +108,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.mailboxVisibility) () => controller.selectSettings(AccountMenuItem.mailboxVisibility)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
@@ -120,7 +120,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
() => controller.selectSettings(AccountMenuItem.languageAndRegion) () => controller.selectSettings(AccountMenuItem.languageAndRegion)
), ),
Divider( Divider(
color: AppColor.colorDividerComposer, color: AppColor.colorDividerHorizontal,
height: 1, height: 1,
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils), indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils) endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
lib/features/manage_account/presentation/menu/settings/settings_view.dart
+10 -17
View File
@@ -20,7 +20,6 @@ import 'package:tmail_ui_user/features/manage_account/presentation/profiles/prof
import 'package:tmail_ui_user/features/manage_account/presentation/vacation/vacation_view.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/vacation/vacation_view.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
typedef CloseSettingsViewAction = void Function(); typedef CloseSettingsViewAction = void Function();
@@ -46,9 +45,9 @@ class SettingsView extends GetWidget<SettingsController> {
Obx(() { Obx(() {
if (controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsValid == true) { if (controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsValid == true) {
return VacationNotificationMessageWidget( return VacationNotificationMessageWidget(
margin: const EdgeInsets.only( margin: const EdgeInsetsDirectional.only(
left: PlatformInfo.isWeb ? 24 : 16, start: PlatformInfo.isWeb ? 24 : 16,
right: PlatformInfo.isWeb ? 24 : 16, end: PlatformInfo.isWeb ? 24 : 16,
top: 16), top: 16),
fromAccountDashBoard: true, fromAccountDashBoard: true,
vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!, vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!,
@@ -60,19 +59,16 @@ class SettingsView extends GetWidget<SettingsController> {
|| controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsStopped == true) || controller.manageAccountDashboardController.vacationResponse.value?.vacationResponderIsStopped == true)
&& controller.manageAccountDashboardController.inVacationSettings()) { && controller.manageAccountDashboardController.inVacationSettings()) {
return VacationNotificationMessageWidget( return VacationNotificationMessageWidget(
margin: const EdgeInsets.only( margin: const EdgeInsetsDirectional.only(
left: PlatformInfo.isWeb ? 24 : 16, start: PlatformInfo.isWeb ? 24 : 16,
right: PlatformInfo.isWeb ? 24 : 16, end: PlatformInfo.isWeb ? 24 : 16,
top: 16), top: 16),
fromAccountDashBoard: true, fromAccountDashBoard: true,
vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!, vacationResponse: controller.manageAccountDashboardController.vacationResponse.value!,
padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16), padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
leadingIcon: Padding( leadingIcon: const Padding(
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(end: 16),
right: AppUtils.isDirectionRTL(context) ? 0 : 16, child: Icon(Icons.timer, size: 20),
left: AppUtils.isDirectionRTL(context) ? 16 : 0,
),
child: const Icon(Icons.timer, size: 20),
) )
); );
} else { } else {
@@ -139,10 +135,7 @@ class SettingsView extends GetWidget<SettingsController> {
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
Container( Container(
margin: EdgeInsets.only( margin: const EdgeInsetsDirectional.only(start: 4),
left: AppUtils.isDirectionRTL(context) ? 0 : 4,
right: AppUtils.isDirectionRTL(context) ? 4 : 0,
),
constraints: const BoxConstraints(maxWidth: 80), constraints: const BoxConstraints(maxWidth: 80),
child: Text( child: Text(
AppLocalizations.of(context).settings, AppLocalizations.of(context).settings,
lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart
+3 -3
View File
@@ -14,8 +14,8 @@ class VacationNotificationMessageWidget extends StatelessWidget {
final VacationResponse vacationResponse; final VacationResponse vacationResponse;
final EndNowVacationSettingAction? actionEndNow; final EndNowVacationSettingAction? actionEndNow;
final GoToVacationSettingAction? actionGotoVacationSetting; final GoToVacationSettingAction? actionGotoVacationSetting;
final EdgeInsets? margin; final EdgeInsetsGeometry? margin;
final EdgeInsets? padding; final EdgeInsetsGeometry? padding;
final double? radius; final double? radius;
final Widget? leadingIcon; final Widget? leadingIcon;
final Color? backgroundColor; final Color? backgroundColor;
@@ -41,7 +41,7 @@ class VacationNotificationMessageWidget extends StatelessWidget {
return Container( return Container(
width: double.infinity, width: double.infinity,
margin: margin ?? const EdgeInsets.symmetric(horizontal: 12), margin: margin ?? const EdgeInsets.symmetric(horizontal: 12),
padding: padding ?? const EdgeInsets.only(left: 12), padding: padding ?? const EdgeInsetsDirectional.only(start: 12),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(radius ?? 8), borderRadius: BorderRadius.circular(radius ?? 8),
color: backgroundColor ?? AppColor.colorBackgroundNotificationVacationSetting, color: backgroundColor ?? AppColor.colorBackgroundNotificationVacationSetting,