Skip to content

Commit b9cb09d

Browse files
amatkivskiyamatkivskiy
committed
Merge branch 'dev'
# Conflicts: # dev/Mikepenz.Android.Iconics.Xamarin.Binding.nuspec # library/Jars/iconics-1.2.1.aar # library/JavaSrc/com/mikepenz/iconics/Iconics.java # library/library.csproj # samples/Android-Iconics-Xamarin-Nuget/AndroidIconicsSample-Nuget.csproj # samples/Android-Iconics-Xamarin-Nuget/packages.config # samples/AndroidIconicsSample/AndroidIconicsSample.csproj # samples/AndroidIconicsSample/Resources/Resource.designer.cs # solutions/Android-Iconics-Xamarin-Nuget.sln # solutions/Android-Iconics.sln
2 parents 1193058 + b2b220b commit b9cb09d

File tree

94 files changed

+16103
-10555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+16103
-10555
lines changed

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,14 @@
66

77
Xamarin bindings for [Android-Iconics](https://github.com/mikepenz/Android-Iconics) library.
88

9+
Typefaces:
10+
- [Meteoconcs](https://github.com/amatkivskiy/Android-Iconics-Xamarin/blob/dev/library/Additions/Meteoconcs.cs);
11+
- [Octicons](https://github.com/amatkivskiy/Android-Iconics-Xamarin/blob/dev/library/Additions/Octicons.cs)
12+
- [CommunityMaterial](https://github.com/amatkivskiy/Android-Iconics-Xamarin/blob/dev/library/Additions/CommunityMaterial.cs)
13+
- [FontAwesome](https://github.com/amatkivskiy/Android-Iconics-Xamarin/blob/dev/library/Additions/FontAwesome.cs)
14+
- [GoogleMaterial](https://github.com/amatkivskiy/Android-Iconics-Xamarin/blob/dev/library/Additions/GoogleMaterial.cs)
15+
16+
Are integrated into the library.
17+
918
# Download
1019
[NuGet Package](https://www.nuget.org/packages/Mikepenz.Android.Iconics.Xamarin.Binding/)

‎dev/.nuget/NuGet.exe‎

2.03 MB
Binary file not shown.

‎dev/Mikepenz.Android.Iconics.Xamarin.Binding.Mac.nuspec‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<!-- prefer rather Mikepenz.Iconics.Xamarin.Android then this id in future -->
5+
<id>Mikepenz.Android.Iconics.Xamarin.Binding</id>
6+
<version>2.5.1</version>
7+
<title>Android-Iconics</title>
8+
<authors>Andriy Matkivskiy</authors>
9+
<owners>amatkivskiy</owners>
10+
<projectUrl>https://github.com/amatkivskiy/Android-Iconics-Xamarin</projectUrl>
11+
<iconUrl>https://raw.githubusercontent.com/mikepenz/Android-Iconics/master/DEV/icon/icon.png</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>C# bindings for Android-Iconics library.
14+
15+
Android-Iconics is a library to use (almost) any alternative iconfont in your projects. It allows you to add any Android-Iconics compatible typeface-library-addon to your project and you are able to start using that font.
16+
http://mikepenz.github.io/Android-Iconics</description>
17+
<summary>Xamarin binding for Android Iconics https://github.com/mikepenz/Android-Iconics</summary>
18+
<tags>Android Xamarin Icons Material</tags>
19+
<releaseNotes>Updated to version 2.5.1.
20+
For more information read https://github.com/mikepenz/Android-Iconics/releases.
21+
</releaseNotes>
22+
<dependencies>
23+
<dependency id="Xamarin.Android.Support.v4" version="23.1.1.0"/>
24+
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0"/>
25+
</dependencies>
26+
</metadata>
27+
<files>
28+
<file src="../library/bin/Release/android-iconics.dll" target="lib\MonoAndroid\"/>
29+
<file src="fonts/fontawesome-webfont-v4.5.0.1.ttf" target="content\Assets\fonts\" />
30+
<file src="fonts/google-material-font-v2.1.0.1.ttf" target="content\Assets\fonts\" />
31+
<file src="fonts/materialdesignicons-v1.3.41.ttf" target="content\Assets\fonts\" />
32+
<file src="fonts/meteocons.ttf" target="content\Assets\fonts\" />
33+
<file src="fonts/octicons-v3.2.0.ttf" target="content\Assets\fonts\" />
34+
</files>
35+
</package>

‎dev/Mikepenz.Android.Iconics.Xamarin.Binding.nuspec‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<!-- prefer rather Mikepenz.Iconics.Xamarin.Android then this id in future -->
55
<id>Mikepenz.Android.Iconics.Xamarin.Binding</id>
6-
<version>1.2.1</version>
6+
<version>2.5.1</version>
77
<title>Android-Iconics</title>
88
<authors>Andriy Matkivskiy</authors>
99
<owners>amatkivskiy</owners>
@@ -16,20 +16,20 @@ Android-Iconics is a library to use (almost) any alternative iconfont in your pr
1616
http://mikepenz.github.io/Android-Iconics</description>
1717
<summary>Xamarin binding for Android Iconics https://github.com/mikepenz/Android-Iconics</summary>
1818
<tags>Android Xamarin Icons Material</tags>
19-
<releaseNotes>Updated to version 1.2.1.
20-
- clean solution for the textAllCaps issue
19+
<releaseNotes>Updated to version 2.5.1.
20+
For more information read https://github.com/mikepenz/Android-Iconics/releases.
2121
</releaseNotes>
2222
<dependencies>
23-
<dependency id="Xamarin.Android.Support.v4" version="22.2.0.0"/>
24-
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="22.2.0.0"/>
23+
<dependency id="Xamarin.Android.Support.v4" version="23.1.1.0"/>
24+
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0"/>
2525
</dependencies>
2626
</metadata>
2727
<files>
28-
<file src="..\library\bin\Release\android-iconics-1.2.1.dll" target="lib\MonoAndroid\"/>
29-
<file src="fonts\google_material_design.ttf" target="content\Assets\fonts\" />
30-
<file src="fonts\fontawesome-webfont-4.3.0.ttf" target="content\Assets\fonts\" />
31-
<file src="fonts\materialdesignicons-webfont.ttf" target="content\Assets\fonts\" />
28+
<file src="..\library\bin\Release\android-iconics-2.5.1.dll" target="lib\MonoAndroid\"/>
29+
<file src="fonts\fontawesome-webfont-v4.5.0.1.ttf" target="content\Assets\fonts\" />
30+
<file src="fonts\google-material-font-v2.1.0.1.ttf" target="content\Assets\fonts\" />
31+
<file src="fonts\materialdesignicons-v1.3.41.ttf" target="content\Assets\fonts\" />
3232
<file src="fonts\meteocons.ttf" target="content\Assets\fonts\" />
33-
<file src="fonts\octicons.ttf" target="content\Assets\fonts\" />
33+
<file src="fonts\octicons-v3.2.0.ttf" target="content\Assets\fonts\" />
3434
</files>
3535
</package>

‎dev/build_release_package.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
echo OFF
2+
clear
3+
# Clear build directories
4+
# Clear library project build directories
5+
rm -rf "library/bin"
6+
rm -rf "library/obj"
7+
8+
# Clear sample project build directories
9+
rm -rf "samples/AndroidIconicsSample/bin"
10+
rm -rf "samples/AndroidIconicsSample/obj"
11+
12+
# Build sample project to ensure that binded library referenced correctly.
13+
xbuild "/p:Configuration=Release" /t:SignAndroidPackage samples/AndroidIconicsSample/AndroidIconicsSample.csproj
14+
# xbuild "/p:Configuration=Release;AdbTarget=-d -r" /t:Clean,Install samples/AndroidIconicsSample/AndroidIconicsSample.csproj
15+
16+
# Create NuGet package
17+
mono "dev/.nuget/NuGet.exe" pack -Verbosity detailed -NoDefaultExcludes "dev/Mikepenz.Android.Iconics.Xamarin.Binding.Mac.nuspec"
18+
19+
echo "Successfully built project."
20+

dev/fonts/fontawesome-webfont-4.3.0.ttf renamed to dev/fonts/fontawesome-webfont-v4.5.0.1.ttf

119 KB
Binary file not shown.

‎dev/fonts/google-material-font-v2.1.0.1.ttf‎

130 KB
Binary file not shown.

‎dev/fonts/google_material_design.ttf‎

-105 KB
Binary file not shown.

‎dev/fonts/materialdesignicons-v1.3.41.ttf‎

188 KB
Binary file not shown.

‎dev/fonts/materialdesignicons-webfont.ttf‎

-138 KB
Binary file not shown.

0 commit comments

Comments
 (0)