Skip to content

Commit

Permalink
Introduce core project and new infrastructor
Browse files Browse the repository at this point in the history
  • Loading branch information
Strypper committed Mar 18, 2024
1 parent dd0be74 commit a9af973
Show file tree
Hide file tree
Showing 670 changed files with 3,332 additions and 3,378 deletions.
63 changes: 46 additions & 17 deletions maui-island.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,65 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31611.283
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MAUIsland", "src\MAUIsland.csproj", "{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Presentations", "Presentations", "{B39EE44A-0776-44E7-8B64-D8572E49B134}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAUIsland.GitHubProvider.IntegrationTests", "MAUIsland.IntegrationTests\MAUIsland.GitHubProvider.IntegrationTests.csproj", "{33E5A903-87C3-4391-A5A5-787B82FFBFF4}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{2FD579F3-6496-437C-956B-E6F62B2D2A5A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAUIsland.GitHubProvider", "MAUIsland.GitHubProvider\MAUIsland.GitHubProvider.csproj", "{85B67FAC-6B7B-4557-955A-5C21812ACE79}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{36CB9EBB-A677-4AF0-A0A9-BDEBDE60F123}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{73E66A66-7BCD-44FE-949C-BD42C274B840}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHubFeatures", "GitHubFeatures", "{23A84AFF-0047-4364-9351-E4521D52A26B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apple", "Apple", "{767B8BFD-B663-4A2E-85AB-323D672F5B4D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{7CEB155B-884F-4995-867D-4CC9145EF87E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MAUIsland.GitHubFeatures", "src\Features\GitHubFeatures\MAUIsland.GitHubFeatures\MAUIsland.GitHubFeatures.csproj", "{B138AC18-EC19-4368-AE0B-CDACD0911650}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MAUIsland.GitHubFeatures.IntegrationTests", "src\Features\GitHubFeatures\MAUIsland.GitHubFeatures.IntegrationTests\MAUIsland.GitHubFeatures.IntegrationTests.csproj", "{6F539157-0DE3-407A-8769-EB997EB7AE59}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MAUIsland", "src\Presentations\Windows\MAUIsland.csproj", "{72B83E80-9D22-4A44-AB91-253A616A9D9C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAUIsland.Core", "src\Core\MAUIsland.Core\MAUIsland.Core.csproj", "{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Release|Any CPU.Build.0 = Release|Any CPU
{8F2E1887-0EA7-4653-919A-FB737B8BD6E8}.Release|Any CPU.Deploy.0 = Release|Any CPU
{33E5A903-87C3-4391-A5A5-787B82FFBFF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33E5A903-87C3-4391-A5A5-787B82FFBFF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33E5A903-87C3-4391-A5A5-787B82FFBFF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33E5A903-87C3-4391-A5A5-787B82FFBFF4}.Release|Any CPU.Build.0 = Release|Any CPU
{85B67FAC-6B7B-4557-955A-5C21812ACE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85B67FAC-6B7B-4557-955A-5C21812ACE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85B67FAC-6B7B-4557-955A-5C21812ACE79}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85B67FAC-6B7B-4557-955A-5C21812ACE79}.Release|Any CPU.Build.0 = Release|Any CPU
{B138AC18-EC19-4368-AE0B-CDACD0911650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B138AC18-EC19-4368-AE0B-CDACD0911650}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B138AC18-EC19-4368-AE0B-CDACD0911650}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B138AC18-EC19-4368-AE0B-CDACD0911650}.Release|Any CPU.Build.0 = Release|Any CPU
{6F539157-0DE3-407A-8769-EB997EB7AE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F539157-0DE3-407A-8769-EB997EB7AE59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F539157-0DE3-407A-8769-EB997EB7AE59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F539157-0DE3-407A-8769-EB997EB7AE59}.Release|Any CPU.Build.0 = Release|Any CPU
{72B83E80-9D22-4A44-AB91-253A616A9D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72B83E80-9D22-4A44-AB91-253A616A9D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72B83E80-9D22-4A44-AB91-253A616A9D9C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{72B83E80-9D22-4A44-AB91-253A616A9D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72B83E80-9D22-4A44-AB91-253A616A9D9C}.Release|Any CPU.Build.0 = Release|Any CPU
{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2FD579F3-6496-437C-956B-E6F62B2D2A5A} = {B39EE44A-0776-44E7-8B64-D8572E49B134}
{23A84AFF-0047-4364-9351-E4521D52A26B} = {73E66A66-7BCD-44FE-949C-BD42C274B840}
{767B8BFD-B663-4A2E-85AB-323D672F5B4D} = {B39EE44A-0776-44E7-8B64-D8572E49B134}
{7CEB155B-884F-4995-867D-4CC9145EF87E} = {B39EE44A-0776-44E7-8B64-D8572E49B134}
{B138AC18-EC19-4368-AE0B-CDACD0911650} = {23A84AFF-0047-4364-9351-E4521D52A26B}
{6F539157-0DE3-407A-8769-EB997EB7AE59} = {23A84AFF-0047-4364-9351-E4521D52A26B}
{72B83E80-9D22-4A44-AB91-253A616A9D9C} = {2FD579F3-6496-437C-956B-E6F62B2D2A5A}
{A9F55C31-8BED-4021-8F1B-1F5C7D4B2265} = {36CB9EBB-A677-4AF0-A0A9-BDEBDE60F123}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {61F7FB11-1E47-470C-91E2-47F8143E1572}
EndGlobalSection
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace MAUIsland;
namespace MAUIsland.Core;

[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
public class FieldCompareAttribute : CompareAttribute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.ComponentModel.DataAnnotations;
using System.Text.RegularExpressions;

namespace MAUIsland;
namespace MAUIsland.Core;

public class PasswordAttribute : ValidationAttribute
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Globalization;

namespace MAUIsland;
namespace MAUIsland.Core;

public class AllTrueValueConverter : IMultiValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections;

namespace MAUIsland;
namespace MAUIsland.Core;

public class BoolToOpacityValueConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace MAUIsland;
namespace MAUIsland.Core;

public class DateTimeToSimpleDateTimeStringConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class HexToSolidColorBrushConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class ImageSourceToBoolConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class LineBreakModeEnumToStringConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class RatioValueConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class StringTernaryOperatorConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class StringToColorConverter : IValueConverter
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace MAUIsland;
namespace MAUIsland.Core;

static class ServiceHelper
public static class ServiceHelper
{
public static TService GetService<TService>() => Current.GetService<TService>();
public static TService GetService<TService>(Type type) where TService : class
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;
public static class FluentUIIcon
{
public const string Ic_fluent_access_time_20_regular = "\ue000";
Expand Down
32 changes: 32 additions & 0 deletions src/Core/MAUIsland.Core/MAUIsland.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AcrylicView.Maui" Version="2.1.3" />
<PackageReference Include="ColorCode.Core" Version="2.0.15" />
<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
<PackageReference Include="CommunityToolkit.Maui.Core" Version="7.0.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.1.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.10" />
</ItemGroup>

</Project>
22 changes: 22 additions & 0 deletions src/Core/MAUIsland.Core/MAUIsland.Core.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MAUIsland.Core", "MAUIsland.Core.csproj", "{F17849CD-1322-4054-AEFC-BEFE0E1C5409}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F17849CD-1322-4054-AEFC-BEFE0E1C5409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F17849CD-1322-4054-AEFC-BEFE0E1C5409}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F17849CD-1322-4054-AEFC-BEFE0E1C5409}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F17849CD-1322-4054-AEFC-BEFE0E1C5409}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

[ContentProperty(nameof(All))]
public class EdgeInsetsExtension : IMarkupExtension
Expand Down
7 changes: 7 additions & 0 deletions src/Core/MAUIsland.Core/Platforms/Android/PlatformClass1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace MAUIsland.Core
{
// All the code in this file is only included on Android.
public class PlatformClass1
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace MAUIsland.Core
{
// All the code in this file is only included on Mac Catalyst.
public class PlatformClass1
{
}
}
9 changes: 9 additions & 0 deletions src/Core/MAUIsland.Core/Platforms/Tizen/PlatformClass1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System;

namespace MAUIsland.Core
{
// All the code in this file is only included on Tizen.
public class PlatformClass1
{
}
}
7 changes: 7 additions & 0 deletions src/Core/MAUIsland.Core/Platforms/Windows/PlatformClass1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace MAUIsland.Core
{
// All the code in this file is only included on Windows.
public class PlatformClass1
{
}
}
7 changes: 7 additions & 0 deletions src/Core/MAUIsland.Core/Platforms/iOS/PlatformClass1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace MAUIsland.Core
{
// All the code in this file is only included on iOS.
public class PlatformClass1
{
}
}
17 changes: 17 additions & 0 deletions src/Core/MAUIsland.Core/ServiceExtension.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using CommunityToolkit.Maui;
using CommunityToolkit.Maui.Core;
using Xe.AcrylicView;

namespace MAUIsland.Core;

public static class ServicesExtension
{
public static MauiAppBuilder InitCore(this MauiAppBuilder builder)
{
builder.UseAcrylicView();
builder.UseMauiCommunityToolkit();
builder.UseMauiCommunityToolkitCore();
builder.UseMauiCommunityToolkitMediaElement();
return builder;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public abstract class BaseFormModel : ObservableValidator
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public partial class BaseModel : ObservableObject
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public class BasePage : ContentPage
{
Expand Down
3 changes: 3 additions & 0 deletions src/Core/MAUIsland.Core/Utils/MVVM/BasePopup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
namespace MAUIsland.Core;

public class BasePopup : BasePage { }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public abstract partial class BaseViewModel : ObservableRecipient
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using CommunityToolkit.Maui.Core;
using Font = Microsoft.Maui.Font;

namespace MAUIsland;
namespace MAUIsland.Core;

[ExcludeFromCodeCoverage]
public class AppNavigator : IAppNavigator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public interface IAppNavigator
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public abstract class NavigationAwareBaseViewModel : BaseViewModel, IQueryAttributable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public static class UriHelper
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public static class AppColors
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using CommunityToolkit.Maui.Converters;

namespace MAUIsland;
namespace MAUIsland.Core;

public static class AppConverters
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public static class Dimensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace MAUIsland;
namespace MAUIsland.Core;

public static class FontNames
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Maui.Controls.Shapes;

namespace MAUIsland;
namespace MAUIsland.Core;


public partial class Styles
Expand Down
Loading

0 comments on commit a9af973

Please sign in to comment.