Android: Updated project after changes on iOS.

Split PeakFileGenerator into different files and added an interface. Related to issue #406.
ycastonguay · Mar 15, 2013 · fed9c4c · fed9c4c
1 parent 0f252a0
commit fed9c4c
Show file tree

Hide file tree

Showing 25 changed files with 2,384 additions and 2,104 deletions.
diff --git a/MPfm/MPfm.Android/Classes/Fragments/LoopsFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/LoopsFragment.cs
@@ -16,12 +16,14 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Collections.Generic;
 using Android.App;
 using Android.OS;
 using Android.Views;
 using Android.Widget;
 using MPfm.Android.Classes.Fragments.Base;
 using MPfm.MVP.Views;
+using MPfm.Player.Objects;
 
 namespace MPfm.Android.Classes.Fragments
 {
@@ -47,5 +49,16 @@ public void OnClick(View v)
         {
 
         }
+
+        #region ILoopsView implementation
+
+        public Action OnAddLoop { get; set; }
+        public Action<Loop> OnEditLoop { get; set; }
+
+        public void RefreshLoops(List<Loop> loops)
+        {
+        }
+
+        #endregion
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MarkersFragment.cs
@@ -16,12 +16,14 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Collections.Generic;
 using Android.App;
 using Android.OS;
 using Android.Views;
 using Android.Widget;
 using MPfm.Android.Classes.Fragments.Base;
 using MPfm.MVP.Views;
+using MPfm.Player.Objects;
 
 namespace MPfm.Android.Classes.Fragments
 {
@@ -47,5 +49,16 @@ public void OnClick(View v)
         {
 
         }
+
+        #region IMarkersView implementation
+
+        public Action OnAddMarker { get; set; }
+        public Action<Marker> OnEditMarker { get; set; }
+
+        public void RefreshMarkers(List<Marker> markers)
+        {
+        }
+
+        #endregion
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs
@@ -25,6 +25,7 @@
 using MPfm.Android.Classes.Objects;
 using MPfm.MVP.Models;
 using MPfm.MVP.Views;
+using MPfm.Sound.AudioFiles;
 
 namespace MPfm.Android.Classes.Fragments
 {
@@ -35,10 +36,6 @@ public class MobileLibraryBrowserFragment : BaseListFragment, IMobileLibraryBrow
         private EditText _editText;
         private IEnumerable<LibraryBrowserEntity> _entities = new List<LibraryBrowserEntity>();
 
-        public MobileLibraryBrowserType BrowserType { get; set; }
-        public string Filter { get; set; }
-        public Action<int> OnItemClick { get; set; }
-
         // Leave an empty constructor or the application will crash at runtime
         public MobileLibraryBrowserFragment() : base(null) { }
 
@@ -73,7 +70,15 @@ public void OnClick(View v)
             builder.Show();
         }
 
-        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities)
+
+        #region IMobileLibraryBrowserView implementation
+
+        public MobileLibraryBrowserType BrowserType { get; set; }
+        public string Filter { get; set; }
+        public Action<int> OnItemClick { get; set; }
+        public Action<string, string> OnRequestAlbumArt { get; set; }
+
+        public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle)
         {
             _entities = entities;
             var listAdapter = (MobileLibraryBrowserListAdapter) ListAdapter;
@@ -85,9 +90,19 @@ public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities)
                 Activity.RunOnUiThread(() => {
                     listAdapter.SetData(entities);   
                     listAdapter.NotifyDataSetChanged();
-                });                
+                });
             }
+        }
+
+        public void RefreshCurrentlyPlayingSong(int index, AudioFile audioFile)
+        {
+        }
 
+        public void RefreshAlbumArtCell(string artistName, string albumTitle, byte[] albumArtData)
+        {
         }
+
+        #endregion
+
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/PitchShiftingFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/PitchShiftingFragment.cs
@@ -21,6 +21,8 @@
 using Android.Views;
 using Android.Widget;
 using MPfm.Android.Classes.Fragments.Base;
+using MPfm.MVP.Models;
+using MPfm.MVP.Presenters;
 using MPfm.MVP.Views;
 
 namespace MPfm.Android.Classes.Fragments
@@ -47,5 +49,23 @@ public void OnClick(View v)
         {
 
         }
+
+        #region ITimeShiftingView implementation
+
+        public Action<float> OnSetTimeShifting { get; set; }
+        public Action<TimeShiftingMode> OnSetTimeShiftingMode { get; set; }
+        public Action OnResetTimeShifting { get; set; }
+        public Action OnDetectTempo { get; set; }
+
+        public void RefreshTimeShifting(PlayerTimeShiftingEntity entity)
+        {
+        }   
+
+        public void TimeShiftingError(Exception ex)
+        {
+        }
+
+        #endregion
+
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/PlayerFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/PlayerFragment.cs
@@ -28,6 +28,7 @@
 using MPfm.Android.Classes.Fragments.Base;
 using MPfm.Android.Classes.Helpers;
 using MPfm.Core;
+using MPfm.MVP.Messages;
 using MPfm.MVP.Views;
 using MPfm.Player;
 using MPfm.Sound.AudioFiles;
@@ -113,6 +114,10 @@ public void OnClick(View v)
         public Action<float> OnPlayerSetTimeShifting { get; set; }
         public Action<float> OnPlayerSetPosition { get; set; }
 
+        public void RefreshPlayerStatus(PlayerStatusType status)
+        {
+        }
+
         public void RefreshPlayerPosition(MVP.Models.PlayerPositionEntity entity)
         {
             Activity.RunOnUiThread(() =>

diff --git a/MPfm/MPfm.Android/Classes/Fragments/PlayerMetadataFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/PlayerMetadataFragment.cs
@@ -22,6 +22,7 @@
 using Android.Widget;
 using MPfm.Android.Classes.Fragments.Base;
 using MPfm.MVP.Views;
+using MPfm.Sound.AudioFiles;
 
 namespace MPfm.Android.Classes.Fragments
 {
@@ -47,5 +48,14 @@ public void OnClick(View v)
         {
 
         }
+
+        #region IPlayerMetadataView implementation
+
+        public void RefreshAudioFile(AudioFile audioFile)
+        {
+        }
+
+        #endregion
+
     }
 }
diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
diff --git a/MPfm/MPfm.Core/MPfm.Core.Android.csproj b/MPfm/MPfm.Core/MPfm.Core.Android.csproj
@@ -84,8 +84,6 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -101,5 +99,6 @@
     <Compile Include="OS.cs" />
     <Compile Include="CacheStore.cs" />
     <Compile Include="ByteArrayQueue.cs" />
+    <Compile Include="Normalizer.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Core/MPfm.Core.csproj b/MPfm/MPfm.Core/MPfm.Core.csproj
@@ -94,5 +94,6 @@
     <Compile Include="OS.cs" />
     <Compile Include="CacheStore.cs" />
     <Compile Include="ByteArrayQueue.cs" />
+    <Compile Include="Normalizer.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Library/MPfm.Library.Android.csproj b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
@@ -87,9 +87,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Reactive">
-      <HintPath>Lib\System.Reactive.dll</HintPath>
-    </Reference>
     <Reference Include="System.Data.SQLite">
       <HintPath>Lib\System.Data.SQLite.dll</HintPath>
     </Reference>

diff --git a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
@@ -223,5 +223,13 @@
     <Compile Include="Presenters\PitchShiftingPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IPlayerMetadataPresenter.cs" />
     <Compile Include="Presenters\PlayerMetadataPresenter.cs" />
+    <Compile Include="Messages\PlayerPlaylistIndexChangedMessage.cs" />
+    <Compile Include="Messages\PlayerCommandMessage.cs" />
+    <Compile Include="Views\ILoopDetailsView.cs" />
+    <Compile Include="Views\IMarkerDetailsView.cs" />
+    <Compile Include="Presenters\Interfaces\ILoopDetailsPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IMarkerDetailsPresenter.cs" />
+    <Compile Include="Presenters\LoopDetailsPresenter.cs" />
+    <Compile Include="Presenters\MarkerDetailsPresenter.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.csproj b/MPfm/MPfm.MVP/MPfm.MVP.csproj
@@ -211,5 +211,13 @@
     <Compile Include="Presenters\PitchShiftingPresenter.cs" />
     <Compile Include="Presenters\Interfaces\IPlayerMetadataPresenter.cs" />
     <Compile Include="Presenters\PlayerMetadataPresenter.cs" />
+    <Compile Include="Messages\PlayerPlaylistIndexChangedMessage.cs" />
+    <Compile Include="Messages\PlayerCommandMessage.cs" />
+    <Compile Include="Views\ILoopDetailsView.cs" />
+    <Compile Include="Views\IMarkerDetailsView.cs" />
+    <Compile Include="Presenters\Interfaces\ILoopDetailsPresenter.cs" />
+    <Compile Include="Presenters\Interfaces\IMarkerDetailsPresenter.cs" />
+    <Compile Include="Presenters\LoopDetailsPresenter.cs" />
+    <Compile Include="Presenters\MarkerDetailsPresenter.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Player/MPfm.Player.Android.csproj b/MPfm/MPfm.Player/MPfm.Player.Android.csproj
@@ -125,5 +125,6 @@
     <Compile Include="Objects\Loop.cs" />
     <Compile Include="Objects\Marker.cs" />
     <Compile Include="Player.cs" />
+    <Compile Include="Events\AudioInterruptedData.cs" />
   </ItemGroup>
 </Project>
diff --git a/MPfm/MPfm.Player/MPfm.Player.csproj b/MPfm/MPfm.Player/MPfm.Player.csproj
@@ -112,5 +112,6 @@
     <Compile Include="Objects\Loop.cs" />
     <Compile Include="Objects\Marker.cs" />
     <Compile Include="Player.cs" />
+    <Compile Include="Events\AudioInterruptedData.cs" />
   </ItemGroup>
 </Project>