Merge branch 'master' into MacOS

Author: xabre

.build/Plugin.Badge.nuspec

@@ -16,6 +16,10 @@
     <releaseNotes>
       [1.3.0-beta]
       - #31 MacOS support
+      [1.2.1]
+      - #20 Support for more badge postions: TopCenter, BottomCenter, LeftCenter, RightCenter
+      [1.2.0]
+      - #8 #20 #36 Bindable badge position for Android and UWP
       [1.2.0-beta3]
       - UAP ensure missing *.xr.xml is also copied.
       - UAP XF dependency updated

.gitignore

@@ -46,4 +46,4 @@ Thumbs.db
 
 **/Resource.designer.cs
 /.build/FAKE.4.61.3
-/Source/.vs/Plugin.Badge/v15/sqlite3
+/Source/.vs/Plugin.Badge/v15/sqlite3/storage.ide

README.md

@@ -1,5 +1,5 @@
 # <img src="icon_small.png" width="80" height="80"/> xamarin-forms-tab-badge [![Build Status](https://www.bitrise.io/app/6fbb08a710d8f2aa.svg?token=SlEUDTzwNV54nK7HHhUdOQ&branch=master)](https://www.bitrise.io/app/6fbb08a710d8f2aa)
-**Xamarin Forms** bindable tab badges for iOS and Android. The plugin creates a custom renderer (iOS & Android) and a custom attached property for adding tab bar badges which can be bound in XF shared code.
+**Xamarin Forms** bindable tab badges for iOS, Android and UWP. The plugin creates a custom renderer (iOS, Android & UWP) and a custom attached property for adding tab bar badges which can be bound in XF shared code.
 
 ## Sample
 <img src="Screencasts/xamarin.forms.android.gif" height="600"/><img src="Screencasts/xamarin.forms.ios.gif" height="600"/>
@@ -12,6 +12,7 @@
 | Bindable Badge Color | ✓ | ✓ (iOS >= 10.0) | ✓ | ✓ |
 | Bindable Badge Text Color | ✓ | ✓ (iOS >= 10.0) | ✓ | ✓ |
 | Bindable Badge Font | ✓\* | ✓ \*(iOS >= 10.0) | ✓ | ✓ |
+| Bindable Badge Postion | ✓ | ✕ | ✓ | ✓ |
 | Dynamic tab add/removal | ✓ | On overflow, 'More' / '...' menu don't have badges. | ✓ | ✓ |
 
 \***Caution**: For Xamarin.Forms Android make sure to use AppCompat. I.e.inherit from FormsAppCompatActivity
@@ -127,6 +128,14 @@ ToDo:
 - you can alo try to set font family, should work in theory
 - font size is not supported yet on android ......
 
+### Badge Position
+
+Very similar to `BadgeColor` just use [`TabBadge.BadgePosition` (XAML) or `TabBadge.BadgePositionPropery` (CSharp)].
+
+| TopLeft | BottomLeft | BottomRight | Center | TopCenter | BottomCenter | LeftCenter | RightCenter |
+| ------------- | ----------- | ----------- | ----------- | ----------- | ----------- | ----------- | ----------- |
+| <img src="Screencasts/badge_topleft.PNG" height="50"/> | <img src="Screencasts/badge_bottomleft.PNG" height="50"/> | <img src="Screencasts/badge_bottomright.PNG" height="50"/> | <img src="Screencasts/badge_center.PNG" height="50"/> | | | | |
+
 ## Showning / Hiding the badge
 If the value of the `BadgeText` is set to null or empty string the badge is hidden. To show it again set a non null or empty value
 

Screencasts/badge_bottomleft.PNG

@@ -0,0 +1,15 @@
+namespace Plugin.Badge.Abstractions
+{
+    public enum BadgePosition
+    {
+        PositionTopRight = 0,
+        PositionTopLeft = 1,
+        PositionBottomRight = 2,
+        PositionBottomLeft = 3,
+        PositionCenter = 4,
+        PositionTopCenter = 5,
+        PositionBottomCenter = 6,
+        PositionLeftCenter = 7,
+        PositionRightCenter = 8,
+    }
+}

Screencasts/badge_bottomright.PNG

@@ -30,6 +30,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="BadgePosition.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TabBadge.cs" />
   </ItemGroup>

Screencasts/badge_center.PNG

@@ -2,7 +2,7 @@
 using Xamarin.Forms;
 namespace Plugin.Badge.Abstractions
 {
-    public class TabBadge //: TabbedPage
+    public class TabBadge
     {
         public static BindableProperty BadgeTextProperty = BindableProperty.CreateAttached("BadgeText", typeof(string), typeof(TabBadge), default(string), BindingMode.OneWay);
 
@@ -16,7 +16,6 @@ public static void SetBadgeText(BindableObject view, string value)
             view.SetValue(BadgeTextProperty, value);
         }
 
-
         public static BindableProperty BadgeColorProperty = BindableProperty.CreateAttached("BadgeColor", typeof(Color), typeof(TabBadge), Color.Default, BindingMode.OneWay);
 
         public static Color GetBadgeColor(BindableObject view)
@@ -52,5 +51,44 @@ public static void SetBadgeFont(BindableObject view, Font value)
         {
             view.SetValue(BadgeFontProperty, value);
         }
+
+        public static BindableProperty BadgePositionProperty = BindableProperty.CreateAttached("BadgePosition", typeof(BadgePosition), typeof(TabBadge), BadgePosition.PositionTopRight, BindingMode.OneWay);
+
+        public static BadgePosition GetBadgePosition(BindableObject view)
+        {
+            return (BadgePosition)view.GetValue(BadgePositionProperty);
+        }
+
+        public static void SetBadgePosition(BindableObject view, BadgePosition value)
+        {
+            view.SetValue(BadgePositionProperty, value);
+        }
+
+        public static BindableProperty BadgeMarginProperty = BindableProperty.CreateAttached("BadgeMargin", typeof(Thickness), typeof(TabBadge), GetDefaultMargins(), BindingMode.OneWay);
+
+        public static Thickness GetBadgeMargin(BindableObject view)
+        {
+            return (Thickness)view.GetValue(BadgeMarginProperty);
+        }
+
+        public static void SetBadgeMargin(BindableObject view, Thickness value)
+        {
+            view.SetValue(BadgeMarginProperty, value);
+        }
+
+        public static Thickness GetDefaultMargins()
+        {
+            switch (Device.RuntimePlatform)
+            {
+                case Device.Android:
+                    return new Thickness(-10, -5);
+                case Device.Windows:
+                    return new Thickness(0);
+                case Device.iOS:
+                    return new Thickness(0);
+            }
+
+            return new Thickness(0);
+        }
     }
 }