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.

Sign up for GitHub

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

Jump to bottom

vNext #1427

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

vNext #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8dc0657
Merge remote-tracking branch 'origin/master'
Oct 30, 2017
c3c15c7
Merge remote-tracking branch 'origin/master'
Aug 1, 2018
9939d43
Merge remote-tracking branch 'origin/master'
Jan 17, 2019
15a1e7b
Merge branch 'master' of https://github.com/luberda-molinet/FFImageLo…
Feb 19, 2019
81a713c
Merge remote-tracking branch 'origin/master'
Apr 4, 2019
9ef3ff7
wpf support
Apr 4, 2019
a1efd2f
wpf support
Apr 4, 2019
d26b863
rebase
Apr 19, 2019
e1a9f1d
cleanup
Apr 19, 2019
9a523ae
Merge branch 'feature/wpf' of https://github.com/melimion/FFImageLoad…
Apr 19, 2019
f497f07
Merge pull request #1248 from melimion/feature/wpf
daniel-luberda Sep 24, 2019
726dfc5
Fix indentation
martijn00 Sep 24, 2019
72e106a
Add initial files
martijn00 Sep 24, 2019
314adbc
Add new projects
martijn00 Sep 24, 2019
71a0574
Formatting
martijn00 Sep 24, 2019
acbdbe3
Add project
martijn00 Sep 24, 2019
f1b5234
Clean project files of samples
martijn00 Sep 24, 2019
6ad2d60
Fix sample project settings
martijn00 Sep 24, 2019
054a589
Fix csproj files
martijn00 Sep 24, 2019
0fe3cf9
Fix references
martijn00 Sep 24, 2019
e8d7128
Move mvvmcross
martijn00 Sep 24, 2019
a58ec64
Add skiasharp dependency
martijn00 Sep 24, 2019
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
70 changes: 70 additions & 0 deletions Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) Daniel Luberda</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/luberda-molinet/FFImageLoading</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/luberda-molinet/FFImageLoading/master/icon.png</PackageIconUrl>
<Authors>Daniel Luberda, Fabien Molinet</Authors>
<Owners>Daniel Luberda, Fabien Molinet</Owners>
<PackageTags>xamarin, android, ios, mac, windows, image, cache, caching, memory, bitmap, lru, load, loading, save, effects, photo</PackageTags>
<PackageReleaseNotes>https://github.com/luberda-molinet/FFImageLoading/releases</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

<RepositoryUrl>https://github.com/luberda-molinet/FFImageLoading</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<Version>2.5.0</Version>
<Platform>AnyCPU</Platform>

<LangVersion>7.3</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>

<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
<UseWPF>true</UseWPF>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DesignTimeBuild>false</DesignTimeBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild Condition=" '$(IsTestProject)' != 'true'">true</GeneratePackageOnBuild>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(OS)' == 'Windows_NT' ">
<!--<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\LICENSE.md" Pack="true" PackagePath=""/>
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' ">
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<TargetsToBuild>All</TargetsToBuild>
<!--<TargetsToBuild>Android</TargetsToBuild>-->
<!--<TargetsToBuild>Uap</TargetsToBuild>-->
<!--<TargetsToBuild>iOS</TargetsToBuild>-->
<!--<TargetsToBuild>Apple</TargetsToBuild>-->
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
<TargetsToBuild>All</TargetsToBuild>
</PropertyGroup>

</Project>
39 changes: 39 additions & 0 deletions Directory.build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<Project>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP</DefineConstants>
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.tvos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.watchos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;WATCHOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('monoandroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
<TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
</Project>
117 changes: 117 additions & 0 deletions FFImageLoading.Forms/FFImageLoading.Forms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid90;tizen40;uap10.0.16299;net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.16299;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid90;</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;xamarin.ios10</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Apple' ">netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<AssemblyName>FFImageLoading.Forms</AssemblyName>
<RootNamespace>FFImageLoading.Forms</RootNamespace>
<PackageId>Xamarin.FFImageLoading.Forms</PackageId>
<Description>Xamarin library to load images quickly and easily on Xamarin.iOS / Xamarin.Android / Xamarin.Mac / Windows</Description>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('uap')) And '$(OS)' == 'Windows_NT'">
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<None Include="Resources\*.cs" />
<Compile Remove="Resources\*.cs" />
<None Include="readme.txt" pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<None Remove="Platforms\Netstandard\**\*.cs" />
<Compile Include="Platforms\Netstandard\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) And '$(OS)' == 'Windows_NT' ">
<None Remove="Platforms\Net\**\*.cs" />
<None Remove="Platforms\Wpf\**\*.cs" />
<Compile Include="Platforms\Net\**\*.cs" />
<Compile Include="Platforms\Wpf\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<Compile Include="Platforms\Windows\**\*.cs" />
<Compile Include="Platforms\Uap\**\*.cs" />
<Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
<None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.ios')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Ios\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Ios\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.mac')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Mac\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Mac\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.tvos')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Ios\**\*.cs" />
<None Remove="Platforms\Tvos\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Ios\**\*.cs" />
<Compile Include="Platforms\Tvos\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.watchos')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Watchos\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Watchos\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
<None Remove="Platforms\Android\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Android\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
<AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
<PackageReference Include="Tizen.NET" Version="4.0.0" PrivateAssets="All" />
<None Remove="Platforms\Tizen\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Tizen\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.709238" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FFImageLoading\FFImageLoading.csproj" />
</ItemGroup>

</Project>
10 changes: 10 additions & 0 deletions FFImageLoading.Forms/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---------------------------------
FFImageLoading
---------------------------------

TODO: getting started here


---------------------------------
Star on Github if this project helps you: https://github.com/luberda-molinet/FFImageLoading
---------------------------------
118 changes: 118 additions & 0 deletions FFImageLoading.MvvmCross/FFImageLoading.MvvmCross.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid90;tizen40;uap10.0.16299;net472</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.16299;$(TargetFrameworks)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid90;</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.16299</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;xamarin.ios10</TargetFrameworks>
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Apple' ">netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<AssemblyName>FFImageLoading.MvvmCross</AssemblyName>
<RootNamespace>FFImageLoading.MvvmCross</RootNamespace>
<PackageId>Xamarin.FFImageLoading.MvvmCross</PackageId>
<Description>Xamarin library to load images quickly and easily on Xamarin.iOS / Xamarin.Android / Xamarin.Mac / Windows</Description>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('uap')) And '$(OS)' == 'Windows_NT'">
<GenerateLibraryLayout>true</GenerateLibraryLayout>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<None Include="Resources\*.cs" />
<Compile Remove="Resources\*.cs" />
<None Include="readme.txt" pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
<None Remove="Platforms\Netstandard\**\*.cs" />
<Compile Include="Platforms\Netstandard\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) And '$(OS)' == 'Windows_NT' ">
<None Remove="Platforms\Net\**\*.cs" />
<None Remove="Platforms\Wpf\**\*.cs" />
<Compile Include="Platforms\Net\**\*.cs" />
<Compile Include="Platforms\Wpf\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<Compile Include="Platforms\Windows\**\*.cs" />
<Compile Include="Platforms\Uap\**\*.cs" />
<Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
<None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.ios')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Ios\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Ios\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.mac')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Mac\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Mac\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.tvos')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Ios\**\*.cs" />
<None Remove="Platforms\Tvos\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Ios\**\*.cs" />
<Compile Include="Platforms\Tvos\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.watchos')) ">
<None Remove="Platforms\Apple\**\*.cs" />
<None Remove="Platforms\Watchos\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Apple\**\*.cs" />
<Compile Include="Platforms\Watchos\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
<None Remove="Platforms\Android\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Android\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
<AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
<PackageReference Include="Tizen.NET" Version="4.0.0" PrivateAssets="All" />
<None Remove="Platforms\Tizen\**\*.cs" />
<None Remove="Platforms\Xamarin\**\*.cs" />
<Compile Include="Platforms\Tizen\**\*.cs" />
<Compile Include="Platforms\Xamarin\**\*.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MvvmCross" Version="6.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FFImageLoading\FFImageLoading.csproj" />
<ProjectReference Include="..\FFImageLoading.Svg\FFImageLoading.Svg.csproj" />
</ItemGroup>

</Project>
0 ...FImageLoading.Cross/MvxCachedImageView.cs → ...geLoading.MvvmCross/MvxCachedImageView.cs
View file
Open in desktop
File renamed without changes.
0 ...oading.Cross.Svg/MvxSvgCachedImageView.cs → ...oading.MvvmCross/MvxSvgCachedImageView.cs
View file
Open in desktop
File renamed without changes.
10 changes: 10 additions & 0 deletions FFImageLoading.MvvmCross/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---------------------------------
FFImageLoading
---------------------------------

TODO: getting started here


---------------------------------
Star on Github if this project helps you: https://github.com/luberda-molinet/FFImageLoading
---------------------------------
Loading