Skip to content

Commit

Permalink
Merge branch 'master' into Fix/DynamicResources
Browse files Browse the repository at this point in the history
  • Loading branch information
IeuanWalker authored May 12, 2020
2 parents bac20ff + 1d3593b commit d0a9b5e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Breadcrumb/Breadcrumb.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
<PackageReference Include="Xamarin.Forms.PancakeView" Version="1.3.7" />
<PackageReference Include="Xamarin.Forms.PancakeView" Version="1.4.2" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions DemoApp/DemoApp.Android/DemoApp.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
1 change: 1 addition & 0 deletions DemoApp/DemoApp.iOS/DemoApp.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions DemoApp/DemoApp/DemoApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Next up, just add the breadcrumb control onto that page and you're all set.
You are able to change the first breadcrumb to an Icon, embedded image or url image.
It implements the Xamarin.Forms ImageSource object.

```csharp
```xaml
<breadcrumb:Breadcrumb Padding="15" VerticalOptions="Start">
<breadcrumb:Breadcrumb.FirstBreadCrumb>
<FontImageSource FontFamily="{StaticResource FontAwesome}"
Expand All @@ -77,7 +77,7 @@ You are able to change the separators to an Icon, embedded image or url image.
It implements the Xamarin.Forms ImageSource object.

Font - (FontAwesome)
```csharp
```xaml
<breadcrumb:Breadcrumb Padding="15" VerticalOptions="Start">
<breadcrumb:Breadcrumb.Separator>
<FontImageSource FontFamily="{StaticResource FontAwesome}"
Expand All @@ -89,7 +89,7 @@ Font - (FontAwesome)
```

Image - URL
```csharp
```xaml
<breadcrumb:Breadcrumb Padding="15" VerticalOptions="Start">
<breadcrumb:Breadcrumb.Separator>
<UriImageSource Uri="https://cdn.iconscout.com/icon/free/png-256/xamarin-4-599473.png" />
Expand All @@ -98,7 +98,7 @@ Image - URL
```

Image - Embedded
```csharp
```xaml
<breadcrumb:Breadcrumb Padding="15" VerticalOptions="Start">
<breadcrumb:Breadcrumb.Separator>
<FileImageSource File="exampleImage.png" />
Expand Down

0 comments on commit d0a9b5e

Please sign in to comment.