added converting from png, jpg

This commit is contained in:
Vashchuk Nikita 2023-03-23 20:18:37 +05:00
parent ca6e1d1553
commit 7d7f537317

View File

@ -418,9 +418,13 @@ public class TenantWhiteLabelSettingsHelper
if (currentLogoType == WhiteLabelLogoTypeEnum.LoginPage) if (currentLogoType == WhiteLabelLogoTypeEnum.LoginPage)
{ {
var (notificationData, extNotification) = GetNotificationLogoData(lightData, extLight, tenantWhiteLabelSettings); var (notificationData, extNotification) = GetNotificationLogoData(lightData, extLight, tenantWhiteLabelSettings);
if (notificationData != null)
{
await SetLogo(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Notification, extNotification, notificationData, false, storage); await SetLogo(tenantWhiteLabelSettings, WhiteLabelLogoTypeEnum.Notification, extNotification, notificationData, false, storage);
} }
} }
}
if (darkData != null && CanBeDark(currentLogoType)) if (darkData != null && CanBeDark(currentLogoType))
{ {
@ -489,7 +493,20 @@ public class TenantWhiteLabelSettingsHelper
{ {
var extNotification = tenantWhiteLabelSettings.GetExt(WhiteLabelLogoTypeEnum.Notification); var extNotification = tenantWhiteLabelSettings.GetExt(WhiteLabelLogoTypeEnum.Notification);
if (extLogo != extNotification) switch (extLogo)
{
case "png":
return (logoData, extNotification);
case "svg":
return (GetLogoDataFromSvg(), extNotification);
case "jpg":
case "jpeg":
return (GetLogoDataFromJpg(), extNotification);
default:
return (null, extNotification);
}
byte[] GetLogoDataFromSvg()
{ {
var size = GetSize(WhiteLabelLogoTypeEnum.Notification); var size = GetSize(WhiteLabelLogoTypeEnum.Notification);
var skSize = new SKSize(size.Width, size.Height); var skSize = new SKSize(size.Width, size.Height);
@ -509,13 +526,18 @@ public class TenantWhiteLabelSettingsHelper
using (var image = SKImage.FromBitmap(bitMap)) using (var image = SKImage.FromBitmap(bitMap))
using (var pngData = image.Encode(SKEncodedImageFormat.Png, 100)) using (var pngData = image.Encode(SKEncodedImageFormat.Png, 100))
{ {
return (pngData.ToArray(), extNotification); return pngData.ToArray();
} }
} }
} }
else
byte[] GetLogoDataFromJpg()
{ {
return (null, extNotification); using (var image = SKImage.FromEncodedData(logoData))
using (var pngData = image.Encode(SKEncodedImageFormat.Png, 100))
{
return pngData.ToArray();
}
} }
} }