feat: switch CTA buttons on preset stage and skip confirm screen

Author: mihakrajnc

Assets/Scripts/Configurator/ConfiguratorUIPresenter.cs

@@ -118,18 +118,20 @@ private void OnEnable()
 
             _backButton.Clicked += OnBackClicked;
             _confirmButton.Clicked += OnNextClicked;
-            _skipButton.Clicked += () => OpenConfirm(true);
+            _skipButton.Clicked += OnSkipClicked;
 
             _loader = root.Q("Loader");
             _loaderIcon = _loader.Q("Icon");
 
             var presetsContainer = root.Q("Presets");
             _presetsView = new PresetsView(presetsContainer,
                 "Choose {0}'s starting look",
-                "START CUSTOMIZING",
+                "CUSTOMIZE LATER",
                 221,
-                "START",
-                true);
+                "LATER",
+                true,
+                "START CUSTOMIZATION",
+                "START");
             _presetsView.PresetSelected += preset => PresetSelected!(preset);
 
             // Dropdowns
@@ -269,12 +271,36 @@ private void OnBackClicked()
 
         private void OnNextClicked()
         {
+            // The next button on the first stage (presets) functions as "skip"
+            if (_currentStageIndex == 0)
+            {
+                JumpIn!();
+                return;
+            }
+            
             if (_currentStageIndex == _stages.Length - 1)
             {
-                OpenConfirm(true);
+                JumpIn!();
                 return;
             }
 
+            AdvanceStage();
+        }
+
+        private void OnSkipClicked()
+        {
+            // The skip button on the first stage (presets) functions as "next"
+            if (_currentStageIndex == 0)
+            {
+                AdvanceStage();
+                return;
+            }
+
+            JumpIn!();
+        }
+
+        private void AdvanceStage()
+        {
             _stages[_currentStageIndex].HideLeft();
             _stages[++_currentStageIndex].Show();
 
@@ -317,7 +343,7 @@ private void RefreshCurrentStage()
 
             _skipButton.EnableInClassList("dcl-button--hidden-down",
                 !stage.CanSkip || _usingMobile && _currentStageIndex != 0);
-            _skipButton.Text = _usingMobile ? "SKIP" : "SKIP CUSTOMIZATION";
+            _skipButton.Text = _usingMobile ? stage.SkipButtonTextMobile : stage.SkipButtonText;
             _backButton.EnableInClassList("dcl-button--hidden-down", _currentStageIndex == 0);
 
             // TODO: Change?

Assets/Scripts/Configurator/Views/PresetsView.cs

@@ -33,8 +33,8 @@ public override void SetData(object data)
         }
 
         public PresetsView(VisualElement root, string title, string confirmButtonText, int confirmButtonWidth,
-            string confirmButtonTextMobile, bool canSkip) : base(root, title, confirmButtonText, confirmButtonWidth,
-            confirmButtonTextMobile, canSkip)
+            string confirmButtonTextMobile, bool canSkip, string skipButtonText, string skipButtonTextMobile) : base(root, title, confirmButtonText,
+            confirmButtonWidth, confirmButtonTextMobile, canSkip, skipButtonText, skipButtonTextMobile)
         {
             _presetsContainer = root.Q<ScrollView>("Body");
             _previewButtons = _presetsContainer.Query<PreviewButtonElement>().ToList();

Assets/Scripts/Configurator/Views/StageView.cs

@@ -9,21 +9,27 @@ public abstract class StageView: IRefreshableView
         public readonly string Title;
         public readonly string ConfirmButtonText;
         public readonly string ConfirmButtonTextMobile;
+        public readonly string SkipButtonText;
+        public readonly string SkipButtonTextMobile;
         public readonly int ConfirmButtonWidth; // This is ugly but the only way to get it to animate nicely
+        public readonly int SkipButtonWidth; // This is ugly but the only way to get it to animate nicely
         public readonly bool CanSkip;
 
         public abstract string SelectedCategory { get; }
 
         protected bool UsingMobile;
 
-        protected StageView(VisualElement root, string title, string confirmButtonText, int confirmButtonWidth, string confirmButtonTextMobile, bool canSkip)
+        protected StageView(VisualElement root, string title, string confirmButtonText, int confirmButtonWidth, string confirmButtonTextMobile,
+                            bool canSkip, string skipButtonText = "SKIP CUSTOMIZATION", string skipButtonTextMobile = "SKIP")
         {
             _root = root;
             Title = title;
             ConfirmButtonText = confirmButtonText;
             ConfirmButtonTextMobile = confirmButtonTextMobile;
             CanSkip = canSkip;
             ConfirmButtonWidth = confirmButtonWidth;
+            SkipButtonText = skipButtonText;
+            SkipButtonTextMobile = skipButtonTextMobile;
         }
 
         public void HideLeft()