Somem Ui issues.
This commit is contained in:
@@ -46,9 +46,9 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
|
|||||||
|
|
||||||
public List<ElementThemeContainer> ElementThemes { get; set; } =
|
public List<ElementThemeContainer> ElementThemes { get; set; } =
|
||||||
[
|
[
|
||||||
|
new ElementThemeContainer(ApplicationElementTheme.Default, Translator.ElementTheme_Default),
|
||||||
new ElementThemeContainer(ApplicationElementTheme.Light, Translator.ElementTheme_Light),
|
new ElementThemeContainer(ApplicationElementTheme.Light, Translator.ElementTheme_Light),
|
||||||
new ElementThemeContainer(ApplicationElementTheme.Dark, Translator.ElementTheme_Dark),
|
new ElementThemeContainer(ApplicationElementTheme.Dark, Translator.ElementTheme_Dark),
|
||||||
new ElementThemeContainer(ApplicationElementTheme.Default, Translator.ElementTheme_Default),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
public List<MailListDisplayMode> InformationDisplayModes { get; set; } =
|
public List<MailListDisplayMode> InformationDisplayModes { get; set; } =
|
||||||
@@ -202,7 +202,8 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void SetInitialValues()
|
private void SetInitialValues()
|
||||||
{
|
{
|
||||||
SelectedElementTheme = ElementThemes.Find(a => a.NativeTheme == _newThemeService.RootTheme);
|
SelectedElementTheme = ElementThemes.Find(a => a.NativeTheme == _newThemeService.RootTheme)
|
||||||
|
?? ElementThemes.FirstOrDefault();
|
||||||
SelectedInfoDisplayMode = PreferencesService.MailItemDisplayMode;
|
SelectedInfoDisplayMode = PreferencesService.MailItemDisplayMode;
|
||||||
|
|
||||||
var currentAccentColor = _newThemeService.AccentColor;
|
var currentAccentColor = _newThemeService.AccentColor;
|
||||||
@@ -219,7 +220,9 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
|
|||||||
|
|
||||||
// Find selected theme, handling backward compatibility where theme ID might not exist
|
// Find selected theme, handling backward compatibility where theme ID might not exist
|
||||||
var currentThemeId = _newThemeService.CurrentApplicationThemeId;
|
var currentThemeId = _newThemeService.CurrentApplicationThemeId;
|
||||||
SelectedAppTheme = currentThemeId.HasValue ? AppThemes.Find(a => a.Id == currentThemeId.Value) : null;
|
SelectedAppTheme = currentThemeId.HasValue
|
||||||
|
? AppThemes.Find(a => a.Id == currentThemeId.Value) ?? AppThemes.FirstOrDefault()
|
||||||
|
: AppThemes.FirstOrDefault();
|
||||||
|
|
||||||
// Set the current backdrop from service - backdrop should be independent of theme selection
|
// Set the current backdrop from service - backdrop should be independent of theme selection
|
||||||
var currentBackdropType = _newThemeService.CurrentBackdropType;
|
var currentBackdropType = _newThemeService.CurrentBackdropType;
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ public partial class SettingOptionsPageViewModel : CoreBaseViewModel
|
|||||||
|
|
||||||
public List<ElementThemeContainer> ElementThemes { get; } =
|
public List<ElementThemeContainer> ElementThemes { get; } =
|
||||||
[
|
[
|
||||||
|
new(ApplicationElementTheme.Default, Translator.ElementTheme_Default),
|
||||||
new(ApplicationElementTheme.Light, Translator.ElementTheme_Light),
|
new(ApplicationElementTheme.Light, Translator.ElementTheme_Light),
|
||||||
new(ApplicationElementTheme.Dark, Translator.ElementTheme_Dark),
|
new(ApplicationElementTheme.Dark, Translator.ElementTheme_Dark),
|
||||||
new(ApplicationElementTheme.Default, Translator.ElementTheme_Default),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
public bool HasAccounts => Accounts.Count > 0;
|
public bool HasAccounts => Accounts.Count > 0;
|
||||||
@@ -253,7 +253,7 @@ public partial class SettingOptionsPageViewModel : CoreBaseViewModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
SelectedElementTheme = ElementThemes.FirstOrDefault(theme => theme.NativeTheme == _newThemeService.RootTheme)
|
SelectedElementTheme = ElementThemes.FirstOrDefault(theme => theme.NativeTheme == _newThemeService.RootTheme)
|
||||||
?? ElementThemes.LastOrDefault();
|
?? ElementThemes.FirstOrDefault();
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(currentAccentColor))
|
if (string.IsNullOrWhiteSpace(currentAccentColor))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -207,6 +207,15 @@ public class SynchronizationManager : ISynchronizationManager, IRecipient<Accoun
|
|||||||
.Failed(ex)
|
.Failed(ex)
|
||||||
.MergeIssues([SynchronizationIssue.FromException(ex, "MailSync")]);
|
.MergeIssues([SynchronizationIssue.FromException(ex, "MailSync")]);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (synchronizer.State == AccountSynchronizerState.Idle)
|
||||||
|
{
|
||||||
|
PublishSynchronizationProgress(AccountSynchronizationProgress.Idle(
|
||||||
|
options.AccountId,
|
||||||
|
SynchronizationProgressCategory.Mail));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user