Rename Eden to Focus 44/93444/3
authorUmar <m.umar@partner.samsung.com>
Mon, 24 Oct 2016 09:38:59 +0000 (10:38 +0100)
committerRichard Huang <r.huang@samsung.com>
Mon, 24 Oct 2016 12:46:32 +0000 (05:46 -0700)
Change-Id: I393ef82c0850461bee08b81f06a547ade4222b85

plugins/dali-swig/examples/firstscreen/App.cs
plugins/dali-swig/examples/firstscreen/FocusData.cs [moved from plugins/dali-swig/examples/firstscreen/EdenData.cs with 83% similarity]
plugins/dali-swig/examples/firstscreen/FocusEffect.cs [moved from plugins/dali-swig/examples/firstscreen/EdenEffect.cs with 50% similarity]
plugins/dali-swig/examples/firstscreen/IFocusEffect.cs [moved from plugins/dali-swig/examples/firstscreen/IEdenEffect.cs with 61% similarity]
plugins/dali-swig/examples/firstscreen/ScrollContainer.cs
plugins/dali-swig/examples/firstscreen/images/focus_launcher_shadow.9.png [moved from plugins/dali-swig/examples/firstscreen/images/eden_launcher_shadow.9.png with 100% similarity]
plugins/dali-swig/examples/firstscreen/images/focus_launcher_shadow_n.png [moved from plugins/dali-swig/examples/firstscreen/images/eden_launcher_shadow_n.png with 100% similarity]
plugins/dali-swig/examples/firstscreen/images/focuseffect/halo.png [moved from plugins/dali-swig/examples/firstscreen/images/edeneffect/halo.png with 100% similarity]
plugins/dali-swig/examples/firstscreen/images/focuseffect/horizontalFrame.png [moved from plugins/dali-swig/examples/firstscreen/images/edeneffect/horizontalFrame.png with 100% similarity]
plugins/dali-swig/examples/firstscreen/images/focuseffect/verticalFrame.png [moved from plugins/dali-swig/examples/firstscreen/images/edeneffect/verticalFrame.png with 100% similarity]

index e96d98d..5f5819f 100644 (file)
@@ -24,7 +24,7 @@ namespace FirstScreen
         private View _topContainer;
         private View _bottomContainer;
 
-        private EdenEffect _edenEffect;
+        private FocusEffect _focusEffect;
         private string _imagePath;
 
         private ImageView _keyboardFocusIndicator;
@@ -116,7 +116,7 @@ namespace FirstScreen
                     HideBottomContainer();
 
                     // Also apply Focus animation on Focused item on Poster ScrollContainer
-                    _postersContainer[_currentPostersContainerID].FocusAnimation(_edenEffect, EdenEffectDirection.BottomToTop);
+                    _postersContainer[_currentPostersContainerID].FocusAnimation(_focusEffect, FocusEffectDirection.BottomToTop);
                 }
             }
             else if (e.Direction == View.KeyboardFocus.Direction.DOWN)
@@ -130,7 +130,7 @@ namespace FirstScreen
                     _menuContainer.SetFocused(true);
 
                     // Also apply Focus animation on Focused item on Menu ScrollContainer
-                    _menuContainer.FocusAnimation(_edenEffect, EdenEffectDirection.TopToBottom);
+                    _menuContainer.FocusAnimation(_focusEffect, FocusEffectDirection.TopToBottom);
                 }
             }
             else if (e.Direction == View.KeyboardFocus.Direction.LEFT)
@@ -337,7 +337,7 @@ namespace FirstScreen
             }
 
             // Add a shadow seperator image between last Launcher icon and Menu ScrollContainer
-            _launcherSeparator = new ImageView(_imagePath + "/eden_launcher_shadow_n.png");
+            _launcherSeparator = new ImageView(_imagePath + "/focus_launcher_shadow_n.png");
             _launcherSeparator.Name = "launcherSeparator";
             _launcherSeparator.WidthResizePolicy = "USE_NATURAL_SIZE";
             _launcherSeparator.HeightResizePolicy = "FILL_TO_PARENT";
@@ -357,7 +357,7 @@ namespace FirstScreen
             _menuContainer.OffsetX = Constants.LauncherWidth;
             _menuContainer.Width = _stageSize.width - Constants.LauncherWidth;
             _menuContainer.Height = _stageSize.height * Constants.MenuContainerHeightFactor;
-            _menuContainer.ShadowBorder = new ImageView(_imagePath + "/eden_launcher_shadow.9.png");
+            _menuContainer.ShadowBorder = new ImageView(_imagePath + "/focus_launcher_shadow.9.png");
             _menuContainer.ShadowBorder.Name = "_menuContainer.ShadowBorder";
             _menuContainer.ShadowBorder.Size = new Vector3(_menuContainer.ItemSize.width + 40.0f, _menuContainer.ItemSize.height + 50.0f, 0.0f);
             _menuContainer.ShadowBorder.Position = new Vector3(0.0f, 5.0f, 0.0f);
@@ -381,7 +381,7 @@ namespace FirstScreen
 
             keyboardFocusManager.SetFocusIndicatorActor(_keyboardFocusIndicator);
 
-            _edenEffect = new EdenEffect();
+            _focusEffect = new FocusEffect();
 
             // Move Fcous to Bottom Container (Menu ScrollContainer)
             ShowBottomContainer();
@@ -3,9 +3,9 @@ using System;
 
 namespace FirstScreen
 {
-    public class EdenData
+    public class FocusData
     {
-        private string _name;                 // Name used for EdenData object (mainly to differentiate key frame animation )
+        private string _name;                 // Name used for FocusData object (mainly to differentiate key frame animation )
         private string _imageName;            // Image File Name (to be loaded from disk) used for ImageView used in key frame animation
         private Vector3 _parentOrigin;        // ParentOrigin applied to ImageView
         private Vector3 _initSize;            // InitSize used for key frame animation
@@ -15,8 +15,8 @@ namespace FirstScreen
         private Direction _direction;         // Direction used for key frame animation
         private ImageView _imageFocus;        // ImageView used in key frame animation
 
-        // Initialize EdenData used for key frame animation
-        public EdenData(string name, string imageName, Direction direction, Vector3 parentOrigin, Vector3 initSize,
+        // Initialize FocusData used for key frame animation
+        public FocusData(string name, string imageName, Direction direction, Vector3 parentOrigin, Vector3 initSize,
                         Vector3 targetSize, float keyFrameStart, float keyFrameEnd)
         {
             _name = name;
@@ -28,8 +28,8 @@ namespace FirstScreen
             _keyFrameEnd = keyFrameEnd;
             _direction = direction;
 
-            _imageFocus = new ImageView("./images/edeneffect/" + _imageName); // Desktop
-//            _imageFocus = new ImageView("/home/owner/apps_rw/org.tizen.firstscreen/res/images/edeneffect/" + _imageName); // Target
+            _imageFocus = new ImageView("./images/focuseffect/" + _imageName); // Desktop
+//            _imageFocus = new ImageView("/home/owner/apps_rw/org.tizen.firstscreen/res/images/focuseffect/" + _imageName); // Target
 
             _imageFocus.ParentOrigin = _parentOrigin;
             _imageFocus.AnchorPoint = NDalic.AnchorPointCenter;
@@ -42,7 +42,7 @@ namespace FirstScreen
             Vertical
         };
 
-        public Direction EdenDirection
+        public Direction FocusDirection
         {
             get {return _direction;}
             set {_direction = value;}
@@ -5,51 +5,51 @@ using System.Collections.Specialized;
 
 namespace FirstScreen
 {
-    public class EdenEffect : IEdenEffect
+    public class FocusEffect : IFocusEffect
     {
         private float _frameThickness;
-        private EdenData[] _edenFocusData; // Each EdenData is used for one key frame animation (total 6 key frame animations needed for EddenEffect)
+        private FocusData[] _focusData; // Each FocusData is used for one key frame animation (total 6 key frame animations needed for EddenEffect)
         private Animation _animation;      // Animation used to apply all six key frame animations
 
-        public EdenEffect()
+        public FocusEffect()
         {
             _frameThickness = 10.0f;
             float _bottomFrameTime = 0.6f; // complete the halo/bottom animation 60% of the way through
             float _sideFrameTime = 0.8f; // Start the side frame  animation after the bottom animation and complete at 80% of the way through
             float _topFrameTime = 1.0f; // start the top frame animation after the side frame animation and complete at 100% way through
 
-            // Six key frame animations (EdenData objects) needed for EddenEffect
+            // Six key frame animations (FocusData objects) needed for EddenEffect
             // Two key frame animations for top horizontal effect
             // Two key frame animations for bottom horizontal effect
             // Two key frame animations for vertical horizontal effect
-            _edenFocusData = new EdenData[6];
+            _focusData = new FocusData[6];
 
-            EdenData edenData = new EdenData("halo", "halo.png", EdenData.Direction.Horizontal, NDalic.ParentOriginTopCenter,
+            FocusData focusData = new FocusData("halo", "halo.png", FocusData.Direction.Horizontal, NDalic.ParentOriginTopCenter,
                                              new Vector3(50,20,0),  new Vector3(0.0f, 100.0f , 0.0f), 0.0f, _bottomFrameTime);
-            _edenFocusData[0] = edenData;
+            _focusData[0] = focusData;
 
-            edenData = new EdenData("bottom", "horizontalFrame.png", EdenData.Direction.Horizontal, NDalic.ParentOriginTopCenter,
+            focusData = new FocusData("bottom", "horizontalFrame.png", FocusData.Direction.Horizontal, NDalic.ParentOriginTopCenter,
                                     new Vector3(0.0f, 0.0f, 0.0f),  new Vector3(0.0f, _frameThickness, 0.0f), 0.0f, _bottomFrameTime);
-            _edenFocusData[1] = edenData;
+            _focusData[1] = focusData;
 
-            edenData = new EdenData("left", "verticalFrame.png", EdenData.Direction.Vertical, NDalic.ParentOriginBottomLeft,
+            focusData = new FocusData("left", "verticalFrame.png", FocusData.Direction.Vertical, NDalic.ParentOriginBottomLeft,
                                     new Vector3(0.0f, 0.0f, 0.0f),  new Vector3(_frameThickness, 0.0f, 0.0f), _bottomFrameTime, _sideFrameTime);
-            _edenFocusData[2] = edenData;
+            _focusData[2] = focusData;
 
-            edenData = new EdenData("right", "verticalFrame.png", EdenData.Direction.Vertical, NDalic.ParentOriginBottomRight,
+            focusData = new FocusData("right", "verticalFrame.png", FocusData.Direction.Vertical, NDalic.ParentOriginBottomRight,
                                     new Vector3(0.0f, 0.0f, 0.0f),  new Vector3(_frameThickness, 0.0f, 0.0f), _bottomFrameTime, _sideFrameTime);
-            _edenFocusData[3] = edenData;
+            _focusData[3] = focusData;
 
-            edenData = new EdenData("top-left", "horizontalFrame.png", EdenData.Direction.Horizontal, NDalic.ParentOriginBottomLeft,
+            focusData = new FocusData("top-left", "horizontalFrame.png", FocusData.Direction.Horizontal, NDalic.ParentOriginBottomLeft,
                                     new Vector3(0.0f, 0.0f, 0.0f),  new Vector3(0.0f ,_frameThickness, 0.0f), _sideFrameTime, _topFrameTime);
-            _edenFocusData[4] = edenData;
+            _focusData[4] = focusData;
 
-            edenData = new EdenData("top-right", "horizontalFrame.png", EdenData.Direction.Horizontal, NDalic.ParentOriginBottomRight,
+            focusData = new FocusData("top-right", "horizontalFrame.png", FocusData.Direction.Horizontal, NDalic.ParentOriginBottomRight,
                                     new Vector3(0.0f, 0.0f, 0.0f),  new Vector3(0.0f, _frameThickness, 0.0f), _sideFrameTime, _topFrameTime);
-            _edenFocusData[5] = edenData;
+            _focusData[5] = focusData;
         }
 
-        public void FocusAnimation(View parentItem, Vector3 itemSize, float duration, EdenEffectDirection direction)
+        public void FocusAnimation(View parentItem, Vector3 itemSize, float duration, FocusEffectDirection direction)
         {
             var itemWidth = itemSize.x + _frameThickness / 2;
             var itemHeight = itemSize.y + _frameThickness / 3;
@@ -61,42 +61,42 @@ namespace FirstScreen
             }
             _animation = new Animation(duration);
 
-            if (direction == EdenEffectDirection.BottomToTop)
+            if (direction == FocusEffectDirection.BottomToTop)
             {
-                _edenFocusData[0].ParentOrigin = NDalic.ParentOriginBottomCenter;
-                _edenFocusData[1].ParentOrigin = NDalic.ParentOriginBottomCenter;
-                _edenFocusData[2].ParentOrigin = NDalic.ParentOriginBottomLeft;
-                _edenFocusData[3].ParentOrigin = NDalic.ParentOriginBottomRight;
-                _edenFocusData[4].ParentOrigin = NDalic.ParentOriginTopLeft;
-                _edenFocusData[5].ParentOrigin = NDalic.ParentOriginTopRight;
+                _focusData[0].ParentOrigin = NDalic.ParentOriginBottomCenter;
+                _focusData[1].ParentOrigin = NDalic.ParentOriginBottomCenter;
+                _focusData[2].ParentOrigin = NDalic.ParentOriginBottomLeft;
+                _focusData[3].ParentOrigin = NDalic.ParentOriginBottomRight;
+                _focusData[4].ParentOrigin = NDalic.ParentOriginTopLeft;
+                _focusData[5].ParentOrigin = NDalic.ParentOriginTopRight;
             }
             else
             {
-                _edenFocusData[0].ParentOrigin = NDalic.ParentOriginTopCenter;
-                _edenFocusData[1].ParentOrigin = NDalic.ParentOriginTopCenter;
-                _edenFocusData[2].ParentOrigin = NDalic.ParentOriginBottomLeft;
-                _edenFocusData[3].ParentOrigin = NDalic.ParentOriginBottomRight;
-                _edenFocusData[4].ParentOrigin = NDalic.ParentOriginBottomLeft;
-                _edenFocusData[5].ParentOrigin = NDalic.ParentOriginBottomRight;
+                _focusData[0].ParentOrigin = NDalic.ParentOriginTopCenter;
+                _focusData[1].ParentOrigin = NDalic.ParentOriginTopCenter;
+                _focusData[2].ParentOrigin = NDalic.ParentOriginBottomLeft;
+                _focusData[3].ParentOrigin = NDalic.ParentOriginBottomRight;
+                _focusData[4].ParentOrigin = NDalic.ParentOriginBottomLeft;
+                _focusData[5].ParentOrigin = NDalic.ParentOriginBottomRight;
             }
 
-            foreach (EdenData edenData in _edenFocusData)
+            foreach (FocusData focusData in _focusData)
             {
-                var currentParent =  edenData.ImageItem.GetParent();
+                var currentParent =  focusData.ImageItem.GetParent();
 
                 // first parent the controls
                 if (parentItem != currentParent)
                 {
-                    parentItem.Add(edenData.ImageItem);
+                    parentItem.Add(focusData.ImageItem);
                 }
 
-                edenData.ImageItem.Size = new Vector3(100.0f,100.0f, 0.0f);
-                parentItem.Add(edenData.ImageItem);
+                focusData.ImageItem.Size = new Vector3(100.0f,100.0f, 0.0f);
+                parentItem.Add(focusData.ImageItem);
 
-                Vector3 targetSize = edenData.TargetSize;
-                Vector3 initSize = edenData.InitSize;
+                Vector3 targetSize = focusData.TargetSize;
+                Vector3 initSize = focusData.InitSize;
 
-                if (edenData.EdenDirection == EdenData.Direction.Horizontal)
+                if (focusData.FocusDirection == FocusData.Direction.Horizontal)
                 {
                     // adjust the width to match the parent
                     targetSize.x = itemWidth;
@@ -108,7 +108,7 @@ namespace FirstScreen
                 }
 
                 // half the size for the top frame as we come out from both left / right sides
-                if (edenData.Name == "top-right" ||  edenData.Name == "top-left")
+                if (focusData.Name == "top-right" ||  focusData.Name == "top-left")
                 {
                     targetSize.x = itemWidth - _frameThickness;
                 }
@@ -116,67 +116,67 @@ namespace FirstScreen
                 KeyFrames keyFrames = new KeyFrames();
 
                 keyFrames.Add(0.0f, new Property.Value(initSize));
-                keyFrames.Add(edenData.KeyFrameStart, new Property.Value(initSize));
-                keyFrames.Add(edenData.KeyFrameEnd, new Property.Value(targetSize));
+                keyFrames.Add(focusData.KeyFrameStart, new Property.Value(initSize));
+                keyFrames.Add(focusData.KeyFrameEnd, new Property.Value(targetSize));
 
                 // for halo add an extra keyframe to shrink it ( in 20% of time after it has finished)
-                if (edenData.Name =="halo")
+                if (focusData.Name =="halo")
                 {
-                    keyFrames.Add(edenData.KeyFrameEnd + 0.2f, new Property.Value(initSize));
+                    keyFrames.Add(focusData.KeyFrameEnd + 0.2f, new Property.Value(initSize));
                 }
 
-                _animation.AnimateBetween(new Property(edenData.ImageItem, Actor.Property.SIZE), keyFrames,
+                _animation.AnimateBetween(new Property(focusData.ImageItem, Actor.Property.SIZE), keyFrames,
                                           new AlphaFunction(AlphaFunction.BuiltinFunction.EASE_OUT_SINE));
 
                 // Simulate the vertical frame growing from the top.
                 // Vertical items are anchored to the bottom of the parent... so when they grow
                 // we need to move them to the middle of the parent ( otherwise they stick out the bottom)
-                if (edenData.EdenDirection == EdenData.Direction.Vertical)
+                if (focusData.FocusDirection == FocusData.Direction.Vertical)
                 {
                     //animate position as well so it looks like animation is coming from bottom
                     KeyFrames keyFramesV = new KeyFrames();
 
-                    if (direction == EdenEffectDirection.BottomToTop)
+                    if (direction == FocusEffectDirection.BottomToTop)
                     {
                         keyFramesV.Add(0.0f, new Property.Value(0.0f));
-                        keyFramesV.Add(edenData.KeyFrameStart, new Property.Value(0.0f));
+                        keyFramesV.Add(focusData.KeyFrameStart, new Property.Value(0.0f));
                     }
                     else
                     {
                         keyFramesV.Add(0.0f, new Property.Value(-itemHeight));
-                        keyFramesV.Add(edenData.KeyFrameStart, new Property.Value(-itemHeight));
+                        keyFramesV.Add(focusData.KeyFrameStart, new Property.Value(-itemHeight));
                     }
 
-                    keyFramesV.Add(edenData.KeyFrameEnd, new Property.Value(-itemHeight / 2)); // animate to halfway up the control
+                    keyFramesV.Add(focusData.KeyFrameEnd, new Property.Value(-itemHeight / 2)); // animate to halfway up the control
 
-                    _animation.AnimateBetween(new Property(edenData.ImageItem, Actor.Property.POSITION_Y), keyFramesV,
+                    _animation.AnimateBetween(new Property(focusData.ImageItem, Actor.Property.POSITION_Y), keyFramesV,
                                               new AlphaFunction(AlphaFunction.BuiltinFunction.EASE_OUT_SINE));
                 }
 
                 // Simulate the top frame growing from the sides.
-                if (edenData.Name == "top-left")
+                if (focusData.Name == "top-left")
                 {
                     KeyFrames keyFramesTL = new KeyFrames();
 
                     keyFramesTL.Add(0.0f, new Property.Value(0.0f));
-                    keyFramesTL.Add(edenData.KeyFrameStart, new Property.Value(0.0f));
-                    keyFramesTL.Add(edenData.KeyFrameEnd, new Property.Value(itemWidth / 2)); // animate to halfway up the control
+                    keyFramesTL.Add(focusData.KeyFrameStart, new Property.Value(0.0f));
+                    keyFramesTL.Add(focusData.KeyFrameEnd, new Property.Value(itemWidth / 2)); // animate to halfway up the control
 
                     // grow these from the left or right
-                    _animation.AnimateBetween(new Property(edenData.ImageItem, Actor.Property.POSITION_X), keyFramesTL,
+                    _animation.AnimateBetween(new Property(focusData.ImageItem, Actor.Property.POSITION_X), keyFramesTL,
                                               new AlphaFunction(AlphaFunction.BuiltinFunction.EASE_OUT_SINE));
                 }
 
-                if (edenData.Name == "top-right")
+                if (focusData.Name == "top-right")
                 {
                     KeyFrames keyFramesTR = new KeyFrames();
 
                     keyFramesTR.Add(0.0f, new Property.Value(0.0f));
-                    keyFramesTR.Add(edenData.KeyFrameStart, new Property.Value(0.0f));
-                    keyFramesTR.Add(edenData.KeyFrameEnd, new Property.Value(-itemWidth / 2)); // animate to halfway up the control
+                    keyFramesTR.Add(focusData.KeyFrameStart, new Property.Value(0.0f));
+                    keyFramesTR.Add(focusData.KeyFrameEnd, new Property.Value(-itemWidth / 2)); // animate to halfway up the control
 
                     // grow these from the left or right
-                    _animation.AnimateBetween(new Property(edenData.ImageItem, Actor.Property.POSITION_X), keyFramesTR,
+                    _animation.AnimateBetween(new Property(focusData.ImageItem, Actor.Property.POSITION_X), keyFramesTR,
                                               new AlphaFunction(AlphaFunction.BuiltinFunction.EASE_OUT_SINE));
                 }
 
@@ -188,13 +188,13 @@ namespace FirstScreen
 
         private void OnAnimationFinished(object source, Animation.FinishedEventArgs e)
         {
-            foreach (EdenData edenData in _edenFocusData)
+            foreach (FocusData focusData in _focusData)
             {
-                var currentParent =  edenData.ImageItem.GetParent();
+                var currentParent =  focusData.ImageItem.GetParent();
 
                 if (currentParent)
                 {
-                    currentParent.Remove(edenData.ImageItem);
+                    currentParent.Remove(focusData.ImageItem);
                 }
             }
         }
@@ -3,15 +3,15 @@ using System;
 
 namespace FirstScreen
 {
-    public enum EdenEffectDirection
+    public enum FocusEffectDirection
     {
         TopToBottom,
         BottomToTop
     };
 
-    public interface IEdenEffect
+    public interface IFocusEffect
     {
-        void FocusAnimation(View parentItem, Vector3 itemSize, float duration, EdenEffectDirection direction);
+        void FocusAnimation(View parentItem, Vector3 itemSize, float duration, FocusEffectDirection direction);
     }
 }
 
index c22c712..633af05 100644 (file)
@@ -428,9 +428,9 @@ namespace FirstScreen
         }
 
         // Perform EddenEffect animation on Focused Item specified
-        public void FocusAnimation(EdenEffect edenEffect, EdenEffectDirection direction)
+        public void FocusAnimation(FocusEffect focusEffect, FocusEffectDirection direction)
         {
-            edenEffect.FocusAnimation(_itemList[_focusedItem], _itemSize, 1.0f, direction);
+            focusEffect.FocusAnimation(_itemList[_focusedItem], _itemSize, 1.0f, direction);
         }
 
         public void SetFocused(bool focused)