diff --git a/samples/Android-Iconics-Xamarin-Nuget/Adapter/IconAdapter.cs b/samples/Android-Iconics-Xamarin-Nuget/Adapter/IconAdapter.cs index f5e6c48..b452821 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/Adapter/IconAdapter.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/Adapter/IconAdapter.cs @@ -4,7 +4,7 @@ namespace AndroidIconicsSample.Adapter using Android.Support.V7.Widget; using Android.Views; using Android.Widget; - using Com.Mikepenz.Iconics.View; + using Mikepenz.Iconics.View; public class IconAdapter : RecyclerView.Adapter { @@ -17,7 +17,7 @@ public IconAdapter(List icons, int rowLayout) this.rowLayout = rowLayout; } - public void setIcons(List icons) + public void SetIcons(List icons) { this.icons.AddRange(icons); this.NotifyItemRangeChanged(0, icons.Count - 1); diff --git a/samples/Android-Iconics-Xamarin-Nuget/AndroidIconicsSample-Nuget.csproj b/samples/Android-Iconics-Xamarin-Nuget/AndroidIconicsSample-Nuget.csproj index 1b28bd0..355d2fd 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/AndroidIconicsSample-Nuget.csproj +++ b/samples/Android-Iconics-Xamarin-Nuget/AndroidIconicsSample-Nuget.csproj @@ -47,23 +47,23 @@ - - Libs\material-drawer-3.0.3.dll - - ..\..\packages\Xamarin.Android.Support.v4.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\packages\Xamarin.Android.Support.v7.CardView.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll + packages\Xamarin.Android.Support.v7.CardView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll - ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + packages\Xamarin.Android.Support.v7.RecyclerView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + + + Libs\material-drawer-3.0.7.dll - - packages\Mikepenz.Android.Iconics.Xamarin.Binding.1.0.2\lib\MonoAndroid\android-iconics-1.0.2.dll + + packages\Mikepenz.Android.Iconics.Xamarin.Binding.1.2.0\lib\MonoAndroid\android-iconics-1.2.0.dll @@ -104,13 +104,14 @@ Designer - + + diff --git a/samples/Android-Iconics-Xamarin-Nuget/CustomApplication.cs b/samples/Android-Iconics-Xamarin-Nuget/CustomApplication.cs index 420e7eb..21fd0d3 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/CustomApplication.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/CustomApplication.cs @@ -4,10 +4,10 @@ namespace AndroidIconicsSample using Android.App; using Android.Runtime; using AndroidIconicsSample.Typeface; - using Com.Mikepenz.Iconics; - using Com.Mikepenz.Community_material_typeface_library; - using Com.Mikepenz.Meteocons_typeface_library; - using Com.Mikepenz.Octicons_typeface_library; + using Mikepenz.Iconics; + using Mikepenz.Community_material_typeface_library; + using Mikepenz.Meteocons_typeface_library; + using Mikepenz.Octicons_typeface_library; [Application(Theme = "@style/AppTheme")] public class CustomApplication : Application diff --git a/samples/Android-Iconics-Xamarin-Nuget/IconsFragment.cs b/samples/Android-Iconics-Xamarin-Nuget/IconsFragment.cs index f70732e..e993002 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/IconsFragment.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/IconsFragment.cs @@ -6,7 +6,7 @@ namespace AndroidIconicsSample using Android.Support.V7.Widget; using Android.Views; using AndroidIconicsSample.Adapter; - using Com.Mikepenz.Iconics; + using Mikepenz.Iconics; public class IconsFragment : Fragment { @@ -55,7 +55,7 @@ public override void OnViewCreated(View view, Bundle savedInstanceState) { this.icons.Add(icon); } - adapter.setIcons(this.icons); + adapter.SetIcons(this.icons); break; } } diff --git a/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.3.dll b/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.3.dll deleted file mode 100644 index aebdfd0..0000000 Binary files a/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.3.dll and /dev/null differ diff --git a/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.7.dll b/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.7.dll new file mode 100644 index 0000000..dd95d45 Binary files /dev/null and b/samples/Android-Iconics-Xamarin-Nuget/Libs/material-drawer-3.0.7.dll differ diff --git a/samples/Android-Iconics-Xamarin-Nuget/MainActivity.cs b/samples/Android-Iconics-Xamarin-Nuget/MainActivity.cs index 998e908..26c3767 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/MainActivity.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/MainActivity.cs @@ -8,11 +8,11 @@ namespace AndroidIconicsSample using Android.OS; using Android.Views; using Android.Widget; - using Com.Mikepenz.Iconics; - using Com.Mikepenz.Iconics.Typeface; - using Com.Mikepenz.Materialdrawer; - using Com.Mikepenz.Materialdrawer.Model; - using Com.Mikepenz.Materialdrawer.Model.Interfaces; + using Mikepenz.Iconics; + using Mikepenz.Iconics.Typeface; + using Mikepenz.MaterialDrawer; + using Mikepenz.MaterialDrawer.Models; + using Mikepenz.MaterialDrawer.Models.Interfaces; using Toolbar = Android.Support.V7.Widget.Toolbar; [Activity(MainLauncher = true, Label = "@string/app_name")] @@ -52,7 +52,7 @@ public override bool OnCreateOptionsMenu(IMenu menu) var menuItem = menu.FindItem(Resource.Id.action_opensource); - menuItem.SetIcon(new IconicsDrawable(this, FontAwesome.Icon.FawGithub).ActionBarSize().Color(Color.White)); + menuItem.SetIcon(new IconicsDrawable(this, FontAwesome.Icon.FawGithub).SizeDp(48).Color(Color.White)); return base.OnCreateOptionsMenu(menu); } diff --git a/samples/Android-Iconics-Xamarin-Nuget/PlaygroundActivity.cs b/samples/Android-Iconics-Xamarin-Nuget/PlaygroundActivity.cs index 28527a9..ca3938d 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/PlaygroundActivity.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/PlaygroundActivity.cs @@ -6,8 +6,8 @@ namespace AndroidIconicsSample using Android.Text; using Android.Text.Style; using Android.Widget; - using Com.Mikepenz.Iconics; - using Com.Mikepenz.Iconics.Typeface; + using Mikepenz.Iconics; + using Mikepenz.Iconics.Typeface; [Activity] public class PlaygroundActivity : Activity diff --git a/samples/Android-Iconics-Xamarin-Nuget/Typeface/CustomFont.cs b/samples/Android-Iconics-Xamarin-Nuget/Typeface/CustomFont.cs index ba0e862..f27baa2 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/Typeface/CustomFont.cs +++ b/samples/Android-Iconics-Xamarin-Nuget/Typeface/CustomFont.cs @@ -5,7 +5,7 @@ using System.Linq; using Android.Graphics; using Android.Util; - using Com.Mikepenz.Iconics.Typeface; + using Mikepenz.Iconics.Typeface; public class CustomFont : Java.Lang.Object, ITypeface { diff --git a/samples/Android-Iconics-Xamarin-Nuget/packages.config b/samples/Android-Iconics-Xamarin-Nuget/packages.config index 3e11fe4..2219011 100644 --- a/samples/Android-Iconics-Xamarin-Nuget/packages.config +++ b/samples/Android-Iconics-Xamarin-Nuget/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file