Refactor

aanfuso · Jan 11, 2020 · 2fa4689 · 2fa4689
1 parent db0bc0d
commit 2fa4689
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 57 deletions.
diff --git a/Assets/FancyScrollView/Examples/Sources/02_FocusOn/Cell.cs b/Assets/FancyScrollView/Examples/Sources/02_FocusOn/Cell.cs
@@ -21,7 +21,7 @@ static class AnimatorHash
             public static readonly int Scroll = Animator.StringToHash("scroll");
         }
 
-        void Start()
+        public override void Initialize()
         {
             button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index));
         }

diff --git a/Assets/FancyScrollView/Examples/Sources/04_Metaball/Cell.cs b/Assets/FancyScrollView/Examples/Sources/04_Metaball/Cell.cs
@@ -30,10 +30,21 @@ static class AnimatorHash
         float hash;
         bool currentSelection;
 
-        void Start()
+        public override void Initialize()
         {
             hash = Random.value * 100f;
             button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index));
+
+            Context.UpdateCellState += () =>
+            {
+                var siblingIndex = rectTransform.GetSiblingIndex();
+                var scale = Mathf.Min(1f, 10 * (0.5f - Mathf.Abs(currentPosition - 0.5f)));
+                var position = IsVisible
+                    ? this.position + GetFluctuation()
+                    : rectTransform.rect.size.x * 10f * Vector3.left;
+
+                Context.SetCellState(siblingIndex, Index, position.x, position.y, scale);
+            };
         }
 
         void LateUpdate()
@@ -48,22 +59,6 @@ Vector3 GetFluctuation()
             return new Vector3(fluctX, fluctY, 0f);
         }
 
-        public override void SetupContext(Context context)
-        {
-            base.SetupContext(context);
-
-            Context.UpdateCellState += () =>
-            {
-                var siblingIndex = rectTransform.GetSiblingIndex();
-                var scale = Mathf.Min(1f, 10 * (0.5f - Mathf.Abs(currentPosition - 0.5f)));
-                var position = IsVisible
-                    ? this.position + GetFluctuation()
-                    : rectTransform.rect.size.x * 10f * Vector3.left;
-
-                Context.SetCellState(siblingIndex, Index, position.x, position.y, scale);
-            };
-        }
-
         public override void UpdateContent(ItemData cellData)
         {
             message.text = cellData.Message;

diff --git a/Assets/FancyScrollView/Examples/Sources/05_Voronoi/Cell.cs b/Assets/FancyScrollView/Examples/Sources/05_Voronoi/Cell.cs
@@ -31,27 +31,10 @@ static class AnimatorHash
         bool currentSelection;
         float updateSelectionTime;
 
-        void Start()
+        public override void Initialize()
         {
             hash = Random.value * 100f;
             button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index));
-        }
-
-        void LateUpdate()
-        {
-            image.rectTransform.localPosition = position + GetFluctuation();
-        }
-
-        Vector3 GetFluctuation()
-        {
-            var fluctX = Mathf.Sin(Time.time + hash * 40) * 10;
-            var fluctY = Mathf.Sin(Time.time + hash) * 10;
-            return new Vector3(fluctX, fluctY, 0f);
-        }
-
-        public override void SetupContext(Context context)
-        {
-            base.SetupContext(context);
 
             Context.UpdateCellState += () =>
             {
@@ -66,6 +49,18 @@ public override void SetupContext(Context context)
             };
         }
 
+        void LateUpdate()
+        {
+            image.rectTransform.localPosition = position + GetFluctuation();
+        }
+
+        Vector3 GetFluctuation()
+        {
+            var fluctX = Mathf.Sin(Time.time + hash * 40) * 10;
+            var fluctY = Mathf.Sin(Time.time + hash) * 10;
+            return new Vector3(fluctX, fluctY, 0f);
+        }
+
         public override void UpdateContent(ItemData cellData)
         {
             message.text = cellData.Message;

diff --git a/Assets/FancyScrollView/Examples/Sources/06_LoopTabBar/Tab.cs b/Assets/FancyScrollView/Examples/Sources/06_LoopTabBar/Tab.cs
@@ -20,7 +20,7 @@ static class AnimatorHash
             public static readonly int Scroll = Animator.StringToHash("scroll");
         }
 
-        void Start()
+        public override void Initialize()
         {
             button.onClick.AddListener(() => Context.OnCellClicked?.Invoke(Index));
         }

diff --git a/Assets/FancyScrollView/Examples/Sources/08_GridView/Cell.cs b/Assets/FancyScrollView/Examples/Sources/08_GridView/Cell.cs
@@ -9,7 +9,7 @@
 
 namespace FancyScrollView.Example08
 {
-    public class Cell : FancyCell<ItemData, Context>
+    public class Cell : FancyGridViewCell<ItemData, Context>
     {
         [SerializeField] Text message = default;
         [SerializeField] Image image = default;
@@ -26,16 +26,10 @@ public override void UpdateContent(ItemData itemData)
 
         public override void UpdatePosition(float position)
         {
-            var cellSize = Context.GetCellSize();
-            var spacing = Context.GetColumnSpacing();
-            var columnCount = Context.GetColumnCount();
-            var count = Index % columnCount;
+            base.UpdatePosition(position);
 
-            var x = (cellSize + spacing) * (count - (columnCount - 1) * 0.5f);
-            var y = transform.localPosition.y;
             var wave = Mathf.Sin(position * Mathf.PI * 2) * 65;
-
-            transform.localPosition = new Vector2(x + wave, y);
+            transform.localPosition += Vector3.right * wave;
         }
     }
 }
diff --git a/Assets/FancyScrollView/Sources/Runtime/Core/FancyCell.cs b/Assets/FancyScrollView/Sources/Runtime/Core/FancyCell.cs
@@ -34,10 +34,15 @@ namespace FancyScrollView
         protected TContext Context { get; private set; }
 
         /// <summary>
-        /// <see cref="Context"/> のセットアップを行います.
+        /// <see cref="Context"/> をセットします.
         /// </summary>
         /// <param name="context">コンテキスト.</param>
-        public virtual void SetupContext(TContext context) => Context = context;
+        public virtual void SetContext(TContext context) => Context = context;
+
+        /// <summary>
+        /// 初期化を行います.
+        /// </summary>
+        public virtual void Initialize() { }
 
         /// <summary>
         /// このセルの可視状態を設定します.
@@ -66,6 +71,6 @@ namespace FancyScrollView
     public abstract class FancyCell<TItemData> : FancyCell<TItemData, NullContext>
     {
         /// <inheritdoc/>
-        public sealed override void SetupContext(NullContext context) => base.SetupContext(context);
+        public sealed override void SetContext(NullContext context) => base.SetContext(context);
     }
 }
diff --git a/Assets/FancyScrollView/Sources/Runtime/Core/FancyScrollView.cs b/Assets/FancyScrollView/Sources/Runtime/Core/FancyScrollView.cs
@@ -141,7 +141,8 @@ void ResizePool(float firstPosition)
                         typeof(TItemData).FullName, typeof(TContext).FullName, CellPrefab.name));
                 }
 
-                cell.SetupContext(Context);
+                cell.SetContext(Context);
+                cell.Initialize();
                 cell.SetVisible(false);
                 pool.Add(cell);
             }

diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridView.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridView.cs
@@ -15,11 +15,13 @@ namespace FancyScrollView
     /// <summary>
     /// グリッドレイアウトのスクロールビューを実装するための抽象基底クラス.
     /// 無限スクロールおよびスナップには対応していません.
+    /// /// <see cref="FancyScrollView{TItemData, TContext}.Context"/> が不要な場合は
+    /// 代わりに <see cref="FancyGridView{TItemData}"/> を使用します.
     /// </summary>
     /// <typeparam name="TItemData">アイテムのデータ型.</typeparam>
     /// <typeparam name="TContext"><see cref="FancyScrollView{TItemData, TContext}.Context"/> の型.</typeparam>
     public abstract class FancyGridView<TItemData, TContext> : FancyScrollRect<TItemData[], TContext>
-        where TContext : class, IFancyScrollRectContext, IFancyGridViewContext, new()
+        where TContext : class, IFancyGridViewContext, new()
     {
         /// <summary>
         /// カラム同士の余白.
@@ -140,4 +142,12 @@ protected override void ScrollTo(int itemIndex, float duration, Ease easing, flo
             base.ScrollTo(rowIndex, duration, easing, alignment, onComplete);
         }
     }
+
+    /// <summary>
+    /// グリッドレイアウトのスクロールビューを実装するための抽象基底クラス.
+    /// 無限スクロールおよびスナップには対応していません.
+    /// </summary>
+    /// <typeparam name="TItemData">アイテムのデータ型.</typeparam>
+    /// <seealso cref="FancyGridView{TItemData, TContext}"/>
+    public abstract class FancyGridView<TItemData> : FancyGridView<TItemData, FancyGridViewContext> { }
 }
diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs
@@ -0,0 +1,45 @@
+/*
+ * FancyScrollView (https://github.com/setchi/FancyScrollView)
+ * Copyright (c) 2019 setchi
+ * Licensed under MIT (https://github.com/setchi/FancyScrollView/blob/master/LICENSE)
+ */
+
+using UnityEngine;
+
+namespace FancyScrollView
+{
+    /// <summary>
+    /// <see cref="FancyGridView{TItemData, TContext}"/> のセルを実装するための抽象基底クラス.
+    /// </summary>
+    /// <typeparam name="TItemData">アイテムのデータ型.</typeparam>
+    /// <typeparam name="TContext"><see cref="FancyCell{TItemData, TContext}.Context"/> の型.</typeparam>
+    public abstract class FancyGridViewCell<TItemData, TContext> : FancyCell<TItemData, TContext>
+        where TContext : class, IFancyGridViewContext, new()
+    {
+        /// <inheritdoc/>
+        public override void UpdatePosition(float position)
+        {
+            var cellSize = Context.GetCellSize();
+            var spacing = Context.GetColumnSpacing();
+            var columnCount = Context.GetColumnCount();
+
+            var count = Index % columnCount;
+            var p = (cellSize + spacing) * (count - (columnCount - 1) * 0.5f);
+
+            transform.localPosition = Context.ScrollDirection == ScrollDirection.Horizontal
+                ? new Vector2(transform.localPosition.x, p)
+                : new Vector2(p, transform.localPosition.y);
+        }
+    }
+
+    /// <summary>
+    /// <see cref="FancyGridView{TItemData}"/> のセルを実装するための抽象基底クラス.
+    /// </summary>
+    /// <typeparam name="TItemData">アイテムのデータ型.</typeparam>
+    /// <seealso cref="FancyGridViewCell{TItemData, TContext}"/>
+    public abstract class FancyGridViewCell<TItemData> : FancyGridViewCell<TItemData, FancyGridViewContext>
+    {
+        /// <inheritdoc/>
+        public sealed override void SetContext(FancyGridViewContext context) => base.SetContext(context);
+    }
+}
diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs.meta b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewCell.cs.meta
diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewRow.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/FancyGridViewRow.cs
@@ -35,16 +35,15 @@ protected virtual FancyCell<TItemData, TContext>[] InstantiateCells()
         }
 
         /// <inheritdoc/>
-        public override void SetupContext(TContext context)
+        public override void Initialize()
         {
-            base.SetupContext(context);
-
             Cells = InstantiateCells();
             Debug.Assert(Cells.Length == Context.GetColumnCount());
 
             for (var i = 0; i < Cells.Length; i++)
             {
-                Cells[i].SetupContext(context);
+                Cells[i].SetContext(Context);
+                Cells[i].Initialize();
             }
         }
 

diff --git a/Assets/FancyScrollView/Sources/Runtime/GridView/IFancyGridViewContext.cs b/Assets/FancyScrollView/Sources/Runtime/GridView/IFancyGridViewContext.cs
@@ -12,7 +12,7 @@ namespace FancyScrollView
     /// <summary>
     /// <see cref="FancyGridView{TItemData, TContext}"/> のコンテキストインターフェース.
     /// </summary>
-    public interface IFancyGridViewContext
+    public interface IFancyGridViewContext : IFancyScrollRectContext
     {
         GameObject CellTemplate { get; set; }
         ScrollDirection ScrollDirection { get; set; }

diff --git a/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectCell.cs b/Assets/FancyScrollView/Sources/Runtime/ScrollRect/FancyScrollRectCell.cs
@@ -51,6 +51,6 @@ protected virtual void UpdatePosition(float position, float viewportPosition) {
     public abstract class FancyScrollRectCell<TItemData> : FancyScrollRectCell<TItemData, FancyScrollRectContext>
     {
         /// <inheritdoc/>
-        public sealed override void SetupContext(FancyScrollRectContext context) => base.SetupContext(context);
+        public sealed override void SetContext(FancyScrollRectContext context) => base.SetContext(context);
     }
 }