tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create LibationUiBase for shared UI code

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2023-02-07 23:15:52 -07:00
parent bb40df5fa3
commit 00c8be1f7e
15 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/FileLiberator/_InternalsVisible.cs
View File

@ -1 +0,0 @@
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(nameof(FileLiberator) + ".Tests")]

13
Source/LibationAvalonia/LibationAvalonia.csproj
View File

@ -9,9 +9,7 @@
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationIcon>libation.ico</ApplicationIcon>
<AssemblyName>Libation</AssemblyName>
<IsPublishable>true</IsPublishable>
<PublishReadyToRun>true</PublishReadyToRun>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -82,12 +80,6 @@
<None Remove="Assets\up.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
@ -117,10 +109,13 @@
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4 " />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-preview4" />
<PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="glass-with-glow_256.svg">

2
Source/LibationAvalonia/ViewModels/GridEntry.cs
View File

@ -1,10 +1,10 @@
using ApplicationServices;
using AppScaffolding;
using Avalonia.Media;
using DataLayer;
using Dinah.Core;
using FileLiberator;
using LibationFileManager;
using LibationUiBase;
using ReactiveUI;
using System;
using System.Collections;

2
Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ApplicationServices;
using AppScaffolding;
using AudibleApi;
using AudibleApi.Common;
using Avalonia.Media;
@ -13,6 +12,7 @@ using Dinah.Core;
using Dinah.Core.ErrorHandling;
using FileLiberator;
using LibationFileManager;
using LibationUiBase;
using ReactiveUI;
namespace LibationAvalonia.ViewModels

2
Source/LibationAvalonia/ViewModels/ProcessQueueViewModel.cs
View File

@ -1,9 +1,9 @@
using ApplicationServices;
using AppScaffolding;
using Avalonia.Controls;
using Avalonia.Threading;
using DataLayer;
using LibationFileManager;
using LibationUiBase;
using ReactiveUI;
using System;
using System.Collections.Generic;

3
Source/LibationAvalonia/Views/ProcessBookControl.axaml.cs
View File

@ -1,11 +1,10 @@
using Avalonia;
using System;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using LibationAvalonia.ViewModels;
using ApplicationServices;
using DataLayer;
using AppScaffolding;
using LibationUiBase;
namespace LibationAvalonia.Views
{

2
Source/LibationAvalonia/Views/ProcessQueueControl.axaml.cs
View File

@ -1,11 +1,11 @@
using ApplicationServices;
using AppScaffolding;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data.Converters;
using Avalonia.Markup.Xaml;
using DataLayer;
using LibationAvalonia.ViewModels;
using LibationUiBase;
using System;
using System.Collections.Generic;
using System.Globalization;

2
Source/AppScaffolding/ILogForm.cs → Source/LibationUiBase/ILogForm.cs
View File

@ -1,4 +1,4 @@
namespace AppScaffolding
namespace LibationUiBase
{
public interface ILogForm
{

24
Source/LibationUiBase/LibationUiBase.csproj Normal file
View File

@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<IsPublishable>true</IsPublishable>
<PublishReadyToRun>true</PublishReadyToRun>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>embedded</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>embedded</DebugType>
</PropertyGroup>
</Project>

2
Source/AppScaffolding/LogMe.cs → Source/LibationUiBase/LogMe.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace AppScaffolding
namespace LibationUiBase
{
// decouple serilog and form. include convenience factory method
public class LogMe

2
Source/AppScaffolding/ObjectComparer[T].cs → Source/LibationUiBase/ObjectComparer[T].cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections;
namespace AppScaffolding
namespace LibationUiBase
{
public class ObjectComparer<T> : IComparer where T : IComparable
{

2
Source/LibationWinForms/GridView/GridEntry.cs
View File

@ -1,11 +1,11 @@
using ApplicationServices;
using AppScaffolding;
using DataLayer;
using Dinah.Core;
using Dinah.Core.DataBinding;
using Dinah.Core.WindowsDesktop.Drawing;
using FileLiberator;
using LibationFileManager;
using LibationUiBase;
using System;
using System.Collections;
using System.Collections.Generic;

4
Source/LibationWinForms/LibationWinForms.csproj
View File

@ -49,9 +49,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
<ProjectReference Include="..\AppScaffolding\AppScaffolding.csproj" />
<ProjectReference Include="..\FileLiberator\FileLiberator.csproj" />
<ProjectReference Include="..\LibationUiBase\LibationUiBase.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Form1.*.cs">

2
Source/LibationWinForms/ProcessQueue/ProcessBook.cs
View File

@ -15,7 +15,7 @@ using Dinah.Core.ErrorHandling;
using Dinah.Core.WindowsDesktop.Drawing;
using FileLiberator;
using LibationFileManager;
using AppScaffolding;
using LibationUiBase;
namespace LibationWinForms.ProcessQueue
{

2
Source/LibationWinForms/ProcessQueue/ProcessQueueControl.cs
View File

@ -6,8 +6,8 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using ApplicationServices;
using AppScaffolding;
using LibationFileManager;
using LibationUiBase;
namespace LibationWinForms.ProcessQueue
{