[dali_1.9.7] Merge branch 'devel/master'

Change-Id: Ib084e5d3018472747f8285bfdffa2faf6a1328e5

[dali_1.9.7] Merge branch 'devel/master'
Change-Id: Ib084e5d3018472747f8285bfdffa2faf6a1328e5
Anton Obzhirov
2 parents 1d3a43d6 5f14daa1
Showing 9 changed files with 310 additions and 4 deletions
com.samsung.dali-demo.xml
examples-reel/dali-examples-reel.cpp
examples/arc-visual/arc-visual-example.cpp
examples/color-visual/color-visual-example.cpp
packaging/com.samsung.dali-demo.spec
resources/po/en_GB.po
resources/po/en_US.po
resources/po/ko.po
shared/dali-demo-strings.h
@@ -31,6 +31,9 @@
 	<ui-application appid="animated-shapes.example" exec="/usr/apps/com.samsung.dali-demo/bin/animated-shapes.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Animated shapes</label>
 	</ui-application>
+	<ui-application appid="arc-visual.example" exec="/usr/apps/com.samsung.dali-demo/bin/arc-visual.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+		<label>Arc Visual</label>
+	</ui-application>
 	<ui-application appid="benchmark.example" exec="/usr/apps/com.samsung.dali-demo/bin/benchmark.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Benchmark</label>
 	</ui-application>
@@ -58,6 +61,9 @@
 	<ui-application appid="clipping.example" exec="/usr/apps/com.samsung.dali-demo/bin/clipping.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Clipping</label>
 	</ui-application>
+	<ui-application appid="color-visual.example" exec="/usr/apps/com.samsung.dali-demo/bin/color-visual.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+		<label>Color Visual</label>
+	</ui-application>
 	<ui-application appid="compressed-texture-formats.example" exec="/usr/apps/com.samsung.dali-demo/bin/compressed-texture-formats.example" nodisplay="true" multiple="false" taskmanage="true" type="c++app">
 		<label>Compressed Texture Formats</label>
 	</ui-application>
@@ -42,11 +42,13 @@ int DALI_EXPORT_API main(int argc, char **argv)
   demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
   demo.AddExample(Example("animated-vector-images.example", DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES));
   demo.AddExample(Example("alpha-blending-cpu.example", DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU));
+  demo.AddExample(Example("arc-visual.example", DALI_DEMO_STR_TITLE_ARC_VISUAL));
   demo.AddExample(Example("bloom-view.example", DALI_DEMO_STR_TITLE_BLOOM_VIEW));
   demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
   demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS));
   demo.AddExample(Example("clipping.example", DALI_DEMO_STR_TITLE_CLIPPING));
   demo.AddExample(Example("clipping-draw-order.example", DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER));
+  demo.AddExample(Example("color-visual.example", DALI_DEMO_STR_TITLE_COLOR_VISUAL));
   demo.AddExample(Example("deferred-shading.example", DALI_DEMO_STR_TITLE_DEFERRED_SHADING));
   demo.AddExample(Example("dissolve-effect.example", DALI_DEMO_STR_TITLE_DISSOLVE_TRANSITION));
   demo.AddExample(Example("drag-and-drop.example", DALI_DEMO_STR_TITLE_DRAG_AND_DROP));
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+namespace
+{
+
+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 Property::Value BACKGROUND
+{
+  { Visual::Property::TYPE, DevelVisual::ARC },
+  { Visual::Property::MIX_COLOR, Color::RED },
+  { DevelArcVisual::Property::START_ANGLE, 0.0f },
+  { DevelArcVisual::Property::SWEEP_ANGLE, 90.0f },
+  { DevelArcVisual::Property::CAP, DevelArcVisual::Cap::ROUND },
+  { DevelArcVisual::Property::THICKNESS, 20.0f }
+};
+
+} // namespace
+
+// This example shows the properties of the arc visual - thickness, startAngle and sweepAngle and animates them.
+//
+class ArcVisualExample : public ConnectionTracker
+{
+public:
+
+  ArcVisualExample( Application& application )
+  : mApplication( application ),
+    mStartAngle( 0.0f ),
+    mSweepAngle( 0.0f )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &ArcVisualExample::Create );
+  }
+
+  ~ArcVisualExample() = default;
+
+private:
+
+  // The Init signal is received once (only) during the Application lifetime
+  void Create( Application& application )
+  {
+    // Get a handle to the stage
+    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Color::WHITE );
+
+    mControl = Control::New();
+    mControl.SetParentOrigin( ParentOrigin::CENTER );
+    mControl.SetSize( 200.0f, 200.0f );
+    mControl.SetProperty( Control::Property::BACKGROUND, BACKGROUND );
+
+    stage.Add( mControl );
+
+    // Respond to a click anywhere on the stage
+    stage.GetRootLayer().TouchSignal().Connect( this, &ArcVisualExample::OnTouch );
+
+    // Respond to key events
+    stage.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent );
+  }
+
+  bool OnTouch( Actor actor, const TouchData& touch )
+  {
+    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 ) ) );
+
+      TransitionData transitionData = TransitionData::New( array );
+      Animation animation = DevelControl::CreateTransition( Toolkit::Internal::GetImplementation( mControl ), transitionData );
+      animation.Play();
+    }
+    return true;
+  }
+
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
+private:
+  Application&  mApplication;
+  Control mControl;
+  float mStartAngle;
+  float mSweepAngle;
+};
+
+int DALI_EXPORT_API main( int argc, char **argv )
+{
+  Application application = Application::New( &argc, &argv );
+  ArcVisualExample test( application );
+  application.MainLoop();
+  return 0;
+}
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+
+using namespace Dali;
+using namespace Dali::Toolkit;
+
+namespace
+{
+
+const char* IMAGE_FILE( DEMO_IMAGE_DIR "gallery-medium-1.jpg" );
+
+const float BLUR_RADIUS_VALUE( 10.0f );
+const float NO_BLUR_VALUE( 0.0f );
+const float ANIMATION_DURATION( 2.0f );
+
+const Property::Value SHADOW
+{
+  { Visual::Property::TYPE, Visual::COLOR },
+  { Visual::Property::MIX_COLOR, Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) },
+  { Visual::Property::TRANSFORM, Property::Map{ { Visual::Transform::Property::OFFSET, Vector2( 0.05f, 0.05f ) },
+                                                { Visual::Transform::Property::SIZE, Vector2( 1.05f, 1.05f ) },
+                                                { Visual::Transform::Property::ORIGIN, Align::CENTER },
+                                                { Visual::Transform::Property::ANCHOR_POINT, Align::CENTER } } },
+  { DevelColorVisual::Property::BLUR_RADIUS, BLUR_RADIUS_VALUE }
+};
+
+} // namespace
+
+// This example shows the blur radius property of the color visual and animates it.
+//
+class ColorVisualExample : public ConnectionTracker
+{
+public:
+
+  ColorVisualExample( Application& application )
+  : mApplication( application ),
+    mShadowVisible( true )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &ColorVisualExample::Create );
+  }
+
+  ~ColorVisualExample()
+  {
+    // Nothing to do here;
+  }
+
+  // The Init signal is received once (only) during the Application lifetime
+  void Create( Application& application )
+  {
+    // Get a handle to the stage
+    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Color::WHITE );
+
+    mImageView = ImageView::New( IMAGE_FILE );
+    mImageView.SetParentOrigin( ParentOrigin::CENTER );
+    mImageView.SetSize( 200.0f, 200.0f );
+    mImageView.SetProperty( DevelControl::Property::SHADOW, SHADOW );
+
+    stage.Add( mImageView );
+
+    // Respond to a click anywhere on the stage
+    stage.GetRootLayer().TouchSignal().Connect( this, &ColorVisualExample::OnTouch );
+
+    // Respond to key events
+    stage.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent );
+  }
+
+  bool OnTouch( Actor actor, const TouchData& touch )
+  {
+    if( touch.GetState( 0 ) == PointState::UP )
+    {
+      float initialValue, targetValue;
+      if( !mShadowVisible )
+      {
+        initialValue = NO_BLUR_VALUE;
+        targetValue = BLUR_RADIUS_VALUE;
+      }
+      else
+      {
+        initialValue = BLUR_RADIUS_VALUE;
+        targetValue = NO_BLUR_VALUE;
+      }
+
+      mShadowVisible = !mShadowVisible;
+
+      TransitionData transitionData = TransitionData::New( Property::Map().Add( "target", "shadow" )
+                                                                          .Add( "property", "blurRadius" )
+                                                                          .Add( "initialValue", initialValue )
+                                                                          .Add( "targetValue", targetValue )
+                                                                          .Add( "animator", Property::Map().Add( "duration", ANIMATION_DURATION ) ) );
+      Animation animation = DevelControl::CreateTransition( Toolkit::Internal::GetImplementation( mImageView ), transitionData );
+      animation.Play();
+    }
+    return true;
+  }
+
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
+private:
+  Application&  mApplication;
+  ImageView mImageView;
+  bool mShadowVisible;
+};
+
+int DALI_EXPORT_API main( int argc, char **argv )
+{
+  Application application = Application::New( &argc, &argv );
+  ColorVisualExample test( application );
+  application.MainLoop();
+  return 0;
+}
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.9.6
+Version:    1.9.7
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -7,6 +7,9 @@ msgstr &quot;Animated Shapes&quot;
 msgid "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU"
 msgstr "CPU Alpha Blending"
+msgid "DALI_DEMO_STR_TITLE_ARC_VISUAL"
+msgstr "Arc Visual"
+
 msgid "DALI_DEMO_STR_TITLE_BASIC_LIGHT"
 msgstr "Basic Light"
@@ -43,6 +46,9 @@ msgstr &quot;Clipping&quot;
 msgid "DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER"
 msgstr "Clipping Draw Order"
+msgid "DALI_DEMO_STR_TITLE_COLOR_VISUAL"
+msgstr "Colour Visual"
+
 msgid "DALI_DEMO_STR_TITLE_GAUSSIAN_BLUR_VIEW"
 msgstr "Gaussian Blur"
@@ -7,6 +7,9 @@ msgstr &quot;Animated Shapes&quot;
 msgid "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU"
 msgstr "CPU Alpha Blending"
+msgid "DALI_DEMO_STR_TITLE_ARC_VISUAL"
+msgstr "Arc Visual"
+
 msgid "DALI_DEMO_STR_TITLE_BASIC_LIGHT"
 msgstr "Basic Light"
@@ -43,6 +46,9 @@ msgstr &quot;Clipping&quot;
 msgid "DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER"
 msgstr "Clipping Draw Order"
+msgid "DALI_DEMO_STR_TITLE_COLOR_VISUAL"
+msgstr "Color Visual"
+
 msgid "DALI_DEMO_STR_TITLE_DEFERRED_SHADING"
 msgstr "Deferred Shading"
@@ -4,8 +4,11 @@ msgstr &quot;애니메이션 이미지&quot;
 msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
 msgstr "애니메이션 모양"
+msgid "DALI_DEMO_STR_TITLE_ARC_VISUAL"
+msgstr "호 비주얼"
+
 msgid "DALI_DEMO_STR_TITLE_BASIC_LIGHT"
-msgstr "기본 표시 등"
+msgstr "기본 조명"
 msgid "DALI_DEMO_STR_TITLE_BLOCKS"
 msgstr "블록"
@@ -23,16 +26,19 @@ msgid &quot;DALI_DEMO_STR_TITLE_CARD_ACTIVE&quot;
 msgstr "NFC 카드 태깅"
 msgid "DALI_DEMO_STR_TITLE_CLIPPING"
-msgstr "깎는"
+msgstr "클리핑"
 msgid "DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER"
 msgstr "드로잉 순서를 클리핑"
+msgid "DALI_DEMO_STR_TITLE_COLOR_VISUAL"
+msgstr "색상 비주얼"
+
 msgid "DALI_DEMO_STR_TITLE_COLOR_GRADIENT"
 msgstr "색상 그라디언트"
 msgid "DALI_DEMO_STR_TITLE_CONTACT_CARDS"
-msgstr "접촉"
+msgstr "연락처"
 msgid "DALI_DEMO_STR_TITLE_CUBE_TRANSITION"
 msgstr "입방체 전환"
@@ -38,6 +38,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES             dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES")
 #define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES      dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES")
 #define DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU")
+#define DALI_DEMO_STR_TITLE_ARC_VISUAL                  dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ARC_VISUAL")
 #define DALI_DEMO_STR_TITLE_BASIC_LIGHT                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BASIC_LIGHT")
 #define DALI_DEMO_STR_TITLE_BENCHMARK                   dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BENCHMARK")
 #define DALI_DEMO_STR_TITLE_BEZIER_CURVE                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BEZIER_CURVE")
@@ -49,6 +50,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_CARD_ACTIVE                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CARD_ACTIVE")
 #define DALI_DEMO_STR_TITLE_CLIPPING                    dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CLIPPING")
 #define DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER         dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER")
+#define DALI_DEMO_STR_TITLE_COLOR_VISUAL                dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_COLOR_VISUAL")
 #define DALI_DEMO_STR_TITLE_DEFERRED_SHADING            dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_DEFERRED_SHADING")
 #define DALI_DEMO_STR_TITLE_GAUSSIAN_BLUR_VIEW          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_GAUSSIAN_BLUR_VIEW")
 #define DALI_DEMO_STR_TITLE_GESTURES                    dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_GESTURES")
@@ -138,6 +140,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES             "Animated Shapes"
 #define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES      "Animated Vector Images"
 #define DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU          "CPU Alpha Blending"
+#define DALI_DEMO_STR_TITLE_ARC_VISUAL                  "Arc Visual"
 #define DALI_DEMO_STR_TITLE_BASIC_LIGHT                 "Basic Light"
 #define DALI_DEMO_STR_TITLE_BENCHMARK                   "ImageView Benchmark"
 #define DALI_DEMO_STR_TITLE_BEZIER_CURVE                "Alpha Function Bezier Curve"
@@ -149,6 +152,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_CARD_ACTIVE                 "Card Active"
 #define DALI_DEMO_STR_TITLE_CLIPPING                    "Clipping"
 #define DALI_DEMO_STR_TITLE_CLIPPING_DRAW_ORDER         "Clipping Draw Order"
+#define DALI_DEMO_STR_TITLE_COLOR_VISUAL                "Color Visual"
 #define DALI_DEMO_STR_TITLE_GAUSSIAN_BLUR_VIEW          "Gaussian Blur"
 #define DALI_DEMO_STR_TITLE_GESTURES                    "Gestures"
 #define DALI_DEMO_STR_TITLE_COLOR_GRADIENT              "Color Gradient"