Merge pull request #25 from Softeq/fixes-with-whitelabel

Fixes with whitelabel
Softeq · Dec 14, 2018 · b9744c9 · b9744c9
2 parents fab5859 + fc4ce50
commit b9744c9
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 35 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 = 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
@@ -56,7 +56,7 @@ protected override void OnCreate(Bundle savedInstanceState)
             _navigationBarView = FindViewById<NavigationBarView>(Resource.Id.activity_chat_details_navigation_bar);
             _navigationBarView.SetLeftButton(StyleHelper.Style.NavigationBarBackButtonIcon, ViewModel.BackCommand);
             _navigationBarView.SetTitle(ViewModel.LocalizedStrings.DetailsTitle);
-            _navigationBarView.SetRightButton(ViewModel.LocalizedStrings.Save, new RelayCommand(() => OnSaveClick()));
+            _navigationBarView.SetRightButton(ViewModel.LocalizedStrings.Save, new RelayCommand(OnSaveClick));
 
             _chatPhotoImageView = FindViewById<MvxCachedImageView>(Resource.Id.iv_chat_photo);
 
@@ -77,8 +77,8 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             // TODO YP: remove ServiceLocator
             _imagePicker = new ImagePicker(
-                ServiceLocator.Resolve<IPermissionsManager>(),
-                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
@@ -1,7 +1,7 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Android.App;
@@ -101,7 +101,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                 ScrollToPosition(_conversationsRecyclerView.GetAdapter().ItemCount - 1);
             }));
 
-            _imagePicker = new ImagePicker(ServiceLocator.Resolve<IPermissionsManager>(), 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);
@@ -148,7 +148,6 @@ protected override void OnDestroy()
         {
             _conversationsRecyclerView.GetAdapter().Dispose();
             _conversationsRecyclerView.ClearOnScrollListeners();
-            // TODO: remove onTouchListener
 
             base.OnDestroy();
         }

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(ServiceLocator.Resolve<IPermissionsManager>(), 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 = 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, 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/ChatMessagesViewController.cs b/Softeq.XToolkit.Chat.iOS/ViewControllers/ChatMessagesViewController.cs
@@ -345,20 +345,4 @@ public void Scrolled(UIScrollView scrollView)
             }
         }
     }
-
-    public class LinksDelegate : ASTextNodeDelegate
-    {
-        public override void TappedLinkAttribute(ASTextNode textNode, string attribute, NSObject value, CGPoint point,
-            NSRange textRange)
-        {
-            var launcherService = ServiceLocator.Resolve<ILauncherService>();
-            launcherService.OpenUrl(((NSUrl)value).AbsoluteString);
-        }
-
-        public override bool ShouldHighlightLinkAttribute(ASTextNode textNode, string attribute, NSObject value,
-            CGPoint point)
-        {
-            return true;
-        }
-    }
 }
diff --git a/Softeq.XToolkit.Chat.iOS/ViewControllers/ChatsListViewController.cs b/Softeq.XToolkit.Chat.iOS/ViewControllers/ChatsListViewController.cs
@@ -26,12 +26,6 @@ public ChatsListViewController(IntPtr handle) : base(handle) { }
 
         public override void ViewDidLoad()
         {
-            if (ViewModel == null)
-            {
-                var viewModel = ServiceLocator.Resolve<ChatsListViewModel>();
-                SetExistingViewModel(viewModel);
-            }
-
             base.ViewDidLoad();
 
             // Setup brand color for NavigationBar buttons

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, 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, 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 = ServiceLocator.Resolve<IViewModelFactoryService>();
+            var viewModelFactoryService = Dependencies.IocContainer.Resolve<IViewModelFactoryService>();
 
             var col1 = new ObservableRangeCollection<ChatMessageViewModel>
             {