lots of new stuff and lots of small changes under the hood

add notifications bottom right corner add undo action for hiding episode in home add undo action for deleting a tracked anime add you can now track anime in all animebytes views fix lots of small style stuff rearranged animebytes settings add setup wizard (WIP) lots of other small stuff
MemeLabs · Jun 9, 2021 · 8c1baca · 8c1baca
1 parent 7eb9e9a
commit 8c1baca
Show file tree

Hide file tree

Showing 74 changed files with 2,647 additions and 918 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,23 +1,22 @@
-name: .NET
+name: .NET 5 Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
-
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore --configuration Release
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.x
+      - name: Restore dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --no-restore --configuration Release
diff --git a/anidow/App.xaml b/anidow/App.xaml
@@ -21,6 +21,7 @@
                 <ResourceDictionary Source="pack://application:,,,/Styles/ListViewItem.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Styles/Button.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Styles/ListBox.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Styles/Notification.xaml" />
             </s:ApplicationLoader.MergedDictionaries>
 
             <!--  Override colors  -->
@@ -49,7 +50,27 @@
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                 <Setter Property="VerticalContentAlignment" Value="Center" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Margin" Value="2" />
+                <Setter Property="Margin" Value="2,0,2,2" />
+            </Style>
+
+            <Style
+                x:Key="GridViewFirstCenteredContainerStyle"
+                BasedOn="{StaticResource {x:Type GridViewColumnHeader}}"
+                TargetType="{x:Type GridViewColumnHeader}">
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Margin" Value="0,0,2,2" />
+            </Style>
+
+            <Style
+                x:Key="GridViewLastCenteredContainerStyle"
+                BasedOn="{StaticResource {x:Type GridViewColumnHeader}}"
+                TargetType="{x:Type GridViewColumnHeader}">
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Margin" Value="2,0,0,2" />
             </Style>
 
             <Style
@@ -102,7 +123,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
         </s:ApplicationLoader>
     </Application.Resources>
 </Application>
diff --git a/anidow/App.xaml.cs b/anidow/App.xaml.cs
@@ -1,11 +1,9 @@
-using System.Windows;
-
-namespace Anidow
+namespace Anidow
 {
     /// <summary>
     ///     Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
     }
 }
diff --git a/anidow/Bootstrapper.cs b/anidow/Bootstrapper.cs
@@ -1,14 +1,14 @@
 using System;
-using System.Diagnostics;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
 using System.Windows;
 using System.Windows.Markup;
-using AdonisUI.Controls;
 using Anidow.Database;
+using Anidow.Database.Models;
 using Anidow.Factories;
 using Anidow.Helpers;
 using Anidow.Pages;
@@ -22,19 +22,24 @@
 using Jot;
 using Jot.Storage;
 using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
 using Microsoft.EntityFrameworkCore;
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;
 using Stylet;
 using StyletIoC;
+using ILogger = Serilog.ILogger;
 
 #if RELEASE
+using AdonisUI.Controls;
 using System.IO;
 using System.Windows.Threading;
+using System.Diagnostics;
 
 using MessageBox = AdonisUI.Controls.MessageBox;
+using MessageBoxButton = AdonisUI.Controls.MessageBoxButton;
 using MessageBoxImage = AdonisUI.Controls.MessageBoxImage;
 using MessageBoxResult = AdonisUI.Controls.MessageBoxResult;
 #endif
@@ -52,11 +57,11 @@ public class Bootstrapper : Bootstrapper<ShellViewModel>
         // Configure the IoC container in here
         protected override void ConfigureIoC(IStyletIoCBuilder builder)
         {
-            builder.Bind<Assembly>().ToInstance(Assembly.GetExecutingAssembly());
+            var assembly = Assembly.GetExecutingAssembly();
+            builder.Bind<Assembly>().ToInstance(assembly);
             var tracker = InitTracker();
             builder.Bind<Tracker>().ToInstance(tracker);
 
-
             var logViewModel = new LogViewModel();
             InitLogger(logViewModel);
 
@@ -153,53 +158,43 @@ private void InitLogger(ILogEventSink logViewModel)
                                    .WriteTo.Console()
                                    .WriteTo.Sink(logViewModel, logLevel)
                                    .WriteTo.File(
-                                       "./logs/log-.txt", rollingInterval: RollingInterval.Day,
-                                       retainedFileCountLimit: 7);
+                                       "./logs/log-.txt", 
+                                       rollingInterval: RollingInterval.Day,
+                                       retainedFileCountLimit: 7, 
+                                       restrictedToMinimumLevel: LogEventLevel.Error);
 
             _logger = logConfiguration.CreateLogger();
         }
 
-        public override void Start(string[] args)
-        {
-            base.Start(args);
-        }
-
         protected override void OnExit(ExitEventArgs e)
         {
             _taskBarIcon?.Dispose();
             JobManager.Stop();
             base.OnExit(e);
         }
 
-        protected override async void Configure()
+        protected override void Configure()
         {
 #if RELEASE
             var processes = Process.GetProcessesByName(
                 Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly()?.Location));
             if (processes.Length > 1)
             {
-                MessageBox.Show("Anidow is already running!", "Already running");
+                MessageBox.Show("Already running!", "Anidow");
                 Environment.Exit(0);
             }
 #endif
 
             var secret = Resources.AppCenter_Secret;
-            if (!AppCenter.Configured && !string.IsNullOrWhiteSpace(secret))
+            if (!string.IsNullOrWhiteSpace(secret) && !AppCenter.Configured)
             {
-                AppCenter.Start(secret, typeof(Crashes));
+                AppCenter.Start(secret, typeof(Crashes), typeof(Analytics));
             }
-
-            if (string.IsNullOrWhiteSpace(secret))
+            else
             {
                 _logger.Warning("AppCenter not configured, secret is empty");
             }
 
-            // Perform any other configuration before the application starts
-            {
-                await using var db = new TrackContext();
-                await db.Database.MigrateAsync();
-            }
-
             if (Application.Current.MainWindow != null)
             {
                 Application.Current.MainWindow.Language =
@@ -211,48 +206,41 @@ protected override async void Configure()
             JobManager.JobException += info =>
                 _logger.Error(info.Exception, "An error just happened with a scheduled job");
 
-            var selfContained = false;
 #if SELF_CONTAINED && RELEASE
-            selfContained = true;
+            var selfContained = true;
+#else
+            var selfContained = false;
 #endif
             _logger.Information(
                 $"Anidow v{Assembly.GetExecutingAssembly().GetName().Version} selfcontained: {selfContained}");
-
-#if RELEASE
-            try
-            {
-                var (check, hasUpdate) = await _updateManager.HasUpdate();
-                if (hasUpdate && check != null)
-                {
-                    await _updateManager.Update(check);
-                }
-            }
-            catch (Exception e)
-            {
-                _logger.Error(e, "failed updating anidow");
-            }
-#endif
         }
 #if RELEASE
         protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
         {
             _logger.Fatal(e.Exception, e.Exception.Message);
-            var messageBox = new MessageBoxModel
+            if (AppCenter.Configured)
             {
-                Text = $"Would you like to report this crash?\n\nCrash message: '{e.Exception.Message}'",
-                Caption = "Anidow crashed!",
-                Icon = MessageBoxImage.Error,
-                Buttons = new[]
+                var messageBox = new MessageBoxModel
                 {
-                    MessageBoxButtons.Yes("Yes!"),
-                    MessageBoxButtons.No("No!"),
-                },
-                IsSoundEnabled = true,
-            };
-            var result = MessageBox.Show(messageBox);
-            if (result == MessageBoxResult.Yes)
+                    Text = $"Would you like to report this crash?\n\nCrash message: '{e.Exception.Message}'",
+                    Caption = "Anidow crashed!",
+                    Icon = MessageBoxImage.Error,
+                    Buttons = new[]
+                    {
+                        MessageBoxButtons.Yes("Yes!"),
+                        MessageBoxButtons.No("No!"),
+                    },
+                    IsSoundEnabled = true,
+                };
+                var result = MessageBox.Show(messageBox);
+                if (result == MessageBoxResult.Yes)
+                {
+                    Crashes.TrackError(e.Exception);
+                }
+            }
+            else
             {
-                Crashes.TrackError(e.Exception);
+                MessageBox.Show(e.Exception.Message, "Anidow crashed!", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 #endif

diff --git a/anidow/Utils/LogEventReader.cs → anidow/Converters/LogEventRenderConverter.cs b/anidow/Utils/LogEventReader.cs → anidow/Converters/LogEventRenderConverter.cs
@@ -4,11 +4,11 @@
 using System.Windows.Data;
 using Serilog.Events;
 
-namespace Anidow.Utils
+namespace Anidow.Converters
 {
-    public class LogEventRender : IValueConverter
+    public class LogEventRenderConverter : IValueConverter
     {
-        public static readonly LogEventRender Instance = new();
+        public static readonly LogEventRenderConverter Instance = new();
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {

diff --git a/anidow/Database/Models/Anime.cs b/anidow/Database/Models/Anime.cs
@@ -2,11 +2,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Windows.Documents;
 using Anidow.Enums;
 using Anidow.Model;
 using Humanizer;
-using Newtonsoft.Json;
 
 namespace Anidow.Database.Models
 {

diff --git a/anidow/Database/Models/AppState.cs b/anidow/Database/Models/AppState.cs
@@ -0,0 +1,14 @@
+// // Created: 06-06-2021 21:45
+
+using System;
+using Anidow.Model;
+
+namespace Anidow.Database.Models
+{
+    public class AppState : ObservableObject
+    {
+        public int Id { get; set; }
+        public DateTime Created { get; set; }
+        public bool FirstStart { get; set; } = true;
+    }
+}
diff --git a/anidow/Database/TrackContext.cs b/anidow/Database/TrackContext.cs
@@ -1,10 +1,13 @@
-using Anidow.Database.Models;
+using System;
+using Anidow.Database.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace Anidow.Database
 {
     public class TrackContext : DbContext
     {
+        public DbSet<AppState> AppStates { get; set; }
         public DbSet<Anime> Anime { get; set; }
         public DbSet<Episode> Episodes { get; set; }
         public DbSet<Cover> Covers { get; set; }
@@ -18,6 +21,10 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<AppState>()
+                        .Property(b => b.Created)
+                        .HasDefaultValue(DateTime.UtcNow);
+
         }
     }
 }
diff --git a/anidow/Events/AddToHomeEvent.cs b/anidow/Events/AddToHomeEvent.cs
@@ -0,0 +1,9 @@
+using Anidow.Database.Models;
+
+namespace Anidow.Events
+{
+    public class AddToHomeEvent
+    {
+        public Episode Episode { get; init; }
+    }
+}
diff --git a/anidow/Events/OpenAnimeEditEvent.cs b/anidow/Events/OpenAnimeEditEvent.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Anidow.Database.Models;
+using Anidow.Database.Models;
 
 namespace Anidow.Events
 {

diff --git a/anidow/Events/TrackedDeleteAnimeEvent.cs b/anidow/Events/TrackedDeleteAnimeEvent.cs
@@ -0,0 +1,9 @@
+using Anidow.Database.Models;
+
+namespace Anidow.Events
+{
+    public class TrackedDeleteAnimeEvent
+    {
+        public Anime Anime { get; set; }
+    }
+}
diff --git a/anidow/Events/TrackedRefreshEvent.cs b/anidow/Events/TrackedRefreshEvent.cs
@@ -0,0 +1,6 @@
+namespace Anidow.Events
+{
+    public class TrackedRefreshEvent
+    {
+    }
+}