Container logics improved and localization tests

Hypocrite.Avalonia/Container/LightContainerExtension.cs

@@ -11,7 +11,7 @@ namespace Hypocrite.Container
 {
  public class LightContainerExtension : IContainerExtension<ILightContainer>, IContainerInfo
  {
- private AbdrakovScopedProvider _currentScope;
+ private LightScopedProvider _currentScope;
 
  /// <summary>
  /// The instance of the wrapped container
@@ -197,13 +197,13 @@ public object Resolve(Type type, string name, params (Type Type, object Instance
  protected IScopedProvider CreateScopeInternal()
  {
  var child = Instance;
- _currentScope = new AbdrakovScopedProvider(child);
+ _currentScope = new LightScopedProvider(child);
  return _currentScope;
  }
 
- private class AbdrakovScopedProvider : IScopedProvider
+ private class LightScopedProvider : IScopedProvider
  {
- public AbdrakovScopedProvider(ILightContainer container)
+ public LightScopedProvider(ILightContainer container)
  {
  Container = container;
  }

Hypocrite.Avalonia/MVVM/ViewModelBase.cs

@@ -7,7 +7,7 @@
 
 namespace Hypocrite.Mvvm
 {
- public class ViewModelBase : EngineViewModelBase, INavigationAware, IRequireInjection
+ public class ViewModelBase : EngineViewModelBase, INavigationAware
  {
  public ViewModelBase()
  {

Hypocrite.Core/Container/Extensions/ContainerRegistrationExtensions.cs

@@ -8,14 +8,19 @@ public static class ContainerRegistrationExtensions
  {
  public static object GetInstance(this IContainerRegistration registration, ILightContainer container, bool withInjections = true)
  {
+ // this is for cached Type instances
+ if (registration.Instance != null && registration.RegistrationType == RegistrationType.Type)
+ {
+ return registration.Instance;
+ }
+
  if (registration.Instance != null && registration.RegistrationType == RegistrationType.Instance)
  {
  // all the injections should be resolved in the instance on its first resolve
  if (container.InstanceCreator.RequiresInjections(registration.Instance) && withInjections)
  {
  container.InstanceCreator.ResolveInjections(registration.Instance, container);
  }
- if (registration.Instance is IRequireInjection reqInj2) reqInj2.OnResolveReady(); // callback
  return registration.Instance;
  }
 
@@ -24,7 +29,6 @@ public static object GetInstance(this IContainerRegistration registration, ILigh
  {
  registration.Instance = instance;
  }
- if (instance is IRequireInjection reqInj) reqInj.OnResolveReady(); // callback
  return instance;
  }
 

Hypocrite.Core/Container/Interfaces/ILightContainer.cs

@@ -23,6 +23,6 @@ public interface ILightContainer : IDisposable
  object Resolve(Type type);
  object Resolve(Type type, bool withInjections);
  object Resolve(Type type, string name, bool withInjections);
- void ResolveInjections(Type type);
+ void ResolveInjections(object instance);
  }
 }

Hypocrite.Core/Container/LightContainer.cs

@@ -151,24 +151,11 @@ public object Resolve(Type type, string name, bool withInjections)
  return null;
  }
 
- public void ResolveInjections(Type type)
+ public void ResolveInjections(object instance)
  {
- if (IsRegistered(type, out IContainerRegistration registration))
+ if (InstanceCreator.RequiresInjections(instance))
  {
- switch (registration.RegistrationType)
- {
- case RegistrationType.Type:
- case RegistrationType.Instance:
- {
- registration.GetInstance(this, true);
- break;
- }
- case RegistrationType.Func:
- {
- registration.GetFunc();
- break;
- }
- }
+ InstanceCreator.ResolveInjections(instance, this);
  }
  }
 

Hypocrite.Core/Container/Registration/DefaultInstanceCreator.cs

@@ -29,8 +29,20 @@ public object CreateInstance(IContainerRegistration registration, ILightContaine
  }
 
  var instance = constructor?.Invoke(constructorParams.ToArray());
+ if (registration.RegistrationType == RegistrationType.Type)
+ {
+ // save the instance as cache
+ registration.Instance = instance;
+ }
+
  if (withInjections && RequiresInjections(instance))
  ResolveInjections(instance, container);
+
+ if (registration.RegistrationType == RegistrationType.Type)
+ {
+ // remove the cached instance
+ registration.Instance = null;
+ }
  return instance;
  }
 
@@ -48,7 +60,7 @@ public void ResolveInjections(object instance, ILightContainer container, Type t
  continue;
  var dep = container.Resolve(f.FieldType, false);
  f.SetValue(instance, dep);
- container.ResolveInjections(f.FieldType);
+ container.ResolveInjections(dep);
  }
  }
  // properties
@@ -62,20 +74,14 @@ public void ResolveInjections(object instance, ILightContainer container, Type t
  continue;
  var dep = container.Resolve(p.PropertyType, false);
  p.SetValue(instance, dep, null);
- container.ResolveInjections(p.PropertyType);
+ container.ResolveInjections(dep);
  }
  }
 
  if (type.BaseType != null)
  {
  ResolveInjections(instance, container, type.BaseType);
  }
-
- // callback
- if (instance is IRequireInjection reqInj)
- {
- reqInj.OnInjectionsReady();
- }
  }
 
  public bool RequiresInjections(object instance, Type type = null)

Hypocrite.Core/Container/Registration/RegistrationType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hypocrite.Core.Container.Registration
+namespace Hypocrite.Core.Container.Registration
 {
  public enum RegistrationType : byte
  {

Hypocrite.Wpf/Container/LightContainerExtension.cs

@@ -6,11 +6,11 @@
 using Prism.Ioc.Internals;
 using Hypocrite.Core.Container;
 
-namespace Hypocrite.Container.PrismAdapter
+namespace Hypocrite.Container
 {
  public class LightContainerExtension : IContainerExtension<ILightContainer>, IContainerInfo
  {
- private AbdrakovScopedProvider _currentScope;
+ private LightScopedProvider _currentScope;
 
  /// <summary>
  /// The instance of the wrapped container
@@ -196,13 +196,13 @@ public object Resolve(Type type, string name, params (Type Type, object Instance
  protected IScopedProvider CreateScopeInternal()
  {
  var child = Instance;
- _currentScope = new AbdrakovScopedProvider(child);
+ _currentScope = new LightScopedProvider(child);
  return _currentScope;
  }
 
- private class AbdrakovScopedProvider : IScopedProvider
+ private class LightScopedProvider : IScopedProvider
  {
- public AbdrakovScopedProvider(ILightContainer container)
+ public LightScopedProvider(ILightContainer container)
  {
  Container = container;
  }

Hypocrite.Wpf/Localization/LocalizationChangedExpression.cs

@@ -0,0 +1,20 @@
+using System.Windows;
+
+namespace Hypocrite.Localization
+{
+ public class LocalizationChangedExpression
+ {
+ /// <summary>
+ /// Constructor for ResourceReferenceExpression
+ /// </summary>
+ /// <param name="resourceKey">
+ /// Name of the resource being referenced
+ /// </param>
+ public LocalizationChangedExpression(object resourceKey)
+ {
+ _resourceKey = resourceKey;
+ }
+
+ private object _resourceKey; // Name of the resource being referenced by this expression
+ }
+}

Hypocrite.Wpf/Localization/LocalizedResourceTestExtension.cs

@@ -0,0 +1,90 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Markup;
+
+namespace Hypocrite.Localization
+{
+ [MarkupExtensionReturnType(typeof(object))]
+ public class LocalizedResourceTestExtension : MarkupExtension, INotifyPropertyChanged
+ {
+ /// <summary>
+ /// Holds the Binding to get the key
+ /// </summary>
+ private Binding _binding;
+ /// <summary>
+ /// Holds the Key to a .resx object
+ /// </summary>
+ private string _key;
+ /// <summary>
+ /// Gets or sets the Key to a .resx object
+ /// </summary>
+ public string Key
+ {
+ get => _key;
+ set
+ {
+ if (_key != value)
+ {
+ _key = value;
+ OnNotifyPropertyChanged(nameof(Key));
+ }
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the initialize value.
+ /// This is ONLY used to support the localize extension in blend!
+ /// </summary>
+ /// <value>The initialize value.</value>
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ [ConstructorArgument("key")]
+ public object InitializeValue { get; set; }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ /// <summary>
+ /// Constructor that takes no parameters
+ /// </summary>
+ public LocalizedResourceTestExtension()
+ {
+ }
+
+ /// <summary>
+ /// Constructor that takes the resource key that this is a static reference to.
+ /// </summary>
+ public LocalizedResourceTestExtension(
+ object key)
+ {
+ if (key is Binding binding)
+ _binding = binding;
+ else
+ Key = key?.ToString();
+ }
+
+
+ /// <summary>
+ /// Return an object that should be set on the targetObject's targetProperty
+ /// for this markup extension. For DynamicResourceExtension, this is the object found in
+ /// a resource dictionary in the current parent chain that is keyed by ResourceKey
+ /// </summary>
+ /// <returns>
+ /// The object to set on this property.
+ /// </returns>
+ public override object ProvideValue(IServiceProvider serviceProvider)
+ {
+ if (Key == null)
+ {
+ throw new InvalidOperationException();
+ }
+
+ return null;
+ }
+
+ internal void OnNotifyPropertyChanged(string property)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+ }
+ }
+}

Hypocrite.Wpf/MVVM/ApplicationBase.cs

@@ -12,7 +12,7 @@
 using Prism.Mvvm;
 using System.Windows;
 using Prism;
-using Hypocrite.Container.PrismAdapter;
+using Hypocrite.Container;
 
 namespace Hypocrite.Mvvm
 {

Hypocrite.Wpf/MVVM/ViewModelBase.cs

@@ -7,7 +7,7 @@
 
 namespace Hypocrite.Mvvm
 {
- public class ViewModelBase : EngineViewModelBase, INavigationAware, IRequireInjection
+ public class ViewModelBase : EngineViewModelBase, INavigationAware
  {
  public ViewModelBase() 
  {