Skip to content

Commit

Permalink
Add icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Release-Candidate committed Apr 8, 2021
1 parent 1a4494e commit a00bbc3
Show file tree
Hide file tree
Showing 9 changed files with 111 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/Tzolkin.Android/MainActivity.fs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type MainActivity() =
base.OnCreate(bundle)
Xamarin.Essentials.Platform.Init(this, bundle)
Xamarin.Forms.Forms.Init(this, bundle)
FFImageLoading.Forms.Platform.CachedImageRenderer.Init(enableFastRenderer = true)

this.LoadApplication(TzolkinApp.App())

override this.OnRequestPermissionsResult
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions src/Tzolkin.Android/Tzolkin.Android.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@
<Compile Include="AssemblyInfo.fs" />
<Compile Include="MainActivity.fs" />
<None Include="packages.config" />
<AndroidResource Include="Resources\drawable\number-01.png" />
<AndroidResource Include="Resources\drawable\01-Imix.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Fabulous">
Expand All @@ -170,9 +172,33 @@
<Reference Include="Fabulous.XamarinForms">
<HintPath>..\..\packages\Fabulous.XamarinForms.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.FFImageLoading">
<HintPath>..\..\packages\Fabulous.XamarinForms.FFImageLoading.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.FFImageLoading.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.LiveUpdate">
<HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.SkiaSharp">
<HintPath>..\..\packages\Fabulous.XamarinForms.SkiaSharp.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.11.982\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Forms">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.4.11.982\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Forms.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.4.11.982\lib\MonoAndroid10\FFImageLoading.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.11.982\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Svg.Forms">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Svg.Forms.2.4.11.982\lib\MonoAndroid10\FFImageLoading.Svg.Forms.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Svg.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Svg.2.4.11.982\lib\MonoAndroid10\FFImageLoading.Svg.Platform.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2012\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
</Reference>
Expand All @@ -185,13 +211,26 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\..\packages\SkiaSharp.2.80.2\lib\monoandroid1.0\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Extended.Svg">
<HintPath>..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.Android">
<HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\MonoAndroid\SkiaSharp.Views.Android.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.Forms">
<HintPath>..\..\packages\SkiaSharp.Views.Forms.1.68.1\lib\MonoAndroid\SkiaSharp.Views.Forms.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers">
<Private>True</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
<HintPath>..\..\packages\Xamarin.Android.FSharp.ResourceProvider.1.0.0.28\lib\monoandroid81\Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -417,6 +456,7 @@
<Error Condition="!Exists('..\..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets'))" />
<Error Condition="!Exists('..\..\packages\SkiaSharp.2.80.2\build\monoandroid1.0\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.2.80.2\build\monoandroid1.0\SkiaSharp.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.Solver.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.Solver.targets')" />
<Import Project="..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.MultiDex.2.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.MultiDex.targets')" />
Expand Down Expand Up @@ -467,4 +507,5 @@
<Import Project="..\..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
<Import Project="..\..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\SkiaSharp.2.80.2\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.2.80.2\build\monoandroid1.0\SkiaSharp.targets')" />
</Project>
10 changes: 10 additions & 0 deletions src/Tzolkin.Android/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@
<package id="Fabulous" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="Fabulous.LiveUpdate" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="Fabulous.XamarinForms" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="Fabulous.XamarinForms.FFImageLoading" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="Fabulous.XamarinForms.SkiaSharp" version="1.0.0" targetFramework="monoandroid11.0" />
<package id="FSharp.Core" version="5.0.1" targetFramework="monoandroid11.0" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid11.0" />
<package id="SkiaSharp" version="2.80.2" targetFramework="monoandroid11.0" />
<package id="SkiaSharp.Svg" version="1.60.0" targetFramework="monoandroid11.0" />
<package id="SkiaSharp.Views" version="1.68.1" targetFramework="monoandroid11.0" />
<package id="SkiaSharp.Views.Forms" version="1.68.1" targetFramework="monoandroid11.0" />
<package id="System.Buffers" version="4.5.1" targetFramework="monoandroid11.0" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid11.0" />
<package id="Xamarin.Android.FSharp.ResourceProvider" version="1.0.0.28" targetFramework="monoandroid11.0" />
Expand Down Expand Up @@ -57,6 +63,10 @@
<package id="Xamarin.AndroidX.ViewPager" version="1.0.0.7" targetFramework="monoandroid11.0" />
<package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.9" targetFramework="monoandroid11.0" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid11.0" />
<package id="Xamarin.FFImageLoading" version="2.4.11.982" targetFramework="monoandroid11.0" />
<package id="Xamarin.FFImageLoading.Forms" version="2.4.11.982" targetFramework="monoandroid11.0" />
<package id="Xamarin.FFImageLoading.Svg" version="2.4.11.982" targetFramework="monoandroid11.0" />
<package id="Xamarin.FFImageLoading.Svg.Forms" version="2.4.11.982" targetFramework="monoandroid11.0" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="monoandroid11.0" />
<package id="Xamarin.Google.Android.Material" version="1.3.0.1" targetFramework="monoandroid11.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid11.0" />
Expand Down
2 changes: 2 additions & 0 deletions src/Tzolkin.iOS/AppDelegate.fs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ type AppDelegate() =

override this.FinishedLaunching(app, options) =
Forms.Init()
FFImageLoading.Forms.Platform.CachedImageRenderer.Init()

let appcore = new Tzolkin.App()
this.LoadApplication(appcore)
base.FinishedLaunching(app, options)
Expand Down
41 changes: 41 additions & 0 deletions src/Tzolkin.iOS/Tzolkin.iOS.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,33 @@
<Reference Include="Fabulous.XamarinForms">
<HintPath>..\..\packages\Fabulous.XamarinForms.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.FFImageLoading">
<HintPath>..\..\packages\Fabulous.XamarinForms.FFImageLoading.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.FFImageLoading.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.LiveUpdate">
<HintPath>..\..\packages\Fabulous.XamarinForms.LiveUpdate.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.LiveUpdate.dll</HintPath>
</Reference>
<Reference Include="Fabulous.XamarinForms.SkiaSharp">
<HintPath>..\..\packages\Fabulous.XamarinForms.SkiaSharp.1.0.0\lib\netstandard2.0\Fabulous.XamarinForms.SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Forms">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Forms.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Svg.Forms">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Svg.Forms.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.Svg.Forms.dll</HintPath>
</Reference>
<Reference Include="FFImageLoading.Svg.Platform">
<HintPath>..\..\packages\Xamarin.FFImageLoading.Svg.2.4.11.982\lib\Xamarin.iOS10\FFImageLoading.Svg.Platform.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core">
<Private>True</Private>
</Reference>
Expand All @@ -166,6 +190,18 @@
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OpenTK-1.0" />
<Reference Include="SkiaSharp">
<HintPath>..\..\packages\SkiaSharp.2.80.2\lib\xamarinios1.0\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Extended.Svg">
<HintPath>..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.Forms">
<HintPath>..\..\packages\SkiaSharp.Views.Forms.1.68.1\lib\Xamarin.iOS\SkiaSharp.Views.Forms.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Views.iOS">
<HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\Xamarin.iOS\SkiaSharp.Views.iOS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers">
<Private>True</Private>
Expand All @@ -175,6 +211,9 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="WebP.Touch">
<HintPath>..\..\packages\WebP.Touch.1.0.8\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\..\packages\Xamarin.Essentials.1.6.1\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -205,6 +244,8 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets'))" />
<Error Condition="!Exists('..\..\packages\SkiaSharp.2.80.2\build\xamarinios1.0\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.2.80.2\build\xamarinios1.0\SkiaSharp.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\SkiaSharp.2.80.2\build\xamarinios1.0\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.2.80.2\build\xamarinios1.0\SkiaSharp.targets')" />
</Project>
11 changes: 11 additions & 0 deletions src/Tzolkin.iOS/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,22 @@
<package id="Fabulous" version="1.0.0" targetFramework="xamarinios10" />
<package id="Fabulous.LiveUpdate" version="1.0.0" targetFramework="xamarinios10" />
<package id="Fabulous.XamarinForms" version="1.0.0" targetFramework="xamarinios10" />
<package id="Fabulous.XamarinForms.FFImageLoading" version="1.0.0" targetFramework="xamarinios10" />
<package id="Fabulous.XamarinForms.LiveUpdate" version="1.0.0" targetFramework="xamarinios10" />
<package id="Fabulous.XamarinForms.SkiaSharp" version="1.0.0" targetFramework="xamarinios10" />
<package id="FSharp.Core" version="5.0.1" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="2.80.2" targetFramework="xamarinios10" />
<package id="SkiaSharp.Svg" version="1.60.0" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views" version="1.68.1" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views.Forms" version="1.68.1" targetFramework="xamarinios10" />
<package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
<package id="WebP.Touch" version="1.0.8" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading" version="2.4.11.982" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading.Forms" version="2.4.11.982" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading.Svg" version="2.4.11.982" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading.Svg.Forms" version="2.4.11.982" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="xamarinios10" />
</packages>
4 changes: 4 additions & 0 deletions src/Tzolkin/TzolkinApp.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@
<PackageReference Include="Fabulous" Version="1.0.0" />
<PackageReference Include="Fabulous.LiveUpdate" Version="1.0.0" />
<PackageReference Include="Fabulous.XamarinForms" Version="1.0.0" />
<PackageReference Include="Fabulous.XamarinForms.FFImageLoading" Version="1.0.0" />
<PackageReference Include="Fabulous.XamarinForms.LiveUpdate" Version="1.0.0" />
<PackageReference Include="Fabulous.XamarinForms.SkiaSharp" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="FSharp.Core" Version="5.0.1" />
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms" Version="2.4.11.982" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Update="FSharp.Core" Version="5.0.1" /> <!-- workaround for VSMac bug https://github.com/mono/monodevelop/pull/5137 -->
</ItemGroup>
Expand Down

0 comments on commit a00bbc3

Please sign in to comment.