iOS: Built TinyIoC with older code because the PCL library has a bug …

…with TinyMessenger specific with iOS. Updated project after changes on other platforms. Related to issue #405.
ycastonguay · Sep 4, 2013 · 9798e63 · 9798e63
1 parent 2ac248a
commit 9798e63
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 18 deletions.
diff --git a/MPfm/MPfm.Core/Lib/iOS/TinyIoC.dll b/MPfm/MPfm.Core/Lib/iOS/TinyIoC.dll
diff --git a/MPfm/MPfm.Core/MPfm.Core.iOS.csproj b/MPfm/MPfm.Core/MPfm.Core.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -141,8 +141,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="TinyIoC">
+      <HintPath>Lib\iOS\TinyIoC.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Content Include="Lib\PCL\TinyIoC.dll" />
+    <Content Include="Lib\TinyIoC.dll" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Conversion.cs" />
     <Compile Include="Attributes\DatabaseFieldAttribute.cs" />
@@ -156,8 +163,12 @@
     <Compile Include="Helpers\XMLHelper.cs" />
     <Compile Include="Network\IPAddressRangeFinder.cs" />
     <Compile Include="Network\WebClientTimeout.cs" />
-    <Compile Include="TinyIoC\TinyIoC.cs" />
-    <Compile Include="TinyIoC\TinyMessenger.cs" />
     <Compile Include="XmlSerialization.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Lib\iOS\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Lib\iOS\TinyIoC.dll" />
+  </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Library/MPfm.Library.iOS.csproj b/MPfm/MPfm.Library/MPfm.Library.iOS.csproj
@@ -138,6 +138,9 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>Lib\iOS\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="TinyIoC.iOS">
+      <HintPath>..\MPfm.Core\Lib\iOS\TinyIoC.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />

diff --git a/MPfm/MPfm.Library/Services/AudioFileCacheService.cs b/MPfm/MPfm.Library/Services/AudioFileCacheService.cs
@@ -133,8 +133,13 @@ orderby GetPropertyValue(s, query.OrderBy)
         /// <returns>Value</returns>
         private static object GetPropertyValue(object obj, string property)
         {
+            #if WINDOWSSTORE
 		    var propertyInfo = obj.GetType().GetRuntimeProperty(property);
             return propertyInfo.GetValue(obj, null);
+            #else
+            var propertyInfo = obj.GetType().GetProperty(property);
+            return propertyInfo.GetValue(obj, null);
+            #endif
         }
 	}
 

diff --git a/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj b/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj
@@ -131,6 +131,9 @@
     <Reference Include="taglib-sharp">
       <HintPath>..\MPfm.Sound\Lib\iOS\taglib-sharp.dll</HintPath>
     </Reference>
+    <Reference Include="TinyIoC.iOS">
+      <HintPath>..\MPfm.Core\Lib\iOS\TinyIoC.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -308,5 +311,6 @@
     <Compile Include="Messages\PlayerPlaylistUpdatedMessage.cs" />
     <Compile Include="Views\IDesktopPreferencesView.cs" />
     <Compile Include="Views\IDesktopEffectsView.cs" />
+    <Compile Include="Messages\PlayerSetPositionMessage.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs
@@ -194,6 +194,7 @@ private void HandleFaderValueChanged(object sender, MPfmEqualizerFaderValueChang
 
         #region IEqualizerPresetDetailsView implementation
 
+        public Action<Guid> OnChangePreset { get; set; }
         public Action OnResetPreset { get; set; }
         public Action OnNormalizePreset { get; set; }
         public Action OnRevertPreset { get; set; }

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/MarkersViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/MarkersViewController.cs
@@ -143,6 +143,7 @@ public void RowSelected(UITableView tableView, NSIndexPath indexPath)
         public Action<MarkerTemplateNameType> OnAddMarker { get; set; }
         public Action<Marker> OnEditMarker { get; set; }
         public Action<Marker> OnSelectMarker { get; set; }
+        public Action<Marker> OnDeleteMarker { get; set; }
 
         public void MarkerError(Exception ex)
         {

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/MobileLibraryBrowserViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/MobileLibraryBrowserViewController.cs
@@ -452,7 +452,8 @@ private void ReloadImages()
         }
 
         #region IMobileLibraryBrowserView implementation
-
+
+        public Action<MobileLibraryBrowserType> OnChangeBrowserType { get; set; }
         public Action<int> OnItemClick { get; set; }
         public Action<int> OnDeleteItem { get; set; }
         public Action<string, string> OnRequestAlbumArt { get; set; }
@@ -547,7 +548,7 @@ public void RefreshAlbumArtCell(string artistName, string albumTitle, byte[] alb
             }, TaskScheduler.FromCurrentSynchronizationContext());
         }
 
-        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle, string navigationBarSubtitle, string breadcrumb, bool isPopBackstack)
+        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle, string navigationBarSubtitle, string breadcrumb, bool isPopBackstack, bool isBackstackEmpty)
         {
             InvokeOnMainThread(() => {
                 _items = entities.ToList();

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/PlayerMetadataViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/PlayerMetadataViewController.cs
@@ -58,7 +58,7 @@ public override void ViewDidLoad()
 
         partial void actionPlaylist(NSObject sender)
         {
-            OnClickPlaylist();
+            OnOpenPlaylist();
         }
 
         partial void actionRepeat(NSObject sender)
@@ -98,7 +98,7 @@ public void ShowPanel(bool show, bool swipeUp)
 
         #region IPlayerMetadataView implementation
 
-        public Action OnClickPlaylist { get; set; }
+        public Action OnOpenPlaylist { get; set; }
         public Action OnToggleShuffle { get; set; }
         public Action OnToggleRepeat { get; set; }
 

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/PlayerViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/PlayerViewController.cs
@@ -406,6 +406,10 @@ private void CreateHidePlayerMetadataTimer()
         public Action<float> OnPlayerSetPitchShifting { get; set; }
         public Action<float> OnPlayerSetTimeShifting { get; set; }
         public Action<float> OnPlayerSetPosition { get; set; }
+        public Action OnPlayerShuffle { get; set; }
+        public Action OnPlayerRepeat { get; set; }
+        public Action OnEditSongMetadata { get; set; }
+        public Action OnOpenPlaylist { get; set; }
         public Func<float, PlayerPositionEntity> OnPlayerRequestPosition { get; set; }
 
         public void RefreshPlayerPosition(PlayerPositionEntity entity)

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/PlaylistViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/PlaylistViewController.cs
@@ -25,6 +25,7 @@
 using MPfm.iOS.Classes.Controls;
 using MPfm.Sound.Playlists;
 using MPfm.Sound.AudioFiles;
+using System.Collections.Generic;
 
 namespace MPfm.iOS
 {
@@ -196,7 +197,7 @@ private void HandleShuffleTouchUpInside(object sender, EventArgs e)
 
         public Action<Guid, int> OnChangePlaylistItemOrder { get; set; }
         public Action<Guid> OnSelectPlaylistItem { get; set; }
-        public Action<Guid> OnRemovePlaylistItem { get; set; }
+        public Action<List<Guid>> OnRemovePlaylistItems { get; set; }
         public Action OnNewPlaylist { get; set; }
         public Action<string> OnLoadPlaylist { get; set; }
         public Action OnSavePlaylist { get; set; }

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/SyncMenuViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/SyncMenuViewController.cs
@@ -112,9 +112,9 @@ private void HandleLongPress(UILongPressGestureRecognizer gestureRecognizer)
             NSIndexPath indexPath = tableView.IndexPathForRowAtPoint(pt);
             if (indexPath != null)
             {
-                if(OnSelectItem != null)
+                if(OnSelectItems != null)
                 {
-                    OnSelectItem(_items[indexPath.Row]);
+                    OnSelectItems(new List<SyncMenuItemEntity>() { _items[indexPath.Row] });
                     RefreshCell(indexPath);
                 }
             }
@@ -193,7 +193,7 @@ private void HandleOnRightButtonTap(MPfmTableViewCell cell)
         {
             Console.WriteLine("SyncMenuViewController - HandleOnRightButtonTap");
             int row = cell.Tag;
-            OnSelectItem(_items[row]);
+            OnSelectItems(new List<SyncMenuItemEntity>() { _items[row] });
 
             tableView.BeginUpdates();
             tableView.ReloadRows(new NSIndexPath[1] { NSIndexPath.FromRowSection(row, 0) }, UITableViewRowAnimation.None);
@@ -206,13 +206,13 @@ public void RowSelected(UITableView tableView, NSIndexPath indexPath)
             switch(_items[indexPath.Row].ItemType)
             {
                 case SyncMenuItemEntityType.Artist:
-                    OnExpandItem(_items[indexPath.Row]);
+                    OnExpandItem(_items[indexPath.Row], null);
                     break;
                 case SyncMenuItemEntityType.Album:
-                    OnExpandItem(_items[indexPath.Row]);
+                    OnExpandItem(_items[indexPath.Row], null);
                     break;
                 case SyncMenuItemEntityType.Song:
-                    OnSelectItem(_items[indexPath.Row]);
+                    OnSelectItems(new List<SyncMenuItemEntity>() { _items[indexPath.Row] });
                     RefreshCell(indexPath);
                     break;
             }
@@ -227,10 +227,13 @@ private void RefreshCell(NSIndexPath indexPath)
 
         #region ISyncMenuView implementation
 
-        public Action<SyncMenuItemEntity> OnExpandItem { get; set; }
-        public Action<SyncMenuItemEntity> OnSelectItem { get; set; }
+        public Action<SyncMenuItemEntity, object> OnExpandItem { get; set; }
+        public Action<List<SyncMenuItemEntity>> OnSelectItems { get; set; }
         public Action OnSync { get; set; }
         public Action OnSelectButtonClick { get; set; }
+        public Action<List<AudioFile>> OnRemoveItems { get; set; }
+        public Action OnSelectAll { get; set; }
+        public Action OnRemoveAll { get; set; }
 
         public void SyncMenuError(Exception ex)
         {
@@ -300,7 +303,7 @@ public void RefreshSyncTotal(string title, string subtitle, bool enoughFreeSpace
             });
         }
 
-        public void InsertItems(int index, List<SyncMenuItemEntity> items)
+        public void InsertItems(int index, SyncMenuItemEntity parentItem, List<SyncMenuItemEntity> items, object userData)
         {
             InvokeOnMainThread(() => {
                 _items.InsertRange(index, items);
@@ -313,7 +316,7 @@ public void InsertItems(int index, List<SyncMenuItemEntity> items)
             });
         }
 
-        public void RemoveItems(int index, int count)
+        public void RemoveItems(int index, int count, object userData)
         {
             InvokeOnMainThread(() => {
                 _items.RemoveRange(index, count);
@@ -326,6 +329,12 @@ public void RemoveItems(int index, int count)
             });
         }
 
+        public void RefreshSelection(List<AudioFile> audioFiles)
+        {
+            // Not used on mobile devices.
+        }
+
         #endregion
+
     }
 }
diff --git a/MPfm/MPfm.iOS/Classes/Controllers/UpdateLibraryViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/UpdateLibraryViewController.cs
@@ -75,6 +75,7 @@ public override void ViewDidAppear(bool animated)
         #region IUpdateLibraryView implementation
 
         public Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
+        public Action<string> OnSaveLog { get; set; }
         public Action OnCancelUpdateLibrary { get; set; }
 
         public void RefreshStatus(UpdateLibraryEntity entity)

diff --git a/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs b/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs
@@ -30,6 +30,7 @@
 using MPfm.iOS.Classes.Navigation;
 using MPfm.iOS.Classes.Objects;
 using MPfm.iOS.Helpers;
+using TinyMessenger;
 
 namespace MPfm.iOS.Classes.Delegates
 {
@@ -58,6 +59,7 @@ public partial class AppDelegate : UIApplicationDelegate
 		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 		{
             TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer();
+            var messenger = container.Resolve<ITinyMessengerHub>();
             RegisterViews();
 
             UINavigationBar.Appearance.SetBackgroundImage(new UIImage(), UIBarMetrics.Default);

diff --git a/MPfm/MPfm.iOS/MPfm.iOS.csproj b/MPfm/MPfm.iOS/MPfm.iOS.csproj
@@ -107,6 +107,9 @@
     <Reference Include="taglib-sharp">
       <HintPath>Lib\taglib-sharp.dll</HintPath>
     </Reference>
+    <Reference Include="TinyIoC.iOS">
+      <HintPath>..\MPfm.Core\Lib\iOS\TinyIoC.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />