From a2056d8be8db9fa366b6a1cd52e923b7f30ef139 Mon Sep 17 00:00:00 2001 From: roubachof Date: Mon, 4 Oct 2021 11:47:39 +0200 Subject: [PATCH] fix #40 --- Sharpnado.Tabs.nuspec | 20 +++++++++++--------- Tabs/Tabs.Droid/AssemblyInfo.cs | 16 ++++++++-------- Tabs/Tabs.UWP/AssemblyInfo.cs | 18 +++++++++--------- Tabs/Tabs.iOS/AssemblyInfo.cs | 16 ++++++++-------- Tabs/Tabs/AssemblyInfo.cs | 8 ++++---- Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs | 2 +- make-package.ps1 | 2 +- 7 files changed, 42 insertions(+), 40 deletions(-) diff --git a/Sharpnado.Tabs.nuspec b/Sharpnado.Tabs.nuspec index 37da558..b51fd8d 100644 --- a/Sharpnado.Tabs.nuspec +++ b/Sharpnado.Tabs.nuspec @@ -15,13 +15,15 @@ Including fixed tabs, scrollable tabs, bottom tabs, badge, segmented control, custom tabs, button tabs, ... xamarin.forms android ios uwp netstandard tabs segmented control bottombar fixed tabs scrollable tabs badge - Add MaterialTabItem a complete implementation of the material design tabs, including top icon and leading icon.. + Add MaterialUnderlinedTabItem a complete implementation of the material design tabs, including top icon and leading icon. +Add SVG image support Pure Xamarin.Forms tabs: * Fixed tabs (android tabs style) * Scrollable tabs * Vertical tabs * Material design tabs (top and leading icon) + * Support for SVG images * Segmented tabs * Custom shadows (neumorphism ready) * Badges on tabs @@ -63,26 +65,26 @@ Pure Xamarin.Forms tabs: - - + + - - + + - - + + - - + + diff --git a/Tabs/Tabs.Droid/AssemblyInfo.cs b/Tabs/Tabs.Droid/AssemblyInfo.cs index b6aa44d..493ea77 100644 --- a/Tabs/Tabs.Droid/AssemblyInfo.cs +++ b/Tabs/Tabs.Droid/AssemblyInfo.cs @@ -1,20 +1,20 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ -[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" + - "rlined tabs, scrollable tabs, badges...")] +[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" + + "rial tabs, underlined tabs, scrollable tabs, badges...")] [assembly: System.Reflection.AssemblyCompany("Sharpnado")] [assembly: System.Reflection.AssemblyProduct("Tabs")] [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")] -[assembly: System.Reflection.AssemblyFileVersion("2.1.0")] -[assembly: System.Reflection.AssemblyVersion("2.1.0")] +[assembly: System.Reflection.AssemblyFileVersion("2.2.0")] +[assembly: System.Reflection.AssemblyVersion("2.2.0")] [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.Android")] diff --git a/Tabs/Tabs.UWP/AssemblyInfo.cs b/Tabs/Tabs.UWP/AssemblyInfo.cs index f8c7c91..5aa4696 100644 --- a/Tabs/Tabs.UWP/AssemblyInfo.cs +++ b/Tabs/Tabs.UWP/AssemblyInfo.cs @@ -1,20 +1,20 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ -[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" + - "rlined tabs, scrollable tabs, badges...")] +[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" + + "rial tabs, underlined tabs, scrollable tabs, badges...")] [assembly: System.Reflection.AssemblyCompany("Sharpnado")] [assembly: System.Reflection.AssemblyProduct("Tabs")] -[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2020")] -[assembly: System.Reflection.AssemblyFileVersion("2.0.1")] -[assembly: System.Reflection.AssemblyVersion("2.0.1")] +[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")] +[assembly: System.Reflection.AssemblyFileVersion("2.2.0")] +[assembly: System.Reflection.AssemblyVersion("2.2.0")] [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.UWP")] diff --git a/Tabs/Tabs.iOS/AssemblyInfo.cs b/Tabs/Tabs.iOS/AssemblyInfo.cs index d367f20..2420223 100644 --- a/Tabs/Tabs.iOS/AssemblyInfo.cs +++ b/Tabs/Tabs.iOS/AssemblyInfo.cs @@ -1,20 +1,20 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ -[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" + - "rlined tabs, scrollable tabs, badges...")] +[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" + + "rial tabs, underlined tabs, scrollable tabs, badges...")] [assembly: System.Reflection.AssemblyCompany("Sharpnado")] [assembly: System.Reflection.AssemblyProduct("Tabs")] [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")] -[assembly: System.Reflection.AssemblyFileVersion("2.1.0")] -[assembly: System.Reflection.AssemblyVersion("2.1.0")] +[assembly: System.Reflection.AssemblyFileVersion("2.2.0")] +[assembly: System.Reflection.AssemblyVersion("2.2.0")] [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.iOS")] diff --git a/Tabs/Tabs/AssemblyInfo.cs b/Tabs/Tabs/AssemblyInfo.cs index 9b4169d..57c3d62 100644 --- a/Tabs/Tabs/AssemblyInfo.cs +++ b/Tabs/Tabs/AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Ce code a été généré par un outil. +// Version du runtime :4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si +// le code est régénéré. // //------------------------------------------------------------------------------ diff --git a/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs b/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs index f599b2a..1a50957 100644 --- a/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs +++ b/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs @@ -176,7 +176,7 @@ private void ToggleIconVisibility(bool visible) private void UpdateGeometryIcon() { - var brush = IsSelected ? SelectedTabColor : UnselectedLabelColor; + var brush = new SolidColorBrush(IsSelected ? SelectedTabColor : UnselectedLabelColor); if (Fill) { IconPath.Fill = brush; diff --git a/make-package.ps1 b/make-package.ps1 index e30c588..ba8596d 100644 --- a/make-package.ps1 +++ b/make-package.ps1 @@ -1,4 +1,4 @@ -$formsVersion = "4.7.0.968" +$formsVersion = "5.0.0.1874" $orgName = "Sharpnado" $projectName = "Tabs"