From 9d9df76f4e123d2c57751df0a3d2908e767ff9a4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 1 Jun 2022 11:29:22 -0400 Subject: [PATCH] refactor: Clean up KeyedTemplateSelector * Use new lang feats * Run formatter * Split up classes into separate files * Move into Controller dir (per the MVCVM paradigm) --- .../spark/Controller/ITemplateSelectorKey.cs | 6 +++ .../spark/Controller/KeyedTemplateSelector.cs | 41 +++++++++++++++++++ .../Controller/TemplateSelectorKeyValue.cs | 11 +++++ .../view/Utility/KeyedTemplateSelector.cs | 37 ----------------- 4 files changed, 58 insertions(+), 37 deletions(-) create mode 100644 src/client/spark/Controller/ITemplateSelectorKey.cs create mode 100644 src/client/spark/Controller/KeyedTemplateSelector.cs create mode 100644 src/client/spark/Controller/TemplateSelectorKeyValue.cs delete mode 100644 src/client/spark/view/Utility/KeyedTemplateSelector.cs diff --git a/src/client/spark/Controller/ITemplateSelectorKey.cs b/src/client/spark/Controller/ITemplateSelectorKey.cs new file mode 100644 index 000000000..710cc789f --- /dev/null +++ b/src/client/spark/Controller/ITemplateSelectorKey.cs @@ -0,0 +1,6 @@ +#nullable enable +namespace mbts.ui { + interface ITemplateSelectorKey { + string key { get; } + } +} diff --git a/src/client/spark/Controller/KeyedTemplateSelector.cs b/src/client/spark/Controller/KeyedTemplateSelector.cs new file mode 100644 index 000000000..f29f9f78b --- /dev/null +++ b/src/client/spark/Controller/KeyedTemplateSelector.cs @@ -0,0 +1,41 @@ +#nullable enable +namespace mbts.ui { + using bts.collections; + + using System.Collections; + using System.Windows; + using System.Windows.Controls; + using System.Windows.Markup; + + [ContentProperty(nameof(Map))] + class KeyedTemplateSelector : DataTemplateSelector { + readonly KeyedCollection _map = new(kv => kv.Key); + + public IList Map => _map; + public DataTemplate? Default { get; set; } + public bool TryMatchType { get; set; } + + public override DataTemplate? SelectTemplate(object? item, DependencyObject container) { + if (item is null) { + return Default; + } + var k = _get_key(item); + return k is not null && _map.TryGetValue(k, out var result) ? + result.Value : Default; + } + + object? _get_key(object? item) { + if (item is null) { + return null; + } + var key = item; + if (key is ITemplateSelectorKey tsk) { + key = tsk.key; + } + if (key is null && TryMatchType) { + key = item.GetType(); + } + return key; + } + } +} diff --git a/src/client/spark/Controller/TemplateSelectorKeyValue.cs b/src/client/spark/Controller/TemplateSelectorKeyValue.cs new file mode 100644 index 000000000..5f6ea35f6 --- /dev/null +++ b/src/client/spark/Controller/TemplateSelectorKeyValue.cs @@ -0,0 +1,11 @@ +#nullable enable +namespace mbts.ui { + using System.Windows; + using System.Windows.Markup; + + [ContentProperty(nameof(Value))] + class TemplateSelectorKeyValue { + public object? Key { get; set; } + public DataTemplate? Value { get; set; } + } +} diff --git a/src/client/spark/view/Utility/KeyedTemplateSelector.cs b/src/client/spark/view/Utility/KeyedTemplateSelector.cs deleted file mode 100644 index c48f92973..000000000 --- a/src/client/spark/view/Utility/KeyedTemplateSelector.cs +++ /dev/null @@ -1,37 +0,0 @@ -using bts.collections; - -using System.Collections; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Markup; - -namespace mbts.ui { - interface ITemplateSelectorKey { - string key { get; } - } - - [ContentProperty(nameof(Map))] - class KeyedTemplateSelector : DataTemplateSelector { - KeyedCollection _c = new KeyedCollection(kv => kv.Key); - - public IList Map => _c; - public DataTemplate Default { get; set; } - public bool TryMatchType { get; set; } - - public override DataTemplate SelectTemplate(object item, DependencyObject container) { - if (item != null && - ((item is ITemplateSelectorKey k && k.key != null && _c.TryGetValue(k.key, out var result)) || - (TryMatchType && _c.TryGetValue(item.GetType(), out result)))) { - // - return result.Value; - } - return Default; - } - } - - [ContentProperty(nameof(Value))] - class TemplateSelectorKeyValue { - public object Key { get; set; } - public DataTemplate Value { get; set; } - } -}