Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move files to Eppie.App.Shared #360

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
using System;
using System;
using System.Threading;
using System.Threading.Tasks;

#if WINDOWS_UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
#endif

namespace Tuvi.App.Shared.Common
{
Expand Down Expand Up @@ -36,7 +42,7 @@ public static async Task ShowInfoMessageAsync(string title, string message, stri
finally
{
_mutex.Release();
}
}
}

public static async Task<bool> ShowDialogAsync(string title, string message, string acceptButtonText, string rejectButtonText)
Expand All @@ -55,12 +61,12 @@ public static async Task<bool> ShowDialogAsync(string title, string message, str

var result = await messageDialog.ShowAsync();

return result == ContentDialogResult.Primary;
return result == ContentDialogResult.Primary;
}
finally
{
_mutex.Release();
}
}
}

public static async Task<bool> ShowErrorMessageAsync(string title, string message, string acceptButtonText, string rejectButtonText)
Expand Down
3 changes: 3 additions & 0 deletions source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)IncrementalLoading\IncrementalLoadingCollection.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\UITools.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Tools\ElementHierarchyTools.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Views\MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
Expand All @@ -7,7 +7,12 @@
using System.Threading.Tasks;
using Tuvi.App.ViewModels;
using Windows.Foundation;

#if WINDOWS_UWP
using Windows.UI.Xaml.Data;
#else
using Microsoft.UI.Xaml.Data;
#endif

namespace Tuvi.App.IncrementalLoading
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
using Windows.UI.Xaml;
#if WINDOWS_UWP
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
#else
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
#endif

namespace Tuvi.App.Shared.Tools
{
public static class ElementHierarchyTools
{
public static Frame GetMainFrame(FrameworkElement frameworkElement)
public static class ElementHierarchyTools
{
public static Frame GetMainFrame(FrameworkElement frameworkElement)
{
if (frameworkElement == null) return null;

Expand Down
24 changes: 24 additions & 0 deletions source/Eppie.App/Eppie.App.UWP/Eppie.App.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,34 @@
<Project>{5dce27ba-aa10-469f-9897-0e679764943f}</Project>
<Name>ComponentBuilder</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Backup\Tuvi.Core.Backup.csproj">
<Project>{d7e6f7a8-6d95-462d-9f41-8e55f6ba0fbb}</Project>
<Name>Tuvi.Core.Backup</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Entities\Tuvi.Core.Entities.csproj">
<Project>{1e363987-165e-4ea6-a0e1-fad82b7c0633}</Project>
<Name>Tuvi.Core.Entities</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Logging\Tuvi.Core.Logging.csproj">
<Project>{c4d11ff0-3cb0-4b07-be17-56f35f6e8937}</Project>
<Name>Tuvi.Core.Logging</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Mail.Impl\Tuvi.Core.Mail.Impl.csproj">
<Project>{610c1259-9bc9-4ea8-8c0a-6d32c6d7690e}</Project>
<Name>Tuvi.Core.Mail.Impl</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Mail\Tuvi.Core.Mail.csproj">
<Project>{d77b09a4-b06a-4c2e-8fe2-a499dc1f0522}</Project>
<Name>Tuvi.Core.Mail</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core\Tuvi.Core.csproj">
<Project>{ebd69008-dab3-41b1-88c4-a7f82b41e8d8}</Project>
<Name>Tuvi.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\gitmodules\TuviPgpLib\TuviPgpLib\TuviPgpLib.csproj">
<Project>{93c3844c-03b2-4c24-9070-16ba1971758e}</Project>
<Name>TuviPgpLib</Name>
</ProjectReference>
<ProjectReference Include="..\Eppie.App.Converters\Eppie.App.Converters.UWP\Eppie.App.Converters.UWP.csproj">
<Project>{d392835a-52ae-4529-aac0-52d3189cb461}</Project>
<Name>Eppie.App.Converters.UWP</Name>
Expand Down
6 changes: 6 additions & 0 deletions source/Eppie.App/Eppie.App/Eppie.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@

<ItemGroup>
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\ComponentBuilder\ComponentBuilder.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Backup\Tuvi.Core.Backup.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Logging\Tuvi.Core.Logging.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Mail.Impl\Tuvi.Core.Mail.Impl.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core.Mail\Tuvi.Core.Mail.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviCore\Sources\Tuvi.Core\Tuvi.Core.csproj" />
<ProjectReference Include="..\..\..\gitmodules\TuviPgpLib\TuviPgpLib\TuviPgpLib.csproj" />
<ProjectReference Include="..\Eppie.App.Converters\Eppie.App.Converters.Uno\Eppie.App.Converters.Uno.csproj" />
<ProjectReference Include="..\Eppie.App.ViewModels\Eppie.App.ViewModels.csproj" />
</ItemGroup>
Expand Down
Loading