(ArcVisual) Fix wrong transtion animator value 20/235520/3
authorHeeyong Song <heeyong.song@samsung.com>
Fri, 5 Jun 2020 07:38:36 +0000 (16:38 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 16 Jun 2020 08:53:28 +0000 (08:53 +0000)
Change-Id: Id7a5c82f28e5148deb420075f4b65f93e9fccd86

examples/arc-visual/arc-visual-example.cpp

index 0182a87..de4e9ac 100644 (file)
@@ -31,7 +31,7 @@ const float START_ANGLE_INITIAL_VALUE( 0.0f );
 const float START_ANGLE_TARGET_VALUE( 360.0f );
 const float SWEEP_ANGLE_INITIAL_VALUE( 90.0f );
 const float SWEEP_ANGLE_TARGET_VALUE( 360.0f );
-const float ANIMATION_DURATION( 5.0f );
+const float ANIMATION_DURATION( 3.0f );
 
 const Property::Value BACKGROUND
 {
@@ -43,6 +43,29 @@ const Property::Value BACKGROUND
   { DevelArcVisual::Property::THICKNESS, 20.0f }
 };
 
+const Property::Value TRANSITION_ANIMATOR
+{
+  { "timePeriod", Property::Map().Add( "duration", ANIMATION_DURATION ) }
+};
+
+const Property::Value TRANSITION_START_ANGLE
+{
+  { "target", "background" },
+  { "property", "startAngle" },
+  { "initialValue", START_ANGLE_INITIAL_VALUE },
+  { "targetValue", START_ANGLE_TARGET_VALUE },
+  { "animator", TRANSITION_ANIMATOR }
+};
+
+const Property::Value TRANSITION_SWEEP_ANGLE
+{
+  { "target", "background" },
+  { "property", "sweepAngle" },
+  { "initialValue", SWEEP_ANGLE_INITIAL_VALUE },
+  { "targetValue", SWEEP_ANGLE_TARGET_VALUE },
+  { "animator", TRANSITION_ANIMATOR }
+};
+
 } // namespace
 
 // This example shows the properties of the arc visual - thickness, startAngle and sweepAngle and animates them.
@@ -90,16 +113,8 @@ private:
     if( touch.GetState( 0 ) == PointState::UP )
     {
       Property::Array array;
-      array.PushBack( Property::Map().Add( "target", "background" )
-                                     .Add( "property", "startAngle" )
-                                     .Add( "initialValue", START_ANGLE_INITIAL_VALUE )
-                                     .Add( "targetValue", START_ANGLE_TARGET_VALUE )
-                                     .Add( "animator", Property::Map().Add( "duration", ANIMATION_DURATION ) ) );
-      array.PushBack( Property::Map().Add( "target", "background" )
-                                     .Add( "property", "sweepAngle" )
-                                     .Add( "initialValue", SWEEP_ANGLE_INITIAL_VALUE )
-                                     .Add( "targetValue", SWEEP_ANGLE_TARGET_VALUE )
-                                     .Add( "animator", Property::Map().Add( "duration", ANIMATION_DURATION ) ) );
+      array.PushBack( TRANSITION_START_ANGLE );
+      array.PushBack( TRANSITION_SWEEP_ANGLE );
 
       TransitionData transitionData = TransitionData::New( array );
       Animation animation = DevelControl::CreateTransition( Toolkit::Internal::GetImplementation( mControl ), transitionData );