Fixed spacing in xaml files.
authorAndrzej Krawczyk <a.krawczyk@samsung.com>
Thu, 8 Jul 2021 14:27:50 +0000 (16:27 +0200)
committerPiotr Czaja <p.czaja@samsung.com>
Tue, 14 Sep 2021 11:01:34 +0000 (13:01 +0200)
Fitness/res/layout/BarView.xaml
Fitness/res/layout/ExercisePreviewView.xaml
Fitness/res/layout/ExercisingView.xaml
Fitness/res/layout/FitnessItemView.xaml
Fitness/res/layout/LoadingView.xaml
Fitness/res/layout/MainView.xaml
Fitness/res/layout/PauseView.xaml
Fitness/res/layout/PlayingView.xaml
Fitness/res/layout/ScanningView.xaml
Fitness/res/layout/SummaryView.xaml

index e8f592d58482648b4640ab4e5a6af850d4d4d339..43f06381635b71c1839db1a98d3dda19f537e4ea 100644 (file)
@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <View x:Class="Fitness.Views.BarView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:views="clr-namespace:Fitness.Views"
-  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"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-  Size="{views:SizeInUnits Height=30}"
-  x:Name="Root">
+      xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+      xmlns:vm="clr-namespace:Fitness.ViewModels"
+      xmlns:ctrl="clr-namespace:Fitness.Controls"
+      xmlns:views="clr-namespace:Fitness.Views"
+      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"
+      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+      Size="{views:SizeInUnits Height=30}"
+      x:Name="Root">
+
     <ctrl:NinePatchButton Text="previous"
                           x:Name="prev"
                           Position="{views:PositionInUnits X=17, Y=10}"
                           Size="{views:SizeInUnits Width=64, Height=20}"
                           behaviors:StyleSetter.Style="{x:Static styles:Buttons.Previous}"/>
+
     <TextLabel x:Name="title"
-                TextColor="#000C2B"
-                PixelSize="32"
-                HorizontalAlignment="Center"
-                Position="{views:PositionInUnits X=190, Y=15}"
-                Size="{views:SizeInUnits Width=100, Height=10}"/>
+               TextColor="#000C2B"
+               PixelSize="32"
+               HorizontalAlignment="Center"
+               Position="{views:PositionInUnits X=190, Y=15}"
+               Size="{views:SizeInUnits Width=100, Height=10}"/>
+
     <ctrl:NinePatchButton Text="next"
                           x:Name="next"
                           Position="{views:PositionInUnits X=400, Y=10}"
                           Size="{views:SizeInUnits Width=64, Height=20}"
                           behaviors:StyleSetter.Style="{x:Static styles:Buttons.Next}"/>
-</View>
\ No newline at end of file
+
+</View>
index ae5bf3e200631f28f4211b1f0e1b3f03cd9b8be4..26403d2bb0dd018f77d992ac16db56d5c03cab44 100644 (file)
 <?xml version="1.0" encoding="UTF-8" ?>
 <ctrl:Page x:Class="Fitness.Views.ExercisePreviewView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:views="clr-namespace:Fitness.Views"
-  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"
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true">
+           xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:ctrl="clr-namespace:Fitness.Controls"
+           xmlns:vm="clr-namespace:Fitness.ViewModels"
+           xmlns:views="clr-namespace:Fitness.Views"
+           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"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           ParentOrigin="Center"
+           PivotPoint="Center"
+           PositionUsesPivotPoint="true">
+    
     <ctrl:Page.BindingContext>
         <vm:ExercisePreviewViewModel x:Name="context"/>
     </ctrl:Page.BindingContext>
+    
     <ctrl:Page.PageTransitions>
         <ctrl:PageTransitionCollection>
-            <ctrl:ConnectedTransition AnimationId="preview" TargetOverride="{x:Reference temp}" Duration="500"/>
-            <ctrl:FadeTransition Duration="500" StartOpacity="0.0" EndOpacity="1.0" />
+            
+            <ctrl:ConnectedTransition AnimationId="preview"
+                                      TargetOverride="{x:Reference temp}"
+                                      Duration="500"/>
+            
+            <ctrl:FadeTransition Duration="500"
+                                 StartOpacity="0.0"
+                                 EndOpacity="1.0"/>
+            
         </ctrl:PageTransitionCollection>
     </ctrl:Page.PageTransitions>
-    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-    <ImageView BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" ResourceUrl="{Binding ThumbnailUrl}" x:Name="temp" ctrl:Connected.Id="preview"/>
-    <VideoView HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" x:Name="player" Looping="true"/>
-    <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-        <View.Layout>
-            <LinearLayout LinearOrientation="Vertical"/>
-        </View.Layout>
-        <!-- Bar -->
-        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 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}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" 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 HeightSpecification="{Static LayoutParamPolicies.MatchParent}" Weight="1.0">
-        </View>
-        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" Size="{views:SizeInUnits Height=40}" Margin="{views:ExtentsInUnits Start=16,End=16,Bottom=6}">
+    
+    <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+        
+        <ImageView BindingContext="{Binding Source={x:Reference context}, Path=CurrentWorkout}"
+                   HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   ResourceUrl="{Binding ThumbnailUrl}"
+                   x:Name="temp"
+                   ctrl:Connected.Id="preview"/>
+        
+        <VideoView HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   x:Name="player"
+                   Looping="true"/>
+        
+        <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+            
             <View.Layout>
-                <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical" CellPadding="40,40"/>
+                <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
-            <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}" Text="Back" Size="{views:SizeInUnits Width=219,Height=26}" Command="{Binding Back}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
-            <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}" Text="Let's try!" Size="{views:SizeInUnits Width=219,Height=26}" Command="{Binding Skip}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
+            
+            <!-- Bar -->
+            <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  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}"
+                           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                           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 HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  Weight="1.0">
+                
+            </View>
+            
+            <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  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>
+                
+                <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}"
+                                      Text="Back"
+                                      Size="{views:SizeInUnits Width=219, Height=26}"
+                                      Command="{Binding Back}"
+                                      behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
+                
+                <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference context}}"
+                                      Text="Let's try!"
+                                      Size="{views:SizeInUnits Width=219, Height=26}"
+                                      Command="{Binding Skip}"
+                                      behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
+                
+            </View>
+            
         </View>
+        
     </View>
-</View>
+    
 </ctrl:Page>
index 8eead37cd0867710b053883b1a6f3faeafe1e228..4fd650e8c8a2c8c1f754e2babbe2a299a8abf474 100644 (file)
@@ -1,30 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ctrl:Page x:Class="Fitness.Views.ExercisingView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:views="clr-namespace:Fitness.Views"
-  xmlns:converters="clr-namespace:Fitness.Views.Converters"
-  x:Name="Root"
-  BackgroundColor="#EEEFF1"
-  IsPlaying="{Binding State, Converter={x:Static converters:WorkoutStateToBoolConverter.Converter}}">
+           xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:vm="clr-namespace:Fitness.ViewModels"
+           xmlns:ctrl="clr-namespace:Fitness.Controls"
+           xmlns:views="clr-namespace:Fitness.Views"
+           xmlns:converters="clr-namespace:Fitness.Views.Converters"
+           x:Name="Root"
+           BackgroundColor="#EEEFF1"
+           IsPlaying="{Binding State, Converter={x:Static converters:WorkoutStateToBoolConverter.Converter}}">
+    
     <views:PlayingView x:Name="PlayingView"
                        BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"/>
+    
     <!--Layer-->
+    
     <ImageView x:Name="Preview"
                ResourceUrl="*Resource*/layout/images/preview.png"/>
+    
     <!--Layer-->
+    
     <ctrl:Camera x:Name="cameraView"
                  PreviewFps="Fps30"
-                 PositionX="796" PositionY="152" SizeWidth="640" SizeHeight="480"/>
+                 PositionX="796"
+                 PositionY="152"
+                 SizeWidth="640"
+                 SizeHeight="480"/>
+    
     <!--Layer-->
+    
     <views:PauseView x:Name="PauseView"
                      BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"/>
+    
     <!--Layer-->
+    
     <views:BarView BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                PrevCommand="{Binding PreviousWorkout}"
-                NextCommand="{Binding NextWorkout}"
-                Title="{Binding CurrentWorkout.Title}"/>
+                   PrevCommand="{Binding PreviousWorkout}"
+                   NextCommand="{Binding NextWorkout}"
+                   Title="{Binding CurrentWorkout.Title}"/>
+    
     <views:LoadingView x:Name="LoadingView"/>
+    
 </ctrl:Page>
index d47a7527ab85e7db554d49df743b35e12c5e4a75..288c4c91207cf3662c0e6530f6ccd9cfcd822d97 100644 (file)
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <nui:RecyclerViewItem x:Class="Fitness.Views.FitnessItemView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:views="clr-namespace:Fitness.Views"
-  xmlns:converters="clr-namespace:Fitness.Views.Converters"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  Size="{views:SizeInUnits Width=82,Height=44}"
-  BackgroundColor="Transparent"
-  x:Name="Root">
-    <View Size="{views:SizeInUnits Width=78,Height=44}" >
+                      xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+                      xmlns:nui="clr-namespace:Tizen.NUI.Components"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                      xmlns:views="clr-namespace:Fitness.Views"
+                      xmlns:converters="clr-namespace:Fitness.Views.Converters"
+                      xmlns:ctrl="clr-namespace:Fitness.Controls"
+                      Size="{views:SizeInUnits Width=82, Height=44}"
+                      BackgroundColor="Transparent"
+                      x:Name="Root">
+    <View Size="{views:SizeInUnits Width=78, Height=44}" >
+        
         <ImageView x:Name="image"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                    HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                    ResourceUrl="{Binding ThumbnailUrl}"/>
+        
         <TextLabel x:Name="label"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                    PositionUsesPivotPoint="true"
-                   PivotPoint="0.0,1.0"
-                   ParentOrigin="0.0,1.0"
+                   PivotPoint="0.0, 1.0"
+                   ParentOrigin="0.0, 1.0"
                    PixelSize="24"
                    Text="{Binding Title}"/>
+        
         <ImageView x:Name="favourite"
                    BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
-                   Size="40,40"
+                   Size="40, 40"
                    PositionUsesPivotPoint="true"
-                   PivotPoint="1.0,0.0"
-                   ParentOrigin="1.0,0.0"
+                   PivotPoint="1.0, 0.0"
+                   ParentOrigin="1.0, 0.0"
                    ResourceUrl="{Binding Favourite, Converter={Static converters:FavouriteToIconConverter.Converter}}"/>
+        
     </View>
 </nui:RecyclerViewItem>
index 8ea14e5daf796bfdadf373b4b29c47ee1776949a..a39cf5ec88e0f66d09d1c2b63b1c947b622709fb 100644 (file)
@@ -1,18 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ctrl:Page x:Class="Fitness.Views.LoadingView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  BackgroundColor="Transparent"
-  >
-  <ctrl:Page.BindingContext>
-      <vm:LoadingViewModel x:Name="context"/>
-  </ctrl:Page.BindingContext>
-  <ctrl:Page.Layout>
-      <AbsoluteLayout/>
-  </ctrl:Page.Layout>
-  <ImageView HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 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}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" PositionUsesPivotPoint="true" PivotPoint="Center" ParentOrigin="Center" VerticalAlignment="Center" HorizontalAlignment="Center" TextColor="#000C2B"/>
+           xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:ctrl="clr-namespace:Fitness.Controls"
+           xmlns:vm="clr-namespace:Fitness.ViewModels"
+           BackgroundColor="Transparent">
+    
+    <ctrl:Page.BindingContext>
+        <vm:LoadingViewModel x:Name="context"/>
+    </ctrl:Page.BindingContext>
+    
+    <ctrl:Page.Layout>
+        <AbsoluteLayout/>
+    </ctrl:Page.Layout>
+    
+    <ImageView HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+               WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+               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}"
+               WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+               HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+               PositionUsesPivotPoint="true"
+               PivotPoint="Center"
+               ParentOrigin="Center"
+               VerticalAlignment="Center"
+               HorizontalAlignment="Center"
+               TextColor="#000C2B"/>
+    
 </ctrl:Page>
index 2a0f6545a93cb362d44c7351a8b0da1dc1562632..712fd5eeae71ca4e646e3232d4d5ce907f941721 100644 (file)
 <?xml version="1.0" encoding="UTF-8" ?>
 <ctrl:Page x:Class="Fitness.Views.MainView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:vm="clr-namespace:Fitness.ViewModels;"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:views="clr-namespace:Fitness.Views"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
-  xmlns:converters="clr-namespace:Fitness.Views.Converters"
-  xmlns:styles="clr-namespace:Fitness.Views.Styles"
-  xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
-    HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" BackgroundColor="#EEEFF1" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" >
-  <View.BindingContext>
-      <vm:MainViewModel x:Name="context"/>
-  </View.BindingContext>
-  <View.Layout>
-      <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.Exit}" Command="{Binding Exit}" />
-  <View Margin="{views:ExtentsInUnits Start=16,End=16}" Weight="1.0" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-      <View.Layout>
-          <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Begin"/>
-      </View.Layout>
-      <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Weight="1.0" HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" 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}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
-          <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
-              <View.Layout>
-                  <LinearLayout LinearOrientation="Vertical" LinearAlignment="Begin"/>
-              </View.Layout>
-              <View>
-                  <View.Layout>
-                      <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Begin"/>
-                  </View.Layout>
-                  <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Text="{Binding Path=Title}" PixelSize="40" VerticalAlignment="Center" TextColor="#000C2B"/>
-                  <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Size="36,48" Margin="30,30,0,0" ResourceUrl="{Binding Difficulty, Converter={Static converters:DifficultyLevelToIconConverter.Converter}}"/>
-              </View>
-              <View>
-                  <View.Layout>
-                      <LinearLayout LinearOrientation="Horizontal" LinearAlignment="Begin"/>
-                  </View.Layout>
-                  <ImageView Size="28,28" ResourceUrl="*Resource*/layout/images/icon_time.png"/>
-                  <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Text="{Binding Duration,StringFormat=\{0:h\\:mm\\:ss\}}" PixelSize="28" Margin="8,0,0,0" VerticalAlignment="Center" TextColor="#000C2B"/>
-              </View>
-              <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}" Size="{views:SizeInUnits Width=107}" Text="{Binding Description}" PixelSize="28" LineWrapMode="Word" Weight="1.0" VerticalAlignment="Bottom" Ellipsis="false" MultiLine="true" TextColor="#000C2B" EnableAutoScroll="true"/>
-          </View>
-          <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>
-    <nui:CollectionView Size="{views:SizeInUnits Height=44}" Margin="{views:ExtentsInUnits Top=10, Bottom=10, Start=16, End=16}" WidthSpecification="{Static LayoutParamPolicies.MatchParent}" ItemsSource="{Binding Workouts}" SelectedItem="{Binding Path=SelectedWorkout, Mode=TwoWay}" SelectionMode="SingleAlways" ScrollingDirection="Horizontal">
+           xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+           xmlns:vm="clr-namespace:Fitness.ViewModels;"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:views="clr-namespace:Fitness.Views"
+           xmlns:ctrl="clr-namespace:Fitness.Controls"
+           xmlns:nui="clr-namespace:Tizen.NUI.Components;assembly=Tizen.NUI.Components"
+           xmlns:converters="clr-namespace:Fitness.Views.Converters"
+           xmlns:styles="clr-namespace:Fitness.Views.Styles"
+           xmlns:behaviors="clr-namespace:Fitness.Views.Behaviors"
+           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+           BackgroundColor="#EEEFF1"
+           ParentOrigin="Center"
+           PivotPoint="Center"
+           PositionUsesPivotPoint="true">
+    
+    <View.BindingContext>
+        <vm:MainViewModel x:Name="context"/>
+    </View.BindingContext>
+    
+    <View.Layout>
+        <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.Exit}"
+                Command="{Binding Exit}"/>
+    
+    <View Margin="{views:ExtentsInUnits Start=16, End=16}"
+          Weight="1.0"
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+          HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+        
+        <View.Layout>
+            <LinearLayout LinearOrientation="Horizontal"
+                          LinearAlignment="Begin"/>
+        </View.Layout>
+        
+        <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
+                   Weight="1.0"
+                   HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   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}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}">
+            
+            <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
+                <View.Layout>
+                    <LinearLayout LinearOrientation="Vertical"
+                                  LinearAlignment="Begin"/>
+                </View.Layout>
+                
+                <View>
+                    
+                    <View.Layout>
+                        <LinearLayout LinearOrientation="Horizontal"
+                                      LinearAlignment="Begin"/>
+                    </View.Layout>
+                    
+                    <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
+                               Text="{Binding Path=Title}"
+                               PixelSize="40"
+                               VerticalAlignment="Center"
+                               TextColor="#000C2B"/>
+                    
+                    <ImageView BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
+                               Size="36, 48"
+                               Margin="30, 30, 0, 0"
+                               ResourceUrl="{Binding Difficulty, Converter={Static converters:DifficultyLevelToIconConverter.Converter}}"/>
+                
+                </View>
+                
+                <View>
+                    
+                    <View.Layout>
+                        <LinearLayout LinearOrientation="Horizontal"
+                                      LinearAlignment="Begin"/>
+                    </View.Layout>
+                    
+                    <ImageView Size="28, 28"
+                               ResourceUrl="*Resource*/layout/images/icon_time.png"/>
+                    
+                    <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
+                               Text="{Binding Duration, StringFormat=\{0:h\\:mm\\:ss\}}"
+                               PixelSize="28"
+                               Margin="8, 0, 0, 0"
+                               VerticalAlignment="Center"
+                               TextColor="#000C2B"/>
+                
+                </View>
+                
+                <TextLabel BindingContext="{Binding Source={x:Reference context}, Path=SelectedWorkout}"
+                           Size="{views:SizeInUnits Width=107}"
+                           Text="{Binding Description}"
+                           PixelSize="28"
+                           LineWrapMode="Word"
+                           Weight="1.0"
+                           VerticalAlignment="Bottom"
+                           Ellipsis="false"
+                           MultiLine="true"
+                           TextColor="#000C2B"
+                           EnableAutoScroll="true"/>
+            
+            </View>
+            
+            <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>
+    
+    <nui:CollectionView Size="{views:SizeInUnits Height=44}"
+                        Margin="{views:ExtentsInUnits Top=10, Bottom=10, Start=16, End=16}"
+                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                        ItemsSource="{Binding Workouts}"
+                        SelectedItem="{Binding Path=SelectedWorkout, Mode=TwoWay}"
+                        SelectionMode="SingleAlways"
+                        ScrollingDirection="Horizontal">
+        
         <nui:CollectionView.ItemTemplate>
             <DataTemplate>
                 <views:FitnessItemView />
             </DataTemplate>
         </nui:CollectionView.ItemTemplate>
+        
         <nui:CollectionView.ItemsLayouter>
             <nui:GridLayouter />
         </nui:CollectionView.ItemsLayouter>
+    
     </nui:CollectionView>
+
 </ctrl:Page>
index ad90fc1a98a58775ffcac5ea2c5b983c82c080a0..91f22ed94b5958641c602d33acedd23675b9997d 100644 (file)
@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <View x:Class="Fitness.Views.PauseView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:views="clr-namespace:Fitness.Views"
-  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"
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-  x:Name="Root">
+      xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+      xmlns:vm="clr-namespace:Fitness.ViewModels"
+      xmlns:ctrl="clr-namespace:Fitness.Controls"
+      xmlns:views="clr-namespace:Fitness.Views"
+      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"
+      HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+      x:Name="Root">
     <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+        
         <View.Layout>
             <LinearLayout LinearOrientation="Vertical"/>
         </View.Layout>
+        
         <!--Bar stub-->
         <View Size="{views:SizeInUnits Height=30}"
               WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+        
         <!--Margin-->
         <View BackgroundColor="Transparent"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-          Weight="1"/>
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              Weight="1"/>
+        
         <!--Bottom Bar-->
         <ImageView Size="{views:SizeInUnits Height=30}"
                    Margin="{views:ExtentsInUnits Start=16, End=16}"
                    WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                    ResourceUrl="*Resource*/styles/button/ButtonFrame.png">
+            
             <!--Left button-->
             <View Size="{views:SizeInUnits Height=30}"
                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                                       HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       Weight="1"
                                       Command="{Binding TryAgain}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Transparent}}"/>
+                
                 <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                       BackgroundColor="Transparent"
                       Weight="2"/>
+            
             </View>
+            
             <!--Right button-->
             <View Size="{views:SizeInUnits Height=30}"
                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                       BackgroundColor="Transparent"
                       Weight="2"/>
+                
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                                       HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       Weight="1"
                                       Command="{Binding EndWorkout}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Transparent}}"/>
+            
             </View>
+            
             <!--Center button-->
             <View Size="{views:SizeInUnits Height=30}"
                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                       BackgroundColor="Transparent"
                       Weight="1"/>
+                
                 <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                                       HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                                       Weight="1"
                                       Command="{Binding PauseResumeWorkout}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Regular}}"/>
+                
                 <View HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                       BackgroundColor="Transparent"
                       Weight="1"/>
+            
             </View>
+        
         </ImageView>
+        
         <View Size="{views:SizeInUnits Height=5}"
               WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+    
     </View>
-</View>
\ No newline at end of file
+</View>
index 5dfebcb5d3f57e9c455cf0c6d728470ee5cda19e..2ed1b0a4b95ad9d862ca15d7db653b974ecc6b90 100644 (file)
@@ -1,54 +1,65 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <View x:Class="Fitness.Views.PlayingView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:views="clr-namespace:Fitness.Views"
-  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"
-  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-  x:Name="Root">
+      xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+      xmlns:vm="clr-namespace:Fitness.ViewModels"
+      xmlns:ctrl="clr-namespace:Fitness.Controls"
+      xmlns:views="clr-namespace:Fitness.Views"
+      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"
+      HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+      x:Name="Root">
+    
     <View.Layout>
         <LinearLayout LinearOrientation="Vertical"/>
     </View.Layout>
+    
     <!--Bar stub-->
     <View Size="{views:SizeInUnits Height=30}"
-              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+    
     <!--Margin-->
     <View BackgroundColor="Transparent"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
           Size="{views:SizeInUnits Height=5}"/>
+    
     <View BackgroundColor="Transparent"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
           Weight="1"/>
+    
     <!--Content-->
     <View Size="{views:SizeInUnits Height=189}"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+        
         <View.Layout>
             <LinearLayout LinearOrientation="Horizontal"/>
         </View.Layout>
+        
         <!--Preview-->
         <View BackgroundColor="Transparent"
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-          Weight="1">
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              Weight="1">
+            
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
+            
             <!--Preview stub-->
             <ImageView x:Name="PreviewStub"
                        HeightForWidth="true"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                        HeightResizePolicy="SizeRelativeToParent"
-                       SizeModeFactor="0.0,0.6,0.0"
+                       SizeModeFactor="0.0, 0.6, 0.0"
                        ResourceUrl="*Resource*/layout/images/previewBlank.png"/>
+            
             <View BackgroundColor="Transparent"
                   Weight="1"
                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            
             <!--Time 165-->
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding TimeLeft, StringFormat=\{0:m\\:ss\}}"
@@ -58,6 +69,7 @@
                        Margin="{views:ExtentsInUnits Start=48}"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                        Size="{views:SizeInUnits Width=102, Height=50}"/>
+            
             <TextLabel Text="Time left"
                        TextColor="#000C2B"
                        PixelSize="24"
                        Margin="{views:ExtentsInUnits Start=87}"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                        Size="{views:SizeInUnits Width=28, Height=9}"/>
+        
         </View>
+        
         <!--Cemera Preview-->
         <View BackgroundColor="Transparent"
-          HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-          WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-          Size="{views:SizeInUnits Width=281, Height=189}">
+              HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+              WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+              Size="{views:SizeInUnits Width=281, Height=189}">
+            
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
+            
             <!--Camera stub-->
             <View x:Name="CameraStub"
                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                   Size="{views:SizeInUnits Width=281, Height=158}"/>
+            
             <View Size="{views:SizeInUnits Width=281, Height=4}"/>
+            
             <!--Numbers-->
             <View Size="{views:SizeInUnits Width=281, Height=16}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Hold, StringFormat='{0:ss}'}"
                            TextColor="#000C2B"
                            HorizontalAlignment="Center"
                            Margin="{views:ExtentsInUnits Start=87}"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Repetitions}"
                            TextColor="#000C2B"
                            PixelSize="40"
                            HorizontalAlignment="Center"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding Score}"
                            TextColor="#000C2B"
                            PixelSize="40"
                            HorizontalAlignment="Center"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+            
             </View>
+            
             <!--Description-->
             <View Size="{views:SizeInUnits Width=281, Height=16}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <TextLabel Text="Hold"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
                            Margin="{views:ExtentsInUnits Start=87}"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+                
                 <TextLabel Text="Count"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+                
                 <TextLabel Text="Score"
                            TextColor="#000C2B"
                            PixelSize="24"
                            HorizontalAlignment="Center"
                            Size="{views:SizeInUnits Width=36, Height=16}"/>
+            
             </View>
+        
         </View>
+    
     </View>
+    
     <!--Margin-->
     <View BackgroundColor="Transparent"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
           HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-          Weight="1" />
+          Weight="1"/>
+    
     <!--Bar-->
     <View Size="{views:SizeInUnits Height=30}"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
                               Size="{views:SizeInUnits Width=448, Height=30}"
                               behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.RegularBig}}"/>
     </View>
+    
     <View Size="{views:SizeInUnits Height=10}"
           WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
-</View>
\ No newline at end of file
+
+</View>
index 6034f35753be68443b3e105e1a9c03704e4a013e..2c89491a66c201de36beec7a0bdde5626ad4c1db 100644 (file)
            PivotPoint="Center"
            PositionUsesPivotPoint="true"
            x:Name="Root">
+    
     <View.BindingContext>
-        <vm:ScanningViewModel />
+        <vm:ScanningViewModel/>
     </View.BindingContext>
-
+    
     <View Position="320, 100"
           Size="1280, 960">
+        
         <ctrl:Camera x:Name="cameraView"
                      WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                      HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-                     PreviewFps="Fps30" />
+                     PreviewFps="Fps30"/>
+        
         <ctrl:Overlay WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                       HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                       PoseLandmarks="{Binding PoseLandmarks}">
-          <x:Arguments>
-            <Size2D>1280, 960</Size2D>
-          </x:Arguments>
+            <x:Arguments>
+                <Size2D>1280, 960</Size2D>
+            </x:Arguments>
         </ctrl:Overlay>
+    
     </View>
-
+    
     <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+        
         <View.Layout>
-            <LinearLayout LinearOrientation="Horizontal" />
+            <LinearLayout LinearOrientation="Horizontal"/>
         </View.Layout>
+        
         <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+            
             <View.Layout>
-                <LinearLayout LinearOrientation="Vertical" />
+                <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
+            
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding PoseScores}"
                        PixelSize="30"
-                       TextColor="Black" />
+                       TextColor="Black"/>
+            
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding SquatSimilarity}"
                        PixelSize="40"
-                       TextColor="Black" />
+                       TextColor="Black"/>
+        
         </View>
+        
         <ctrl:NinePatchButton BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                               WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                               Text="Close"
                               Size="{views:SizeInUnits Width=80, Height=20}"
                               PointSize="6"
-                              Command="{Binding CloseScanningView}" />
+                              Command="{Binding CloseScanningView}"/>
+    
     </View>
+
 </ctrl:Page>
index c6632a5ad64195943b179ce6bbeceacb102237c3..966b4cd8bd9cb568511db36bd103614e7c732a30 100644 (file)
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ctrl:Page x:Class="Fitness.Views.SummaryView"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-  xmlns:vm="clr-namespace:Fitness.ViewModels"
-  xmlns:ctrl="clr-namespace:Fitness.Controls"
-  xmlns:views="clr-namespace:Fitness.Views"
-  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"
-  x:Name="Root">
+           xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:vm="clr-namespace:Fitness.ViewModels"
+           xmlns:ctrl="clr-namespace:Fitness.Controls"
+           xmlns:views="clr-namespace:Fitness.Views"
+           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"
+           x:Name="Root">
     <ImageView HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                ResourceUrl="*Resource*/layout/images/0_BG_dim.png">
         <ImageView PositionUsesPivotPoint="True"
-                  ParentOrigin="Center"
-                  PivotPoint="Center"
-                  WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
-                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
-                  Size="{views:SizeInUnits Width=296, Height=148}"
-                  ResourceUrl="*Resource*/layout/images/08_popup_body.png">
+                   ParentOrigin="Center"
+                   PivotPoint="Center"
+                   WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+                   Size="{views:SizeInUnits Width=296, Height=148}"
+                   ResourceUrl="*Resource*/layout/images/08_popup_body.png">
+            
             <View.Layout>
                 <LinearLayout LinearOrientation="Vertical"/>
             </View.Layout>
-            <View Size="{views:SizeInUnits Height=10}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            
+            <View Size="{views:SizeInUnits Height=10}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+            
             <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                        Text="{Binding Title}"
                        PixelSize="40"
                        Size="{views:SizeInUnits Height=14}"
                        HorizontalAlignment="Center"
                        TextColor="#000C2B"/>
-            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+            
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                   Weight="1"/>
+            
             <TextLabel Text="Your session summary:"
                        PixelSize="32"
                        WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
                        Size="{views:SizeInUnits Height=11}"
                        HorizontalAlignment="Begin"
                        TextColor="#000C2B"/>
+            
             <View Size="{views:SizeInUnits Height=7}"/>
-            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" >
+            
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
                     <TextLabel Text="Total time"
-                           HorizontalAlignment="End"
-                           Weight="1"
-                           PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
+                               HorizontalAlignment="End"
+                               Weight="1"
+                               PixelSize="32"
+                               Size="{views:SizeInUnits Height=11}"/>
                 </View>
+                
                 <View Size="{views:SizeInUnits Width=11}"/>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding TotalTime, StringFormat='{0:m\\:ss}'}"
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
                            Size="{views:SizeInUnits Height=11}"/>
+            
             </View>
+            
             <View Size="{views:SizeInUnits Height=4}"/>
+            
             <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
                     <TextLabel Text="Total count"
-                           HorizontalAlignment="End"
-                           Weight="1"
-                           PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
+                               HorizontalAlignment="End"
+                               Weight="1"
+                               PixelSize="32"
+                               Size="{views:SizeInUnits Height=11}"/>
                 </View>
+                
                 <View Size="{views:SizeInUnits Width=11}"/>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding TotalCount}"
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
                            Size="{views:SizeInUnits Height=11}"/>
+            
             </View>
+            
             <View Size="{views:SizeInUnits Height=4}"/>
+            
             <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
                     <TextLabel Text="Average score"
-                           HorizontalAlignment="End"
-                           Weight="1"
-                           PixelSize="32"
-                           Size="{views:SizeInUnits Height=11}"/>
+                               HorizontalAlignment="End"
+                               Weight="1"
+                               PixelSize="32"
+                               Size="{views:SizeInUnits Height=11}"/>
                 </View>
+                
                 <View Size="{views:SizeInUnits Width=11}"/>
+                
                 <TextLabel BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                            Text="{Binding AverageScore}"
                            HorizontalAlignment="Begin"
                            Weight="1"
                            PixelSize="32"
                            Size="{views:SizeInUnits Height=11}"/>
+            
             </View>
-            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}" HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
+            
+            <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}"
+                  HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                   Weight="1"/>
+            
             <View WidthSpecification="{Static LayoutParamPolicies.MatchParent}">
+                
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal"/>
                 </View.Layout>
+                
                 <View Size="{views:SizeInUnits Width=20, Height=26}"/>
+                
                 <ctrl:NinePatchButton Text="Back"
                                       Size="{views:SizeInUnits Width=100, Height=26}"
                                       BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                                       Command="{Binding Back}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Outline}}"/>
+                
                 <View Weight="1"
                       HeightSpecification="{Static LayoutParamPolicies.MatchParent}"
                       WidthSpecification="{Static LayoutParamPolicies.MatchParent}"/>
+                
                 <ctrl:NinePatchButton Text="Ok"
                                       Size="{views:SizeInUnits Width=100, Height=26}"
                                       BindingContext="{Binding Source={x:Reference Root}, Path=BindingContext}"
                                       Command="{Binding Ok}"
                                       behaviors:StyleSetter.Style="{Binding Source={x:Static styles:Buttons.Inverse}}"/>
-                <View Size="{views:SizeInUnits Width=20,Height=24}"/>
+                
+                <View Size="{views:SizeInUnits Width=20, Height=24}"/>
+            
             </View>
+            
             <View Size="{views:SizeInUnits Height=16}"/>
+        
         </ImageView>
     </ImageView>
 </ctrl:Page>