Skip to content

Commit 42ff3b3

Browse files
SamuelAsherRivelloSamuelAsherRivello
committed
2.2.4 - Concerns (M,V,C,S) are now Disposable. Locator API updated per dispose.
1 parent 577d7b4 commit 42ff3b3

File tree

99 files changed

+579
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+579
-130
lines changed

Diff for: ‎RMC Mini MVCS/3rdParty/RMC/RMC Core (Borrowed)/Scripts/Tests/RMC/Core/Testing/GroupOfScenesBaseTest.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections;
22
using NUnit.Framework;
3+
using UnityEngine;
34
using UnityEngine.SceneManagement;
45
using UnityEngine.TestTools;
56

@@ -64,8 +65,11 @@ public virtual IEnumerator SceneName_ThrowsNoErrors_WhenLoadScene(string sceneNa
6465
{
6566
yield return null;
6667
}
68+
69+
// 4. Wait 0.5 seconds
70+
yield return new WaitForSeconds(0.5f);
6771

68-
// 4. Unload the temporary scene by setting it active and then unloading it
72+
// 5. Unload the temporary scene by setting it active and then unloading it
6973
SceneManager.SetActiveScene(temporaryScene);
7074
var tempUnloadAsyncOperation = SceneManager.UnloadSceneAsync(temporaryScene);
7175
while (tempUnloadAsyncOperation != null && !tempUnloadAsyncOperation.isDone)
@@ -75,7 +79,7 @@ public virtual IEnumerator SceneName_ThrowsNoErrors_WhenLoadScene(string sceneNa
7579

7680
Assert.DoesNotThrow(() => { });
7781

78-
// Change back to old value
82+
// .6 Change back to old value
7983
LogAssert.ignoreFailingMessages = _ignoreFailingMessagesBefore;
8084
yield return null;
8185
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example01_ClockMini/WithMini/Scripts/Runtime/Mini/View/ClockView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ public void RequireIsInitialized()
4545
// Methods ---------------------------------------
4646

4747

48+
// Dispose Methods --------------------------------
49+
public void Dispose()
50+
{
51+
// Optional: Handle any cleanup here...
52+
}
53+
54+
4855
// Event Handlers --------------------------------
4956
private void OnTimeChangedCommand(TimeChangedCommand timeChangedCommand)
5057
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example02_LoginMini/WithMini/Scripts/Runtime/Mini/LoginWithMiniExample.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using RMC.Mini.Experimental.ContextLocators;
22
using RMC.Mini.Samples.Login.WithMini.Mini.View;
33
using UnityEngine;
4-
using UnityEngine.Assertions;
54

65
namespace RMC.Mini.Samples.Login.WithMini.Mini
76
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example02_LoginMini/WithMini/Scripts/Runtime/Mini/View/LoginView.cs

+8
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ private void AnyInputField_OnValueChanged(string _)
114114
}
115115

116116

117+
118+
// Dispose Methods --------------------------------
119+
public void Dispose()
120+
{
121+
// Optional: Handle any cleanup here...
122+
}
123+
124+
117125
// Event Handlers --------------------------------
118126

119127
private void LoginButton_OnClicked()

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/DialogView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ public void RequireIsInitialized()
100100
// Methods ---------------------------------------
101101

102102

103+
// Dispose Methods --------------------------------
104+
public void Dispose()
105+
{
106+
// Optional: Handle any cleanup here...
107+
}
108+
109+
103110
// Event Handlers --------------------------------
104111
private void CancelButton_OnClicked()
105112
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/Input/RollABallInputActions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// <auto-generated>
33
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
44
// version 1.7.0
5-
// from Assets/Samples/RMC Mini MVCS/2.1.4/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/Input/RollABallInputActions.inputactions
5+
// from Assets/Samples/RMC Mini MVCS/2.2.2/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/Input/RollABallInputActions.inputactions
66
//
77
// Changes to this file may cause incorrect behavior and will be lost if
88
// the code is regenerated.

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/InputView.cs

+8
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,18 @@ protected void Update()
104104
OnInput.Invoke(movement);
105105

106106
}
107+
107108

108109
// Methods ---------------------------------------
109110

110111

112+
// Dispose Methods --------------------------------
113+
public void Dispose()
114+
{
115+
// Optional: Handle any cleanup here...
116+
}
117+
118+
111119
// Event Handlers --------------------------------
112120

113121
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/PickupsView.cs

+8
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ public void RequireIsInitialized()
6363
}
6464
}
6565

66+
67+
// Dispose Methods --------------------------------
68+
public void Dispose()
69+
{
70+
// Optional: Handle any cleanup here...
71+
}
72+
73+
6674
// Unity Methods ---------------------------------
6775

6876
// Event Handlers --------------------------------

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/PlayerView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,13 @@ protected void OnDestroy()
111111
OnInputCommand);
112112
}
113113

114+
115+
// Dispose Methods --------------------------------
116+
public void Dispose()
117+
{
118+
// Optional: Handle any cleanup here...
119+
}
120+
114121

115122
// Methods ---------------------------------------
116123

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Advanced/WithMini/Scripts/Runtime/Mini/View/UIView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ private void UpdateScoreText()
118118
}
119119

120120

121+
// Dispose Methods --------------------------------
122+
public void Dispose()
123+
{
124+
// Optional: Handle any cleanup here...
125+
}
126+
127+
121128
// Event Handlers --------------------------------
122129
private void OnScoreChangedCommand(ScoreChangedCommand scoreChangedCommand)
123130
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/RollABallMiniExample.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using RMC.Mini.Experimental.ContextLocators;
22
using RMC.Mini.Samples.RollABall.WithMini.Mini.View;
33
using UnityEngine;
4-
using UnityEngine.Assertions;
54

65
namespace RMC.Mini.Samples.RollABall.WithMini.Mini
76
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/RollABallSimpleMini.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using RMC.Mini.Samples.RollABall.WithMini.Mini.Model;
55
using RMC.Mini.Samples.RollABall.WithMini.Mini.Service;
66
using RMC.Mini.Samples.RollABall.WithMini.Mini.View;
7-
using UnityEngine;
87

98
namespace RMC.Mini.Samples.RollABall.WithMini.Mini
109
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/View/DialogView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ public void RequireIsInitialized()
6767
// Methods ---------------------------------------
6868

6969

70+
// Dispose Methods --------------------------------
71+
public void Dispose()
72+
{
73+
// Optional: Handle any cleanup here...
74+
}
75+
76+
7077
// Event Handlers --------------------------------
7178
private void CancelButton_OnClicked()
7279
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/View/InputView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ protected void Update()
6666
// Methods ---------------------------------------
6767

6868

69+
// Dispose Methods --------------------------------
70+
public void Dispose()
71+
{
72+
// Optional: Handle any cleanup here...
73+
}
74+
75+
6976
// Event Handlers --------------------------------
7077
}
7178
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/View/PlayerView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ protected void OnDestroy()
8888
// Methods ---------------------------------------
8989

9090

91+
// Dispose Methods --------------------------------
92+
public void Dispose()
93+
{
94+
// Optional: Handle any cleanup here...
95+
}
96+
97+
9198
// Event Handlers --------------------------------
9299
private void OnInputCommand(InputCommand inputCommand)
93100
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/Example03_RollABallMini/Basic/WithMini/Scripts/Runtime/Mini/View/UIView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ private void UpdateScoreText()
100100
}
101101

102102

103+
// Dispose Methods --------------------------------
104+
public void Dispose()
105+
{
106+
// Optional: Handle any cleanup here...
107+
}
108+
109+
103110
// Event Handlers --------------------------------
104111
private void OnScoreChangedCommand(ScoreChangedCommand scoreChangedCommand)
105112
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example04_CalculatorMini/WithMini/Scripts/Runtime/Mini/View/CalculatorView.cs

+5
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,10 @@ private void ResetButton_OnClicked()
124124

125125
OnReset.Invoke();
126126
}
127+
128+
public void Dispose()
129+
{
130+
// Do any cleanup
131+
}
127132
}
128133
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example05_CountUpMini/WithMini/Scripts/Runtime/Mini/View/CountUpView.cs

+4
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,9 @@ private void OnCounterValueChangedCommand(CounterChangedCommand counterChangedCo
9393
_statusText.text = $"Counter: {counterChangedCommand.CurrentValue}";
9494
}
9595

96+
public void Dispose()
97+
{
98+
// Do any cleanup
99+
}
96100
}
97101
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example06_BouncyBallMini/WithMini/Scripts/Runtime/Mini/View/BouncyBallView.cs

+4
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,9 @@ private void OnBounceCountChangedCommand(BounceCountChangedCommand bounceCountCh
9090
_statusText.text = $"Bounce Count: {bounceCountChangedCommand.CurrentValue}/{bounceCountMax}";
9191
}
9292

93+
public void Dispose()
94+
{
95+
// Do any cleanup
96+
}
9397
}
9498
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example07_DataBindingMini/WithMini/Scripts/Runtime/Mini/View/LeftView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ public void RequireIsInitialized()
6565

6666
// Methods ---------------------------------------
6767

68+
69+
// Dispose Methods --------------------------------
70+
public void Dispose()
71+
{
72+
// Optional: Handle any cleanup here...
73+
}
74+
6875

6976
// Event Handlers --------------------------------
7077
private void Message_OnValueChanged(string previousValue,

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example07_DataBindingMini/WithMini/Scripts/Runtime/Mini/View/RightView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ public void RequireIsInitialized()
6464
// Methods ---------------------------------------
6565

6666

67+
// Dispose Methods --------------------------------
68+
public void Dispose()
69+
{
70+
// Optional: Handle any cleanup here...
71+
}
72+
73+
6774
// Event Handlers --------------------------------
6875
private void Message_OnValueChanged(string previousValue,
6976
string currentValue)

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example08_MultipleMinis/WithMini/Scripts/Runtime/Mini/View/LeftView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ public void RequireIsInitialized()
5858
// Unity Methods ---------------------------------
5959

6060

61+
// Dispose Methods --------------------------------
62+
public void Dispose()
63+
{
64+
// Optional: Handle any cleanup here...
65+
}
66+
67+
6168
// Methods ---------------------------------------
6269

6370

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example08_MultipleMinis/WithMini/Scripts/Runtime/Mini/View/RightView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ protected void OnDestroy()
6060
}
6161

6262

63+
// Dispose Methods --------------------------------
64+
public void Dispose()
65+
{
66+
// Optional: Handle any cleanup here...
67+
}
68+
69+
6370
// Methods ---------------------------------------
6471

6572

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example09_TutorialMini/Scripts/Runtime/Mini/View/TutorialView.cs

+7
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ public void RequireIsInitialized()
5858

5959

6060
// Methods ---------------------------------------
61+
62+
63+
// Dispose Methods --------------------------------
64+
public void Dispose()
65+
{
66+
// Optional: Handle any cleanup here...
67+
}
6168

6269

6370
// Event Handlers --------------------------------

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example09_TutorialMini/Scripts/Runtime/TutorialMiniExample.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using RMC.Mini.Samples.Tutorial.Mini.Controller;
44
using RMC.Mini.Samples.Tutorial.Mini.View;
55
using UnityEngine;
6-
using UnityEngine.Assertions;
76
using UnityEngine.SceneManagement;
87

98
namespace RMC.Mini.Samples.Tutorial

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example10_UIToolkitMini/WithMini/Scripts/Runtime/Mini/View/UIToolkitView.cs

+10
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,20 @@ public void RequireIsInitialized()
128128
}
129129
}
130130

131+
131132
// Unity Methods ---------------------------------
132133

134+
133135
// Methods ---------------------------------------
134136

137+
138+
// Dispose Methods --------------------------------
139+
public void Dispose()
140+
{
141+
// Optional: Handle any cleanup here...
142+
}
143+
144+
135145
// Event Handlers --------------------------------
136146
}
137147
}

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example11_MultiSceneMini/WithMini/Scripts/Runtime/Mini/View/Base/MultiSceneViewBase.cs

+7
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ private void RefreshUI()
105105
}
106106

107107

108+
// Dispose Methods --------------------------------
109+
public void Dispose()
110+
{
111+
// Optional: Handle any cleanup here...
112+
}
113+
114+
108115
// Event Handlers --------------------------------
109116
private void ServiceHasLoaded_OnValueChanged(bool previousValue, bool currentValue)
110117
{

Diff for: ‎RMC Mini MVCS/Samples~/RMC Mini MVCS - 1. Beginner Examples/Examples/More/Example12_SpawnerMini/WithMini/Scripts/Runtime/Mini/View/LeftView.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,16 @@ public void RequireIsInitialized()
7474
// Unity Methods ---------------------------------
7575

7676

77-
// Methods ---------------------------------------
77+
// Dispose Methods --------------------------------
78+
public void Dispose()
79+
{
80+
// Optional: Handle any cleanup here...
81+
}
7882

7983

84+
// Methods ---------------------------------------
85+
86+
8087
// Event Handlers --------------------------------
8188
private void IncrementCounterButton_OnClicked()
8289
{

0 commit comments

Comments
 (0)