From 6f0d0d345cce38e57cda6d705d8444d3e584d252 Mon Sep 17 00:00:00 2001
From: ycastonguay <ycastonguay@mp4m.org>
Date: Fri, 26 Jul 2013 02:23:53 -0400
Subject: [PATCH] Android: Added new long press contextual menu for
 MobileLibraryBrowser list view. Play and Delete buttons are functional. Added
 new sync actionbar icon. Lots of layout bug fixes in EqualizerPreset screens.

Related to issue #406.
---
 .../Classes/Activities/MainActivity.cs        |   2 +-
 .../MobileLibraryBrowserListAdapter.cs        |  32 +++++++-
 .../Fragments/MobileLibraryBrowserFragment.cs |   5 +-
 MPfm/MPfm.Android/MPfm.Android.csproj         |   4 +
 .../Resources/Layout/AlbumCell.axml           |  12 +--
 .../Resources/Layout/EqualizerPresetCell.axml |   6 +-
 .../Layout/EqualizerPresetDetails.axml        |  20 +++--
 .../Resources/Layout/EqualizerPresets.axml    |  10 ++-
 .../Resources/Resource.Designer.cs            |  71 +++++++++---------
 .../drawable-hdpi/actionbar_sync.png          | Bin 0 -> 1619 bytes
 .../drawable-mdpi/actionbar_sync.png          | Bin 0 -> 1388 bytes
 .../drawable-xhdpi/actionbar_sync.png         | Bin 0 -> 1891 bytes
 .../drawable-xxhdpi/actionbar_sync.png        | Bin 0 -> 2427 bytes
 .../MobileLibraryBrowserPresenter.cs          |  55 ++++++++++++--
 .../Views/IMobileLibraryBrowserView.cs        |   3 +-
 15 files changed, 155 insertions(+), 65 deletions(-)
 create mode 100644 MPfm/MPfm.Android/Resources/drawable-hdpi/actionbar_sync.png
 create mode 100644 MPfm/MPfm.Android/Resources/drawable-mdpi/actionbar_sync.png
 create mode 100644 MPfm/MPfm.Android/Resources/drawable-xhdpi/actionbar_sync.png
 create mode 100644 MPfm/MPfm.Android/Resources/drawable-xxhdpi/actionbar_sync.png

diff --git a/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs b/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
index 18fff915..089487c0 100644
--- a/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
+++ b/MPfm/MPfm.Android/Classes/Activities/MainActivity.cs
@@ -320,7 +320,7 @@ public override bool OnCreateOptionsMenu(IMenu menu)
                         break;
                     case MobileOptionsMenuType.SyncLibrary:
                         menuItem.SetShowAsAction(ShowAsAction.IfRoom);
-                        menuItem.SetIcon(Resource.Drawable.actionbar_mobile);
+                        menuItem.SetIcon(Resource.Drawable.actionbar_sync);
                         break;
                     case MobileOptionsMenuType.SyncLibraryCloud:
                         menuItem.SetIcon(Resource.Drawable.actionbar_cloud);
diff --git a/MPfm/MPfm.Android/Classes/Adapters/MobileLibraryBrowserListAdapter.cs b/MPfm/MPfm.Android/Classes/Adapters/MobileLibraryBrowserListAdapter.cs
index 5d302d14..06a633a6 100644
--- a/MPfm/MPfm.Android/Classes/Adapters/MobileLibraryBrowserListAdapter.cs
+++ b/MPfm/MPfm.Android/Classes/Adapters/MobileLibraryBrowserListAdapter.cs
@@ -22,6 +22,7 @@
 using Android.Views;
 using Android.Views.Animations;
 using Android.Widget;
+using MPfm.Android.Classes.Fragments;
 using MPfm.MVP.Models;
 
 namespace MPfm.Android.Classes.Adapters
@@ -29,21 +30,25 @@ namespace MPfm.Android.Classes.Adapters
     public class MobileLibraryBrowserListAdapter : BaseAdapter<LibraryBrowserEntity>, View.IOnClickListener
     {
         readonly Activity _context;
+        readonly MobileLibraryBrowserFragment _fragment;
         readonly ListView _listView;
         List<LibraryBrowserEntity> _items;
         int _editingRowPosition = -1;
 
         public bool IsEditingRow { get; private set; }
 
-        public MobileLibraryBrowserListAdapter(Activity context, ListView listView, List<LibraryBrowserEntity> items)
+        public MobileLibraryBrowserListAdapter(Activity context, MobileLibraryBrowserFragment fragment, ListView listView, List<LibraryBrowserEntity> items)
         {
             _context = context;
+            _fragment = fragment;
             _listView = listView;
             _items = items;
         }
 
         public void SetData(IEnumerable<LibraryBrowserEntity> items)
         {
+            _editingRowPosition = -1;
+            IsEditingRow = false;
             _items = items.ToList();
             NotifyDataSetChanged();
         }
@@ -87,6 +92,19 @@ public override View GetView(int position, View convertView, ViewGroup parent)
             btnPlay.SetOnClickListener(this);
             btnDelete.SetOnClickListener(this);
 
+            if (IsEditingRow && position == _editingRowPosition)
+            {
+                btnAdd.Visibility = ViewStates.Visible;
+                btnPlay.Visibility = ViewStates.Visible;
+                btnDelete.Visibility = ViewStates.Visible;
+            }
+            else
+            {
+                btnAdd.Visibility = ViewStates.Gone;
+                btnPlay.Visibility = ViewStates.Gone;
+                btnDelete.Visibility = ViewStates.Gone;
+            }
+
             lblTitle.Text = item.Title;
             lblTitleWithSubtitle.Text = item.Title;
             lblSubtitle.Text = string.Empty;
@@ -201,13 +219,23 @@ public void OnClick(View v)
             switch(v.Id)
             {
                 case Resource.Id.mobileLibraryBrowserCell_imageAdd:
-                    Console.WriteLine("MLBLA - ADD - position: {0}", position);
+                    Console.WriteLine("MLBLA - ADD - position: {0}", position);                    
                     break;
                 case Resource.Id.mobileLibraryBrowserCell_imagePlay:
                     Console.WriteLine("MLBLA - PLAY - position: {0}", position);
+                    _fragment.OnPlayItem(position);
                     break;
                 case Resource.Id.mobileLibraryBrowserCell_imageDelete:
                     Console.WriteLine("MLBLA - DELETE - position: {0}", position);
+                    AlertDialog ad = new AlertDialog.Builder(_context)
+                        .SetIconAttribute(global::Android.Resource.Attribute.AlertDialogIcon)
+                        .SetTitle("Delete confirmation")
+                        .SetMessage(string.Format("Are you sure you wish to delete {0}?", _items[position].Title))
+                        .SetCancelable(true)
+                        .SetPositiveButton("OK", (sender, args) => _fragment.OnDeleteItem(position))
+                        .SetNegativeButton("Cancel", (sender, args) => {})
+                        .Create();
+                    ad.Show();
                     break;
             }
         }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs
index 87bda6b0..26e09364 100644
--- a/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs
+++ b/MPfm/MPfm.Android/Classes/Fragments/MobileLibraryBrowserFragment.cs
@@ -92,7 +92,7 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
             _listView.Visibility = ViewStates.Gone;
             _gridView.Visibility = ViewStates.Gone;
 
-            _listAdapter = new MobileLibraryBrowserListAdapter(Activity, _listView, _entities.ToList());
+            _listAdapter = new MobileLibraryBrowserListAdapter(Activity, this, _listView, _entities.ToList());
             _listView.SetAdapter(_listAdapter);
             _listView.ItemClick += ListViewOnItemClick;
             _listView.ItemLongClick += ListViewOnItemLongClick;
@@ -190,6 +190,7 @@ public override void OnDetach()
         public string Filter { get; set; }
         public Action<int> OnItemClick { get; set; }
         public Action<int> OnDeleteItem { get; set; }
+        public Action<int> OnPlayItem { get; set; }
         public Action<string, string> OnRequestAlbumArt { get; set; }
 
         public void MobileLibraryBrowserError(Exception ex)
@@ -272,6 +273,8 @@ public void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, Mo
                 {
                     if (_listView != null)
                         _listAdapter.SetData(_entities);
+
+                    _listView.SetSelection(0);
                 }
             });
         }
diff --git a/MPfm/MPfm.Android/MPfm.Android.csproj b/MPfm/MPfm.Android/MPfm.Android.csproj
index 9d18d0ce..4083d1a0 100644
--- a/MPfm/MPfm.Android/MPfm.Android.csproj
+++ b/MPfm/MPfm.Android/MPfm.Android.csproj
@@ -432,6 +432,10 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\icon_speaker.png" />
     <AndroidResource Include="Resources\Anim\listviewoptions_fade_in.xml" />
     <AndroidResource Include="Resources\Anim\listviewoptions_fade_out.xml" />
+    <AndroidResource Include="Resources\drawable-hdpi\actionbar_sync.png" />
+    <AndroidResource Include="Resources\drawable-mdpi\actionbar_sync.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\actionbar_sync.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\actionbar_sync.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Lib\armeabi\" />
diff --git a/MPfm/MPfm.Android/Resources/Layout/AlbumCell.axml b/MPfm/MPfm.Android/Resources/Layout/AlbumCell.axml
index c34c935d..a5bdaab1 100644
--- a/MPfm/MPfm.Android/Resources/Layout/AlbumCell.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/AlbumCell.axml
@@ -3,9 +3,7 @@
   android:id="@+id/albumCell_layout"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"   
-  android:background="@color/background"
-  android:gravity="center"
-  android:orientation="vertical">
+  android:background="@color/background">
   <org.sessionsapp.android.SquareImageView
     android:id="@+id/albumCell_image"
     android:layout_width="fill_parent"
@@ -17,13 +15,14 @@
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
     android:background="#66000000"    
-    android:gravity="center"
+    android:gravity="center"   
     android:orientation="vertical">
     <TextView
       android:id="@+id/albumCell_artistName"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:padding="2dp"
+      android:paddingLeft="4dp"
+      android:paddingRight="4dp"
       android:gravity="center_vertical"
       android:textStyle="bold"
       android:textColor="#FFFFFF"
@@ -34,8 +33,9 @@
       android:id="@+id/albumCell_albumTitle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"      
+      android:paddingLeft="4dp"
+      android:paddingRight="4dp"
       android:gravity="center_vertical"
-      android:padding="2dp"
       android:textColor="#FFFFFF"
       android:textSize="12dp"
       android:ellipsize="end"
diff --git a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetCell.axml b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetCell.axml
index 41326386..b5d2e8d8 100644
--- a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetCell.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetCell.axml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
-   android:layout_height="56dp"
-   android:padding="8dp"
+   android:layout_height="52dp"
+   android:paddingLeft="8dp"
    android:gravity="center_vertical"
    android:orientation="horizontal">
   <ImageView
@@ -19,7 +19,7 @@
     android:gravity="left"
     android:text="Default"
     android:textColor="#000000"
-    android:textSize="14dp" />
+    android:textSize="18dp" />
   <ImageView
     android:id="@+id/equalizerPresetCell_imageCheck"
     android:layout_width="48dp"
diff --git a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetDetails.axml b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetDetails.axml
index 2178c704..f46a8853 100644
--- a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetDetails.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresetDetails.axml
@@ -46,7 +46,7 @@
       android:layout_height="0dp"
       android:layout_weight="1"
       android:background="@android:color/transparent"
-      android:cacheColorHint="#333333"
+      android:cacheColorHint="@android:color/transparent"
       android:divider="#FFFFFF"
       android:listSelector="#CCCCCC" />
     <LinearLayout
@@ -58,18 +58,22 @@
         android:id="@+id/equalizerPresetDetails_btnNormalize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"        
+        android:layout_marginRight="8dp"
+        android:padding="8dp"
+        android:background="@color/button_background"
         android:text="Normalize"
-        android:textColor="#ffffffff"
-        android:textSize="14dp"
-        android:padding="8dp" />
+        android:textColor="@color/button_textcolor"
+        android:textSize="14dp" />
       <Button
         android:id="@+id/equalizerPresetDetails_btnReset"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"        
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dp"
+        android:padding="8dp"
+        android:background="@color/button_background"
         android:text="Reset"
-        android:textColor="#ffffffff"
-        android:textSize="14dp"
-        android:padding="8dp" />
+        android:textColor="@color/button_textcolor"
+        android:textSize="14dp" />
     </LinearLayout>
   </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresets.axml b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresets.axml
index cf717bd1..d7e8881a 100644
--- a/MPfm/MPfm.Android/Resources/Layout/EqualizerPresets.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/EqualizerPresets.axml
@@ -22,28 +22,32 @@
         android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1"
-        android:padding="8dp">
+        android:padding="4dp">
       <TextView
           android:id="@+id/equalizerPresets_lblMasterVolume"          
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
+          android:layout_margin="2dp"
           android:text="Master Volume:"
           android:textColor="#FFFFFF" />
       <SeekBar
           android:id="@+id/equalizerPresets_seekBarVolume"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
+          android:layout_margin="2dp"
           android:max="100" />
       <TextView
           android:id="@+id/equalizerPresets_lblBypass"          
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
-          android:text="Equalizer Bypass:"
+          android:layout_margin="2dp"
+          android:text="Equalizer Bypass:"          
           android:textColor="#FFFFFF" />
       <ToggleButton
           android:id="@+id/equalizerPresets_btnBypass"
           android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
+          android:layout_height="wrap_content"
+          android:layout_margin="2dp" />
     </LinearLayout>
   </LinearLayout>
   <ListView
diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
index 20340277..202c6b46 100644
--- a/MPfm/MPfm.Android/Resources/Resource.Designer.cs
+++ b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
@@ -156,106 +156,109 @@ public partial class Drawable
 			public const int actionbar_share = 2130837513;
 			
 			// aapt resource value: 0x7f02000a
-			public const int checkbox_checked = 2130837514;
+			public const int actionbar_sync = 2130837514;
 			
 			// aapt resource value: 0x7f02000b
-			public const int checkbox_partial = 2130837515;
+			public const int checkbox_checked = 2130837515;
 			
 			// aapt resource value: 0x7f02000c
-			public const int checkbox_unchecked = 2130837516;
+			public const int checkbox_partial = 2130837516;
 			
 			// aapt resource value: 0x7f02000d
-			public const int Icon = 2130837517;
+			public const int checkbox_unchecked = 2130837517;
 			
 			// aapt resource value: 0x7f02000e
-			public const int icon_add = 2130837518;
+			public const int Icon = 2130837518;
 			
 			// aapt resource value: 0x7f02000f
-			public const int icon_android = 2130837519;
+			public const int icon_add = 2130837519;
 			
 			// aapt resource value: 0x7f020010
-			public const int icon_artist = 2130837520;
+			public const int icon_android = 2130837520;
 			
 			// aapt resource value: 0x7f020011
-			public const int icon_check = 2130837521;
+			public const int icon_artist = 2130837521;
 			
 			// aapt resource value: 0x7f020012
-			public const int icon_equalizer = 2130837522;
+			public const int icon_check = 2130837522;
 			
 			// aapt resource value: 0x7f020013
-			public const int icon_linux = 2130837523;
+			public const int icon_equalizer = 2130837523;
 			
 			// aapt resource value: 0x7f020014
-			public const int icon_osx = 2130837524;
+			public const int icon_linux = 2130837524;
 			
 			// aapt resource value: 0x7f020015
-			public const int icon_phone = 2130837525;
+			public const int icon_osx = 2130837525;
 			
 			// aapt resource value: 0x7f020016
-			public const int icon_play = 2130837526;
+			public const int icon_phone = 2130837526;
 			
 			// aapt resource value: 0x7f020017
-			public const int icon_speaker = 2130837527;
+			public const int icon_play = 2130837527;
 			
 			// aapt resource value: 0x7f020018
-			public const int icon_tablet = 2130837528;
+			public const int icon_speaker = 2130837528;
 			
 			// aapt resource value: 0x7f020019
-			public const int icon_transparent = 2130837529;
+			public const int icon_tablet = 2130837529;
 			
 			// aapt resource value: 0x7f02001a
-			public const int icon_trash = 2130837530;
+			public const int icon_transparent = 2130837530;
 			
 			// aapt resource value: 0x7f02001b
-			public const int icon_vinyl = 2130837531;
+			public const int icon_trash = 2130837531;
 			
 			// aapt resource value: 0x7f02001c
-			public const int icon_windows = 2130837532;
+			public const int icon_vinyl = 2130837532;
 			
 			// aapt resource value: 0x7f02001d
-			public const int player_next = 2130837533;
+			public const int icon_windows = 2130837533;
 			
 			// aapt resource value: 0x7f02001e
-			public const int player_next_on = 2130837534;
+			public const int player_next = 2130837534;
 			
 			// aapt resource value: 0x7f02001f
-			public const int player_pause = 2130837535;
+			public const int player_next_on = 2130837535;
 			
 			// aapt resource value: 0x7f020020
-			public const int player_pause_on = 2130837536;
+			public const int player_pause = 2130837536;
 			
 			// aapt resource value: 0x7f020021
-			public const int player_play = 2130837537;
+			public const int player_pause_on = 2130837537;
 			
 			// aapt resource value: 0x7f020022
-			public const int player_play_on = 2130837538;
+			public const int player_play = 2130837538;
 			
 			// aapt resource value: 0x7f020023
-			public const int player_playlist = 2130837539;
+			public const int player_play_on = 2130837539;
 			
 			// aapt resource value: 0x7f020024
-			public const int player_playlist_on = 2130837540;
+			public const int player_playlist = 2130837540;
 			
 			// aapt resource value: 0x7f020025
-			public const int player_previous = 2130837541;
+			public const int player_playlist_on = 2130837541;
 			
 			// aapt resource value: 0x7f020026
-			public const int player_previous_on = 2130837542;
+			public const int player_previous = 2130837542;
 			
 			// aapt resource value: 0x7f020027
-			public const int player_repeat = 2130837543;
+			public const int player_previous_on = 2130837543;
 			
 			// aapt resource value: 0x7f020028
-			public const int player_repeat_on = 2130837544;
+			public const int player_repeat = 2130837544;
 			
 			// aapt resource value: 0x7f020029
-			public const int player_shuffle = 2130837545;
+			public const int player_repeat_on = 2130837545;
 			
 			// aapt resource value: 0x7f02002a
-			public const int player_shuffle_on = 2130837546;
+			public const int player_shuffle = 2130837546;
 			
 			// aapt resource value: 0x7f02002b
-			public const int Splash = 2130837547;
+			public const int player_shuffle_on = 2130837547;
+			
+			// aapt resource value: 0x7f02002c
+			public const int Splash = 2130837548;
 			
 			static Drawable()
 			{
diff --git a/MPfm/MPfm.Android/Resources/drawable-hdpi/actionbar_sync.png b/MPfm/MPfm.Android/Resources/drawable-hdpi/actionbar_sync.png
new file mode 100644
index 0000000000000000000000000000000000000000..0178d70927919c66fc2df46b1d18e18273352592
GIT binary patch
literal 1619
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFisGcxGNoet9ui
zwXd(0XI^nhVqS8pr;Du;P`_SgW{Q=Gg_)6wn}xZXsgtRpp{tRjtFxJtxuuJvv8%bM
zrI86tuS<S%X>Mv>2~2MaLazl*y`Y4UTL84#CABECEH%ZgC_h&L>|v`++-@<&X&zK>
z3U0TU;nb@Sbc{YIT9Kj|CIn17ASOJ~0y*$xpPC0u>qWps9nNGO&A`BP($mE;q~g|_
z8K<*_14Y^|t4;ioQ5(SO$lbesfyN4MZZX}g+65vZEaI^tEK3#ge#vwElHa1l@yf~d
zPDr`k3Jor=^1zROSBS<O5%)4(d+kT;4^HP9*^_5-nilcbOt@qD{7&(+d6wVLT@m4G
zjWG4jU32QF>I0zy&K)c<OnQy0rn$J(J-Wcbov67a(ah)S*TfSCy(?JGKj7{0O<_`d
zk#>XowIcILp<MTeoOfD27w8ulJu?VbD=px7C%$O%ni@ZC^La&6gbNthyg4#NiVReW
zq@?}XOx+h<*^%XC<F~#+SWD8rl6`v!S7Zh6e1-L|HD@eLPqtjsSZZ+n(R)3aDeEt&
zUSX}AzuS~)dV;nOUqIKfH0hXaYy9Gh+4U4RTiH%qx{qNdgX8TJCzj9uqA_igR|a<p
z$9kJqy%+ya?=y;*J-Ov-Rd0RZ?HV5E52us%Gxi;RwCJPpg-AcnvyHI^Z*~elPuSI;
zClj?$TrTR=+y0vAe(Q4{+5I~slWuEvU&MQX-WKM%1A+6iw{DPTbJ}vAk@b1F(s7gT
z-!|lK;hf}}-2I@c<@W*8pI^>RymDvamcaFI8Yj>D_3c#j4(9D!FV|hIkkx4vi{SoT
zlhgaIZb!t)xjSwbv9Hfs8Laxl!}ELB(eU!6WshdOGL7F-ysbTB{##e;-5>XEp2R6(
zc6i3CvT3gALQ4|2dSsvR-_H2!;qsc}T5}r`MbCVZ%x}B=Ax8E{wV6@!@+HAJ={0M4
zguFwnGnKzgy;%AyMY!snMpJ$>KV#JLjW<Qg{%PDhvFyi|E8$jodoKKEwNf*wEP0hG
z?Wd%*&}^=sz0>liHu=ZCd8WIVEqu<mY2wW#qW2Cr7k-)M*c_+s>^+6^#=Y6efqVA&
zA4#7owl^^K>u#l>lcGBoZt8m3crPMX`@_vozvuti@KnA1Yk;(6P_OEfeZ9Lt$%k=z
kgZBZ|5BJqSL^m)p_`H8Rb&~VaP*5@N>FVdQ&MBb@0940i!2kdN

literal 0
HcmV?d00001

diff --git a/MPfm/MPfm.Android/Resources/drawable-mdpi/actionbar_sync.png b/MPfm/MPfm.Android/Resources/drawable-mdpi/actionbar_sync.png
new file mode 100644
index 0000000000000000000000000000000000000000..e036c3b58dc6876f9d7f7079e64399b7cbebcff6
GIT binary patch
literal 1388
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFisGcxGNoet9ui
zwXd(0XI^nhVqS8pr;Du;P`_SgW{Q=Gv7w29p_7}NsgtRpp{tRFiJOV5xv86rqq(K2
ztED4MuS<S%X>Mv>2~2MaT(7eMPQ9RnkXrz>*(J3ovn(~mttdZN0qkL`Ox$j9!D${;
zZwgMgIJx4~s}FRHJ}6p|q8TOxOgkVZJkbI<@MNEw2Tbclz(hT<@f<KiF+TEiaSW-r
z_2&9%ZPq}U10Sv9Ca#_mps{YY&8fu!Vqsp2fn7mmV$*V_tQ9ib^uhl|rHGkM%Out=
z8>bg~B3+YQ3TyrUF7vy5#<X~Hw&8L+)BgK&e%>|SU!1m1u-A>bGsm-$#oV6JzOhAp
z!XraF=BF!MBrJ>m2u`;+YI(2Ty3y*(;#eV%;*RR+Dq#lwkL9bwxC427BYJOb55LnL
zKKpZggiGz3YKyrZM|;llPB-k3dZMK9DWF}^^M~*5cf!I3cT^VS#q`LoZC3AD{G$Eh
zrImJS9~XVy+~}0OCb3fdOCpEvru_|xE?Z`BnJnbm`AYMV<Gk;BdRuM;omuGoZTdyo
z)ofQdraYFqJgqqP#+3BeSFRMSUwpRct&E;PQ8aVptuoGQIb3hV*ezU+sLfOr$@t5%
zS7hPJ$gBf7=@O1Jd!|WFZ{zBD<kcN+yhL$cWWuUrb4$!xOT<}cbVlxc<|el?dC$W~
z%}au~@*TfjzSwNmvV>#(hA!0_j~M-LPh;+IPxMp0t$Fmx6~7Cw7W#)PCv5YPIk}$i
z#I5z;c&}s~zgm)0@Yn9cB;7+djxkKqy&S%FLbRN?j=%DU_xsqdXzggvP5FQId&9l1
z3mUh7R{VR-60))P<d)q%+l3GRPkyBSKz+gsmVK-e4AISR&vEE3UkNJzJYD@<);T3K
F0RR&8{iy%|

literal 0
HcmV?d00001

diff --git a/MPfm/MPfm.Android/Resources/drawable-xhdpi/actionbar_sync.png b/MPfm/MPfm.Android/Resources/drawable-xhdpi/actionbar_sync.png
new file mode 100644
index 0000000000000000000000000000000000000000..fea369f4b728d4a0089a062f5c9f5ce34c502ad5
GIT binary patch
literal 1891
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

literal 0
HcmV?d00001

diff --git a/MPfm/MPfm.Android/Resources/drawable-xxhdpi/actionbar_sync.png b/MPfm/MPfm.Android/Resources/drawable-xxhdpi/actionbar_sync.png
new file mode 100644
index 0000000000000000000000000000000000000000..95886c6dec9686751b823bbbd7d3d6ee4dd113ac
GIT binary patch
literal 2427
zcma)8c~nyS7RGQ^w8_~Dv7$*p6crvQIAC@|$uP}p1;P<QffF3ZqEx)TZp+&%>6%kz
zS(>-(x*XDa4VYG%Q=?Plqq1jKFU@*jHu#{Mb^mz1_0C%7{HE{w_TIm}*IwsmW_T#V
z(%BLQgCWA!21n{gw&685)qfusrTOUxCnzKa+9*kY(l}B8M&n810c4nn!v`V(4liSS
z2SA3w;79>028v;<Cvhbr499@Mq>Dg38wMi>q=Ou85&$9N0lq*?L5=_Y3JNLUQBctY
z295y+0f~aOnNnb5W;lzRnZzaXPyzl(aym&bAOau`GF_A`mXXpasL#42{oJsPMIk>!
zpd<?F52s=nOk|Km3Lps>oCg=@gG2gwVm!UPeSLk`An`a)92SSidg47ieMw$;5)Oy_
z@}TtAq`U-DWH9}UE&YmuN`xSggvF+%rD4*%FcK*r>q#UM4H|g7haTY}%Me4HbPuu2
zeO4hDka48~5E4klNP{9LUXlV)P<l`Q2tfpXl@-grT$BF7u<0BS>xsb`LYf6K82=k8
z5`9I>ph)1GzyDQO#>xNzY$PC)q)55?#3i^JOo5~zDZqgwQkF!LJbR1GL<uC3B}zbK
z&_)6>S|H|0(qx~}3<fDoEQ2^=E)W(>LFxGzfq+LM5Pf~{xWEuPA&}td8G@(zdC@{}
z#Gv3HZyGU>=sn8~mT*%<fEb$P^1gBD-{l$#K?Le82Ln<;D!`*lB_ibKfJuVy`x5kB
zy)Rte_k9WeE*GnJ25U&`pVB<LrLP^s^lQ=T7hlUB5bJAQsxNAr-#v&hn91v~U>YlZ
z=w+Ea@mIj{dT*b)y)fLjtL*)Xrb4;mY3SyP+P@9%F?Dj>G(ry?Tq1XjJiyY1hR}2K
z7Jl47k6C!2d(YLIn`-7VP7-CyJ*>{%X^dlxs>d$8CV{S_FERpp-e2VFOaglD9oD^T
z?s-qv$pgkcvChBHSuHCg5KQ<z*sspzrl;<~2-K6Nr;Jt+s0e1YkuYnW{){EeaxRaY
zg<L;tRHf)(&)<g5iD$O$RvKC7xZz;aEu337`e_8!`Y6pD(7(t80|&};l}CQwmwlyW
z8{2FQwnO#1P*q(Jp^efAai#gX>Y5pq?MTvu$9RD!U*!i<nh|RAN)zu-0jes^mI<O`
zPYQgMYCh<2$gy;3=iMLK@F|ae>t=KEoD!9Br|-wzDl;}>U{NYOAuF^ck~z1|d_!S{
zuj&nZ_ki_^N9a$xKD|7-Pf?*U4~p2}Hhu>63cGdP@#;p6NnUfG%dPeYO?^*Omgc^k
zBPv(Em~^|YgXbs4mnImwSH;t#PO2rmqs6vD$D0>!`%mBoc&CjDmQu`OT`zC*-}09h
z2Mu>vD_@*<A^vK&CKg<|fP~IOoO!!uryZQEajwM*&(5ngQCszBPhpFZA`k8Zcbn-;
zOYZHs?SM6{cXcJWQUlUWx;h@8Ky!U!%uKCsfY#)>Cybt`PUju=x89U3^C+6S-NpXL
zwDpaKeX;{l@VzYwig26yiYWW=4~f4G^m7!i8>Qhpeam62oK!`R+ytZJ9G|4Qb?6>V
z*Q*YhK1m)`J2rBiP3|k6o_Taa+4k&oQG0&#o&`Pd6pbshqhAP`az9;cj%;9&Y_r6d
zQ}H{Y-*zr9h~O7(y9j?Z;bpmMP70e}648or*bqpJnbW5bu~$5g3%Yncb8EetbM!f}
z65^ii>|2bpgO-l9hnBas-03s-Aq^Na?%nWl9;^&og3h*8#_7;ioQ6_D9X{J4$-19A
z*j&=`Dp9*kgdwQOKr(h&(TAIf)Ql|kox?BNEfqRD{5;ZJ#MUdgdEV#UH%(l^YXvlP
ze4|F(dgfi}DY?)~-4yGW8vW)_H{6Lx-EB!W4zF)8mgoG`hTgoryBJ>Ve8jtZ`_wKA
z?hX}g!mG7&S79YLv@9~Nv}4sv2()iqi=IA$PTO*xtwLxR;d=zcSexDe_lIP7doUl*
z-+#{G)>LGxcE&huvTGpVU0I*6OXb_+HJZiDe{uqDrgzum$%#FU!%f6V*`$MuP3nT?
zl~#>MOwR$wLpa{-<patV%}AOUQU0v&AgVY&x=Lx?Zwk-d>#aB_)#k!hAHAa;TKMq=
zsN@Z@sa?6Zi^bUHYscq93wl@4`OS8_nhw|C8p`;W8m-+OvbSIYhb-xYCr=g=$!%*p
z#@v@4%F@NiA9g+)V`C^zXyuHbvP`Vdb+leU98mV|+uC&p;_RJ2wbh@wtaq2#C;5lK
z{`(rILqKxU5{CC}yRH(KIC2ZJV+gGYsqMZ_8%m@iY^h>hEzhm^Eqz$NMM#xW+B>k?
zv1zGLYn;9r;TKg`eA&jHUriyBlJ~_-{L9J3dcXOY+~Frum2h-WJ5IA1&O;ZzS+wwZ
zIH*{Zzd9wtTkTaj#I$b$EDD(Qc5y|I(=r`n*RkBUc{~R`Ecx+jWmX2;EvS!GnTosc
z+-B#9Jy0RNHN(x3Qf*@_mb=8AJ~%$c052^{?%ccmftED{)l$TD!>0E!XQR85+8Q2S
zt5|sq6H=6DX-kWB!e<`4A1Ae!uDnY|{xVYCv^xmwF2jW6TNoObdq@AV#qj9K-uZ?8
zF0Ws$W(cVzb=L}wi|cvktdiqK?*hj-8-FOMyB1fwCRt%oVbp(es_DEiYi8ZQfiZWE
z%X&v$R)!i{5GJIGGR>w=kE75tR=L^DSCmJ`tsad0m14VJa;bN;7yr7Z#O(j+o8MZi
d%Kjr(1%vD2Ci92E3d8SESV(yA*+6#Ae*lfB=C1$%

literal 0
HcmV?d00001

diff --git a/MPfm/MPfm.MVP/Presenters/MobileLibraryBrowserPresenter.cs b/MPfm/MPfm.MVP/Presenters/MobileLibraryBrowserPresenter.cs
index d8614e4e..75622c09 100644
--- a/MPfm/MPfm.MVP/Presenters/MobileLibraryBrowserPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/MobileLibraryBrowserPresenter.cs
@@ -79,6 +79,7 @@ public override void BindView(IMobileLibraryBrowserView view)
 
             view.OnDeleteItem = DeleteItem;
             view.OnItemClick = ItemClick;
+            view.OnPlayItem = PlayItem;
             view.OnRequestAlbumArt = RequestAlbumArt;
 
             // Subscribe to any audio file cache update so we can update this screen
@@ -126,6 +127,53 @@ private void RequestAlbumArt(string artistName, string albumTitle)
             });
         }
 
+        private void PlayItem(int index)
+        {
+            try
+            {
+                Console.WriteLine("MobileLibraryBrowserPresenter - PlayItem index: {0}", index);
+                    if (_items[index].Type == LibraryBrowserEntityType.Artist)
+                    {
+                        // TODO: Replace this info on a service. i.e. when initializing presenter, refresh view with query information.
+                        Action<IBaseView> onViewBindedToPresenter = (theView) => _messengerHub.PublishAsync<MobileLibraryBrowserItemClickedMessage>(new MobileLibraryBrowserItemClickedMessage(this)
+                        {
+                            Query = _items[index].Query,
+                            FilePath = _items[index].AudioFile != null ? _items[index].AudioFile.FilePath : string.Empty
+                        });
+
+                        _navigationManager.CreatePlayerView(_tabType, onViewBindedToPresenter);
+                    }
+                    else if (_items[index].Type == LibraryBrowserEntityType.Album)
+                    {
+                        // TODO: Replace this info on a service. i.e. when initializing presenter, refresh view with query information.
+                        Action<IBaseView> onViewBindedToPresenter = (theView) => _messengerHub.PublishAsync<MobileLibraryBrowserItemClickedMessage>(new MobileLibraryBrowserItemClickedMessage(this)
+                        {
+                            Query = _items[index].Query,
+                            FilePath = _items[index].AudioFile != null ? _items[index].AudioFile.FilePath : string.Empty
+                        });
+
+                        _navigationManager.CreatePlayerView(_tabType, onViewBindedToPresenter);
+                    }
+                    else if (_items[index].Type == LibraryBrowserEntityType.Song)
+                    {
+                        // TODO: Replace this info on a service. i.e. when initializing presenter, refresh view with query information.
+                        Action<IBaseView> onViewBindedToPresenter = (theView) => _messengerHub.PublishAsync<MobileLibraryBrowserItemClickedMessage>(new MobileLibraryBrowserItemClickedMessage(this)
+                        {
+                            Query = _items[index].Query,
+                            FilePath = _items[index].AudioFile != null ? _items[index].AudioFile.FilePath : string.Empty
+                        });
+
+                        _navigationManager.CreatePlayerView(_tabType, onViewBindedToPresenter);
+                    }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("MobileLibraryBrowserPresenter - PlayItem - Exception: {0}", ex);
+                View.MobileLibraryBrowserError(ex);
+            }
+
+        }
+
         private void DeleteItem(int index)
         {
             try
@@ -134,11 +182,7 @@ private void DeleteItem(int index)
                 Task.Factory.StartNew(() => {
                     if(_items[index].Type == LibraryBrowserEntityType.Artist)
                     {
-
                         _libraryService.DeleteAudioFiles(_items[index].Query.ArtistName, string.Empty);
-
-                        // Delete files physically, but only on iOS for now. Android uses a shared folder, so that would not make sense IMO.
-#if IOS
                         Console.WriteLine("MobileLibraryBrowserPresenter - Deleting files from hard disk...");
                         var files = _audioFileCacheService.SelectAudioFiles(new LibraryQuery(){ ArtistName = _items[index].Query.ArtistName });
                         foreach(var file in files)
@@ -146,7 +190,6 @@ private void DeleteItem(int index)
                             Console.WriteLine("MobileLibraryBrowserPresenter - Deleting {0}...", file.FilePath);
                             File.Delete(file.FilePath);
                         }
-#endif
 
                         Console.WriteLine("MobileLibraryBrowserPresenter - Removing audio files from cache...");
                         _audioFileCacheService.RemoveAudioFiles(_items[index].Query.ArtistName, string.Empty);
@@ -161,7 +204,6 @@ private void DeleteItem(int index)
                         _libraryService.DeleteAudioFile(_items[index].AudioFile.Id);
                         _audioFileCacheService.RemoveAudioFile(_items[index].AudioFile.Id);
                     }
-                    Console.WriteLine("MobileLibraryBrowserPresenter - Done!");
                 });
             }
             catch(Exception ex)
@@ -201,6 +243,7 @@ private void ItemClick(int index)
 
                 // Make sure the view was binded to the presenter before publishing a message
                 // Why is an action used here? Because on desktop devices, IPlayerView is initialized right away. On mobile devices, IPlayerView is only initialized when playback is started.
+                // TODO: Replace this info on a service. i.e. when initializing presenter, refresh view with query information.
     	        Action<IBaseView> onViewBindedToPresenter = (theView) => _messengerHub.PublishAsync<MobileLibraryBrowserItemClickedMessage>(new MobileLibraryBrowserItemClickedMessage(this)
     	            {
     	                Query = _items[index].Query,
diff --git a/MPfm/MPfm.MVP/Views/IMobileLibraryBrowserView.cs b/MPfm/MPfm.MVP/Views/IMobileLibraryBrowserView.cs
index b513af7b..bc21841e 100644
--- a/MPfm/MPfm.MVP/Views/IMobileLibraryBrowserView.cs
+++ b/MPfm/MPfm.MVP/Views/IMobileLibraryBrowserView.cs
@@ -29,7 +29,8 @@ public interface IMobileLibraryBrowserView : IBaseView
 	{
         Action<int> OnItemClick { get; set; }
         Action<int> OnDeleteItem { get; set; }
-        Action<string, string> OnRequestAlbumArt { get; set; }
+	    Action<int> OnPlayItem { get; set; }
+	    Action<string, string> OnRequestAlbumArt { get; set; }
 
         void MobileLibraryBrowserError(Exception ex);
         void RefreshLibraryBrowser(IEnumerable<LibraryBrowserEntity> entities, MobileLibraryBrowserType browserType, string navigationBarTitle, string navigationBarSubtitle);