Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TF-3410 Reduce color noise and user load #3414

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3000688
TF-3410 Change color of icons in TopAppBarThreadSelection
dab246 Jan 8, 2025
c733b02
TF-3410 Update color, dimensions and alignments in EmailView
dab246 Jan 8, 2025
5c6b732
TF-3410 Remove stroke for thread view or email view in desktop
dab246 Jan 8, 2025
750b0bb
TF-3410 Update color and icon size of mailbox view
dab246 Jan 8, 2025
9f1d301
TF-3410 Update color of quotas view
dab246 Jan 8, 2025
980360c
TF-3410 Update icon color & icon size of composer view
dab246 Jan 8, 2025
32909e1
TF-3410 Update confirm dialog
dab246 Jan 8, 2025
1e171ad
TF-3410 Sync changes between web and mobile
dab246 Jan 8, 2025
47435ea
TF-3410 Synchronize all color for app
dab246 Mar 6, 2025
838a5d6
TF-3410 Update file `email_tile_web_builder_test` to pass unit test
dab246 Mar 6, 2025
fec267d
TF-3410 Use `TextTheme` apply almost text style for text widget
dab246 Mar 9, 2025
d3713ae
TF-3410 Fix list email item in ThreadView was not applied correct font
dab246 Mar 12, 2025
7d6755f
TF-3410 Fix wrong font size label back button in EmailView
dab246 Mar 12, 2025
680cb0b
TF-3410 Fix wrong font size label `Folders` in MailBoxLeftMenu
dab246 Mar 12, 2025
c47af1f
TF-3410 Fix wrong color size `next/previous` button in EmailView
dab246 Mar 12, 2025
8f2f836
TF-3410 Fix wrong text style avatar icon
dab246 Mar 12, 2025
69fdb08
TF-3410 Fix wrong text style sender & recipient information in EmailView
dab246 Mar 12, 2025
f989305
TF-3410 Fix wrong text style `Reply/Forward` button in EmailView
dab246 Mar 12, 2025
4b95a09
TF-3410 Fix wrong text style email subject in EmailView
dab246 Mar 12, 2025
7706855
TF-3410 Fix wrong text style title in ComposerView
dab246 Mar 12, 2025
3fc712a
TF-3410 Fix wrong text style Send button in ComposerView
dab246 Mar 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions assets/images/ic_add_email_forwards.svg

This file was deleted.

3 changes: 3 additions & 0 deletions assets/images/ic_close_dialog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions assets/images/ic_delete_composer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions assets/images/ic_move_email.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions contact/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ packages:
dependency: transitive
description:
name: ffi
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.3"
file:
dependency: transitive
description:
Expand Down Expand Up @@ -1273,18 +1273,18 @@ packages:
dependency: transitive
description:
name: win32
sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
url: "https://pub.dev"
source: hosted
version: "4.1.4"
version: "5.5.1"
win32_registry:
dependency: transitive
description:
name: win32_registry
sha256: "1c52f994bdccb77103a6231ad4ea331a244dbcef5d1f37d8462f713143b0bfae"
sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.4"
xdg_directories:
dependency: transitive
description:
Expand Down
13 changes: 9 additions & 4 deletions core/lib/presentation/extensions/color_extension.dart
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,14 @@ extension AppColor on Color {
static const colorTextSettingDescriptions = colorTextButtonHeaderThread;
static const colorButtonHeaderThread = Color(0x99EBEDF0);
static const colorBorderBodyThread = Color(0x5CB8C1CC);
static const colorBgDesktop = Color(0xFFF6F6F6);
static const colorBgDesktop = Color(0xFFF3F6F9);
static const colorItemEmailSelectedDesktop = Color(0xFFDFEEFF);
static const colorAvatar = Color(0xFFDE5E5E);
static const colorFocusButton = Color(0x14818C99);
static const colorBorderEmailAddressInvalid = Color(0xFFFF3347);
static const colorBorderIdentityInfo = Color(0xFFE7E8EC);
static const colorBgMailboxSelected = Color(0x99E4E8EC);
static const colorLoading = Color(0x2999A2AD);
static const colorActionButtonHover = Color(0xFFA2AAB3);
static const colorBgMenuItemDropDownSelected = Color(0x80DEE2E7);
static const colorButtonCancelDialog = Color(0x0D000000);
static const colorShadowComposerButton = Color(0x99007AFF);
Expand Down Expand Up @@ -206,7 +205,6 @@ extension AppColor on Color {
static const colorLineComposer = Color(0xFFF4F4F4);
static const colorPrefixButtonComposer = Color(0xFF8B9CAF);
static const colorRichButtonComposer = Color(0xFFAEAEC0);
static const colorMobileRichButtonComposer = Color(0xFF8C9CAF);
static const colorSelected = Color(0xFFE3F1FF);
static const colorAttachmentBorder = Color(0xFFE5ECF3);
static const colorProgressLoadingBackground = Color(0xFFE3F1FF);
Expand All @@ -227,7 +225,6 @@ extension AppColor on Color {
static const thumbScrollbarColor = Color(0xFFC1C1C1);
static const loginViewShadowColor = Color(0x3DBCBCBC);
static const colorEmailTileCheckboxUnhover = Color(0xFFAEB7C2);
static const colorEmailTileHoverWeb = Color(0xFFDFEEFF);
static const colorSearchFilterButton = Color(0xFFECEEF1);
static const colorSearchFilterTitle = Color(0xFF686E76);
static const colorSearchFilterIcon = Color(0xFF686E76);
Expand All @@ -241,6 +238,14 @@ extension AppColor on Color {
static const steelGrayA540 = Color(0xFF55687D);
static const steelGray200 = Color(0xFFAEB7C2);
static const blue700 = Color(0xFF208BFF);
static const steelGray400 = Color(0xFF818C99);
static const steelGray600 = Color(0xFF4E5966);
static const blue100 = Color(0xFFDFEEFF);
static const blue400 = Color(0xFF80BDFF);
static const m3Tertiary = Color(0xFF8C9CAF);
static const m3Neutral70 = Color(0xFFAEAAAE);
static const grayBackgroundColor = Color(0xFFF3F6F9);
static const m3SurfaceBackground = Color(0xFF1C1B1F);

static const mapGradientColor = [
[Color(0xFF21D4FD), Color(0xFFB721FF)],
Expand Down
2 changes: 2 additions & 0 deletions core/lib/presentation/extensions/string_extension.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ extension StringExtension on String {
return '';
}
}

String get firstCharacterToUpperCase => isNotEmpty ? this[0].toUpperCase() : '';
}
2 changes: 1 addition & 1 deletion core/lib/presentation/resources/image_paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ class ImagePaths {
String get icSwitchOff => _getImagePath('ic_switch_off.svg');
String get icClock => _getImagePath('ic_clock.svg');
String get icCalendar => _getImagePath('ic_calendar.svg');
String get icAddEmailForward => _getImagePath('ic_add_email_forwards.svg');
String get icChevronDownOutline => _getImagePath('ic_chevron_down_outline.svg');
String get icUndo => _getImagePath('ic_undo.svg');
String get icDownloadAttachment => _getImagePath('ic_download_attachment.svg');
Expand Down Expand Up @@ -227,6 +226,7 @@ class ImagePaths {
String get icSubaddressingAllow => _getImagePath('ic_subaddressing_allow.svg');
String get icSubaddressingDisallow => _getImagePath('ic_subaddressing_disallow.svg');
String get icMarkAsImportant => _getImagePath('ic_mark_as_important.svg');
String get icCloseDialog => _getImagePath('ic_close_dialog.svg');

String _getImagePath(String imageName) {
return AssetsPaths.images + imageName;
Expand Down
113 changes: 111 additions & 2 deletions core/lib/presentation/utils/theme_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

class ThemeUtils {
ThemeUtils._();

static ThemeData get appTheme {
return ThemeData(
Expand All @@ -23,11 +24,119 @@ class ThemeUtils {

static TextTheme get _textTheme {
return const TextTheme(
bodyMedium: TextStyle(color: AppColor.baseTextColor),
bodySmall: TextStyle(color: AppColor.baseTextColor),
bodyLarge: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: -0.15,
fontSize: 17,
height: 24 / 17,
),
bodyMedium: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: 0.25,
),
bodySmall: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w400,
letterSpacing: 0.0,
fontSize: 13,
height: 16 / 13
),
labelLarge: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: 0.1,
),
labelSmall: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: 0.5,
),
displayLarge: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w700,
),
displayMedium: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
letterSpacing: 0.4,
),
displaySmall: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
letterSpacing: 0.4,
),
headlineMedium: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
),
headlineSmall: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
letterSpacing: 0.4,
),
headlineLarge: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
fontSize: 32,
),
titleLarge: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w600,
letterSpacing: 0.0,
fontSize: 22,
height: 28 / 22,
),
titleMedium: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: 0.15,
),
titleSmall: TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: FontWeight.w500,
letterSpacing: 0.1,
),
);
}

static TextStyle textStyleBodyBody1({Color? color, FontWeight? fontWeight}) => TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: fontWeight ?? FontWeight.w500,
letterSpacing: 0.0,
fontSize: 16,
height: 20 / 16,
color: color,
);

static TextStyle textStyleBodyBody2({Color? color, FontWeight? fontWeight}) => TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: fontWeight ?? FontWeight.w400,
letterSpacing: 0.0,
fontSize: 15,
height: 20 / 15,
color: color,
);

static TextStyle textStyleBodyBody3({Color? color, FontWeight? fontWeight}) => TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: fontWeight ?? FontWeight.w400,
letterSpacing: 0.0,
fontSize: 14,
height: 18 / 14,
color: color,
);

static TextStyle textStyleHeadingH6({Color? color, FontWeight? fontWeight}) => TextStyle(
fontFamily: ConstantsUI.fontApp,
fontWeight: fontWeight ?? FontWeight.w700,
letterSpacing: 0.0,
fontSize: 20,
height: 24 / 20,
color: color,
);

static TextSelectionThemeData get _textSelectionTheme {
return const TextSelectionThemeData(
cursorColor: AppColor.primaryColor,
Expand Down
Loading
Loading