Resolving warnings and treating warnings as errors in WinUI project. (#824)
This commit is contained in:
@@ -6,9 +6,9 @@ namespace Wino.Mail.WinUI.Selectors;
|
||||
|
||||
public partial class AppThemePreviewTemplateSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate SystemThemeTemplate { get; set; }
|
||||
public DataTemplate PreDefinedThemeTemplate { get; set; }
|
||||
public DataTemplate CustomAppTemplate { get; set; }
|
||||
public DataTemplate SystemThemeTemplate { get; set; } = null!;
|
||||
public DataTemplate PreDefinedThemeTemplate { get; set; } = null!;
|
||||
public DataTemplate CustomAppTemplate { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item)
|
||||
{
|
||||
@@ -19,6 +19,6 @@ public partial class AppThemePreviewTemplateSelector : DataTemplateSelector
|
||||
else if (item is CustomAppTheme)
|
||||
return CustomAppTemplate;
|
||||
|
||||
return base.SelectTemplateCore(item);
|
||||
return base.SelectTemplateCore(item) ?? SystemThemeTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,11 +10,11 @@ namespace Wino.Selectors;
|
||||
/// </summary>
|
||||
public partial class CalendarItemShowAsStripeTemplateSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate FreeTemplate { get; set; }
|
||||
public DataTemplate TentativeTemplate { get; set; }
|
||||
public DataTemplate BusyTemplate { get; set; }
|
||||
public DataTemplate OutOfOfficeTemplate { get; set; }
|
||||
public DataTemplate WorkingElsewhereTemplate { get; set; }
|
||||
public DataTemplate FreeTemplate { get; set; } = null!;
|
||||
public DataTemplate TentativeTemplate { get; set; } = null!;
|
||||
public DataTemplate BusyTemplate { get; set; } = null!;
|
||||
public DataTemplate OutOfOfficeTemplate { get; set; } = null!;
|
||||
public DataTemplate WorkingElsewhereTemplate { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
|
||||
{
|
||||
@@ -31,6 +31,6 @@ public partial class CalendarItemShowAsStripeTemplateSelector : DataTemplateSele
|
||||
};
|
||||
}
|
||||
|
||||
return base.SelectTemplateCore(item, container);
|
||||
return base.SelectTemplateCore(item, container) ?? BusyTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@ namespace Wino.Mail.WinUI.Selectors;
|
||||
|
||||
public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate InfoIconTemplate { get; set; }
|
||||
public DataTemplate WarningIconTemplate { get; set; }
|
||||
public DataTemplate QuestionIconTemplate { get; set; }
|
||||
public DataTemplate ErrorIconTemplate { get; set; }
|
||||
public DataTemplate InfoIconTemplate { get; set; } = null!;
|
||||
public DataTemplate WarningIconTemplate { get; set; } = null!;
|
||||
public DataTemplate QuestionIconTemplate { get; set; } = null!;
|
||||
public DataTemplate ErrorIconTemplate { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
|
||||
{
|
||||
if (item == null) return null;
|
||||
if (item == null) return InfoIconTemplate;
|
||||
|
||||
if (item is WinoCustomMessageDialogIcon icon)
|
||||
{
|
||||
@@ -32,6 +32,6 @@ public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector
|
||||
throw new Exception("Unknown custom message dialog icon.");
|
||||
}
|
||||
}
|
||||
return base.SelectTemplateCore(item, container);
|
||||
return base.SelectTemplateCore(item, container) ?? InfoIconTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@ namespace Wino.Mail.WinUI.Selectors;
|
||||
|
||||
public partial class FileAttachmentTypeSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate None { get; set; }
|
||||
public DataTemplate Executable { get; set; }
|
||||
public DataTemplate Image { get; set; }
|
||||
public DataTemplate Audio { get; set; }
|
||||
public DataTemplate Video { get; set; }
|
||||
public DataTemplate PDF { get; set; }
|
||||
public DataTemplate HTML { get; set; }
|
||||
public DataTemplate RarArchive { get; set; }
|
||||
public DataTemplate Archive { get; set; }
|
||||
public DataTemplate Other { get; set; }
|
||||
public DataTemplate None { get; set; } = null!;
|
||||
public DataTemplate Executable { get; set; } = null!;
|
||||
public DataTemplate Image { get; set; } = null!;
|
||||
public DataTemplate Audio { get; set; } = null!;
|
||||
public DataTemplate Video { get; set; } = null!;
|
||||
public DataTemplate PDF { get; set; } = null!;
|
||||
public DataTemplate HTML { get; set; } = null!;
|
||||
public DataTemplate RarArchive { get; set; } = null!;
|
||||
public DataTemplate Archive { get; set; } = null!;
|
||||
public DataTemplate Other { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
|
||||
{
|
||||
|
||||
@@ -6,23 +6,23 @@ namespace Wino.Mail.WinUI.Selectors;
|
||||
|
||||
public partial class NavigationMenuTemplateSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate MenuItemTemplate { get; set; }
|
||||
public DataTemplate ContactsMenuItemTemplate { get; set; }
|
||||
public DataTemplate AccountManagementTemplate { get; set; }
|
||||
public DataTemplate ClickableAccountMenuTemplate { get; set; }
|
||||
public DataTemplate MergedAccountTemplate { get; set; }
|
||||
public DataTemplate MergedAccountFolderTemplate { get; set; }
|
||||
public DataTemplate MergedAccountMoreExpansionItemTemplate { get; set; }
|
||||
public DataTemplate FolderMenuTemplate { get; set; }
|
||||
public DataTemplate SettingsItemTemplate { get; set; }
|
||||
public DataTemplate MoreItemsFolderTemplate { get; set; }
|
||||
public DataTemplate RatingItemTemplate { get; set; }
|
||||
public DataTemplate CreateNewFolderTemplate { get; set; }
|
||||
public DataTemplate SeperatorTemplate { get; set; }
|
||||
public DataTemplate NewMailTemplate { get; set; }
|
||||
public DataTemplate CategoryItemsTemplate { get; set; }
|
||||
public DataTemplate FixAuthenticationIssueTemplate { get; set; }
|
||||
public DataTemplate FixMissingFolderConfigTemplate { get; set; }
|
||||
public DataTemplate MenuItemTemplate { get; set; } = null!;
|
||||
public DataTemplate ContactsMenuItemTemplate { get; set; } = null!;
|
||||
public DataTemplate AccountManagementTemplate { get; set; } = null!;
|
||||
public DataTemplate ClickableAccountMenuTemplate { get; set; } = null!;
|
||||
public DataTemplate MergedAccountTemplate { get; set; } = null!;
|
||||
public DataTemplate MergedAccountFolderTemplate { get; set; } = null!;
|
||||
public DataTemplate MergedAccountMoreExpansionItemTemplate { get; set; } = null!;
|
||||
public DataTemplate FolderMenuTemplate { get; set; } = null!;
|
||||
public DataTemplate SettingsItemTemplate { get; set; } = null!;
|
||||
public DataTemplate MoreItemsFolderTemplate { get; set; } = null!;
|
||||
public DataTemplate RatingItemTemplate { get; set; } = null!;
|
||||
public DataTemplate CreateNewFolderTemplate { get; set; } = null!;
|
||||
public DataTemplate SeperatorTemplate { get; set; } = null!;
|
||||
public DataTemplate NewMailTemplate { get; set; } = null!;
|
||||
public DataTemplate CategoryItemsTemplate { get; set; } = null!;
|
||||
public DataTemplate FixAuthenticationIssueTemplate { get; set; } = null!;
|
||||
public DataTemplate FixMissingFolderConfigTemplate { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item)
|
||||
{
|
||||
@@ -34,7 +34,7 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
|
||||
return SettingsItemTemplate;
|
||||
else if (item is SeperatorItem)
|
||||
return SeperatorTemplate;
|
||||
else if (item is AccountMenuItem accountMenuItem)
|
||||
else if (item is AccountMenuItem)
|
||||
// Merged inbox account menu items must be nested.
|
||||
return ClickableAccountMenuTemplate;
|
||||
else if (item is ManageAccountsMenuItem)
|
||||
@@ -52,10 +52,6 @@ public partial class NavigationMenuTemplateSelector : DataTemplateSelector
|
||||
else if (item is FixAccountIssuesMenuItem fixAccountIssuesMenuItem)
|
||||
return fixAccountIssuesMenuItem.Account.AttentionReason == Wino.Core.Domain.Enums.AccountAttentionReason.MissingSystemFolderConfiguration
|
||||
? FixMissingFolderConfigTemplate : FixAuthenticationIssueTemplate;
|
||||
else
|
||||
{
|
||||
var type = item.GetType();
|
||||
return null;
|
||||
}
|
||||
return MenuItemTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,10 +6,10 @@ namespace Wino.Mail.WinUI.Selectors;
|
||||
|
||||
public partial class RsvpStatusIconTemplateSelector : DataTemplateSelector
|
||||
{
|
||||
public DataTemplate NotRespondedTemplate { get; set; }
|
||||
public DataTemplate ConfirmedTemplate { get; set; }
|
||||
public DataTemplate TentativeTemplate { get; set; }
|
||||
public DataTemplate CancelledTemplate { get; set; }
|
||||
public DataTemplate NotRespondedTemplate { get; set; } = null!;
|
||||
public DataTemplate ConfirmedTemplate { get; set; } = null!;
|
||||
public DataTemplate TentativeTemplate { get; set; } = null!;
|
||||
public DataTemplate CancelledTemplate { get; set; } = null!;
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
|
||||
{
|
||||
@@ -25,6 +25,6 @@ public partial class RsvpStatusIconTemplateSelector : DataTemplateSelector
|
||||
};
|
||||
}
|
||||
|
||||
return base.SelectTemplateCore(item, container);
|
||||
return base.SelectTemplateCore(item, container) ?? NotRespondedTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
|
||||
{
|
||||
public CalendarDisplayType DisplayType { get; set; }
|
||||
|
||||
public DataTemplate DayWeekWorkWeekTemplate { get; set; }
|
||||
public DataTemplate MonthlyTemplate { get; set; }
|
||||
public DataTemplate DayWeekWorkWeekTemplate { get; set; } = null!;
|
||||
public DataTemplate MonthlyTemplate { get; set; } = null!;
|
||||
|
||||
|
||||
protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
|
||||
@@ -26,6 +26,6 @@ public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
|
||||
break;
|
||||
}
|
||||
|
||||
return base.SelectTemplateCore(item, container);
|
||||
return base.SelectTemplateCore(item, container) ?? DayWeekWorkWeekTemplate;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user