Resolve WES-99 "Cc refactor"

Assets/Accounts/Scenes/ChangeUserScreen.unity

@@ -1097,7 +1097,6 @@ GameObject:
   - component: {fileID: 1143249627}
   - component: {fileID: 1143249626}
   - component: {fileID: 1143249625}
-  - component: {fileID: 1143249628}
   m_Layer: 5
   m_Name: Button (1)
   m_TagString: Untagged
@@ -1170,10 +1169,10 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1143249628}
-        m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
-        m_MethodName: LoadScene
-        m_Mode: 5
+      - m_Target: {fileID: 906197780}
+        m_TargetAssemblyTypeName: ChangeUserScreen, Assembly-CSharp
+        m_MethodName: GotoUserCreation
+        m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
           m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1220,18 +1219,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1143249623}
   m_CullTransparentMesh: 1
---- !u!114 &1143249628
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1143249623}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1229328479
 GameObject:
   m_ObjectHideFlags: 0

Assets/Accounts/Scripts/ChangeUserScreen.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
+/// <summary>
+/// ChangeUserScreen scene manager
+/// </summary>
 public class ChangeUserScreen : MonoBehaviour
 {
     /// <summary>
@@ -58,12 +60,7 @@ public class ChangeUserScreen : MonoBehaviour
             // Set background color
             background.color = i == currentUserIndex ? Color.blue : Color.gray;
             // Find correct component for setting the sprite
-            foreach (Image img in background.GetComponentsInChildren<Image>())
-                if (img != background)
-                {
-                    img.sprite = user.avatar;
-                    break;
-                }
+            instance.transform.Find("Avatar").GetComponent<Image>().sprite = user.avatar;
         }
     }
 
@@ -85,6 +82,14 @@ public class ChangeUserScreen : MonoBehaviour
     {
         userList.ChangeCurrentUser(currentUserIndex);
         userList.Save();
-        SceneManager.LoadScene("Common/Scenes/StartScreen");
+        SystemController.GetInstance().BackToPreviousScene();
+    }
+
+    /// <summary>
+    /// Callback to load the UserCreationScreen scene
+    /// </summary>
+    public void GotoUserCreation()
+    {
+        SystemController.GetInstance().LoadNextScene("Accounts/Scenes/UserCreationScreen");
     }
 }

Assets/Accounts/Scripts/Progress.cs

@@ -73,7 +73,6 @@ public class Progress
         }
     }
 
-    // Get the value of type `T` belonging to `key`
     /// <summary>
     /// Get the data object of a certain key
     /// </summary>

Assets/Accounts/Scripts/UserCreationScreen.cs

@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using TMPro;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 /// <summary>
@@ -80,12 +79,7 @@ public class UserCreationScreen : MonoBehaviour
             // Set background color
             background.color = selectedAvatar == i ? Color.blue : Color.gray;
             // Find correct component for setting the sprite
-            foreach (Image img in background.GetComponentsInChildren<Image>())
-                if (img != background)
-                {
-                    img.sprite = sprites[i];
-                    break;
-                }
+            instance.transform.Find("Image").GetComponent<Image>().sprite = sprites[i];
         }
     }
 
@@ -123,8 +117,7 @@ public class UserCreationScreen : MonoBehaviour
             {
                 // Create a new entry in the UserList ScriptableObject
                 users.ChangeCurrentUser(users.CreateAndAddNewUser(username, sprites[selectedAvatar]));
-                // TODO: change scene, for now just change to StartScreen
-                SceneManager.LoadScene("Common/Scenes/StartScreen");
+                SystemController.GetInstance().BackToPreviousScene();
             }
             // Warn user that username already exists
             else