Review fixes

diff --git a/Fitness/Config.cs b/Fitness/Config.cs
index 26cc8ef..a7fc539 100644 (file)
--- a/Fitness/Config.cs
+++ b/Fitness/Config.cs
@@ -13,11 +13,6 @@ namespace Fitness
         /// <summary>
         /// Unit Size for current screen
         /// </summary>
-        public const UnitSize PixelsPerUnit = UnitSize.MediumUnit;
-
-        /// <summary>
-        /// Number of units per pixel
-        /// </summary>
-        public const float UnitsPerPixel = 1.0f / (int)PixelsPerUnit;
+        public const UnitSize PixelsPerUnit = UnitSize.Medium;
     }
 }

diff --git a/Fitness/UnitSize.cs b/Fitness/UnitSize.cs
index 4236315..b1938fd 100644 (file)
--- a/Fitness/UnitSize.cs
+++ b/Fitness/UnitSize.cs
@@ -9,26 +9,26 @@ namespace Fitness
         /// <summary>
         /// Number of pixels per unit for very large size displays with very small dpi.
         /// </summary>
-        ExtraSmallUnit = 1,
+        ExtraSmall = 1,
 
         /// <summary>
         /// Number of pixels per unit for large size displays with small dpi.
         /// </summary>
-        SmallUnit = 2,
+        Small = 2,
 
         /// <summary>
         /// Number of pixels per unit for average size displays with average dpi.
         /// </summary>
-        MediumUnit = 4,
+        Medium = 4,
 
         /// <summary>
         /// Number of pixels per unit for small size displays with high dpi.
         /// </summary>
-        LargeUnit = 6,
+        Large = 6,
 
         /// <summary>
         /// Number of pixels per unit for very small size displays with very high dpi.
         /// </summary>
-        ExtraLargUnit = 8,
+        ExtraLarge = 8,
     }
 }

diff --git a/Fitness/Views/SizeInUnitsMarkup.cs b/Fitness/Views/SizeInUnitsMarkup.cs
new file mode 100644 (file)
index 0000000..e1a2f80
--- /dev/null
+++ b/Fitness/Views/SizeInUnitsMarkup.cs
@@ -0,0 +1,26 @@
+using System;
+using Tizen.NUI;
+using Tizen.NUI.BaseComponents;
+using Tizen.NUI.Binding;
+using Tizen.NUI.Xaml;
+
+namespace Fitness.Views
+{
+    public class SizeInUnitsMarkup : IMarkupExtension
+    {
+        /// <summary>
+        /// Width in units
+        /// </summary>
+        public int Width { get; set; }
+
+        /// <summary>
+        /// Height in units
+        /// </summary>
+        public int Height { get; set; }
+
+        public object ProvideValue(IServiceProvider provider)
+        {
+            return new Size2D(UnitsUtils.UnitsToPixels(Width), UnitsUtils.UnitsToPixels(Height));
+        }
+    }
+}

diff --git a/Fitness/Views/UnitsUtils.cs b/Fitness/Views/UnitsUtils.cs
index 5dd8065..83e0e4a 100644 (file)
--- a/Fitness/Views/UnitsUtils.cs
+++ b/Fitness/Views/UnitsUtils.cs
@@ -6,6 +6,11 @@ namespace Fitness.Views
     public static class UnitsUtils
     {
         /// <summary>
+        /// Number of units per pixel
+        /// </summary>
+        private const float UnitsPerPixel = 1.0f / (int)Config.PixelsPerUnit;
+
+        /// <summary>
         /// Converts units into pixels using current UnitSize settings
         /// </summary>
         public static int UnitsToPixels(int units)
@@ -18,7 +23,7 @@ namespace Fitness.Views
         /// </summary>
         public static int PixelsToUnits(int pixels)
         {
-            return (int)(pixels * Config.UnitsPerPixel);
+            return (int)(pixels * UnitsPerPixel);
         }
 
         /// <summary>

diff --git a/Fitness/Views/XamlExtensions.cs b/Fitness/Views/XamlExtensions.cs
deleted file mode 100644 (file)
index df05243..0000000
--- a/Fitness/Views/XamlExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Tizen.NUI;
-using Tizen.NUI.BaseComponents;
-using Tizen.NUI.Binding;
-
-namespace Fitness.Views
-{
-    public static class XamlExtensions
-    {
-        /// <summary>
-        /// SizeInUnits Xaml property extension.
-        /// Use this property to define Size of view int Units system.
-        /// </summary>
-        public static readonly BindableProperty SizeInUnitsProperty =
-  BindableProperty.CreateAttached("SizeInUnits", typeof(Size2D), typeof(XamlExtensions), default(Size2D), propertyChanged: OnSizeInUnitsChanged);
-
-        public static void OnSizeInUnitsChanged(BindableObject view, object oldValue, object newValue)
-        {
-            if (view is View nuiView)
-            {
-                nuiView.Size = UnitsUtils.UnitsToPixels(newValue as Size2D);
-            }
-        }
-    }
-}

diff --git a/Fitness/res/layout/1280x720/MainView.xaml b/Fitness/res/layout/1280x720/MainView.xaml
index 737b7ed..6a8fc5f 100644 (file)
--- a/Fitness/res/layout/1280x720/MainView.xaml
+++ b/Fitness/res/layout/1280x720/MainView.xaml
@@ -11,5 +11,5 @@
   <View.Layout>
       <LinearLayout LinearOrientation="Vertical" CellPadding="50,50" LinearAlignment="Center"/>
   </View.Layout>
-  <TextLabel Text="Title" HorizontalAlignment="Center" VerticalAlignment="Center" views:XamlExtensions.SizeInUnits="75, 12" BackgroundColor="Cyan"/>
+  <TextLabel Text="Title" HorizontalAlignment="Center" VerticalAlignment="Center" Size="{views:SizeInUnitsMarkup Width=75, Height=12}" BackgroundColor="Cyan"/>
 </View>