v1.8.0 merge conflicts resolved.

trippsc2 · Mar 7, 2021 · c85aa62 · c85aa62
2 parents a2af969 + 0ba5f11
commit c85aa62
Show file tree

Hide file tree

Showing 738 changed files with 50,526 additions and 41,911 deletions.
diff --git a/.idea/.idea.OpenTracker/.idea/.idea.OpenTracker.iml b/.idea/.idea.OpenTracker/.idea/.idea.OpenTracker.iml
diff --git a/.idea/.idea.OpenTracker/.idea/contentModel.xml b/.idea/.idea.OpenTracker/.idea/contentModel.xml
diff --git a/.idea/.idea.OpenTracker/.idea/modules.xml b/.idea/.idea.OpenTracker/.idea/modules.xml
diff --git a/.idea/.idea.OpenTracker/.idea/projectSettingsUpdater.xml b/.idea/.idea.OpenTracker/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.OpenTracker/.idea/workspace.xml b/.idea/.idea.OpenTracker/.idea/workspace.xml
diff --git a/Avalonia.ThemeManager/Avalonia.ThemeManager.csproj b/Avalonia.ThemeManager/Avalonia.ThemeManager.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Avalonia.ThemeManager/ITheme.cs b/Avalonia.ThemeManager/ITheme.cs
@@ -5,8 +5,8 @@ namespace Avalonia.ThemeManager
     public interface ITheme
     {
         string Name { get; set; }
-        IStyle Style { get; set; }
-        IThemeSelector Selector { get; set; }
+        IStyle? Style { get; set; }
+        IThemeSelector? Selector { get; set; }
 
         void ApplyTheme();
     }

diff --git a/Avalonia.ThemeManager/IThemeSelector.cs b/Avalonia.ThemeManager/IThemeSelector.cs
@@ -5,8 +5,8 @@ namespace Avalonia.ThemeManager
     public interface IThemeSelector
     {
         Application App { get; }
-        ITheme SelectedTheme { get; set; }
-        IList<ITheme> Themes { get; set; }
+        ITheme? SelectedTheme { get; set; }
+        IList<ITheme>? Themes { get; set; }
 
         void ApplyTheme(ITheme theme);
         void LoadSelectedTheme(string file);

diff --git a/Avalonia.ThemeManager/Theme.cs b/Avalonia.ThemeManager/Theme.cs
@@ -6,22 +6,22 @@ namespace Avalonia.ThemeManager
     public class Theme : ReactiveObject, ITheme
     {
         private string _name = string.Empty;
-        private IStyle _style;
-        private IThemeSelector _selector;
+        private IStyle? _style;
+        private IThemeSelector? _selector;
 
         public string Name
         {
             get => _name;
             set => this.RaiseAndSetIfChanged(ref _name, value);
         }
 
-        public IStyle Style
+        public IStyle? Style
         {
             get => _style;
             set => this.RaiseAndSetIfChanged(ref _style, value);
         }
 
-        public IThemeSelector Selector
+        public IThemeSelector? Selector
         {
             get => _selector;
             set => this.RaiseAndSetIfChanged(ref _selector, value);

diff --git a/Avalonia.ThemeManager/ThemeSelector.cs b/Avalonia.ThemeManager/ThemeSelector.cs
@@ -13,16 +13,16 @@ namespace Avalonia.ThemeManager
 {
     public sealed class ThemeSelector : ReactiveObject, IThemeSelector
     {
-        private ITheme _selectedTheme;
-        private IList<ITheme> _themes;
+        private ITheme? _selectedTheme;
+        private IList<ITheme>? _themes;
 
-        public ITheme SelectedTheme
+        public ITheme? SelectedTheme
         {
             get => _selectedTheme;
             set => this.RaiseAndSetIfChanged(ref _selectedTheme, value);
         }
 
-        public IList<ITheme> Themes
+        public IList<ITheme>? Themes
         {
             get => _themes;
             set => this.RaiseAndSetIfChanged(ref _themes, value);