Merge pull request #3 from ajmcateer/experimental

Experimental
ajmcateer · Mar 7, 2020 · b3cd989 · b3cd989
2 parents c7f797d + 0b7adaf
commit b3cd989
Show file tree

Hide file tree

Showing 26 changed files with 964 additions and 604 deletions.
diff --git a/GotifyDesktop/Build.ps1 b/GotifyDesktop/Build.ps1
@@ -1,3 +1,10 @@
-dotnet publish -f netcoreapp3.0 -r win-x64 -c Release /p:PublishSingleFile=true
+$path = Split-Path -parent $MyInvocation.MyCommand.Definition
+$folderToDelete = $path + '\bin\Release\netcoreapp3.0'
+
+Remove-Item $folderToDelete -Recurse -Force
+
+Set-Location -Path $path
+
+dotnet publish -f netcoreapp3.0 -r win-x64 -c Release /p:PublishSingleFile=true
 dotnet publish -f netcoreapp3.0 -r linux-x64 -c Release
-dotnet publish -f netcoreapp3.0 -r osx-x64 -c Release /p:PublishSingleFile=true
+dotnet publish -f netcoreapp3.0 -r osx-x64 -c Release
diff --git a/GotifyDesktop/Comparer/ApplicationComparer.cs b/GotifyDesktop/Comparer/ApplicationComparer.cs
@@ -0,0 +1,34 @@
+using gotifySharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+
+namespace GotifyDesktop.Comparer
+{
+    public class ApplicationComparer : IEqualityComparer<ApplicationModel>
+    {
+        public bool Equals([AllowNull] ApplicationModel x, [AllowNull] ApplicationModel y)
+        {
+            if (object.ReferenceEquals(x, y))
+            {
+                return true;
+            }
+            if (object.ReferenceEquals(x, null) ||
+                object.ReferenceEquals(y, null))
+            {
+                return false;
+            }
+            return x.id == y.id;
+        }
+
+        public int GetHashCode([DisallowNull] ApplicationModel obj)
+        {
+            if (obj == null)
+            {
+                return 0;
+            }
+            return obj.id.GetHashCode();
+        }
+    }
+}
diff --git a/GotifyDesktop/Comparer/MessageComparer.cs b/GotifyDesktop/Comparer/MessageComparer.cs
@@ -0,0 +1,34 @@
+using gotifySharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Text;
+
+namespace GotifyDesktop.Comparer
+{
+    public class MessageComparer : IEqualityComparer<MessageModel>
+    {
+        public bool Equals([AllowNull] MessageModel x, [AllowNull] MessageModel y)
+        {
+            if (object.ReferenceEquals(x, y))
+            {
+                return true;
+            }
+            if (object.ReferenceEquals(x, null) ||
+                object.ReferenceEquals(y, null))
+            {
+                return false;
+            }
+            return x.id == y.id;
+        }
+
+        public int GetHashCode([DisallowNull] MessageModel obj)
+        {
+            if (obj == null)
+            {
+                return 0;
+            }
+            return obj.id.GetHashCode();
+        }
+    }
+}
diff --git a/GotifyDesktop/GotifyDesktop.csproj b/GotifyDesktop/GotifyDesktop.csproj
@@ -17,16 +17,14 @@
     <AvaloniaResource Remove="Views\AddServerView.xaml" />
     <AvaloniaResource Remove="Views\AlertMessageView.xaml" />
     <AvaloniaResource Remove="Views\ApplicationView.xaml" />
-    <AvaloniaResource Remove="Views\MainControlv2View.xaml" />
-    <AvaloniaResource Remove="Views\MainControlView.xaml" />
+    <AvaloniaResource Remove="Views\BusyView.xaml" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="README.md" />
     <None Remove="Views\AddServerView.xaml" />
     <None Remove="Views\AlertMessageView.xaml" />
     <None Remove="Views\ApplicationView.xaml" />
-    <None Remove="Views\MainControlv2View.xaml" />
-    <None Remove="Views\MainControlView.xaml" />
+    <None Remove="Views\BusyView.xaml" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.9.4" />
@@ -44,27 +42,22 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\MainControlView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\AddServerView.xaml">
+    <EmbeddedResource Include="Views\ApplicationView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\ApplicationView.xaml">
+    <EmbeddedResource Include="Views\AlertMessageView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\MainControlv2View.xaml">
+    <EmbeddedResource Include="Views\AddServerView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\AlertMessageView.xaml">
+    <EmbeddedResource Include="Views\BusyView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
@@ -73,4 +66,9 @@
       <HintPath>..\..\gotifySharp\gotifySharp\bin\Release\netcoreapp3.0\gotifySharp.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Views\AddServerView.xaml.cs">
+      <DependentUpon>AddServerView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 </Project>
diff --git a/GotifyDesktop/Infrastructure/DatabaseContext.cs b/GotifyDesktop/Infrastructure/DatabaseContext.cs
@@ -19,6 +19,9 @@ public DatabaseContext()
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder options)
-            => options.UseSqlite("Data Source=gotifyDesktop.db");
+        {
+            options.UseSqlite("Data Source=gotifyDesktop.db");
+            options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
+        }
     }
 }
diff --git a/GotifyDesktop/Infrastructure/DatabaseContextFactory.cs b/GotifyDesktop/Infrastructure/DatabaseContextFactory.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace GotifyDesktop.Infrastructure
+{
+    public class DatabaseContextFactory
+    {
+        public DatabaseContext CreateContext()
+        {
+            DatabaseContext context = new DatabaseContext();
+            return context;
+        }
+    }
+}
diff --git a/GotifyDesktop/Infrastructure/GotifyServiceFactory.cs b/GotifyDesktop/Infrastructure/GotifyServiceFactory.cs
@@ -0,0 +1,23 @@
+using GotifyDesktop.Service;
+using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace GotifyDesktop.Infrastructure
+{
+    public class GotifyServiceFactory
+    {
+        ILogger _ilogger;
+
+        public GotifyServiceFactory(ILogger ilogger)
+        {
+            _ilogger = ilogger;
+        }
+
+        public GotifyService CreateNewGotifyService()
+        {
+            return new GotifyService(_ilogger);
+        }
+    }
+}
diff --git a/GotifyDesktop/Infrastructure/MessageBox.cs b/GotifyDesktop/Infrastructure/MessageBox.cs
@@ -21,9 +21,16 @@ public static async Task ShowMessageAsync(ButtonEnum buttonEnum, string title, s
             await msBoxStandardWindow.Show();
         }
 
-        public static async Task DropDownMessage()
+        public static async Task<ButtonResult> ShowDialogAsync(ButtonEnum buttonEnum, string title, string message, Icon icon)
         {
-
+            var msBoxStandardWindow = MessageBox.Avalonia.MessageBoxManager.GetMessageBoxStandardWindow(new MessageBoxStandardParams
+            {
+                ButtonDefinitions = buttonEnum,
+                ContentTitle = title,
+                ContentMessage = message,
+                Icon = icon
+            });
+            return await msBoxStandardWindow.Show();
         }
     }
 }
diff --git a/GotifyDesktop/Models/ServerInfo.cs b/GotifyDesktop/Models/ServerInfo.cs
@@ -27,4 +27,4 @@ public ServerInfo(int ID, string Url, int Port, string Username, string Password
             this.ClientName = ClientName;
         }
     }
-}
+}
diff --git a/GotifyDesktop/Program.cs b/GotifyDesktop/Program.cs
@@ -23,6 +23,8 @@ class Program
     {
         public static LoggingLevelSwitch loggingLevelSwitch;
 
+        public static MainWindow window;
+
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
@@ -50,16 +52,17 @@ private static void AppMain(Application app, string[] args)
                 .CreateLogger();
 
             // Register individual components
-            builder.RegisterType<DatabaseContext>();
+            builder.RegisterType<DatabaseContextFactory>();
+            builder.RegisterType<GotifyServiceFactory>();
             builder.RegisterLogger();
             builder.RegisterType<GotifySharp>();
-            builder.RegisterType<GotifyService>().SingleInstance();
+            builder.RegisterType<GotifyService>();
             builder.RegisterType<GotifyService>().Named<GotifyService>("TestService");
             builder.RegisterType<DatabaseService>();
             builder.RegisterType<SyncService>().SingleInstance();
             var container = builder.Build();
 
-            var window = new MainWindow
+            window = new MainWindow
             {
                 DataContext = new MainWindowViewModel(container),
             };
-Original file line number
+Diff line change
@@ Expand Up @@
                 this.ClientName = ClientName;
             }
         }
-    }
+    }