review fixes

diff --git a/Fitness/ViewModels/ExercisePreviewViewModel.cs b/Fitness/ViewModels/ExercisePreviewViewModel.cs
index f2f15af..e6251d3 100644 (file)
--- a/Fitness/ViewModels/ExercisePreviewViewModel.cs
+++ b/Fitness/ViewModels/ExercisePreviewViewModel.cs
@@ -17,7 +17,7 @@ namespace Fitness.ViewModels
 
         public ExercisePreviewViewModel()
         {
-            Skip = new Command(() => { NavigationService.Instance.NavigateToLoadingView(); });
+            Skip = new Command(NavigationService.Instance.NavigateToLoadingView);
             PreviousWorkout = new Command(GoPrevious);
             NextWorkout = new Command(GoNext);
 

diff --git a/Fitness/Views/ExercisePreviewView.cs b/Fitness/Views/ExercisePreviewView.cs
index 572f621..670c565 100644 (file)
--- a/Fitness/Views/ExercisePreviewView.cs
+++ b/Fitness/Views/ExercisePreviewView.cs
@@ -11,7 +11,6 @@ namespace Fitness.Views
         public ExercisePreviewView()
         {
             InitializeComponent();
-            ApplyControlStyles();
             InitializeCallbacks();
         }
 
@@ -30,15 +29,7 @@ namespace Fitness.Views
             this.previousButton.Clicked += ReplyVideo;
         }
 
-        private void ApplyControlStyles()
-        {
-            this.skipButton.ApplyStyle(Styles.Buttons.Regular);
-            this.reviewButton.ApplyStyle(Styles.Buttons.RegularRepeat);
-            this.previousButton.ApplyStyle(Styles.Buttons.Previous);
-            this.nextButton.ApplyStyle(Styles.Buttons.Next);
-        }
-
-        private void PageVisibilityChanged(object senter, VisibilityChangedEventArgs args)
+        private void PageVisibilityChanged(object sender, VisibilityChangedEventArgs args)
         {
             if (args.Visibility == true)
             {

diff --git a/Fitness/res/layout/ExercisePreviewView.xaml b/Fitness/res/layout/ExercisePreviewView.xaml
index 358f01e..7d6dfad 100644 (file)
--- a/Fitness/res/layout/ExercisePreviewView.xaml
+++ b/Fitness/res/layout/ExercisePreviewView.xaml
@@ -6,6 +6,8 @@
   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"
   HeightResizePolicy="FillToParent" WidthResizePolicy="FillToParent" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true">
     <ctrl:Page.BindingContext>
         <vm:ExercisePreviewViewModel x:Name="context"/>
@@ -20,9 +22,9 @@
                 <View.Layout>
                     <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical"/>
                 </View.Layout>
-                <nui:Button BindingContext="{x:Reference context}" Size="{views:SizeInUnits Width=50,Height=20}" Text="previous" x:Name="previousButton" Command="{Binding PreviousWorkout}"/>
+                <nui:Button 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"/>
-                <nui:Button BindingContext="{x:Reference context}" Size="{views:SizeInUnits Width=50,Height=20}" Text="next" x:Name="nextButton" Margin="{views:ExtentsInUnits Start=10}" Command="{Binding NextWorkout}"/>
+                <nui:Button 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">
@@ -32,8 +34,8 @@
             <View.Layout>
                 <LinearLayout LinearOrientation="Horizontal" LinearAlignment="CenterVertical" CellPadding="40,40"/>
             </View.Layout>
-            <nui:Button BindingContext="{Binding Source={x:Reference context}}" Text="Review Movement" Size="{views:SizeInUnits Width=219,Height=26}" x:Name="reviewButton" Command="{Binding ReviewMovement}"/>
-            <nui:Button BindingContext="{Binding Source={x:Reference context}}" Text="Skip" Size="{views:SizeInUnits Width=219,Height=26}" x:Name="skipButton" Command="{Binding Skip}"/>
+            <nui:Button BindingContext="{Binding Source={x:Reference context}}" Text="Review Movement" Size="{views:SizeInUnits Width=219,Height=26}" Command="{Binding ReviewMovement}" x:Name="reviewButton" behaviors:StyleSetter.Style="{x:Static styles:Buttons.RegularRepeat}"/>
+            <nui:Button BindingContext="{Binding Source={x:Reference context}}" Text="Skip" Size="{views:SizeInUnits Width=219,Height=26}" Command="{Binding Skip}" behaviors:StyleSetter.Style="{x:Static styles:Buttons.Regular}"/>
         </View>
     </View>
 </ctrl:Page>