Commit d50d1f2

authored

Merge pull request #32 from LibraStack/develop

Minor changes.

2 parents dacb116 + e6f0159 commit d50d1f2Copy full SHA for d50d1f2

File tree

+26

-8

lines changed

+26

-8

lines changed

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,22 @@ namespace UnityMvvmToolkit.Common`
`15`	`15`	`public abstract class MonoBehaviourView<TBindingContext> : MonoBehaviour, IBindableElement`
`16`	`16`	`where TBindingContext : class, IBindingContext`
`17`	`17`	`{`
`18`		`- private TBindingContext_createdBindingContext;`
	`18`	`+ private bool_isInitialized;`
`19`	`19`
`20`	`20`	`private TBindingContext _bindingContext;`
`21`	`21`	`private IObjectProvider _objectProvider;`
`22`	`22`
	`23`	`+ private TBindingContext _createdBindingContext;`
	`24`	`+`
	`25`	`+ protected virtual bool InitOnAwake => true;`
`23`	`26`	`public TBindingContext BindingContext => _bindingContext;`
`24`	`27`
`25`	`28`	`private void Awake()`
`26`	`29`	`{`
`27`		`- OnInit();`
`28`		`- SetBindingContext();`
	`30`	`+ if (InitOnAwake)`
	`31`	`+ {`
	`32`	`+ Init();`
	`33`	`+ }`
`29`	`34`	`}`
`30`	`35`
`31`	`36`	`private void OnDestroy()`
`@@ -34,6 +39,19 @@ private void OnDestroy()`
`34`	`39`	`OnDispose();`
`35`	`40`	`}`
`36`	`41`
	`42`	`+ protected void Init()`
	`43`	`+ {`
	`44`	`+ if (_isInitialized)`
	`45`	`+ {`
	`46`	`+ throw new InvalidOperationException($"{GetType().Name} already initialized.");`
	`47`	`+ }`
	`48`	`+`
	`49`	`+ OnInit();`
	`50`	`+ SetBindingContext();`
	`51`	`+`
	`52`	`+ _isInitialized = true;`
	`53`	`+ }`
	`54`	`+`
`37`	`55`	`public void SetBindingContext(IBindingContext context, IObjectProvider objectProvider)`
`38`	`56`	`{`
`39`	`57`	`if (_bindingContext is not null)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "com.chebanovdd.unitymvvmtoolkit",`
`3`	`3`	`"displayName": "Unity MVVM Toolkit",`
`4`	`4`	`"author": { "name": "ChebanovDD", "url": "https://github.com/ChebanovDD" },`
`5`		`- "version": "1.1.3",`
	`5`	`+ "version": "1.1.4",`
`6`	`6`	`"unity": "2018.4",`
`7`	`7`	`"description": "The Unity Mvvm Toolkit allows you to use data binding to establish a connection between the app UI and the data it displays. This is a simple and consistent way to achieve clean separation of business logic from UI.",`
`8`	`8`	`"keywords": [ "mvvm", "binding", "ui", "toolkit" ],`

Lines changed: 2 additions & 2 deletions

Lines changed: 2 additions & 2 deletions

Comments

(0)