Changed image preview to the video.

diff --git a/Fitness/ViewModels/ExercisingViewModel.cs b/Fitness/ViewModels/ExercisingViewModel.cs
index 7597720e3aa7b4410c40e3a649072f5859a1086c..9b73e4a5ef401032d4d579302c37c01c0e6a4564 100644 (file)
--- a/Fitness/ViewModels/ExercisingViewModel.cs
+++ b/Fitness/ViewModels/ExercisingViewModel.cs
@@ -98,11 +98,21 @@ namespace Fitness.ViewModels
 
         protected override void GoPrevious()
         {
+            if (State == WorkoutState.Playing)
+            {
+                State = WorkoutState.Paused;
+            }
+
             Services.NavigationService.Instance.NavigateToSummaryView(SummaryType.ChangeToPreviousWorkout, CurrentWorkout);
         }
 
         protected override void GoNext()
         {
+            if (State == WorkoutState.Playing)
+            {
+                State = WorkoutState.Paused;
+            }
+
             Services.NavigationService.Instance.NavigateToSummaryView(SummaryType.ChangeToNextWorkout, CurrentWorkout);
         }
 

diff --git a/Fitness/Views/ExercisingView.xaml.cs b/Fitness/Views/ExercisingView.xaml.cs
index 78a18eb544080e268d645d7edc2f17b9db408d69..26e0296019dc7032505843b16328c0ff3bb99fe9 100644 (file)
--- a/Fitness/Views/ExercisingView.xaml.cs
+++ b/Fitness/Views/ExercisingView.xaml.cs
@@ -133,9 +133,11 @@ namespace Fitness.Views
 
                     PauseView.Hide();
                     PlayingView.Show();
+                    Preview.Play();
                 }
                 else
                 {
+                    Preview.Pause();
                     PlayingView.Hide();
                     PauseView.Show();
 
@@ -155,6 +157,13 @@ namespace Fitness.Views
         {
             UpdatePositionAndSize();
             isInitialized = true;
+
+            LoadingView.Loaded += OnLoaded;
+        }
+
+        private void OnLoaded(object sender, System.EventArgs e)
+        {
+            Preview.Play();
         }
 
         private void UpdatePositionAndSize()

diff --git a/Fitness/Views/LoadingView.cs b/Fitness/Views/LoadingView.cs
index fd17df12d1dc48795355a2e17577b2cc62ec9694..7ecb42a9477c97c832d6ccf4cf4de4635502475b 100644 (file)
--- a/Fitness/Views/LoadingView.cs
+++ b/Fitness/Views/LoadingView.cs
@@ -1,3 +1,4 @@
+using System;
 using Fitness.Controls;
 using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
@@ -17,11 +18,14 @@ namespace Fitness.Views
             CountingLabel.HeightSpecification = LayoutParamPolicies.MatchParent;
         }
 
+        public event EventHandler Loaded;
+
         private void CountingLabel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             Services.Logger.Debug($"CountingLabel_PropertyChanged called for {e.PropertyName}. Text: {CountingLabel.Text}");
             if (e.PropertyName == nameof(CountingLabel.Text) && CountingLabel.Text == string.Empty)
             {
+                Loaded?.Invoke(this, EventArgs.Empty);
                 Hide();
             }
         }

diff --git a/Fitness/res/layout/ExercisingView.xaml b/Fitness/res/layout/ExercisingView.xaml
index 4fd650e8c8a2c8c1f754e2babbe2a299a8abf474..7f7178a9fa0885e0d5914d8ae60177285c3a01ad 100644 (file)
--- a/Fitness/res/layout/ExercisingView.xaml
+++ b/Fitness/res/layout/ExercisingView.xaml
@@ -15,11 +15,6 @@
     
     <!--Layer-->
     
-    <ImageView x:Name="Preview"
-               ResourceUrl="*Resource*/layout/images/preview.png"/>
-    
-    <!--Layer-->
-    
     <ctrl:Camera x:Name="cameraView"
                  PreviewFps="Fps30"
                  PositionX="796"
@@ -29,11 +24,18 @@
     
     <!--Layer-->
     
+    <VideoView x:Name="Preview"
+               Underlay="False"
+               ResourceUrl="{Binding CurrentWorkout.VideoUrl}"
+               Looping="True"/>
+    
+    <!--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}"