iOS: Updated project after changes on other platforms.

Related to issue #405.
ycastonguay · Sep 17, 2013 · 95101fc · 95101fc
1 parent 56d6155
commit 95101fc
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 21 deletions.
diff --git a/MPfm/MPfm.Core/MPfm.Core.csproj b/MPfm/MPfm.Core/MPfm.Core.csproj
@@ -94,6 +94,7 @@
   <ItemGroup>
     <Compile Include="Conversion.cs" />
     <Compile Include="Attributes\DatabaseFieldAttribute.cs" />
+    <Compile Include="DatabaseFieldMap.cs" />
     <Compile Include="Extensions\DictionaryExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tracing.cs" />
@@ -103,9 +104,7 @@
     <Compile Include="Normalizer.cs" />
     <Compile Include="Helpers\XMLHelper.cs" />
     <Compile Include="Network\IPAddressRangeFinder.cs" />
-    <Compile Include="Network\WebClientTimeout.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Network\WebClientTimeout.cs" />
     <Compile Include="XmlSerialization.cs" />
   </ItemGroup>
 </Project>
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>
@@ -150,9 +150,16 @@
     <Content Include="Lib\PCL\TinyIoC.dll" />
     <Content Include="Lib\TinyIoC.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Lib\iOS\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Lib\iOS\TinyIoC.dll" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Conversion.cs" />
     <Compile Include="Attributes\DatabaseFieldAttribute.cs" />
+    <Compile Include="DatabaseFieldMap.cs" />
     <Compile Include="Extensions\DictionaryExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tracing.cs" />
@@ -165,10 +172,4 @@
     <Compile Include="Network\WebClientTimeout.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.csproj b/MPfm/MPfm.Library/MPfm.Library.csproj
@@ -146,7 +146,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup />
   <ItemGroup>
     <None Include="Lib\Newtonsoft.Json.dll" />
   </ItemGroup>
@@ -155,6 +154,7 @@
     <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
+    <Compile Include="Objects\PlaylistAudioFile.cs" />
     <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />

diff --git a/MPfm/MPfm.Library/MPfm.Library.iOS.csproj b/MPfm/MPfm.Library/MPfm.Library.iOS.csproj
@@ -138,7 +138,7 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>Lib\iOS\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="TinyIoC.iOS">
+    <Reference Include="TinyIoC">
       <HintPath>..\MPfm.Core\Lib\iOS\TinyIoC.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -209,14 +209,13 @@
     <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
     <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
     <Compile Include="Database\DatabaseFacade.cs" />
-    <Compile Include="ILibrary.cs" />
+    <Compile Include="Objects\PlaylistAudioFile.cs" />
     <Compile Include="Objects\NetworkState.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />
     <Compile Include="Objects\Setting.cs" />
     <Compile Include="Database\SQLiteGateway.cs" />
     <Compile Include="Objects\Folder.cs" />
-    <Compile Include="Library.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UpdateLibrary\UpdateLibraryProgressDataSong.cs" />
     <Compile Include="UpdateLibrary\UpdateLibraryFinishedData.cs" />

diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -112,10 +112,19 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
-    <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
+    <Compile Include="Messages\ApplicationCloseMessage.cs" />
+    <Compile Include="Messages\ActivateLockScreenMessage.cs" />
+    <Compile Include="Messages\PlaylistUpdatedMessage.cs" />
+    <Compile Include="Messages\PlaylistListUpdatedMessage.cs" />
     <Compile Include="Messages\PlayerSetPositionMessage.cs" />
+    <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
+    <Compile Include="Models\PlaylistEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
+    <Compile Include="Presenters\AddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IAddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\ISelectPlaylistPresenter.cs" />
+    <Compile Include="Presenters\SelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\MobileFirstRunPresenter.cs" />
     <Compile Include="Presenters\DesktopFirstRunPresenter.cs" />
     <Compile Include="Presenters\EditSongMetadataPresenter.cs" />
@@ -131,6 +140,8 @@
     <Compile Include="Presenters\Interfaces\IAudioPreferencesPresenter.cs" />
     <Compile Include="Presenters\UpdateLibraryPresenter.cs" />
     <Compile Include="Models\PlayerPositionEntity.cs" />
+    <Compile Include="Views\IAddNewPlaylistView.cs" />
+    <Compile Include="Views\ISelectPlaylistView.cs" />
     <Compile Include="Views\IMobileFirstRunView.cs" />
     <Compile Include="Views\IDesktopFirstRunView.cs" />
     <Compile Include="Views\IEditSongMetadataView.cs" />

diff --git a/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj b/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj
@@ -179,9 +179,19 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
+    <Compile Include="Messages\ApplicationCloseMessage.cs" />
+    <Compile Include="Messages\ActivateLockScreenMessage.cs" />
+    <Compile Include="Messages\PlaylistUpdatedMessage.cs" />
+    <Compile Include="Messages\PlaylistListUpdatedMessage.cs" />
+    <Compile Include="Messages\PlayerSetPositionMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
+    <Compile Include="Models\PlaylistEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
+    <Compile Include="Presenters\AddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IAddNewPlaylistPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\ISelectPlaylistPresenter.cs" />
+    <Compile Include="Presenters\SelectPlaylistPresenter.cs" />
     <Compile Include="Presenters\MobileFirstRunPresenter.cs" />
     <Compile Include="Presenters\DesktopFirstRunPresenter.cs" />
     <Compile Include="Presenters\EditSongMetadataPresenter.cs" />
@@ -197,6 +207,8 @@
     <Compile Include="Presenters\Interfaces\IAudioPreferencesPresenter.cs" />
     <Compile Include="Presenters\UpdateLibraryPresenter.cs" />
     <Compile Include="Models\PlayerPositionEntity.cs" />
+    <Compile Include="Views\IAddNewPlaylistView.cs" />
+    <Compile Include="Views\ISelectPlaylistView.cs" />
     <Compile Include="Views\IMobileFirstRunView.cs" />
     <Compile Include="Views\IDesktopFirstRunView.cs" />
     <Compile Include="Views\IEditSongMetadataView.cs" />
@@ -311,6 +323,5 @@
     <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.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -95,8 +95,8 @@ public abstract class MobileNavigationManager
         private IGeneralPreferencesPresenter _generalPreferencesPresenter;
         private ILibraryPreferencesPresenter _libraryPreferencesPresenter;
 
-        //protected IEqualizerPresetsView EqualizerPresetsView { get { return _equalizerPresetsView; } }
-        //protected IPlayerView PlayerView { get { return _playerView; } }
+        protected IEqualizerPresetsView EqualizerPresetsView { get { return _equalizerPresetsView; } }
+        protected IPlayerView PlayerView { get { return _playerView; } }
 
         private Dictionary<Tuple<MobileNavigationTabType, MobileLibraryBrowserType>, Tuple<IMobileLibraryBrowserView, IMobileLibraryBrowserPresenter>> _mobileLibraryBrowserList = new Dictionary<Tuple<MobileNavigationTabType, MobileLibraryBrowserType>, Tuple<IMobileLibraryBrowserView, IMobileLibraryBrowserPresenter>>();
 

diff --git a/MPfm/MPfm.iOS/Classes/Controllers/MobileLibraryBrowserViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/MobileLibraryBrowserViewController.cs
@@ -258,7 +258,7 @@ public UICollectionViewCell CellForItemAtIndexPath(UICollectionView collectionVi
                 if (keyPair.Equals(default(KeyValuePair<string, UIImage>)))
                 {
                     cell.Image = null;
-                    OnRequestAlbumArt(_items[indexPath.Row].Query.ArtistName, _items[indexPath.Row].Query.AlbumTitle);
+                    OnRequestAlbumArt(_items[indexPath.Row].Query.ArtistName, _items[indexPath.Row].Query.AlbumTitle, null);
                 } 
                 else
                 {
@@ -456,9 +456,10 @@ private void ReloadImages()
         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; }
+        public Action<string, string, object> OnRequestAlbumArt { get; set; }
         public Action<int> OnPlayItem { get; set; }
         public Func<string, string, byte[]> OnRequestAlbumArtSynchronously { get; set; }
+        public Action<int> OnAddItemToPlaylist { get; set; }
 
         public void MobileLibraryBrowserError(Exception ex)
         {
@@ -468,7 +469,7 @@ public void MobileLibraryBrowserError(Exception ex)
             });
         }
 
-        public void RefreshAlbumArtCell(string artistName, string albumTitle, byte[] albumArtData)
+        public void RefreshAlbumArtCell(string artistName, string albumTitle, byte[] albumArtData, object userData)
         {
             // Note: cannot call UIScreen.MainScreen in a background thread!
 //            int height = 44;
@@ -657,6 +658,11 @@ public void RefreshCurrentlyPlayingSong(int index, AudioFile audioFile)
             });
         }
 
+        public void NotifyNewPlaylistItems(string text)
+        {
+        }
+
         #endregion
+
     }
 }