Added notification to some conditions

Abdesol · Abdesol · commit 88bf1ef73d63 · 2022-01-01T20:17:53.000+03:00
diff --git a/CutCode.CrossPlatform/App.axaml b/CutCode.CrossPlatform/App.axaml
@@ -2,9 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:CutCode.CrossPlatform"
              xmlns:sys="using:System"
-             xmlns:sty="using:FluentAvalonia.Styling"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
-             xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
              x:Class="CutCode.CrossPlatform.App">
   <Application.DataTemplates>
     <local:ViewLocator/>
@@ -20,8 +17,6 @@
   <Application.Styles>
     <FluentTheme Mode="Dark"/>
     
-    <StyleInclude Source="avares://Aura.UI.FluentTheme/AuraUI.xaml"/>
-    
     <StyleInclude Source="/Styles/ButtonStyles.axaml"/>
     <StyleInclude Source="/Styles/ScrollBarStyles.axaml"/>
     <StyleInclude Source="/Styles/TextBoxStyles.axaml"/>
diff --git a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj
@@ -14,18 +14,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Aura.UI" Version="0.1.5-dev-03" />
-    <PackageReference Include="Aura.UI.FluentTheme" Version="0.1.5-dev-03" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0-preview.1" />
     <PackageReference Include="Avalonia" Version="0.10.11" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.11" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.10" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.11" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.1.6" />
-    <PackageReference Include="Material.Avalonia" Version="2.5.0.33-nightly" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Projektanker.Icons.Avalonia" Version="3.5.0" />
-    <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="3.5.0" />
     <PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
   </ItemGroup>
   <ItemGroup>
diff --git a/CutCode.CrossPlatform/Program.cs b/CutCode.CrossPlatform/Program.cs
@@ -2,9 +2,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
-using Projektanker.Icons.Avalonia;
-using Projektanker.Icons.Avalonia.FontAwesome;
-
 namespace CutCode.CrossPlatform
 {
     class Program
@@ -15,7 +12,6 @@ class Program
         [STAThread]
         public static void Main(string[] args)
         {
-            IconProvider.Register<FontAwesomeIconProvider>();
 
             BuildAvaloniaApp()
                 .StartWithClassicDesktopLifetime(args);
diff --git a/CutCode.CrossPlatform/ViewModels/AddViewModel.cs b/CutCode.CrossPlatform/ViewModels/AddViewModel.cs
@@ -12,7 +12,6 @@
 using CutCode.CrossPlatform.ViewModels;
 using CutCode.CrossPlatform.Views;
 using CutCode.DataBase;
-using FluentAvalonia.UI.Controls;
 using Newtonsoft.Json;
 using ReactiveUI;
 
@@ -170,10 +169,11 @@ public async void Save()
                 PageService.Current.ExternalPage = codeViewPage;
                 Title = "";
                 Cells.Clear();
+                NotificationManager.CreateNotification("Notification", "New code is successfully created", 3);
             }
             else
             {
-                // do notification thing to fill empty fields
+                NotificationManager.CreateNotification("Warning", "Please Fill the Empty fields", 2);
             }
             
         }
diff --git a/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs b/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs
@@ -195,7 +195,7 @@ public async void Delete()
         {
             IsPopupOpen = false;
             var delete = DataBaseManager.Current.DelCode(Code);
-            // if it wasn't deleted, we will show notificaiton
+            if(!delete)  NotificationManager.Current.CreateNotification("Error", "Error, Unable to delete the code!", 3);
         }
     }
 }
diff --git a/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs b/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs
@@ -249,12 +249,12 @@ public async void Save()
                 }
                 else
                 {
-                    // do notification
+                    NotificationManager.CreateNotification("Error", "Error, Unable to save the changes", 5);
                 }
             }
             else
             {
-                // do notification
+                NotificationManager.CreateNotification("Warning", "Please Fill the Empty fields", 2);
             }
         }
 
@@ -280,7 +280,7 @@ public async void FavouriteCommand()
             }
             else
             {
-                // do notification
+                NotificationManager.Current.CreateNotification("Error", "Error, Unable to save the changes!", 3);
             }
             
         }
diff --git a/CutCode.CrossPlatform/ViewModels/MainWindowViewModel.cs b/CutCode.CrossPlatform/ViewModels/MainWindowViewModel.cs
@@ -15,7 +15,6 @@
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.Views;
 using CutCode.DataBase;
-using Material.Styles.Themes;
 
 namespace CutCode.CrossPlatform.ViewModels
 {
diff --git a/CutCode.CrossPlatform/ViewModels/SettingsViewModel.cs b/CutCode.CrossPlatform/ViewModels/SettingsViewModel.cs
@@ -13,7 +13,6 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.DataBase;
-using Material.Dialog;
 
 namespace CutCode.CrossPlatform.ViewModels
 {
diff --git a/CutCode.CrossPlatform/Views/CodeCellView.axaml b/CutCode.CrossPlatform/Views/CodeCellView.axaml
@@ -2,7 +2,6 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:exts="using:Aura.UI.ExtensionProperties"
       xmlns:avEdit="using:AvaloniaEdit"
       xmlns:cv="using:Avalonia.Markup.Xaml.Converters"
       xmlns:vm="using:CutCode.CrossPlatform.ViewModels"

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`using CutCode.CrossPlatform.ViewModels;`
`13`	`13`	`using CutCode.CrossPlatform.Views;`
`14`	`14`	`using CutCode.DataBase;`
`15`		`-using FluentAvalonia.UI.Controls;`
`16`	`15`	`using Newtonsoft.Json;`
`17`	`16`	`using ReactiveUI;`
`18`	`17`
`@@ -170,10 +169,11 @@ public async void Save()`
`170`	`169`	`PageService.Current.ExternalPage = codeViewPage;`
`171`	`170`	`Title = "";`
`172`	`171`	`Cells.Clear();`
	`172`	`+ NotificationManager.CreateNotification("Notification", "New code is successfully created", 3);`
`173`	`173`	`}`
`174`	`174`	`else`
`175`	`175`	`{`
`176`		`- // do notification thing to fill empty fields`
	`176`	`+ NotificationManager.CreateNotification("Warning", "Please Fill the Empty fields", 2);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public async void Delete()`
`195`	`195`	`{`
`196`	`196`	`IsPopupOpen = false;`
`197`	`197`	`var delete = DataBaseManager.Current.DelCode(Code);`
`198`		`- // if it wasn't deleted, we will show notificaiton`
	`198`	`+ if(!delete) NotificationManager.Current.CreateNotification("Error", "Error, Unable to delete the code!", 3);`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,12 +249,12 @@ public async void Save()`
`249`	`249`	`}`
`250`	`250`	`else`
`251`	`251`	`{`
`252`		`- // do notification`
	`252`	`+ NotificationManager.CreateNotification("Error", "Error, Unable to save the changes", 5);`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`else`
`256`	`256`	`{`
`257`		`- // do notification`
	`257`	`+ NotificationManager.CreateNotification("Warning", "Please Fill the Empty fields", 2);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`@@ -280,7 +280,7 @@ public async void FavouriteCommand()`
`280`	`280`	`}`
`281`	`281`	`else`
`282`	`282`	`{`
`283`		`- // do notification`
	`283`	`+ NotificationManager.Current.CreateNotification("Error", "Error, Unable to save the changes!", 3);`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`using CutCode.CrossPlatform.Models;`
`16`	`16`	`using CutCode.CrossPlatform.Views;`
`17`	`17`	`using CutCode.DataBase;`
`18`		`-using Material.Styles.Themes;`
`19`	`18`
`20`	`19`	`namespace CutCode.CrossPlatform.ViewModels`
`21`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`using CutCode.CrossPlatform.Interfaces;`
`14`	`14`	`using CutCode.CrossPlatform.Models;`
`15`	`15`	`using CutCode.DataBase;`
`16`		`-using Material.Dialog;`
`17`	`16`
`18`	`17`	`namespace CutCode.CrossPlatform.ViewModels`
`19`	`18`	`{`