TF-1683 Fix height/color divider for correctly

(cherry picked from commit 25c772101eb693825413e6587961c3c56d0e5da2)
This commit is contained in:
dab246
2023-07-07 17:01:42 +07:00
committed by Dat H. Pham
parent 559f3d1e11
commit ad54e6e863
14 changed files with 23 additions and 46 deletions
@@ -65,7 +65,7 @@ extension AppColor on Color {
static const backgroundCountAttachment = Color(0x681C1C1C); static const backgroundCountAttachment = Color(0x681C1C1C);
static const bgStatusResultSearch = Color(0xFFF5F5F7); static const bgStatusResultSearch = Color(0xFFF5F5F7);
static const bgWordSearch = Color(0x3D007AFF); static const bgWordSearch = Color(0x3D007AFF);
static const lineItemListColor = Color(0xFF99A2AD); static const lineItemListColor = Color(0xFFE7E8EC);
static const colorNameEmail = Color(0xFF000000); static const colorNameEmail = Color(0xFF000000);
static const colorContentEmail = Color(0xFF6D7885); static const colorContentEmail = Color(0xFF6D7885);
static const colorTextButton = Color(0xFF007AFF); static const colorTextButton = Color(0xFF007AFF);
@@ -73,7 +73,7 @@ extension AppColor on Color {
static const colorBgSearchBar = Color(0x99EBEDF0); static const colorBgSearchBar = Color(0x99EBEDF0);
static const colorBgIdentityButton = Color(0x00EBEDF0); static const colorBgIdentityButton = Color(0x00EBEDF0);
static const colorShadowBgContentEmail = Color(0x14000000); static const colorShadowBgContentEmail = Color(0x14000000);
static const colorDividerMailbox = Color(0xFF99A2AD); static const colorDividerMailbox = Color(0x1F000000);
static const colorCollapseMailbox = Color(0xFFB8C1CC); static const colorCollapseMailbox = Color(0xFFB8C1CC);
static const colorExpandMailbox = Color(0xFF007AFF); static const colorExpandMailbox = Color(0xFF007AFF);
static const colorBgMailbox = Color(0xFFF7F7F7); static const colorBgMailbox = Color(0xFFF7F7F7);
@@ -53,8 +53,7 @@ class EmailView extends GetWidget<SingleEmailController> {
if (_supportVerticalDivider(context)) if (_supportVerticalDivider(context))
const VerticalDivider( const VerticalDivider(
color: AppColor.lineItemListColor, color: AppColor.lineItemListColor,
width: 1, width: 12),
thickness: 0.2),
Expanded(child: SafeArea( Expanded(child: SafeArea(
right: responsiveUtils.isLandscapeMobile(context), right: responsiveUtils.isLandscapeMobile(context),
left: responsiveUtils.isLandscapeMobile(context), left: responsiveUtils.isLandscapeMobile(context),
@@ -21,13 +21,13 @@ abstract class BaseMailboxView extends GetWidget<MailboxController>
final imagePaths = Get.find<ImagePaths>(); final imagePaths = Get.find<ImagePaths>();
Widget buildUserInformation(BuildContext context) { Widget buildUserInformation(BuildContext context) {
return Column(children: [ return Column(mainAxisSize: MainAxisSize.min, children: [
Obx(() => UserInformationWidgetBuilder( Obx(() => UserInformationWidgetBuilder(
imagePaths, imagePaths,
controller.mailboxDashBoardController.userProfile.value, controller.mailboxDashBoardController.userProfile.value,
subtitle: AppLocalizations.of(context).manage_account, subtitle: AppLocalizations.of(context).manage_account,
onSubtitleClick: controller.mailboxDashBoardController.goToSettings)), onSubtitleClick: controller.mailboxDashBoardController.goToSettings)),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2) const Divider(color: AppColor.colorDividerMailbox, height: 1)
]); ]);
} }
@@ -109,7 +109,7 @@ class MailboxView extends BaseMailboxView {
) )
), ),
if (!responsiveUtils.isTabletLarge(context)) if (!responsiveUtils.isTabletLarge(context))
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 1),
] ]
); );
} }
@@ -187,7 +187,7 @@ class MailboxView extends BaseMailboxView {
} }
}), }),
const SizedBox(height: 8), const SizedBox(height: 8),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 1),
const SizedBox(height: 12), const SizedBox(height: 12),
Container( Container(
margin: EdgeInsetsDirectional.only( margin: EdgeInsetsDirectional.only(
@@ -93,6 +93,7 @@ class MailboxView extends BaseMailboxView {
AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context) AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context)
? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller) ? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
: const SizedBox.shrink(), : const SizedBox.shrink(),
const SizedBox(height: 8),
Obx(() { Obx(() {
if (controller.defaultMailboxIsNotEmpty) { if (controller.defaultMailboxIsNotEmpty) {
return _buildMailboxCategory( return _buildMailboxCategory(
@@ -105,7 +106,7 @@ class MailboxView extends BaseMailboxView {
} }
}), }),
const SizedBox(height: 8), const SizedBox(height: 8),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 1),
const SizedBox(height: 13), const SizedBox(height: 13),
Padding( Padding(
padding: EdgeInsetsDirectional.only( padding: EdgeInsetsDirectional.only(
@@ -347,7 +347,7 @@ mixin MailboxWidgetMixin {
: const Offstage(); : const Offstage();
}) })
), ),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 1)
]); ]);
} }
@@ -37,7 +37,7 @@ class UserInformationWidgetBuilder extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Padding(
padding: padding ?? const EdgeInsetsDirectional.only(start: 16, end: 4, top: 16, bottom: 16), padding: padding ?? const EdgeInsetsDirectional.only(start: 16, end: 4, top: 16, bottom: 16),
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ child: Row(children: [
(AvatarBuilder() (AvatarBuilder()
..text(_userProfile != null ? _userProfile!.getAvatarText() : '') ..text(_userProfile != null ? _userProfile!.getAvatarText() : '')
..backgroundColor(Colors.white) ..backgroundColor(Colors.white)
@@ -47,9 +47,7 @@ class ListEmailRulesWidget extends GetWidget<EmailRulesController> {
), ),
const Divider( const Divider(
color: AppColor.lineItemListColor, color: AppColor.lineItemListColor,
height: 1, height: 1),
thickness: 0.2,
),
Obx(() { Obx(() {
log('ListEmailRulesWidget::build(): ${controller.listEmailRule}'); log('ListEmailRulesWidget::build(): ${controller.listEmailRule}');
return ListView.separated( return ListView.separated(
@@ -67,9 +65,7 @@ class ListEmailRulesWidget extends GetWidget<EmailRulesController> {
if (controller.listEmailRule.isNotEmpty) { if (controller.listEmailRule.isNotEmpty) {
return const Divider( return const Divider(
color: AppColor.lineItemListColor, color: AppColor.lineItemListColor,
height: 1, height: 1);
thickness: 0.2,
);
} else { } else {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
@@ -36,7 +36,7 @@ class ForwardView extends GetWidget<ForwardController> with AppLoaderMixin {
if (_responsiveUtils.isWebDesktop(context)) if (_responsiveUtils.isWebDesktop(context))
...[ ...[
ForwardHeaderWidget(imagePaths: _imagePaths, responsiveUtils: _responsiveUtils), ForwardHeaderWidget(imagePaths: _imagePaths, responsiveUtils: _responsiveUtils),
Container(height: 1, color: AppColor.colorDividerHeaderSetting) const Divider(height: 1, color: AppColor.colorDividerHeaderSetting)
], ],
Expanded(child: SingleChildScrollView( Expanded(child: SingleChildScrollView(
physics: const ClampingScrollPhysics(), physics: const ClampingScrollPhysics(),
@@ -54,7 +54,7 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
]) ])
), ),
if (!_responsiveUtils.isWebDesktop(context)) if (!_responsiveUtils.isWebDesktop(context))
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 1),
Expanded(child: Container( Expanded(child: Container(
color: _responsiveUtils.isWebDesktop(context) ? AppColor.colorBgDesktop : Colors.white, color: _responsiveUtils.isWebDesktop(context) ? AppColor.colorBgDesktop : Colors.white,
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -112,7 +112,7 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
}), }),
const Padding( const Padding(
padding: EdgeInsets.symmetric(vertical: 16), padding: EdgeInsets.symmetric(vertical: 16),
child: Divider(color: AppColor.lineItemListColor, height: 0.5, thickness: 0.2)), child: Divider(color: AppColor.lineItemListColor, height: 1)),
Padding( Padding(
padding: const EdgeInsetsDirectional.only(start: 20, end: 10), padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
child: Material( child: Material(
@@ -155,11 +155,7 @@ class SendingEmailTileWidget extends StatelessWidget {
), ),
Padding( Padding(
padding: SendingQueueUtils.getPaddingDividerListViewByResponsiveSize(constraints.maxWidth), padding: SendingQueueUtils.getPaddingDividerListViewByResponsiveSize(constraints.maxWidth),
child: const Divider( child: const Divider(color: AppColor.lineItemListColor, height: 1),
color: AppColor.lineItemListColor,
height: 1,
thickness: 0.2
),
) )
], ],
), ),
@@ -50,10 +50,7 @@ class ThreadView extends GetWidget<ThreadController>
body: Portal( body: Portal(
child: Row(children: [ child: Row(children: [
if (supportVerticalDivider(context)) if (supportVerticalDivider(context))
const VerticalDivider( const VerticalDivider(color: AppColor.colorDividerVertical, width: 1),
color: AppColor.colorDividerVertical,
width: 1,
thickness: 0.2),
Expanded(child: SafeArea( Expanded(child: SafeArea(
right: _responsiveUtils.isLandscapeMobile(context), right: _responsiveUtils.isLandscapeMobile(context),
left: _responsiveUtils.isLandscapeMobile(context), left: _responsiveUtils.isLandscapeMobile(context),
@@ -135,10 +135,7 @@ class EmailTileBuilder with BaseEmailItemTile {
), ),
Padding( Padding(
padding: paddingDivider ?? const EdgeInsetsDirectional.symmetric(horizontal: 16), padding: paddingDivider ?? const EdgeInsetsDirectional.symmetric(horizontal: 16),
child: const Divider( child: const Divider(color: AppColor.lineItemListColor, height: 1)),
color: AppColor.lineItemListColor,
height: 1,
thickness: 0.2)),
], ],
), ),
); );
@@ -202,11 +202,8 @@ class EmailTileBuilder with BaseEmailItemTile {
), ),
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Transform( Transform(
transform: Matrix4.translationValues(0.0, 10.0, 0.0), transform: Matrix4.translationValues(0.0, 10.0, 0.0),
child: const Divider( child: const Divider(color: AppColor.lineItemListColor, height: 1)),
color: AppColor.lineItemListColor,
height: 1,
thickness: 0.2)),
], ],
); );
} }
@@ -289,10 +286,7 @@ class EmailTileBuilder with BaseEmailItemTile {
if (_selectModeAll == SelectMode.INACTIVE) if (_selectModeAll == SelectMode.INACTIVE)
Transform( Transform(
transform: Matrix4.translationValues(0.0, 10.0, 0.0), transform: Matrix4.translationValues(0.0, 10.0, 0.0),
child: const Divider( child: const Divider(color: AppColor.lineItemListColor, height: 1),
color: AppColor.lineItemListColor,
height: 1,
thickness: 0.2),
), ),
], ],
)) ))
@@ -391,10 +385,7 @@ class EmailTileBuilder with BaseEmailItemTile {
transform: Matrix4.translationValues(0.0, 10, 0.0), transform: Matrix4.translationValues(0.0, 10, 0.0),
child: const Padding( child: const Padding(
padding: EdgeInsetsDirectional.only(start: 120), padding: EdgeInsetsDirectional.only(start: 120),
child: Divider( child: Divider(color: AppColor.lineItemListColor, height: 1)),
color: AppColor.lineItemListColor,
height: 1,
thickness: 0.2)),
) )
]), ]),
); );