diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.Abstraction/ElegantTabs.Abstraction.csproj b/src/ElegantTabs/ElegantTabs/ElegantTabs.Abstraction/ElegantTabs.Abstraction.csproj
index 2d22760..bcb214c 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.Abstraction/ElegantTabs.Abstraction.csproj
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.Abstraction/ElegantTabs.Abstraction.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabRenderer.cs b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabRenderer.cs
index ccb057d..3b15bde 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabRenderer.cs
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabRenderer.cs
@@ -1,6 +1,5 @@
using System;
using Xamarin.Forms.Platform.Android.AppCompat;
-using Android.Support.Design.Widget;
using Android.Views;
using Android.Widget;
using Xamarin.Forms.Platform.Android;
@@ -10,9 +9,8 @@
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using View = Android.Views.View;
using System.Linq;
-using Android.Support.Design.Internal;
using Xamarin.Forms;
-using Android.Support.Design.BottomNavigation;
+using Google.Android.Material.BottomNavigation;
namespace ElegantTabs.Droid
{
@@ -70,7 +68,7 @@ private void UpdateIcons(int selectedIndex)
var icon = Transforms.GetSelectedIcon(page);
if (string.IsNullOrWhiteSpace(icon))
{
- menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
+ menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
}
else
{
@@ -79,12 +77,12 @@ private void UpdateIcons(int selectedIndex)
}
else
{
- menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
+ menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
}
}
else
{
- menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.Icon, ResourceManager.DrawableClass));
+ menu.GetItem(i).SetIcon(IdFromTitle(page.IconImageSource ?? page.IconImageSource, ResourceManager.DrawableClass));
}
}
UpdateTabs();
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabs.Android.csproj b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabs.Android.csproj
index 08d3b0d..4e868b9 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabs.Android.csproj
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/ElegantTabs.Android.csproj
@@ -1,4 +1,4 @@
-
+
Debug
@@ -15,8 +15,7 @@
Properties\AndroidManifest.xml
Resources
Assets
- false
- v9.0
+ v10.0
Xamarin.Android.Net.AndroidClientHandler
@@ -30,9 +29,6 @@
prompt
4
None
- false
- false
- false
true
@@ -52,13 +48,22 @@
-
- 28.0.0.1
+
+ 1.0.0
- 4.0.0.482894
+ 4.5.0.530
-
+
+ 2.2.0
+
+
+ 1.2.0
+
+
+ 1.0.0
+
+
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/Properties/AndroidManifest.xml b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/Properties/AndroidManifest.xml
index b919704..91343fa 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/Properties/AndroidManifest.xml
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabRenderer.cs b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabRenderer.cs
index eac9ca1..77c4f74 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabRenderer.cs
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabRenderer.cs
@@ -1,15 +1,9 @@
using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
using System.Threading.Tasks;
using UIKit;
using Xamarin.Forms.Internals;
-using static Xamarin.Forms.PlatformConfiguration.iOSSpecific.Page;
-using PageUIStatusBarAnimation = Xamarin.Forms.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
using ElegantTabs.Abstraction;
using Xamarin.Forms.Platform.iOS;
-using System.Linq;
using Xamarin.Forms;
namespace ElegantTabs.iOS
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabs.iOS.csproj b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabs.iOS.csproj
index 2c09b41..5a718d3 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabs.iOS.csproj
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/ElegantTabs.iOS.csproj
@@ -1,6 +1,6 @@
-
+
Debug
AnyCPU
@@ -38,19 +38,16 @@
-
- ..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll
-
-
- ..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll
+
+
+ ..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll
-
- ..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll
+
+ ..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll
-
- ..\..\packages\Xamarin.Forms.4.0.0.482894\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll
+
+ ..\..\packages\Xamarin.Forms.4.5.0.530\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll
-
@@ -69,12 +66,5 @@
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/packages.config b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/packages.config
index 32bc7b6..4fef05f 100644
--- a/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/packages.config
+++ b/src/ElegantTabs/ElegantTabs/ElegantTabs.iOS/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file