-
-
Notifications
You must be signed in to change notification settings - Fork 30
New functionality and bug fixes. #37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
e5129a1
Minor changes.
ChebanovDD fa2e92e
Fix unbind issue.
ChebanovDD e3de756
Bindable dropdown (#31)
VasilevMaxim d6ea4a6
Merge branch 'develop' of https://github.com/LibraStack/UnityMvvmTool...
ChebanovDD 978fd29
Resolve #35. Fix ListView remove item issue.
ChebanovDD 21ba331
Resolve #36. Fix ScrollView clear collection issue.
ChebanovDD 6881246
Minor changes.
ChebanovDD d28a387
Fix Dropdown invalid states issue.
ChebanovDD a875635
Update readme file.
ChebanovDD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
...oolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/BindableElementData.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using UnityMvvmToolkit.Core.Interfaces; | ||
|
||
namespace UnityMvvmToolkit.Common | ||
{ | ||
public sealed class BindableElementData : IDisposable | ||
{ | ||
private readonly List<IBindableElement> _bindableElements; | ||
|
||
public BindableElementData(List<IBindableElement> bindableElements) | ||
{ | ||
_bindableElements = bindableElements; | ||
} | ||
|
||
public IBindingContext BindingContext { get; set; } | ||
public IReadOnlyList<IBindableElement> BindableElements => _bindableElements; | ||
|
||
public void Dispose() | ||
{ | ||
_bindableElements.Clear(); | ||
BindingContext = default; | ||
} | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
...t.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/BindableElementData.cs.meta
Oops, something went wrong.
127 changes: 127 additions & 0 deletions
...age/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableDropdown.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
#if UNITYMVVMTOOLKIT_TEXTMESHPRO_SUPPORT | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
using System.Collections.ObjectModel; | ||
using System.Collections.Specialized; | ||
using System.Linq; | ||
using System.Runtime.CompilerServices; | ||
using TMPro; | ||
using UnityEngine; | ||
using UnityMvvmToolkit.Core; | ||
using UnityMvvmToolkit.Core.Extensions; | ||
using UnityMvvmToolkit.Core.Interfaces; | ||
|
||
namespace UnityMvvmToolkit.UGUI.BindableUGUIElements | ||
{ | ||
[RequireComponent(typeof(TMP_Dropdown))] | ||
public class BindableDropdown : MonoBehaviour, IBindableElement | ||
{ | ||
[SerializeField] private TMP_Dropdown _dropdown; | ||
[SerializeField] private string _bindingSelectedItemPath; | ||
[SerializeField] private string _bindingItemsSourcePath; | ||
|
||
private IProperty<string> _selectedItemProperty; | ||
private IReadOnlyProperty<ObservableCollection<string>> _itemsSource; | ||
|
||
private PropertyBindingData _selectedItemBindingData; | ||
private PropertyBindingData _itemsSourceBindingData; | ||
|
||
public void SetBindingContext(IBindingContext context, IObjectProvider objectProvider) | ||
{ | ||
if (string.IsNullOrWhiteSpace(_bindingItemsSourcePath) == false) | ||
{ | ||
_itemsSourceBindingData ??= _bindingItemsSourcePath.ToPropertyBindingData(); | ||
_itemsSource = objectProvider | ||
.RentReadOnlyProperty<ObservableCollection<string>>(context, _itemsSourceBindingData); | ||
_itemsSource.Value.CollectionChanged += OnItemsCollectionChanged; | ||
_dropdown.options = new List<TMP_Dropdown.OptionData>(_itemsSource.Value.Select(value => new TMP_Dropdown.OptionData(value))); | ||
} | ||
|
||
if (string.IsNullOrWhiteSpace(_bindingSelectedItemPath) == false) | ||
{ | ||
_selectedItemBindingData ??= _bindingSelectedItemPath.ToPropertyBindingData(); | ||
_selectedItemProperty = objectProvider.RentProperty<string>(context, _selectedItemBindingData); | ||
_selectedItemProperty.ValueChanged += OnPropertySelectedItemChanged; | ||
|
||
var foundIndex = _dropdown.options.FindIndex(option => option.text == _selectedItemProperty.Value); | ||
if (foundIndex != -1) | ||
{ | ||
UpdateControlValue(foundIndex); | ||
} | ||
|
||
_dropdown.onValueChanged.AddListener(OnControlValueChanged); | ||
_selectedItemProperty.Value = _dropdown.options.Count > 0 ? _dropdown.options[0].text : default; | ||
} | ||
} | ||
|
||
private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) | ||
{ | ||
if (e.Action == NotifyCollectionChangedAction.Add) | ||
{ | ||
foreach (string newItem in e.NewItems) | ||
{ | ||
_dropdown.options.Add(new TMP_Dropdown.OptionData(newItem)); | ||
} | ||
} | ||
|
||
if (e.Action == NotifyCollectionChangedAction.Remove) | ||
{ | ||
foreach (string oldItem in e.OldItems) | ||
{ | ||
_dropdown.options.Remove(new TMP_Dropdown.OptionData(oldItem)); | ||
} | ||
} | ||
|
||
if (e.Action == NotifyCollectionChangedAction.Reset) | ||
{ | ||
_dropdown.options.Clear(); | ||
} | ||
} | ||
|
||
public virtual void ResetBindingContext(IObjectProvider objectProvider) | ||
{ | ||
if (_itemsSource != null) | ||
{ | ||
_itemsSource.Value.CollectionChanged -= OnItemsCollectionChanged; | ||
objectProvider.ReturnReadOnlyProperty(_itemsSource); | ||
_itemsSource = null; | ||
_dropdown.options = new List<TMP_Dropdown.OptionData>(); | ||
} | ||
|
||
if (_selectedItemProperty != null) | ||
{ | ||
_selectedItemProperty.ValueChanged -= OnPropertySelectedItemChanged; | ||
objectProvider.ReturnProperty(_selectedItemProperty); | ||
_selectedItemProperty = null; | ||
_dropdown.onValueChanged.RemoveListener(OnControlValueChanged); | ||
} | ||
|
||
UpdateControlValue(default); | ||
} | ||
|
||
protected virtual void OnControlValueChanged(int index) | ||
{ | ||
_selectedItemProperty.Value = _dropdown.options[index].text; | ||
} | ||
|
||
private void OnPropertySelectedItemChanged(object sender, string newValue) | ||
{ | ||
var foundIndex = _dropdown.options.FindIndex(option => option.text == newValue); | ||
if (foundIndex == -1) | ||
{ | ||
return; | ||
} | ||
|
||
UpdateControlValue(foundIndex); | ||
} | ||
|
||
[MethodImpl(MethodImplOptions.AggressiveInlining)] | ||
protected virtual void UpdateControlValue(int newValue) | ||
{ | ||
_dropdown.SetValueWithoutNotify(newValue); | ||
} | ||
} | ||
} | ||
|
||
#endif |
11 changes: 11 additions & 0 deletions
...ssets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableUGUIElements/BindableDropdown.cs.meta
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.