javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ability to set composer default font (#287)

Browse Source 
* Added ability to set Composer font

* Added missing translations and refactoring

* Remove unused methods

* Small fixes
This commit is contained in:
Tiktack
2024-07-18 20:04:11 +02:00
committed by GitHub
parent 76375c9471
commit cf2f0ec936
30 changed files with 424 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Wino.Mail/Views/Abstract/ReadComposePanePageAbstract.cs Normal file
View File

@@ -0,0 +1,6 @@
using Wino.Mail.ViewModels;
namespace Wino.Views.Abstract
{
public abstract class ReadComposePanePageAbstract : BasePage<ReadComposePanePageViewModel> { }
}

6
Wino.Mail/Views/Abstract/ReadingPanePageAbstract.cs
View File

@@ -1,6 +0,0 @@
using Wino.Mail.ViewModels;
namespace Wino.Views.Abstract
{
public abstract class ReadingPanePageAbstract : BasePage<ReadingPanePageViewModel> { }
}

13
Wino.Mail/Views/ComposePage.xaml.cs
View File

@@ -59,7 +59,7 @@ namespace Wino.Views
InitializeComponent();
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation");
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation,FontAccess");
}
private static async void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
@@ -389,6 +389,7 @@ namespace Wino.Views
await DOMLoadedTask.Task;
await UpdateEditorThemeAsync();
await InitializeEditorAsync();
if (string.IsNullOrEmpty(htmlBody))
{
@@ -400,6 +401,16 @@ namespace Wino.Views
}
}
private async Task<string> InitializeEditorAsync()
{
var fonts = ViewModel.FontService.GetFonts();
var composerFont = ViewModel.PreferencesService.ComposerFont;
int composerFontSize = ViewModel.PreferencesService.ComposerFontSize;
var readerFont = ViewModel.PreferencesService.ReaderFont;
int readerFontSize = ViewModel.PreferencesService.ReaderFontSize;
return await ExecuteScriptFunctionAsync("initializeJodit", fonts, composerFont, composerFontSize, readerFont, readerFontSize);
}
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
{
base.OnNavigatingFrom(e);

5
Wino.Mail/Views/MailRenderingPage.xaml.cs
View File

@@ -17,6 +17,7 @@ using Wino.Core.Domain.Enums;
using Wino.Core.Domain.Interfaces;
using Wino.Core.Messages.Mails;
using Wino.Core.Messages.Shell;
using Wino.Core.Services;
using Wino.Mail.ViewModels.Data;
using Wino.Views.Abstract;
@@ -273,13 +274,11 @@ namespace Wino.Views
await ExecuteScriptFunctionAsync("ChangeFontSize", _fontService.GetCurrentReaderFontSize());
// Prepare font family name with fallback to sans-serif by default.
var fontName = _fontService.GetCurrentReaderFont()?.FontFamilyName ?? "Arial";
var fontName = _fontService.GetCurrentReaderFont();
// If font family name is not supported by the browser, fallback to sans-serif.
fontName += ", sans-serif";
// var fontName = "Starborn";
await ExecuteScriptFunctionAsync("ChangeFontFamily", fontName);
}

38
Wino.Mail/Views/Settings/MessageListPage.xaml
View File

File diff suppressed because one or more lines are too long

125
Wino.Mail/Views/Settings/ReadingPanePage.xaml → Wino.Mail/Views/Settings/ReadComposePanePage.xaml
View File

File diff suppressed because one or more lines are too long

4
Wino.Mail/Views/Settings/ReadingPanePage.xaml.cs → Wino.Mail/Views/Settings/ReadComposePanePage.xaml.cs
View File

@@ -2,9 +2,9 @@
namespace Wino.Views.Settings
{
public sealed partial class ReadingPanePage : ReadingPanePageAbstract
public sealed partial class ReadComposePanePage : ReadComposePanePageAbstract
{
public ReadingPanePage()
public ReadComposePanePage()
{
InitializeComponent();
}

6
Wino.Mail/Views/Settings/SettingOptionsPage.xaml
View File

@@ -68,10 +68,10 @@
<controls:SettingsCard
Command="{x:Bind ViewModel.NavigateSubDetailCommand}"
CommandParameter="{x:Bind enums:WinoPage.ReadingPanePage}"
CommandParameter="{x:Bind enums:WinoPage.ReadComposePanePage}"
IsClickEnabled="True"
Header="{x:Bind domain:Translator.SettingsReadingPane_Title}"
Description="{x:Bind domain:Translator.SettingsReadingPane_Description}">
Header="{x:Bind domain:Translator.SettingsReadComposePane_Title}"
Description="{x:Bind domain:Translator.SettingsReadComposePane_Description}">
<controls:SettingsCard.HeaderIcon>
<PathIcon
Data="F1 M 20 2.5 L 20 3.75 L 8.75 3.75 L 8.75 2.5 Z M 17.5 15 L 0 15 L 0 13.75 L 17.5 13.75 Z M 2.5 10 L 20 10 L 20 11.25 L 2.5 11.25 Z M 2.5 17.5 L 20 17.5 L 20 18.75 L 2.5 18.75 Z M 3.125 7.5 C 2.695312 7.5 2.291667 7.416992 1.914062 7.250977 C 1.536458 7.084961 1.206055 6.860352 0.922852 6.577148 C 0.639648 6.293945 0.415039 5.963542 0.249023 5.585938 C 0.083008 5.208334 0 4.804688 0 4.375 C 0 3.945312 0.083008 3.541668 0.249023 3.164062 C 0.415039 2.786459 0.639648 2.456055 0.922852 2.172852 C 1.206055 1.889648 1.536458 1.665039 1.914062 1.499023 C 2.291667 1.333008 2.695312 1.25 3.125 1.25 C 3.554688 1.25 3.958333 1.333008 4.335938 1.499023 C 4.713542 1.665039 5.043945 1.889648 5.327148 2.172852 C 5.610352 2.456055 5.834961 2.786459 6.000977 3.164062 C 6.166992 3.541668 6.25 3.945312 6.25 4.375 L 5 4.375 C 5 4.114584 4.951172 3.870443 4.853516 3.642578 C 4.755859 3.414715 4.622396 3.216146 4.453125 3.046875 C 4.283854 2.877605 4.085286 2.744141 3.857422 2.646484 C 3.629557 2.548828 3.385417 2.5 3.125 2.5 C 2.864583 2.5 2.620443 2.548828 2.392578 2.646484 C 2.164713 2.744141 1.966146 2.877605 1.796875 3.046875 C 1.627604 3.216146 1.494141 3.414715 1.396484 3.642578 C 1.298828 3.870443 1.25 4.114584 1.25 4.375 C 1.25 4.635418 1.298828 4.879559 1.396484 5.107422 C 1.494141 5.335287 1.627604 5.533854 1.796875 5.703125 C 1.966146 5.872396 2.164713 6.005859 2.392578 6.103516 C 2.620443 6.201172 2.864583 6.25 3.125 6.25 L 17.5 6.25 L 17.5 7.5 Z "

2
Wino.Mail/Views/SettingsPage.xaml.cs
View File

@@ -51,7 +51,7 @@ namespace Wino.Views
WinoPage.AboutPage => typeof(AboutPage),
WinoPage.PersonalizationPage => typeof(PersonalizationPage),
WinoPage.MessageListPage => typeof(MessageListPage),
WinoPage.ReadingPanePage => typeof(ReadingPanePage),
WinoPage.ReadComposePanePage => typeof(ReadComposePanePage),
WinoPage.LanguageTimePage => typeof(LanguageTimePage),
_ => null,
};