renamed

Softeq · Dec 11, 2018 · fc4ce50 · fc4ce50
1 parent 3f3c5d1
commit fc4ce50
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Softeq.XToolkit.Chat.Droid/StyleHelper.cs b/Softeq.XToolkit.Chat.Droid/StyleHelper.cs
@@ -9,7 +9,7 @@ namespace Softeq.XToolkit.Chat.Droid
 {
     internal static class StyleHelper
     {
-        private static readonly Lazy<IChatDroidStyle> StyleLazy = Dependencies.ServiceLocator.LazyResolve<IChatDroidStyle>();
+        private static readonly Lazy<IChatDroidStyle> StyleLazy = Dependencies.IocContainer.LazyResolve<IChatDroidStyle>();
 
         public static IChatDroidStyle Style => StyleLazy.Value;
     }

diff --git a/Softeq.XToolkit.Chat.Droid/Views/ChatDetailsActivity.cs b/Softeq.XToolkit.Chat.Droid/Views/ChatDetailsActivity.cs
@@ -77,8 +77,8 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             // TODO YP: remove ServiceLocator
             _imagePicker = new ImagePicker(
-                Dependencies.ServiceLocator.Resolve<IPermissionsManager>(),
-                Dependencies.ServiceLocator.Resolve<IImagePickerService>())
+                Dependencies.IocContainer.Resolve<IPermissionsManager>(),
+                Dependencies.IocContainer.Resolve<IImagePickerService>())
             {
                 MaxImageWidth = 300
             };

diff --git a/Softeq.XToolkit.Chat.Droid/Views/ChatMessagesActivity.cs b/Softeq.XToolkit.Chat.Droid/Views/ChatMessagesActivity.cs
@@ -101,7 +101,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                 ScrollToPosition(_conversationsRecyclerView.GetAdapter().ItemCount - 1);
             }));
 
-            _imagePicker = new ImagePicker(Dependencies.PermissionsManager, Dependencies.ServiceLocator.Resolve<IImagePickerService>());
+            _imagePicker = new ImagePicker(Dependencies.PermissionsManager, Dependencies.IocContainer.Resolve<IImagePickerService>());
 
             _editImageContainer = FindViewById<View>(Resource.Id.activity_chat_conversations_image_preview_container);
             _imagePreview = FindViewById<ImageViewAsync>(Resource.Id.activity_chat_conversations_preview_image);

diff --git a/Softeq.XToolkit.Chat.Droid/Views/SelectContactsActivity.cs b/Softeq.XToolkit.Chat.Droid/Views/SelectContactsActivity.cs
@@ -72,7 +72,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             InitializeContactsRecyclerView();
 
-            _imagePicker = new ImagePicker(Dependencies.PermissionsManager, Dependencies.ServiceLocator.Resolve<IImagePickerService>())
+            _imagePicker = new ImagePicker(Dependencies.PermissionsManager, Dependencies.IocContainer.Resolve<IImagePickerService>())
             {
                 MaxImageWidth = 300
             };

diff --git a/Softeq.XToolkit.Chat.iOS/StyleHelper.cs b/Softeq.XToolkit.Chat.iOS/StyleHelper.cs
@@ -10,7 +10,7 @@ namespace Softeq.XToolkit.Chat.iOS
 {
     internal static class StyleHelper
     {
-        private static readonly Lazy<IChatIosStyle> StyleLazy = Dependencies.ServiceLocator.LazyResolve<IChatIosStyle>();
+        private static readonly Lazy<IChatIosStyle> StyleLazy = Dependencies.IocContainer.LazyResolve<IChatIosStyle>();
 
         public static IChatIosStyle Style => StyleLazy.Value;
     }

diff --git a/Softeq.XToolkit.Chat.iOS/ViewControllers/ChatDetailsViewController.cs b/Softeq.XToolkit.Chat.iOS/ViewControllers/ChatDetailsViewController.cs
@@ -59,7 +59,7 @@ public override void ViewDidLoad()
 
             _sourceRef = WeakReferenceEx.Create(source);
 
-            _simpleImagePicker = new SimpleImagePicker(this, Dependencies.ServiceLocator.Resolve<IPermissionsManager>(), false)
+            _simpleImagePicker = new SimpleImagePicker(this, Dependencies.IocContainer.Resolve<IPermissionsManager>(), false)
             {
                 MaxImageWidth = 280,
                 MaxImageHeight = 280

diff --git a/Softeq.XToolkit.Chat.iOS/ViewControllers/SelectContactsViewController.cs b/Softeq.XToolkit.Chat.iOS/ViewControllers/SelectContactsViewController.cs
@@ -48,7 +48,7 @@ public override void ViewDidLoad()
                 _chatDetailsHeaderView.ChatNameField.ResignFirstResponder();
             }));
 
-            _simpleImagePicker = new SimpleImagePicker(this, Dependencies.ServiceLocator.Resolve<IPermissionsManager>(), false)
+            _simpleImagePicker = new SimpleImagePicker(this, Dependencies.IocContainer.Resolve<IPermissionsManager>(), false)
             {
                 MaxImageWidth = 280,
                 MaxImageHeight = 280,

diff --git a/Softeq.XToolkit.Chat.iOS/Views/ChatMessagesInputBarView.cs b/Softeq.XToolkit.Chat.iOS/Views/ChatMessagesInputBarView.cs
@@ -121,7 +121,7 @@ public void ViewDidLoad(UIViewController viewController)
             EditImageContainer.Hidden = true;
             EditImageContainerHeightConstraint.Constant = 0;
 
-            _simpleImagePicker = new SimpleImagePicker(viewController, Dependencies.ServiceLocator.Resolve<IPermissionsManager>(), false);
+            _simpleImagePicker = new SimpleImagePicker(viewController, Dependencies.IocContainer.Resolve<IPermissionsManager>(), false);
             _attachedImageBinding = this.SetBinding(() => _simpleImagePicker.ViewModel.ImageCacheKey).WhenSourceChanges(() => 
             {
                 if (string.IsNullOrEmpty(_simpleImagePicker.ViewModel.ImageCacheKey))

diff --git a/Softeq.XToolkit.Chat/Manager/ChatManagerCacheTests.cs b/Softeq.XToolkit.Chat/Manager/ChatManagerCacheTests.cs
@@ -16,7 +16,7 @@ public static class ChatManagerCacheTests
     {
         public static void UpdateCollectionTest()
         {
-            var viewModelFactoryService = Dependencies.ServiceLocator.Resolve<IViewModelFactoryService>();
+            var viewModelFactoryService = Dependencies.IocContainer.Resolve<IViewModelFactoryService>();
 
             var col1 = new ObservableRangeCollection<ChatMessageViewModel>
             {