Fixed minor bugs

Abdesol · Abdesol · commit fd501a9a3242 · 2022-01-02T07:04:38.000+03:00
diff --git a/.idea/.idea.CutCode/.idea/projectSettingsUpdater.xml b/.idea/.idea.CutCode/.idea/projectSettingsUpdater.xml
diff --git a/CutCode.CrossPlatform/App.axaml.cs b/CutCode.CrossPlatform/App.axaml.cs
@@ -11,7 +11,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.ViewModels;
 using CutCode.CrossPlatform.Views;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using ReactiveUI;
 using Splat;
 using Color = Avalonia.Media.Color;
diff --git a/CutCode.CrossPlatform/Controllers/CustomComboBox.axaml.cs b/CutCode.CrossPlatform/Controllers/CustomComboBox.axaml.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
diff --git a/CutCode.CrossPlatform/Controllers/CustomSearchBar.axaml.cs b/CutCode.CrossPlatform/Controllers/CustomSearchBar.axaml.cs
@@ -1,23 +1,14 @@
 ﻿using System;
-using System.ComponentModel;
 using System.Reactive.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Platform;
 using Avalonia.Data;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Media;
-using Avalonia.Rendering;
-using Avalonia.Styling;
 using CutCode.CrossPlatform.Helpers;
 using CutCode.CrossPlatform.Interfaces;
-using CutCode.CrossPlatform.ViewModels;
-using MathNet.Numerics.Optimization.LineSearch;
 using ReactiveUI;
 
 namespace CutCode.CrossPlatform.Controllers
diff --git a/CutCode.CrossPlatform/Controllers/WindowButtons.axaml.cs b/CutCode.CrossPlatform/Controllers/WindowButtons.axaml.cs
@@ -1,18 +1,9 @@
 ﻿using System;
-using System.Diagnostics;
-using System.Linq;
 using System.Reactive.Disposables;
-using System.Runtime.InteropServices;
-using Aura.UI.Extensions;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Shapes;
-using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Media;
-using Avalonia.VisualTree;
 
 namespace CutCode.CrossPlatform.Controllers
 {
diff --git a/CutCode.CrossPlatform/Converters/StringToGeometryConverter.cs b/CutCode.CrossPlatform/Converters/StringToGeometryConverter.cs
@@ -1,11 +1,7 @@
 ﻿using System;
 using System.Globalization;
-using System.Reflection;
-using Avalonia;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
 
 namespace CutCode.CrossPlatform.Converters
 {
diff --git a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj
@@ -3,6 +3,14 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <PublishTrimmed>True</PublishTrimmed>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <Company>CutCode</Company>
+    <Product>CutCode</Product>
+    <AssemblyVersion>3.0.0</AssemblyVersion>
+    <FileVersion>3.0.0</FileVersion>
+    <NeutralLanguage>en-001</NeutralLanguage>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="DataBase" />
diff --git a/CutCode.CrossPlatform/DataBase/CodesTable.cs b/CutCode.CrossPlatform/DataBase/CodesTable.cs
@@ -1,11 +1,6 @@
 ﻿using SQLite;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace CutCode.DataBase
+namespace CutCode.CrossPlatform.DataBase
 {
     [Table("CodesTable")]
     public class CodesTable
diff --git a/CutCode.CrossPlatform/DataBase/DataBaseManager.cs b/CutCode.CrossPlatform/DataBase/DataBaseManager.cs
@@ -1,24 +1,14 @@
 ﻿using SQLite;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using System.IO;
-using System.Security.AccessControl;
-using System.IO.Compression;
-using System.Xml.Linq;
-using Avalonia;
-using Avalonia.Threading;
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
-using ReactiveUI;
 
-namespace CutCode.DataBase
+namespace CutCode.CrossPlatform.DataBase
 {
     public class DataBaseManager : IDataBase
     {
diff --git a/CutCode.CrossPlatform/Helpers/Extensions.cs b/CutCode.CrossPlatform/Helpers/Extensions.cs
@@ -1,9 +1,4 @@
 ﻿using Avalonia.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CutCode.CrossPlatform.Helpers
 {
diff --git a/CutCode.CrossPlatform/Helpers/SystemColorsConfig.cs b/CutCode.CrossPlatform/Helpers/SystemColorsConfig.cs
@@ -1,10 +1,4 @@
-﻿using Avalonia.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
+﻿using Avalonia;
 using Avalonia.Media;
 
 namespace CutCode.CrossPlatform.Helpers
diff --git a/CutCode.CrossPlatform/Interfaces/IDataBase.cs b/CutCode.CrossPlatform/Interfaces/IDataBase.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using CutCode.CrossPlatform.Models;
 
diff --git a/CutCode.CrossPlatform/Interfaces/IPageService.cs b/CutCode.CrossPlatform/Interfaces/IPageService.cs
@@ -1,9 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CutCode.CrossPlatform.Interfaces
 {
diff --git a/CutCode.CrossPlatform/Interfaces/IThemeService.cs b/CutCode.CrossPlatform/Interfaces/IThemeService.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CutCode.CrossPlatform.Interfaces
 {
diff --git a/CutCode.CrossPlatform/ViewModels/AddViewModel.cs b/CutCode.CrossPlatform/ViewModels/AddViewModel.cs
@@ -11,7 +11,7 @@
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.ViewModels;
 using CutCode.CrossPlatform.Views;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using Newtonsoft.Json;
 using ReactiveUI;
 
diff --git a/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs b/CutCode.CrossPlatform/ViewModels/CodeCardViewModel.cs
@@ -5,7 +5,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.Views;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using Newtonsoft.Json;
 using ReactiveUI;
 
diff --git a/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs b/CutCode.CrossPlatform/ViewModels/CodeViewModel.cs
@@ -10,7 +10,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.Views;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using Newtonsoft.Json;
 using ReactiveUI;
 
diff --git a/CutCode.CrossPlatform/ViewModels/FavoritesViewModel.cs b/CutCode.CrossPlatform/ViewModels/FavoritesViewModel.cs
@@ -12,7 +12,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.ViewModels;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using ReactiveUI;
 
 namespace CutCode.CrossPlatform.ViewModels
diff --git a/CutCode.CrossPlatform/ViewModels/HomeViewModel.cs b/CutCode.CrossPlatform/ViewModels/HomeViewModel.cs
@@ -12,7 +12,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.ViewModels;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using ReactiveUI;
 
 namespace CutCode.CrossPlatform.ViewModels
diff --git a/CutCode.CrossPlatform/ViewModels/MainWindowViewModel.cs b/CutCode.CrossPlatform/ViewModels/MainWindowViewModel.cs
@@ -14,7 +14,7 @@
 using CutCode.CrossPlatform.Interfaces;
 using CutCode.CrossPlatform.Models;
 using CutCode.CrossPlatform.Views;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 
 namespace CutCode.CrossPlatform.ViewModels
 {
@@ -96,11 +96,15 @@ public int CurrentTabItem
             get => _currentTabItem;
             set
             {
-                this.RaiseAndSetIfChanged(ref _currentTabItem, value);
-                if (_currentTabItem != 0 && Tabs[0].Content is not HomeView)
+                if (value != 0 && Tabs[0].Content is not HomeView)
                 {
                     Tabs[0].Content = new HomeView();
                 }
+                else if (_currentTabItem == 1)
+                {
+                    Tabs[1].Content = new AddView();
+                }
+                this.RaiseAndSetIfChanged(ref _currentTabItem, value);
             }
         }
 
diff --git a/CutCode.CrossPlatform/ViewModels/PageBaseViewModel.cs b/CutCode.CrossPlatform/ViewModels/PageBaseViewModel.cs
@@ -5,7 +5,7 @@
 using Avalonia.Platform;
 using Avalonia.Themes.Fluent;
 using CutCode.CrossPlatform.Interfaces;
-using CutCode.DataBase;
+using CutCode.CrossPlatform.DataBase;
 using ReactiveUI;
 
 namespace CutCode.CrossPlatform.ViewModels
diff --git a/CutCode.CrossPlatform/ViewModels/SettingsViewModel.cs b/CutCode.CrossPlatform/ViewModels/SettingsViewModel.cs
@@ -1,18 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Media;
 using ReactiveUI;
-using Avalonia.Media.Imaging;
-using CutCode.CrossPlatform.Interfaces;
-using CutCode.CrossPlatform.Models;
-using CutCode.DataBase;
 
 namespace CutCode.CrossPlatform.ViewModels
 {
diff --git a/CutCode.CrossPlatform/Views/MainWindow.axaml b/CutCode.CrossPlatform/Views/MainWindow.axaml
@@ -77,10 +77,10 @@
   </Window.Resources>
   
   
-  <Grid RowDefinitions="50,*" ColumnDefinitions="54,*,auto" Margin="{Binding $parent[Window].OffScreenMargin}" Background="{Binding backgroundColor, Converter={StaticResource ColorToBrushConverter}}">
+  <Grid RowDefinitions="50,*" ColumnDefinitions="60,*,auto" Margin="{Binding $parent[Window].OffScreenMargin}" Background="{Binding backgroundColor, Converter={StaticResource ColorToBrushConverter}}">
     <Border Grid.Column="0" Grid.Row="0" Background="{Binding SideBarColor, Converter={StaticResource ColorToBrushConverter}}">
       <Image Source="avares://CutCode.CrossPlatform/Assets/Images/logo.png" 
-             Width="35" Height="35" Margin="4,0,0,0"
+             Width="35" Height="35" Margin="5,0,0,0"
              RenderOptions.BitmapInterpolationMode="HighQuality"/>
     </Border>
     <Grid Grid.Column="1" Grid.Row="0"
@@ -105,13 +105,17 @@
                             Foreground="{Binding mainTextColor, Converter={StaticResource ColorToBrushConverter}}">
     </controls:WindowButtons>
     
-    <TabControl Name="tabControl" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"
+    <TabControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"
                 TabStripPlacement="Left" SelectedIndex="{Binding CurrentTabItem}" Items="{Binding Tabs}"
                 Background="{Binding SideBarColor, Converter={StaticResource ColorToBrushConverter}}"
                 Foreground="{Binding mainTextColor, Converter={StaticResource ColorToBrushConverter}}"
                 ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
       <TabControl.Styles>
-          <Style Selector="TabItem ToolTip">
+        <Style Selector="TabItem">
+          <Setter Property="Width" Value="45"/>
+          <Setter Property="Margin" Value="5,0,0,0"/>
+        </Style>
+        <Style Selector="TabItem ToolTip">
             <Setter Property="Padding" Value="10 7 10 7"/>
             <Setter Property="CornerRadius" Value="5,5,5,5"/>
             <Setter Property="BorderThickness" Value="0"/>
@@ -139,7 +143,7 @@
         </TabControl.Styles>
         <TabControl.ItemTemplate>
           <DataTemplate>
-              <Viewbox VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="25" Width="25" Margin="-2,0,0,0"
+              <Viewbox Height="25" Width="25" Margin="3,0,0,0"
                        ToolTip.Tip="{Binding ToolTip}" ToolTip.HorizontalOffset="28" ToolTip.VerticalOffset="0">
                 <Path  Fill="{Binding PathColor, Converter={StaticResource ColorToBrushConverter}}"
                        Data="{Binding Path, Converter={StaticResource StringToGeometryConverter}}"/>

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`	`1`	`using Avalonia.Controls;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`2`
`8`	`3`	`namespace CutCode.CrossPlatform.Helpers`
`9`	`4`	`{`