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

Change logos to beta and move position version on web (#3203)

Browse Source
This commit is contained in:
Dat Vu
2024-10-16 17:56:20 +07:00
committed by GitHub
parent 8ccbd8a69d
commit 401f0b97fb
9 changed files with 124 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/images/ic_logo_with_text_beta.svg
+49
View File
@@ -0,0 +1,49 @@
<svg width="1275" height="220" viewBox="0 0 1275 220" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M265.244 71.2701H229V48.4366H326.858V71.2701H290.614V175.29H265.244V71.2701Z" fill="black"/>
<path d="M309.226 81.0559H337.859L350 134.515C351.329 139.952 352.296 144.724 352.9 148.832C353.745 143.637 354.772 138.804 355.98 134.334L369.753 81.0559H397.842L412.521 134.334C413.729 138.804 414.756 143.637 415.601 148.832C416.205 144.724 417.172 139.952 418.501 134.515L431.549 81.0559H458.188L428.83 175.29H402.372L386.969 121.649C385.519 117.3 384.432 112.588 383.707 107.514C382.861 113.071 381.895 117.783 380.807 121.649L366.672 175.29H338.583L309.226 81.0559Z" fill="black"/>
<path d="M501.941 177.645C493.484 177.645 485.691 175.471 478.563 171.122C471.436 166.651 465.757 160.671 461.529 153.181C457.421 145.691 455.367 137.475 455.367 128.535C455.367 119.595 457.421 111.38 461.529 103.889C465.757 96.2783 471.436 90.2376 478.563 85.7676C485.691 81.2975 493.484 79.0625 501.941 79.0625C509.673 79.0625 515.895 80.5122 520.606 83.4117C525.439 86.3112 529.184 90.4793 531.842 95.9158V81.0559H556.125V175.29H532.385V159.886C529.607 165.564 525.801 169.974 520.969 173.115C516.257 176.135 509.914 177.645 501.941 177.645ZM479.832 128.354C479.832 133.186 480.919 137.717 483.094 141.945C485.389 146.053 488.47 149.375 492.336 151.912C496.323 154.329 500.853 155.537 505.927 155.537C511.122 155.537 515.713 154.329 519.7 151.912C523.808 149.496 526.949 146.234 529.123 142.127C531.298 138.019 532.385 133.488 532.385 128.535C532.385 123.582 531.298 119.051 529.123 114.944C526.949 110.715 523.808 107.393 519.7 104.977C515.713 102.44 511.122 101.171 505.927 101.171C500.853 101.171 496.323 102.44 492.336 104.977C488.349 107.393 485.269 110.655 483.094 114.763C480.919 118.87 479.832 123.401 479.832 128.354Z" fill="black"/>
<path d="M595.125 130.529V175.29H570.661V43H595.125V119.112L630.463 81.0559H665.257L620.858 124.911L665.438 175.29H633L595.125 130.529Z" fill="black"/>
<path d="M704.978 177.645C695.433 177.645 686.977 175.471 679.607 171.122C672.237 166.651 666.499 160.671 662.391 153.181C658.284 145.691 656.23 137.415 656.23 128.354C656.23 119.414 658.344 111.138 662.573 103.527C666.801 95.9158 672.6 89.8752 679.969 85.4051C687.46 80.9351 695.796 78.7001 704.978 78.7001C714.159 78.7001 722.375 80.9351 729.623 85.4051C736.993 89.8752 742.671 95.9158 746.658 103.527C750.766 111.017 752.819 119.293 752.819 128.354C752.819 131.374 752.578 134.274 752.094 137.052H681.6C683.05 142.731 685.768 147.322 689.755 150.825C693.863 154.208 698.937 155.899 704.978 155.899C710.052 155.899 714.582 154.751 718.569 152.456C722.556 150.04 725.697 146.959 727.992 143.214L747.02 157.53C743.154 163.571 737.476 168.464 729.986 172.209C722.495 175.833 714.159 177.645 704.978 177.645ZM728.174 118.749C726.724 113.313 723.885 108.782 719.656 105.158C715.428 101.534 710.414 99.7214 704.615 99.7214C698.937 99.7214 693.984 101.473 689.755 104.977C685.648 108.48 682.929 113.071 681.6 118.749H728.174Z" fill="black"/>
<path d="M804.387 52.2196H833.653L858.042 104.192C864.882 118.657 869.255 129.142 871.161 135.645C872.731 129.59 877.048 119.106 884.112 104.192L908.669 52.2196H936.926V169.957H913.883V122.358C913.883 114.621 913.995 108.341 914.219 103.52C914.444 98.698 914.892 93.596 915.565 88.2137L876.375 169.957H864.938L825.748 88.2137C826.421 93.596 826.869 98.698 827.093 103.52C827.318 108.341 827.43 114.621 827.43 122.358V169.957H804.387V52.2196Z" fill="url(#paint0_linear_58327_606)"/>
<path d="M991.875 172.144C984.026 172.144 976.793 170.126 970.178 166.089C963.562 161.94 958.292 156.39 954.367 149.437C950.555 142.485 948.648 134.86 948.648 126.563C948.648 118.265 950.555 110.64 954.367 103.688C958.292 96.6236 963.562 91.017 970.178 86.8682C976.793 82.7193 984.026 80.6449 991.875 80.6449C999.051 80.6449 1004.83 81.9905 1009.2 84.6816C1013.68 87.3728 1017.16 91.2413 1019.63 96.2872V82.495H1042.17V169.957H1020.13V155.661C1017.55 160.931 1014.02 165.024 1009.54 167.939C1005.16 170.742 999.276 172.144 991.875 172.144ZM971.355 126.394C971.355 130.88 972.364 135.085 974.383 139.009C976.513 142.822 979.372 145.905 982.961 148.26C986.661 150.503 990.866 151.624 995.575 151.624C1000.4 151.624 1004.66 150.503 1008.36 148.26C1012.17 146.017 1015.09 142.99 1017.1 139.177C1019.12 135.365 1020.13 131.16 1020.13 126.563C1020.13 121.965 1019.12 117.76 1017.1 113.948C1015.09 110.023 1012.17 106.94 1008.36 104.697C1004.66 102.342 1000.4 101.165 995.575 101.165C990.866 101.165 986.661 102.342 982.961 104.697C979.26 106.94 976.401 109.967 974.383 113.78C972.364 117.592 971.355 121.797 971.355 126.394Z" fill="url(#paint1_linear_58327_606)"/>
<path d="M1055.66 82.495H1078.36V169.957H1055.66V82.495ZM1053.3 61.8068C1053.3 58.1065 1054.59 54.9668 1057.17 52.3878C1059.86 49.8088 1063.11 48.5193 1066.93 48.5193C1070.85 48.5193 1074.1 49.8088 1076.68 52.3878C1079.26 54.9668 1080.55 58.1065 1080.55 61.8068C1080.55 65.6193 1079.26 68.815 1076.68 71.3941C1074.1 73.9731 1070.85 75.2626 1066.93 75.2626C1063.11 75.2626 1059.86 73.9731 1057.17 71.3941C1054.59 68.7029 1053.3 65.5072 1053.3 61.8068Z" fill="url(#paint2_linear_58327_606)"/>
<path d="M1091.79 47.1737H1114.5V169.957H1091.79V47.1737Z" fill="url(#paint3_linear_58327_606)"/>
<rect y="11.9999" width="196.105" height="196.105" rx="64.7641" fill="white"/>
<rect y="11.9999" width="196.105" height="196.105" rx="64.7641" fill="url(#paint4_linear_58327_606)"/>
<g filter="url(#filter0_d_58327_606)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M40.3522 84.1512C35.719 87.6846 33 93.1776 33 99.0044V152.32C33 164.7 43.0357 174.735 55.4154 174.735H140.585C152.964 174.735 163 164.7 163 152.32V99.0044C163 93.1776 160.281 87.6846 155.648 84.1512L109.327 48.8264C102.637 43.7246 93.3625 43.7246 86.6727 48.8264L40.3522 84.1512ZM47.4444 96.8396V153.101C47.4444 157.227 50.7897 160.573 54.9163 160.573H141.084C145.21 160.573 148.556 157.227 148.556 153.101V96.8396L106.573 126.243C101.426 129.847 94.5741 129.847 89.4274 126.243L47.4444 96.8396Z" fill="white"/>
</g>
<path d="M1152.45 170V138.568H1163.96C1166.19 138.568 1168.04 138.936 1169.5 139.673C1170.97 140.399 1172.06 141.387 1172.79 142.635C1173.52 143.873 1173.88 145.27 1173.88 146.825C1173.88 148.135 1173.64 149.24 1173.16 150.14C1172.68 151.03 1172.03 151.746 1171.22 152.289C1170.43 152.821 1169.55 153.21 1168.58 153.455V153.762C1169.63 153.813 1170.65 154.151 1171.64 154.775C1172.64 155.389 1173.47 156.264 1174.12 157.4C1174.78 158.535 1175.11 159.917 1175.11 161.543C1175.11 163.15 1174.73 164.592 1173.97 165.871C1173.22 167.14 1172.07 168.148 1170.5 168.895C1168.94 169.632 1166.94 170 1164.5 170H1152.45ZM1157.2 165.933H1164.04C1166.31 165.933 1167.94 165.493 1168.92 164.613C1169.9 163.733 1170.39 162.633 1170.39 161.313C1170.39 160.321 1170.14 159.41 1169.64 158.581C1169.14 157.753 1168.43 157.093 1167.49 156.601C1166.57 156.11 1165.48 155.865 1164.21 155.865H1157.2V165.933ZM1157.2 152.166H1163.55C1164.61 152.166 1165.57 151.961 1166.42 151.552C1167.28 151.143 1167.96 150.57 1168.46 149.833C1168.97 149.086 1169.23 148.206 1169.23 147.193C1169.23 145.894 1168.77 144.804 1167.86 143.924C1166.95 143.044 1165.56 142.604 1163.67 142.604H1157.2V152.166ZM1182.03 170V138.568H1201.73V142.65H1186.77V152.227H1200.71V156.295H1186.77V165.918H1201.92V170H1182.03ZM1207.82 142.65V138.568H1232.14V142.65H1222.33V170H1217.61V142.65H1207.82ZM1237.75 170H1232.72L1244.03 138.568H1249.51L1260.82 170H1255.79L1246.9 144.277H1246.66L1237.75 170ZM1238.6 157.691H1254.93V161.682H1238.6V157.691Z" fill="#97A3B7"/>
<defs>
<filter id="filter0_d_58327_606" x="23" y="37.0001" width="150" height="149.735" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="2"/>
<feGaussianBlur stdDeviation="5"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_58327_606"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_58327_606" result="shape"/>
</filter>
<linearGradient id="paint0_linear_58327_606" x1="839.942" y1="16.2261" x2="839.942" y2="172" gradientUnits="userSpaceOnUse">
<stop stop-color="#57B9FF"/>
<stop offset="1" stop-color="#0B84FF"/>
</linearGradient>
<linearGradient id="paint1_linear_58327_606" x1="839.942" y1="16.2261" x2="839.942" y2="172" gradientUnits="userSpaceOnUse">
<stop stop-color="#57B9FF"/>
<stop offset="1" stop-color="#0B84FF"/>
</linearGradient>
<linearGradient id="paint2_linear_58327_606" x1="839.942" y1="16.2261" x2="839.942" y2="172" gradientUnits="userSpaceOnUse">
<stop stop-color="#57B9FF"/>
<stop offset="1" stop-color="#0B84FF"/>
</linearGradient>
<linearGradient id="paint3_linear_58327_606" x1="839.942" y1="16.2261" x2="839.942" y2="172" gradientUnits="userSpaceOnUse">
<stop stop-color="#57B9FF"/>
<stop offset="1" stop-color="#0B84FF"/>
</linearGradient>
<linearGradient id="paint4_linear_58327_606" x1="27.5" y1="187.5" x2="191.5" y2="21.4999" gradientUnits="userSpaceOnUse">
<stop stop-color="#1E91FF"/>
<stop offset="0.997303" stop-color="#2ED9FF"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

core/lib/presentation/resources/image_paths.dart
+1
View File
@@ -196,6 +196,7 @@ class ImagePaths {
String get icEventCanceled => _getImagePath('ic_event_canceled.svg');
String get icFormatQuote => _getImagePath('ic_format_quote.svg');
String get icLogoWithText => _getImagePath('ic_logo_with_text.svg');
String get icLogoWithTextBeta => _getImagePath('ic_logo_with_text_beta.svg');
String get icTMailLogo => _getImagePath('ic_tmail_logo.svg');
String get icLoginGraphic => _getImagePath('ic_login_graphic.svg');
String get icCancel => _getImagePath('ic_cancel.svg');
env.file
+2 -1
View File
@@ -5,4 +5,5 @@ OIDC_SCOPES=openid,profile,email,offline_access
APP_GRID_AVAILABLE=supported
FCM_AVAILABLE=supported
IOS_FCM=supported
FORWARD_WARNING_MESSAGE=
FORWARD_WARNING_MESSAGE=
PLATFORM=other
lib/features/base/widget/application_logo_with_text_widget.dart
+12 -2
View File
@@ -1,22 +1,32 @@
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/views/button/tmail_button_widget.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/main/utils/app_config.dart';
class ApplicationLogoWidthTextWidget extends StatelessWidget {
final ImagePaths _imagePaths = Get.find<ImagePaths>();
final VoidCallback? onTapAction;
final EdgeInsetsGeometry? margin;
ApplicationLogoWidthTextWidget({super.key, this.onTapAction});
ApplicationLogoWidthTextWidget({
super.key,
this.onTapAction,
this.margin,
});
@override
Widget build(BuildContext context) {
return TMailButtonWidget.fromIcon(
icon: _imagePaths.icLogoWithText,
icon: PlatformInfo.isWeb && !AppConfig.isSaasPlatForm
? _imagePaths.icLogoWithTextBeta
: _imagePaths.icLogoWithText,
iconSize: 33,
padding: EdgeInsets.zero,
margin: margin,
backgroundColor: Colors.transparent,
hoverColor: Colors.transparent,
onTapActionCallback: onTapAction,
lib/features/mailbox/presentation/mailbox_view_web.dart
+33 -18
View File
@@ -13,6 +13,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_item
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_loading_bar_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget.dart';
import 'package:tmail_ui_user/features/quotas/presentation/quotas_view.dart';
import 'package:tmail_ui_user/features/quotas/presentation/styles/quotas_view_styles.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_config.dart';
@@ -31,8 +32,15 @@ class MailboxView extends BaseMailboxView {
backgroundColor: controller.responsiveUtils.isWebDesktop(context)
? AppColor.colorBgDesktop
: Colors.white,
body: Column(children: [
if (!controller.responsiveUtils.isDesktop(context)) _buildLogoApp(context),
body: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
if (!controller.responsiveUtils.isDesktop(context))
ApplicationLogoWidthTextWidget(
margin: const EdgeInsetsDirectional.only(
top: 16,
bottom: 16,
start: 16,
),
),
if (!controller.responsiveUtils.isDesktop(context))
const Divider(
color: AppColor.colorDividerMailbox,
@@ -50,27 +58,34 @@ class MailboxView extends BaseMailboxView {
child: _buildListMailbox(context),
),
)),
const QuotasView(),
const QuotasView(
padding: EdgeInsetsDirectional.only(
start: QuotasViewStyles.padding,
top: QuotasViewStyles.padding,
),
),
Container(
color: AppColor.colorBgMailbox,
width: double.infinity,
alignment: controller.responsiveUtils.isDesktop(context)
? AlignmentDirectional.centerStart
: AlignmentDirectional.center,
padding: const EdgeInsets.all(16),
child: ApplicationVersionWidget(
padding: EdgeInsets.zero,
title: '${AppLocalizations.of(context).version.toLowerCase()} ',
textStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
fontSize: 13,
color: AppColor.colorTextBody,
fontWeight: FontWeight.normal
),
),
),
]),
)
);
}
Widget _buildLogoApp(BuildContext context) {
return Container(
color: Colors.white,
padding: EdgeInsetsDirectional.only(
top: controller.responsiveUtils.isDesktop(context) ? 25 : 16,
bottom: controller.responsiveUtils.isDesktop(context) ? 25 : 16,
start: controller.responsiveUtils.isDesktop(context) ? 32 : 16,
),
child: Row(children: [
ApplicationLogoWidthTextWidget(),
const ApplicationVersionWidget()
])
);
}
Widget _buildListMailbox(BuildContext context) {
final mailboxListWidget = SingleChildScrollView(
controller: controller.mailboxListScrollController,
lib/features/mailbox_dashboard/presentation/widgets/navigation_bar/navigation_bar_widget.dart
+1 -2
View File
@@ -3,7 +3,6 @@ import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/views/image/avatar_builder.dart';
import 'package:flutter/material.dart';
import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart';
import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/app_grid_dashboard_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/navigation_bar_style.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/app_dashboard/app_grid_dashboard_icon.dart';
@@ -41,7 +40,7 @@ class NavigationBarWidget extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
ApplicationLogoWidthTextWidget(onTapAction: onTapApplicationLogoAction),
const ApplicationVersionWidget()
const Spacer(),
],
),
),
lib/features/manage_account/presentation/menu/manage_account_menu_view.dart
+17
View File
@@ -129,6 +129,23 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
]
),
)),
Container(
color: AppColor.colorBgMailbox,
width: double.infinity,
alignment: controller.responsiveUtils.isDesktop(context)
? AlignmentDirectional.centerStart
: AlignmentDirectional.center,
padding: const EdgeInsets.all(16),
child: ApplicationVersionWidget(
padding: EdgeInsets.zero,
title: '${AppLocalizations.of(context).version.toLowerCase()} ',
textStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
fontSize: 13,
color: AppColor.colorTextBody,
fontWeight: FontWeight.normal
),
),
),
]
)
),
lib/features/quotas/presentation/quotas_view.dart
+4 -2
View File
@@ -8,7 +8,9 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
class QuotasView extends GetWidget<QuotasController> {
const QuotasView({Key? key}) : super(key: key);
final EdgeInsetsGeometry? padding;
const QuotasView({Key? key, this.padding}) : super(key: key);
@override
Widget build(BuildContext context) {
@@ -17,7 +19,7 @@ class QuotasView extends GetWidget<QuotasController> {
final octetQuota = controller.octetsQuota.value!;
return LayoutBuilder(builder: (context, constraints) {
return Container(
padding: const EdgeInsetsDirectional.only(
padding: padding ?? const EdgeInsetsDirectional.only(
start: QuotasViewStyles.padding,
top: QuotasViewStyles.padding,
bottom: QuotasViewStyles.bottomPadding
lib/main/utils/app_config.dart
+5
View File
@@ -14,6 +14,7 @@ class AppConfig {
static const String appFCMConfigurationPath = "configurations/env.fcm";
static const String iOSKeychainSharingGroupId = 'KUT463DS29.com.linagora.ios.teammail.shared';
static const String iOSKeychainSharingService = 'com.linagora.ios.teammail.sessions';
static const String saasPlatform = 'saas';
static String get baseUrl => dotenv.get('SERVER_URL', fallback: '');
static String get domainRedirectUrl => dotenv.get('DOMAIN_REDIRECT_URL', fallback: '');
@@ -61,4 +62,8 @@ class AppConfig {
return forwardWarningMessage;
}
static String get _platformEnv => dotenv.get('PLATFORM', fallback: 'other');
static bool get isSaasPlatForm => _platformEnv == saasPlatform;
}