Fix warnings & debug.

diff --git a/Fitness/Controls/BindableCollectionView.cs b/Fitness/Controls/BindableCollectionView.cs
index a0812943ed211c56575023a8dce7d75400a78652..948899a172703d788ad8c5b48c0c158d911772af 100644 (file)
--- a/Fitness/Controls/BindableCollectionView.cs
+++ b/Fitness/Controls/BindableCollectionView.cs
@@ -16,7 +16,7 @@ namespace Fitness.Controls
         /// <summary>
         /// ItemsSource property.
         /// </summary>
-        public static readonly BindableProperty ItemsSourceProperty =
+        public static new readonly BindableProperty ItemsSourceProperty =
             BindableProperty.Create(nameof(ItemsSource), typeof(IEnumerable), typeof(BindableCollectionView), null, propertyChanged: OnItemsSourceChanged);
 
         /// <summary>

diff --git a/Fitness/Controls/NavigationStack.cs b/Fitness/Controls/NavigationStack.cs
index c6b9cada988cc189eada1badf6940c659ee65fe4..c37a2a0b5953ed9b8de1d96fa044e1b6e4bf4ec2 100644 (file)
--- a/Fitness/Controls/NavigationStack.cs
+++ b/Fitness/Controls/NavigationStack.cs
@@ -16,8 +16,9 @@ namespace Fitness.Controls
         public NavigationStack()
             : base()
         {
-            WidthResizePolicy = ResizePolicyType.FillToParent;
-            HeightResizePolicy = ResizePolicyType.FillToParent;
+            Layout = new AbsoluteLayout();
+            WidthSpecification = LayoutParamPolicies.MatchParent;
+            HeightSpecification = LayoutParamPolicies.MatchParent;
         }
 
         public List<Page> Pages { get => Children.ConvertAll(x => (Page)x); }

diff --git a/Fitness/Controls/Page.cs b/Fitness/Controls/Page.cs
index 39df635417983800eb4c55694ddb2abaa9ee8b43..0b056237742f6f7f5785c110932f73f1816f824b 100644 (file)
--- a/Fitness/Controls/Page.cs
+++ b/Fitness/Controls/Page.cs
@@ -14,8 +14,9 @@ namespace Fitness.Controls
         public Page()
             : base()
         {
-            WidthResizePolicy = ResizePolicyType.FillToParent;
-            HeightResizePolicy = ResizePolicyType.FillToParent;
+            Layout = new AbsoluteLayout();
+            WidthSpecification = LayoutParamPolicies.MatchParent;
+            HeightSpecification = LayoutParamPolicies.MatchParent;
         }
 
         /// <summary>

diff --git a/Fitness/Views/LoadingView.cs b/Fitness/Views/LoadingView.cs
index 9ea63163c5c6a284bc85c6ed54240aced761a78a..3dd1fe93a011082bcadb12219c92c7c1f974c5c3 100644 (file)
--- a/Fitness/Views/LoadingView.cs
+++ b/Fitness/Views/LoadingView.cs
@@ -1,4 +1,5 @@
 using Fitness.Controls;
+using Tizen.NUI.BaseComponents;
 using Tizen.NUI;
 
 namespace Fitness.Views
@@ -12,6 +13,8 @@ namespace Fitness.Views
             PropertyMap fontStyle = new PropertyMap();
             fontStyle.Add("weight", new PropertyValue("medium"));
             CountingLabel.FontStyle = fontStyle;
+            CountingLabel.WidthSpecification = LayoutParamPolicies.MatchParent;
+            CountingLabel.HeightSpecification = LayoutParamPolicies.MatchParent;
         }
 
         private void CountingLabel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)

diff --git a/Fitness/Views/Styles/Buttons.cs b/Fitness/Views/Styles/Buttons.cs
index 399ac65a19be86118f7d4a71deadb197f3e0e801..3876f5be754869a9a5b29c8aa7445fd7b130f421 100644 (file)
--- a/Fitness/Views/Styles/Buttons.cs
+++ b/Fitness/Views/Styles/Buttons.cs
@@ -85,7 +85,7 @@ namespace Fitness.Views.Styles
                 },
             },
             IconPadding = new Extents(20, 0, 0, 0),
-            IconRelativeOrientation = Button.IconOrientation.Right,
+            IconRelativeOrientation = Button.IconOrientation.Left,
         };
 
         public static NinePatchButtonStyle RegularRepeat => new NinePatchButtonStyle

diff --git a/Fitness/res/layout/BarView.xaml b/Fitness/res/layout/BarView.xaml
index 8ff071d56cea0a426a865a7958234a9e25a4ea3b..80d7694250d4576e3ad0bd1b16a3df32ec6805e7 100644 (file)
--- a/Fitness/res/layout/BarView.xaml
+++ b/Fitness/res/layout/BarView.xaml
@@ -8,7 +8,7 @@
   xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:styles="clr-namespace:Fitness.Views.Styles"
   xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-  WidthResizePolicy="FillToParent"
+  WidthSpecification="-1"
   Size="{views:SizeInUnits Height=30}"
   x:Name="Root">
     <ctrl:NinePatchButton Text="previous"

diff --git a/Fitness/res/layout/ExercisePreviewView.xaml b/Fitness/res/layout/ExercisePreviewView.xaml
index c368fff836d250db193af830bbe2ae8159f232ff..5a9bdde6442e6876780e311d07547273a34d6278 100644 (file)
--- a/Fitness/res/layout/ExercisePreviewView.xaml
+++ b/Fitness/res/layout/ExercisePreviewView.xaml
@@ -8,7 +8,7 @@
   xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
   xmlns:styles="clr-namespace:Fitness.Views.Styles"
-  HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true">
+  HeightSpecification="-1" WidthSpecification="-1" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true">
     <ctrl:Page.BindingContext>
         <vm:ExercisePreviewViewModel x:Name="context"/>
     </ctrl:Page.BindingContext>
@@ -18,26 +18,26 @@
             <ctrl:FadeTransition Duration="500" StartOpacity="0.0" EndOpacity="1.0" />
         </ctrl:PageTransitionCollection>
     </ctrl:Page.PageTransitions>
-    <View WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-    <ImageView BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}" HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" ResourceUrl="{Binding ThumbnailUrl}" x:Name="temp" ctrl:Connected.Id="preview"/>
-    <VideoView HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" x:Name="player" Looping="true"/>
-    <View HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent">
+    <View WidthSpecification="-1" HeightSpecification="-1">
+    <ImageView BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}" HeightSpecification="-1" WidthSpecification="-1" ResourceUrl="{Binding ThumbnailUrl}" x:Name="temp" ctrl:Connected.Id="preview"/>
+    <VideoView HeightSpecification="-1" WidthSpecification="-1" x:Name="player" Looping="true"/>
+    <View HeightSpecification="-1">
         <View.Layout>
-            <LinearLayout LinearOrientation="Vertical" LinearAlignment="CenterVertical"/>
+            <LinearLayout LinearOrientation="Vertical"/>
         </View.Layout>
         <!-- Bar -->
-        <View WidthResizePolicy="FillToParent" Size="{views:SizeInUnits Height=40}" Margin="{views:ExtentsInUnits Start=16}">
+        <View HeightSpecification="-1" Size="{views:SizeInUnits Height=40}" Margin="{views:ExtentsInUnits Start=16}">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical"/>
                 </View.Layout>
                 <ctrl:NinePatchButton BindingContext="{x:Reference context}" Size="{views:SizeInUnits Width=50,Height=20}" Text="previous" x:Name="previousButton" Command="{Binding PreviousWorkout}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Previous}"/>
-                <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}" Size="{views:SizeInUnits Width=328,Height=20}" HeightResizePolicy="FillToParent" Text="{Binding Title}" Margin="{views:ExtentsInUnits Start=10}" VerticalAlignment="Center" HorizontalAlignment="Center" PixelSize="32"/>
+                <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}" Size="{views:SizeInUnits Width=328,Height=20}" HeightSpecification="-1" Text="{Binding Title}" Margin="{views:ExtentsInUnits Start=10}" VerticalAlignment="Center" HorizontalAlignment="Center" PixelSize="32"/>
                 <ctrl:NinePatchButton BindingContext="{x:Reference context}" Size="{views:SizeInUnits Width=50,Height=20}" Text="next" x:Name="nextButton" Margin="{views:ExtentsInUnits Start=10}" Command="{Binding NextWorkout}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Next}"/>
         </View>
         <!-- Bar End -->
-        <View WidthResizePolicy="FillToParent" Weight="1.0">
+        <View HeightSpecification="-1" Weight="1.0">
         </View>
-        <View WidthResizePolicy="FillToParent" Size="{views:SizeInUnits Height=40}" Margin="{views:ExtentsInUnits Start=16,End=16,Bottom=6}">
+        <View HeightSpecification="-1" Size="{views:SizeInUnits Height=40}" Margin="{views:ExtentsInUnits Start=16,End=16,Bottom=6}">
             <View.Layout>
                 <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical" CellPadding="40,40"/>
             </View.Layout>

diff --git a/Fitness/res/layout/FitnessItemView.xaml b/Fitness/res/layout/FitnessItemView.xaml
index f0de55c2b6f96d6f4e8e4653dd51b9689752cd54..414f7b41e86ef4bafd49055f8c9fa1500f719529 100644 (file)
--- a/Fitness/res/layout/FitnessItemView.xaml
+++ b/Fitness/res/layout/FitnessItemView.xaml
@@ -12,8 +12,8 @@
     <View Size="{views:SizeInUnits Width=78,Height=44}" >
         <ImageView x:Name="image"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                   HeightResizePolicy="FillToParent"
-                   WidthResizePolicy="FillToParent"
+                   HeightSpecification="-1"
+                   WidthSpecification="-1"
                    ResourceUrl="{Binding ThumbnailUrl}"/>
         <TextLabel x:Name="label"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"

diff --git a/Fitness/res/layout/LoadingView.xaml b/Fitness/res/layout/LoadingView.xaml
index 9b34dc0fff45a739b44f5c7b1be6da2a25525222..b71a12324accc13d53b05f7f5c671f89c81d7a9b 100644 (file)
--- a/Fitness/res/layout/LoadingView.xaml
+++ b/Fitness/res/layout/LoadingView.xaml
@@ -12,7 +12,7 @@
   <ctrl:Page.Layout>
       <AbsoluteLayout/>
   </ctrl:Page.Layout>
-  <ImageView HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" ResourceUrl="*Resource*/layout/images/0_BG_dim.png"/>
+  <ImageView HeightSpecification="-1" WidthSpecification="-1" ResourceUrl="*Resource*/layout/images/0_BG_dim.png"/>
   <ImageView PositionUsesPivotPoint="true" ParentOrigin="Center" PivotPoint="Center" HeightResizePolicy="SizeRelativeToParent" WidthForHeight="true" SizeModeFactor="0.0,0.8,1.0" ResourceUrl="*Resource*/layout/images/circle.svg" x:Name="image" Opacity="0.48"/>
-  <TextLabel x:Name="CountingLabel" Text="{Binding Text}" PixelSize="{Binding PixelSize}" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PositionUsesPivotPoint="true" PivotPoint="Center" ParentOrigin="Center" VerticalAlignment="Center" HorizontalAlignment="Center" TextColor="#000C2B"/>
+  <TextLabel x:Name="CountingLabel" Text="{Binding Text}" PixelSize="{Binding PixelSize}" WidthSpecification="-1" HeightSpecification="-1" PositionUsesPivotPoint="true" PivotPoint="Center" ParentOrigin="Center" VerticalAlignment="Center" HorizontalAlignment="Center" TextColor="#000C2B"/>
 </ctrl:Page>

diff --git a/Fitness/res/layout/MainView.xaml b/Fitness/res/layout/MainView.xaml
index 2c294a22e706aaa19904d908a12ef04ae0dc5c24..fa518f46ed35c1e8ae6b288967ad47b8dc9cbda5 100644 (file)
--- a/Fitness/res/layout/MainView.xaml
+++ b/Fitness/res/layout/MainView.xaml
@@ -9,7 +9,7 @@
   xmlns:converters="clr-namespace:Fitness.Views.Converters"
   xmlns:styles="clr-namespace:Fitness.Views.Styles"
   xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-    HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" BackgroundColor="#EEEFF1" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" >
+    HeightSpecification="-1" WidthSpecification="-1" BackgroundColor="#EEEFF1" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" >
   <View.BindingContext>
       <vm:MainViewModel x:Name="context"/>
   </View.BindingContext>
@@ -17,19 +17,19 @@
       <LinearLayout LinearOrientation="Vertical" LinearAlignment="Top"/>
   </View.Layout>
   <nui:Button BindingContext="{Binding Source={x:Reference context}}" Size="{views:SizeInUnits Width=12, Height=12}" Margin="{views:ExtentsInUnits Start=12, Top=12, Bottom=8}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Back}" Command="{Binding Exit}" />
-  <View Margin="{views:ExtentsInUnits Start=16,End=16}" Weight="1.0" WidthResizePolicy="FillToParent" >
+  <View Margin="{views:ExtentsInUnits Start=16,End=16}" Weight="1.0" WidthSpecification="-1" HeightSpecification="-1">
       <View.Layout>
-          <LinearLayout LinearOrientation="Horizontal" LinearAlignment="End"/>
+          <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Begin"/>
       </View.Layout>
-      <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Weight="1.0" HeightResizePolicy="FillToParent" ResourceUrl="{Binding ThumbnailUrl}" x:Name="imagePreview" ctrl:Connected.Id="preview">
+      <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Weight="1.0" HeightSpecification="-1" WidthSpecification="-1" ResourceUrl="{Binding ThumbnailUrl}" x:Name="imagePreview" ctrl:Connected.Id="preview">
           <ImageView.Layout>
               <LinearLayout LinearOrientation="Vertical" LinearAlignment="Center" CellPadding="0,40"/>
           </ImageView.Layout>
           <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}" PositionUsesPivotPoint="true" ParentOrigin="0.5,0.5" PivotPoint="0.5,0.5" Text="Let's try!" Command="{Binding StartWorkout}" Size="{views:SizeInUnits Width=112,Height=24}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Inverse}"/>
           <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}" PositionUsesPivotPoint="true" ParentOrigin="0.5,0.5" PivotPoint="0.5,0.5" Text="Watch preview" Command="{Binding WatchPreview}" Size="{views:SizeInUnits Width=112,Height=24}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
       </ImageView>
-      <View Size="{views:SizeInUnits Width=107}" Margin="{views:ExtentsInUnits Start=8}" HeightResizePolicy="FillToParent">
-          <View HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent">
+      <View Size="{views:SizeInUnits Width=107}" Margin="{views:ExtentsInUnits Start=8}" HeightSpecification="-1">
+          <View HeightSpecification="-1" WidthSpecification="-1">
               <View.Layout>
                   <LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin"/>
               </View.Layout>
@@ -52,7 +52,7 @@
           <ImageView PositionUsesPivotPoint="true" PivotPoint="1.0,0.0" ParentOrigin="1.0, 0.0" Size="30,30" BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" ResourceUrl="{Binding Favourite, Converter={Static converters:FavouriteToIconConverter.Converter}}"/>
       </View>
   </View>
-    <ctrl:BindableCollectionView Size="{views:SizeInUnits Height=44}" Margin="{views:ExtentsInUnits Top=10, Bottom=10, Start=16, End=16}" WidthResizePolicy="FillToParent" ItemsSource="{Binding Workouts}" SelectedItem="{Binding Path=SelectedWorkout, Mode=TwoWay}" SelectionMode="SingleAlways" ScrollingDirection="Horizontal">
+    <ctrl:BindableCollectionView Size="{views:SizeInUnits Height=44}" Margin="{views:ExtentsInUnits Top=10, Bottom=10, Start=16, End=16}" WidthSpecification="-1" ItemsSource="{Binding Workouts}" SelectedItem="{Binding Path=SelectedWorkout, Mode=TwoWay}" SelectionMode="SingleAlways" ScrollingDirection="Horizontal">
         <ctrl:BindableCollectionView.ItemTemplate>
             <DataTemplate>
                 <views:FitnessItemView />

diff --git a/Fitness/res/layout/PauseView.xaml b/Fitness/res/layout/PauseView.xaml
index 04f191155c4daa1e6b55c81a6d02216603860417..6b470bc44ec45453327bf21fbb7ff75c780ba76a 100644 (file)
--- a/Fitness/res/layout/PauseView.xaml
+++ b/Fitness/res/layout/PauseView.xaml
@@ -8,54 +8,58 @@
   xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:styles="clr-namespace:Fitness.Views.Styles"
   xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent"  
+  HeightSpecification="-1"
+  WidthSpecification="-1"
   x:Name="Root">
-    <View HeightResizePolicy="FillToParent"
-          WidthResizePolicy="FillToParent">
+    <View HeightSpecification="-1"
+          WidthSpecification="-1">
         <View.Layout>
             <LinearLayout LinearOrientation="Vertical"/>
         </View.Layout>
         <!--Bar stub-->
         <View Size="{views:SizeInUnits Height=30}"
-              WidthResizePolicy="FillToParent"/>
+              WidthSpecification="-1"/>
         <!--Margin-->
         <View BackgroundColor="Transparent"
-          WidthResizePolicy="FillToParent"
-          HeightResizePolicy="FillToParent"
+          WidthSpecification="-1"
+          HeightSpecification="-1"
           Weight="1"/>
         <!--Bottom Bar-->
         <ImageView Size="{views:SizeInUnits Height=30}"
                    Margin="{views:ExtentsInUnits Start=16, End=16}"
-                   WidthResizePolicy="FillToParent"
+                   WidthSpecification="-1"
                    ResourceUrl="*Resource*/styles/button/ButtonFrame.png">
             <!--Left button-->
             <View Size="{views:SizeInUnits Height=30}"
-                  WidthResizePolicy="FillToParent">
+                  WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                                      HeightResizePolicy="FillToParent"
+                                      HeightSpecification="-1"
+                                      WidthSpecification="-1"
                                       Text="Review movement"
                                       Weight="1"
                                       Command="{Binding ReviewMovement}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.ReviewMovement}}"/>
-                <View HeightResizePolicy="FillToParent"
+                <View HeightSpecification="-1"
+                      WidthSpecification="-1"
                       BackgroundColor="Transparent"
                       Weight="2"/>
             </View>
             <!--Right button-->
             <View Size="{views:SizeInUnits Height=30}"
-                  WidthResizePolicy="FillToParent">
+                  WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
-                <View HeightResizePolicy="FillToParent"
+                <View HeightSpecification="-1"
+                      WidthSpecification="-1"
                       BackgroundColor="Transparent"
                       Weight="2"/>
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                                      HeightResizePolicy="FillToParent"
+                                      HeightSpecification="-1"
+                                      WidthSpecification="-1"
                                       Text="End workout"
                                       Weight="1"
                                       Command="{Binding EndWorkout}"
@@ -63,25 +67,28 @@
             </View>
             <!--Center button-->
             <View Size="{views:SizeInUnits Height=30}"
-                  WidthResizePolicy="FillToParent">
+                  WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
-                <View HeightResizePolicy="FillToParent"
+                <View HeightSpecification="-1"
+                      WidthSpecification="-1"
                       BackgroundColor="Transparent"
                       Weight="1"/>
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                                      HeightResizePolicy="FillToParent"
+                                      HeightSpecification="-1"
+                                      WidthSpecification="-1"
                                       Text="Continue exercise"
                                       Weight="1"
                                       Command="{Binding PauseResumeWorkout}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Regular}}"/>
-                <View HeightResizePolicy="FillToParent"
+                <View HeightSpecification="-1"
+                      WidthSpecification="-1"
                       BackgroundColor="Transparent"
                       Weight="1"/>
             </View>
         </ImageView>
         <View Size="{views:SizeInUnits Height=5}"
-              WidthResizePolicy="FillToParent"/>
+              WidthSpecification="-1"/>
     </View>
 </View>
\ No newline at end of file

diff --git a/Fitness/res/layout/PlayingView.xaml b/Fitness/res/layout/PlayingView.xaml
index f5bf30e051b63784b7ceadd77bca5b4c356335fd..10c2b535e7c4214f08a2a9960b67f6b9ad653b1e 100644 (file)
--- a/Fitness/res/layout/PlayingView.xaml
+++ b/Fitness/res/layout/PlayingView.xaml
@@ -8,33 +8,33 @@
   xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
   xmlns:styles="clr-namespace:Fitness.Views.Styles"
   xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-  HeightResizePolicy="FillToParent" 
-  WidthResizePolicy="FillToParent"  
+  HeightSpecification="-1"
+  WidthSpecification="-1"
   x:Name="Root">
     <View.Layout>
         <LinearLayout LinearOrientation="Vertical"/>
     </View.Layout>
     <!--Bar stub-->
     <View Size="{views:SizeInUnits Height=30}"
-              WidthResizePolicy="FillToParent"/>
+              WidthSpecification="-1"/>
     <!--Margin-->
     <View BackgroundColor="Transparent"
-          WidthResizePolicy="FillToParent"
+          WidthSpecification="-1"
           Size="{views:SizeInUnits Height=5}"/>
     <View BackgroundColor="Transparent"
-          WidthResizePolicy="FillToParent"
-          HeightResizePolicy="FillToParent"
+          WidthSpecification="-1"
+          HeightSpecification="-1"
           Weight="1"/>
     <!--Content-->
     <View Size="{views:SizeInUnits Height=189}"
-          WidthResizePolicy="FillToParent">
+          WidthSpecification="-1">
         <View.Layout>
             <LinearLayout LinearOrientation="Horizontal"/>
         </View.Layout>
         <!--Preview-->
         <View BackgroundColor="Transparent"
-          HeightResizePolicy="FillToParent"
-          WidthResizePolicy="FillToParent"
+          HeightSpecification="-1"
+          WidthSpecification="-1"
           Weight="1">
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical"/>
@@ -42,13 +42,13 @@
             <!--Preview stub-->
             <ImageView x:Name="PreviewStub"
                        HeightForWidth="true"
-                       WidthResizePolicy="FillToParent"
+                       WidthSpecification="-1"
                        HeightResizePolicy="SizeRelativeToParent"
                        SizeModeFactor="0.0,0.6,0.0"
                        ResourceUrl="*Resource*/layout/images/previewBlank.png"/>
             <View BackgroundColor="Transparent"
                   Weight="1"
-                  WidthResizePolicy="FillToParent"/>
+                  WidthSpecification="-1"/>
             <!--Time 165-->
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding TimeLeft, StringFormat=\{0:m\\:ss\}}"
@@ -56,27 +56,27 @@
                        PixelSize="165"
                        HorizontalAlignment="Center"
                        Margin="{views:ExtentsInUnits Start=48}"
-                       WidthResizePolicy="FillToParent"
+                       WidthSpecification="-1"
                        Size="{views:SizeInUnits Width=102, Height=50}"/>
             <TextLabel Text="Time left"
                        TextColor="#000C2B"
                        PixelSize="24"
                        HorizontalAlignment="Center"
                        Margin="{views:ExtentsInUnits Start=87}"
-                       WidthResizePolicy="FillToParent"
+                       WidthSpecification="-1"
                        Size="{views:SizeInUnits Width=28, Height=9}"/>
         </View>
         <!--Cemera Preview-->
         <View BackgroundColor="Transparent"
-          HeightResizePolicy="FillToParent"
-          WidthResizePolicy="FillToParent"
+          HeightSpecification="-1"
+          WidthSpecification="-1"
           Size="{views:SizeInUnits Width=281, Height=189}">
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
             <!--Camera stub-->
             <View x:Name="CameraStub"
-                  WidthResizePolicy="FillToParent"
+                  WidthSpecification="-1"
                   Size="{views:SizeInUnits Width=281, Height=158}"/>
             <View Size="{views:SizeInUnits Width=281, Height=4}"/>
             <!--Numbers-->
@@ -130,12 +130,12 @@
     </View>
     <!--Margin-->
     <View BackgroundColor="Transparent"
-          WidthResizePolicy="FillToParent"
-          HeightResizePolicy="FillToParent"
+          WidthSpecification="-1"
+          HeightSpecification="-1"
           Weight="1" />
     <!--Bar-->
     <View Size="{views:SizeInUnits Height=30}"
-          WidthResizePolicy="FillToParent">
+          WidthSpecification="-1">
         <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                               PositionUsesPivotPoint="True"
                               ParentOrigin="Center"
@@ -146,5 +146,5 @@
                               behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.RegularBig}}"/>
     </View>
     <View Size="{views:SizeInUnits Height=10}"
-          WidthResizePolicy="FillToParent"/>
+          WidthSpecification="-1"/>
 </View>
\ No newline at end of file

diff --git a/Fitness/res/layout/ScanningView.xaml b/Fitness/res/layout/ScanningView.xaml
index fcd51100f9c1ff9eb002792506d43a63b37a1ba5..a94982cb195189371e7da90fe326558748efe9ba 100644 (file)
--- a/Fitness/res/layout/ScanningView.xaml
+++ b/Fitness/res/layout/ScanningView.xaml
@@ -6,8 +6,8 @@
            xmlns:ctrl="clr-namespace:Fitness.Controls"
            xmlns:views="clr-namespace:Fitness.Views"
            xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-           HeightResizePolicy="FillToParent"
-           WidthResizePolicy="FillToParent"
+           HeightSpecification="-1"
+           WidthSpecification="-1"
            BackgroundColor="#EEEFF1"
            ParentOrigin="Center"
            PivotPoint="Center"
@@ -20,11 +20,11 @@
     <View Position="320, 100"
           Size="1280, 960">
         <ctrl:Camera x:Name="cameraView"
-                     WidthResizePolicy="FillToParent"
-                     HeightResizePolicy="FillToParent"
+                     WidthSpecification="-1"
+                     HeightSpecification="-1"
                      PreviewFps="Fps30" />
-        <ctrl:Overlay WidthResizePolicy="FillToParent"
-                      HeightResizePolicy="FillToParent"
+        <ctrl:Overlay WidthSpecification="-1"
+                      HeightSpecification="-1"
                       BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                       PoseLandmarks="{Binding PoseLandmarks}">
           <x:Arguments>
@@ -33,11 +33,11 @@
         </ctrl:Overlay>
     </View>
 
-    <View WidthResizePolicy="FillToParent">
+    <View WidthSpecification="-1">
         <View.Layout>
             <LinearLayout LinearOrientation="Horizontal" />
         </View.Layout>
-        <View Weight="2">
+        <View WidthSpecification="-1">
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical" />
             </View.Layout>
@@ -51,8 +51,10 @@
                        TextColor="Black" />
         </View>
         <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
+                              WidthSpecification="-1"
                               Text="Close"
                               Size="{views:SizeInUnits Width=80, Height=20}"
+                              PointSize="6"
                               Command="{Binding CloseScanningView}" />
     </View>
 </ctrl:Page>

diff --git a/Fitness/res/layout/SummaryView.xaml b/Fitness/res/layout/SummaryView.xaml
index 08bf32204173847c0126b907e3c80a017124e81e..e86f42cd90d56ee497c0b35c8e278a0f8616f7e4 100644 (file)
--- a/Fitness/res/layout/SummaryView.xaml
+++ b/Fitness/res/layout/SummaryView.xaml
@@ -12,14 +12,14 @@
     <View.BindingContext>
         <vm:SummaryViewModel/>
     </View.BindingContext>
-    <ImageView HeightResizePolicy="FillToParent" 
-               WidthResizePolicy="FillToParent"
+    <ImageView HeightSpecification="-1"
+               WidthSpecification="-1"
                ResourceUrl="*Resource*/layout/images/0_BG_dim.png">
         <ImageView PositionUsesPivotPoint="True"
                   ParentOrigin="Center"
                   PivotPoint="Center"
-                  WidthResizePolicy="FillToParent"
-                  HeightResizePolicy="FillToParent"
+                  WidthSpecification="-1"
+                  HeightSpecification="-1"
                   Size="{views:SizeInUnits Width=296, Height=148}"
                   ResourceUrl="*Resource*/layout/images/08_popup_body.png">
             <View.Layout>
@@ -29,21 +29,21 @@
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding Title}"
                        PixelSize="40"
-                       WidthResizePolicy="FillToParent"
+                       WidthSpecification="-1"
                        Size="{views:SizeInUnits Height=14}"
                        HorizontalAlignment="Center"
                        TextColor="#000C2B"/>
-            <View WidthResizePolicy="FillToParent"
+            <View WidthSpecification="-1"
                   Weight="1"/>
             <TextLabel Text="Your session summary:"
                        PixelSize="32"
-                       WidthResizePolicy="FillToParent"
+                       WidthSpecification="-1"
                        Margin="{views:ExtentsInUnits Start=27}"
                        Size="{views:SizeInUnits Height=11}"
                        HorizontalAlignment="Begin"
                        TextColor="#000C2B"/>
             <View Size="{views:SizeInUnits Height=7}"/>
-            <View WidthResizePolicy="FillToParent">
+            <View WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
@@ -61,7 +61,7 @@
                            Size="{views:SizeInUnits Height=11}"/>
             </View>
             <View Size="{views:SizeInUnits Height=4}"/>
-            <View WidthResizePolicy="FillToParent">
+            <View WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
@@ -79,7 +79,7 @@
                            Size="{views:SizeInUnits Height=11}"/>
             </View>
             <View Size="{views:SizeInUnits Height=4}"/>
-            <View WidthResizePolicy="FillToParent">
+            <View WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
@@ -96,9 +96,9 @@
                            PixelSize="32"
                            Size="{views:SizeInUnits Height=11}"/>
             </View>
-            <View WidthResizePolicy="FillToParent"
+            <View WidthSpecification="-1"
                   Weight="1"/>
-            <View WidthResizePolicy="FillToParent">
+            <View WidthSpecification="-1">
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
@@ -109,8 +109,8 @@
                                       Command="{Binding Back}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Outline}}"/>
                 <View Weight="1"
-                      HeightResizePolicy="FillToParent"
-                      WidthResizePolicy="FillToParent"/>
+                      HeightSpecification="-1"
+                      WidthSpecification="-1"/>
                 <ctrl:NinePatchButton Text="Ok"
                                       Size="{views:SizeInUnits Width=100, Height=26}"
                                       BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"