From ddf6a0db641cc3ff36af8a82f1ae3feaf813d251 Mon Sep 17 00:00:00 2001
From: Tristan Roux <tr.tristan-roux@outlook.fr>
Date: Mon, 11 Feb 2019 01:00:17 +0100
Subject: [PATCH] Reworking the player.

---
 MusicApp/MainActivity.cs                      |   24 +-
 MusicApp/MusicApp.csproj                      |    9 +-
 MusicApp/Resources/Portable Class/Player.cs   |  402 ++--
 MusicApp/Resources/Resource.Designer.cs       | 1717 ++++++++---------
 MusicApp/Resources/drawable/OpenInYoutube.png |  Bin 204 -> 0 bytes
 MusicApp/Resources/drawable/darkCircle.xml    |    5 +
 MusicApp/Resources/drawable/darkLinear.xml    |   13 +
 MusicApp/Resources/layout/player.xml          |  409 ++--
 MusicApp/Resources/values-fr/strings.xml      |   62 +-
 MusicApp/Resources/values/strings.xml         |    2 +
 10 files changed, 1266 insertions(+), 1377 deletions(-)
 delete mode 100644 MusicApp/Resources/drawable/OpenInYoutube.png
 create mode 100644 MusicApp/Resources/drawable/darkCircle.xml
 create mode 100644 MusicApp/Resources/drawable/darkLinear.xml

diff --git a/MusicApp/MainActivity.cs b/MusicApp/MainActivity.cs
index 43f826b..7283095 100644
--- a/MusicApp/MainActivity.cs
+++ b/MusicApp/MainActivity.cs
@@ -137,7 +137,7 @@ namespace MusicApp
             if (intent.Action == "Sleep")
             {
                 ShowPlayer();
-                Player.instance.SleepButton_Click("", null);
+                Player.instance.SleepDialog();
             }
             else if (intent.Action == "Player")
             {
@@ -188,18 +188,22 @@ namespace MusicApp
         }
 
 
-        public  void Login(bool canAsk = true, bool skipSilentLog = false)
+        public  void Login(bool canAsk = true, bool skipSilentLog = false, bool skipLastSigned = false)
         {
             waitingForYoutube = true;
 
-            if(account == null)
-                account = GoogleSignIn.GetLastSignedInAccount(this);
-
-
-            if (account != null)
+            if (!skipLastSigned)
             {
-                CreateYoutube();
-                return;
+                Console.WriteLine("&Checking for last signed in account");
+                if (account == null)
+                    account = GoogleSignIn.GetLastSignedInAccount(this);
+
+
+                if (account != null)
+                {
+                    CreateYoutube();
+                    return;
+                }
             }
 
             GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DefaultSignIn)
@@ -294,7 +298,7 @@ namespace MusicApp
 
                 if(account.ServerAuthCode == null)
                 {
-                    Login(true);
+                    Login(true, false, true);
                     return;
                 }
 
diff --git a/MusicApp/MusicApp.csproj b/MusicApp/MusicApp.csproj
index 7fade26..653b14f 100644
--- a/MusicApp/MusicApp.csproj
+++ b/MusicApp/MusicApp.csproj
@@ -587,9 +587,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\GradientShape.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\OpenInYoutube.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\PlaylistHeader.xml" />
   </ItemGroup>
@@ -866,6 +863,12 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values-es\strings.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\darkCircle.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\darkLinear.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.v7.Preference.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Preference.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.Preference.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.Preference.targets')" />
diff --git a/MusicApp/Resources/Portable Class/Player.cs b/MusicApp/Resources/Portable Class/Player.cs
index ef73c91..c589467 100644
--- a/MusicApp/Resources/Portable Class/Player.cs	
+++ b/MusicApp/Resources/Portable Class/Player.cs	
@@ -3,6 +3,7 @@ using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.Content.Res;
+using Android.Gms.Cast.Framework;
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.OS;
@@ -10,6 +11,8 @@ using Android.Runtime;
 using Android.Support.Design.Widget;
 using Android.Support.V4.Widget;
 using Android.Support.V7.Graphics;
+using Android.Text;
+using Android.Text.Style;
 using Android.Util;
 using Android.Views;
 using Android.Widget;
@@ -20,6 +23,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaRouteButton = Android.Support.V7.App.MediaRouteButton;
 
 namespace MusicApp
 {
@@ -34,7 +38,7 @@ namespace MusicApp
 
         private SeekBar bar;
         private ProgressBar spBar;
-        private TextView timerStart;
+        private TextView timer;
         private ImageView imgView;
         private bool prepared = false;
         private readonly int[] timers = new int[] { 0, 2, 10, 30, 60, 120 };
@@ -58,27 +62,20 @@ namespace MusicApp
 
             await Task.Delay(700);
 
+            CastButtonFactory.SetUpMediaRouteButton(MainActivity.instance, MainActivity.instance.FindViewById<MediaRouteButton>(Resource.Id.castButton));
             MainActivity.instance.PrepareSmallPlayer();
             TextView title = MainActivity.instance.FindViewById<TextView>(Resource.Id.playerTitle);
             TextView artist = MainActivity.instance.FindViewById<TextView>(Resource.Id.playerArtist);
             imgView = MainActivity.instance.FindViewById<ImageView>(Resource.Id.playerAlbum);
-            TextView NextTitle = MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle);
-            TextView NextAlbum = MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist);
-            Button ShowQueue = MainActivity.instance.FindViewById<Button>(Resource.Id.showQueue);
-            ImageButton smallQueue = MainActivity.instance.FindViewById<ImageButton>(Resource.Id.smallQueue);
 
             if (!MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playButton).HasOnClickListeners)
             {
+                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.downButton).Click += Down_Click;
+                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.showQueue).Click += ShowQueue_Click;
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.lastButton).Click += Last_Click;
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playButton).Click += Play_Click;
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.nextButton).Click += Next_Click;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerSleep).Click += SleepButton_Click;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerPlaylistAdd).Click += AddToPlaylist_Click;
-                MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).Click += Fab_Click;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerDownload).Click += Download_Click;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerYoutube).Click += Youtube_Click;
-                ShowQueue.Click += ShowQueue_Click;
-                smallQueue.Click += ShowQueue_Click;
+                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.moreButton).Click += More;
             }
 
             title.Selected = true;
@@ -86,36 +83,13 @@ namespace MusicApp
             artist.Selected = true;
             artist.SetMarqueeRepeatLimit(3);
 
-            ((GradientDrawable)ShowQueue.Background).SetStroke(5, ColorStateList.ValueOf(Color.Argb(255, 21, 183, 237)));
-            ShowQueue.SetTextColor(Color.Argb(255, 21, 183, 237));
-
-            ((GradientDrawable)smallQueue.Background).SetStroke(5, ColorStateList.ValueOf(Color.Argb(255, 21, 183, 237)));
-
-            if (MainActivity.Theme == 1)
-            {
-                NextTitle.SetTextColor(Color.White);
-                NextAlbum.SetTextColor(Color.White);
-                NextAlbum.Alpha = 0.7f;
-                smallQueue.ImageTintList = ColorStateList.ValueOf(Color.Argb(255, 255, 255, 255));
-            }
-            else
-            {
-                smallQueue.ImageTintList = ColorStateList.ValueOf(Color.Argb(255, 0, 0, 0));
-            }
-
-            if (ShowQueue.Height < 100)
-            {
-                smallQueue.Visibility = ViewStates.Visible;
-                ShowQueue.Visibility = ViewStates.Gone;
-            }
-
+            timer = MainActivity.instance.FindViewById<TextView>(Resource.Id.timer);
             bar = MainActivity.instance.FindViewById<SeekBar>(Resource.Id.songTimer);
             bar.ProgressChanged += (sender, e) =>
             {
                 if(!MusicPlayer.isLiveStream)
-                    timerStart.Text = DurationToTimer(e.Progress);
+                    timer.Text = string.Format("{0} | {1}", DurationToTimer(e.Progress), DurationToTimer((int)MusicPlayer.Duration));
             };
-            timerStart = MainActivity.instance.FindViewById<TextView>(Resource.Id.timerStart);
 
             spBar = MainActivity.instance.FindViewById<ProgressBar>(Resource.Id.spProgress);
         }
@@ -126,7 +100,7 @@ namespace MusicApp
                 await Task.Delay(100);
 
             Song current = await MusicPlayer.GetItem();
-
+            
             FrameLayout smallPlayer = MainActivity.instance.FindViewById<FrameLayout>(Resource.Id.smallPlayer);
             smallPlayer.FindViewById<TextView>(Resource.Id.spTitle).Text = current.Title;
             smallPlayer.FindViewById<TextView>(Resource.Id.spArtist).Text = current.Artist;
@@ -148,8 +122,12 @@ namespace MusicApp
             TextView title = MainActivity.instance.FindViewById<TextView>(Resource.Id.playerTitle);
             TextView artist = MainActivity.instance.FindViewById<TextView>(Resource.Id.playerArtist);
             imgView = MainActivity.instance.FindViewById<ImageView>(Resource.Id.playerAlbum);
-            title.Text = current.Title;
-            artist.Text = current.Artist;
+            SpannableString titleText = new SpannableString(current.Title);
+            titleText.SetSpan(new BackgroundColorSpan(Color.ParseColor("#BF000000")), 0, current.Title.Length, SpanTypes.InclusiveInclusive);
+            title.TextFormatted = titleText;
+            SpannableString artistText = new SpannableString(current.Artist);
+            artistText.SetSpan(new BackgroundColorSpan(Color.ParseColor("#BF000000")), 0, current.Artist.Length, SpanTypes.InclusiveInclusive);
+            artist.TextFormatted = artistText;
 
             if (!errorState)
             {
@@ -201,19 +179,6 @@ namespace MusicApp
             imgView.SetImageBitmap(icon);
             Palette.From(icon).MaximumColorCount(28).Generate(this);
 
-            if (current.IsYt)
-            {
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerDownload).Visibility = ViewStates.Visible;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerYoutube).Visibility = ViewStates.Visible;
-            }
-            else
-            {
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerDownload).Visibility = ViewStates.Gone;
-                MainActivity.instance.FindViewById<ImageButton>(Resource.Id.playerYoutube).Visibility = ViewStates.Gone;
-            }
-
-            UpdateNext();
-
             if (bar != null)
             {
                 while (MusicPlayer.Duration < 2)
@@ -225,15 +190,13 @@ namespace MusicApp
                     bar.Progress = 1;
                     spBar.Max = 1;
                     spBar.Progress = 1;
-                    timerStart.Text = "";
-                    MainActivity.instance.FindViewById<TextView>(Resource.Id.timerEnd).Text = "🔴 LIVE";
+                    timer.Text = "🔴 LIVE";
                 }
                 else
                 {
                     bar.Max = (int)MusicPlayer.Duration;
                     MusicPlayer.SetSeekBar(bar);
-                    timerStart.Text = DurationToTimer((int)MusicPlayer.CurrentPosition);
-                    MainActivity.instance.FindViewById<TextView>(Resource.Id.timerEnd).Text = DurationToTimer((int)MusicPlayer.Duration);
+                    timer.Text = string.Format("{0} | {1}", DurationToTimer((int)MusicPlayer.CurrentPosition), DurationToTimer((int)MusicPlayer.Duration));
                     spBar.Max = (int)MusicPlayer.Duration;
                     spBar.Progress = (int)MusicPlayer.CurrentPosition;
 
@@ -245,82 +208,82 @@ namespace MusicApp
         public async void UpdateNext()
         {
             await Task.Delay(10);
-            bool asNext = MusicPlayer.queue.Count > MusicPlayer.CurrentID() + 1;
-            if (asNext)
-            {
-                Song next = await MusicPlayer.GetItem(MusicPlayer.CurrentID() + 1);
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
-                ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
+            //bool asNext = MusicPlayer.queue.Count > MusicPlayer.CurrentID() + 1;
+            //if (asNext)
+            //{
+            //    Song next = await MusicPlayer.GetItem(MusicPlayer.CurrentID() + 1);
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
+            //    ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
 
-                if (next.Album == null)
-                {
-                    var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
-                    var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
+            //    if (next.Album == null)
+            //    {
+            //        var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
+            //        var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
 
-                    Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
-                }
-                else
-                {
-                    Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
-                }
-            }
-            else if (MusicPlayer.useAutoPlay)
-            {
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
-                ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
+            //        Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
+            //    }
+            //    else
+            //    {
+            //        Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
+            //    }
+            //}
+            //else if (MusicPlayer.useAutoPlay)
+            //{
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
+            //    ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
 
-                Song next = await MusicPlayer.GetItem(MusicPlayer.CurrentID() + 1);
-                if(next != null)
-                {
-                    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
+            //    Song next = await MusicPlayer.GetItem(MusicPlayer.CurrentID() + 1);
+            //    if(next != null)
+            //    {
+            //        MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
 
-                    if (next.Album == null)
-                    {
-                        var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
-                        var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
+            //        if (next.Album == null)
+            //        {
+            //            var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
+            //            var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
 
-                        Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
-                    }
-                    else
-                    {
-                        Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
-                    }
-                }
-                else
-                {
-                    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = Resources.GetString(Resource.String.next_loading);
-                    Picasso.With(MainActivity.instance).Load(Resource.Drawable.noAlbum).Into(nextArt);
-                    MusicPlayer.instance?.GenerateAutoPlay(false);
-                }
-            }
-            else if (MusicPlayer.repeat)
-            {
-                Song next = await MusicPlayer.GetItem(0);
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
-                ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
+            //            Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
+            //        }
+            //        else
+            //        {
+            //            Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
+            //        }
+            //    }
+            //    else
+            //    {
+            //        MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = Resources.GetString(Resource.String.next_loading);
+            //        Picasso.With(MainActivity.instance).Load(Resource.Drawable.noAlbum).Into(nextArt);
+            //        MusicPlayer.instance?.GenerateAutoPlay(false);
+            //    }
+            //}
+            //else if (MusicPlayer.repeat)
+            //{
+            //    Song next = await MusicPlayer.GetItem(0);
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = next.Title;
+            //    ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
 
-                if (next.Album == null)
-                {
-                    var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
-                    var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
+            //    if (next.Album == null)
+            //    {
+            //        var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
+            //        var nextAlbumArtUri = ContentUris.WithAppendedId(songCover, next.AlbumArt);
 
-                    Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
-                }
-                else
-                {
-                    Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
-                }
-            }
-            else
-            {
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
-                MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = Resources.GetString(Resource.String.nothing);
+            //        Picasso.With(MainActivity.instance).Load(nextAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
+            //    }
+            //    else
+            //    {
+            //        Picasso.With(MainActivity.instance).Load(next.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(nextArt);
+            //    }
+            //}
+            //else
+            //{
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextTitle).Text = Resources.GetString(Resource.String.up_next);
+            //    MainActivity.instance.FindViewById<TextView>(Resource.Id.nextArtist).Text = Resources.GetString(Resource.String.nothing);
 
-                ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
-                Picasso.With(MainActivity.instance).Load(Resource.Drawable.noAlbum).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
-            }
+            //    ImageView nextArt = MainActivity.instance.FindViewById<ImageView>(Resource.Id.nextArt);
+            //    Picasso.With(MainActivity.instance).Load(Resource.Drawable.noAlbum).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(nextArt);
+            //}
         }
 
         public void Buffering()
@@ -374,29 +337,12 @@ namespace MusicApp
 
         }
 
-        private void Download_Click(object sender, EventArgs e)
-        {
-            Song song = MusicPlayer.queue[MusicPlayer.CurrentID()];
-            YoutubeEngine.Download(song.Title, song.YoutubeID);
-        }
-
-        private void Youtube_Click(object sender, EventArgs e)
-        {
-            Intent intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse("vnd.youtube://" + MusicPlayer.queue[MusicPlayer.CurrentID()].YoutubeID));
-            StartActivity(intent);
-        }
-
         public void Stoped()
         {
             MainActivity.instance.ShowSmallPlayer();
             MainActivity.instance.SheetBehavior.State = BottomSheetBehavior.StateCollapsed;
         }
 
-        private void AddToPlaylist_Click(object sender, EventArgs e)
-        {
-            Browse.GetPlaylist(MusicPlayer.queue[MusicPlayer.CurrentID()]);
-        }
-
         public void UpdateSeekBar()
         {
             if (!MusicPlayer.isRunning)
@@ -407,7 +353,7 @@ namespace MusicApp
             if(MusicPlayer.autoUpdateSeekBar)
             {
                 bar.Progress = (int)MusicPlayer.CurrentPosition;
-                timerStart.Text = DurationToTimer((int)MusicPlayer.CurrentPosition);
+                timer.Text = string.Format("{0} | {1}", DurationToTimer((int)MusicPlayer.CurrentPosition), DurationToTimer((int)MusicPlayer.Duration));
             }
             spBar.Progress = (int)MusicPlayer.CurrentPosition;
             handler.PostDelayed(UpdateSeekBar, 1000);
@@ -432,7 +378,7 @@ namespace MusicApp
             return (hours == 0) ? (min + ":" + sec) : (hour + ":" + min + ":" + sec);
         }
 
-        private void Fab_Click(object sender, EventArgs e)
+        private void Down_Click(object sender, EventArgs e)
         {
             MainActivity.instance.ShowSmallPlayer();
             MainActivity.instance.SheetBehavior.State = BottomSheetBehavior.StateCollapsed;
@@ -472,7 +418,69 @@ namespace MusicApp
             MainActivity.instance.StartService(intent);
         }
 
-        public void SleepButton_Click(object sender, EventArgs e)
+        private async void More(object s, EventArgs e)
+        {
+            Song item = await MusicPlayer.GetItem();
+
+            BottomSheetDialog bottomSheet = new BottomSheetDialog(MainActivity.instance);
+            View bottomView = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.BottomSheet, null);
+            bottomView.FindViewById<TextView>(Resource.Id.bsTitle).Text = item.Title;
+            bottomView.FindViewById<TextView>(Resource.Id.bsArtist).Text = item.Artist;
+            if (item.Album == null)
+            {
+                var songCover = Android.Net.Uri.Parse("content://media/external/audio/albumart");
+                var songAlbumArtUri = ContentUris.WithAppendedId(songCover, item.AlbumArt);
+
+                Picasso.With(MainActivity.instance).Load(songAlbumArtUri).Placeholder(Resource.Drawable.noAlbum).Resize(400, 400).CenterCrop().Into(bottomView.FindViewById<ImageView>(Resource.Id.bsArt));
+            }
+            else
+            {
+                Picasso.With(MainActivity.instance).Load(item.Album).Placeholder(Resource.Drawable.noAlbum).Transform(new RemoveBlackBorder(true)).Into(bottomView.FindViewById<ImageView>(Resource.Id.bsArt));
+            }
+            bottomSheet.SetContentView(bottomView);
+
+            List<BottomSheetAction> actions = new List<BottomSheetAction>
+            {
+                new BottomSheetAction(Resource.Drawable.Timer, Resources.GetString(Resource.String.timer), (sender, eventArg) => { SleepDialog(); bottomSheet.Dismiss(); }),
+                new BottomSheetAction(Resource.Drawable.PlaylistAdd, Resources.GetString(Resource.String.add_to_playlist), (sender, eventArg) => { Browse.GetPlaylist(item); bottomSheet.Dismiss(); })
+            };
+
+            if (item.IsYt)
+            {
+                actions.AddRange(new BottomSheetAction[]
+                {
+                    new BottomSheetAction(Resource.Drawable.PlayCircle, Resources.GetString(Resource.String.create_mix_from_song), (sender, eventArg) =>
+                    {
+                        YoutubeEngine.CreateMix(item);
+                        bottomSheet.Dismiss();
+                    }),
+                    new BottomSheetAction(Resource.Drawable.Download, Resources.GetString(Resource.String.download), (sender, eventArg) =>
+                    {
+                        YoutubeEngine.Download(item.Title, item.YoutubeID);
+                        bottomSheet.Dismiss();
+                    }),
+                    new BottomSheetAction(Resource.Drawable.OpenInBrowser, Resources.GetString(Resource.String.open_youtube), (sender, eventArg) =>
+                    {
+                        Intent intent = new Intent(Intent.ActionView, Android.Net.Uri.Parse("vnd.youtube://" + MusicPlayer.queue[MusicPlayer.CurrentID()].YoutubeID));
+                        StartActivity(intent);
+                        bottomSheet.Dismiss();
+                    })
+                });
+            }
+            else
+            {
+                actions.Add(new BottomSheetAction(Resource.Drawable.Edit, Resources.GetString(Resource.String.edit_metadata), (sender, eventArg) =>
+                {
+                    Browse.EditMetadata(item);
+                    bottomSheet.Dismiss();
+                }));
+            }
+
+            bottomSheet.FindViewById<ListView>(Resource.Id.bsItems).Adapter = new BottomSheetAdapter(MainActivity.instance, Resource.Layout.BottomSheetText, actions);
+            bottomSheet.Show();
+        }
+
+        public void SleepDialog()
         {
             string minutes = GetString(Resource.String.minutes);
             Android.Support.V7.App.AlertDialog.Builder builder = new Android.Support.V7.App.AlertDialog.Builder(MainActivity.instance, MainActivity.dialogTheme);
@@ -533,61 +541,61 @@ namespace MusicApp
             Color text = Color.Argb(Color.GetAlphaComponent(swatch.BodyTextColor), Color.GetRedComponent(swatch.BodyTextColor), Color.GetGreenComponent(swatch.BodyTextColor), Color.GetBlueComponent(swatch.BodyTextColor));
             Color background = Color.Argb(Color.GetAlphaComponent(swatch.Rgb), Color.GetRedComponent(swatch.Rgb), Color.GetGreenComponent(swatch.Rgb), Color.GetBlueComponent(swatch.Rgb));
             Color accentColor = Color.Argb(Color.GetAlphaComponent(accent.Rgb), Color.GetRedComponent(accent.Rgb), Color.GetGreenComponent(accent.Rgb), Color.GetBlueComponent(accent.Rgb));
-            MainActivity.instance.FindViewById<TextView>(Resource.Id.playerTitle).SetTextColor(text);
-            MainActivity.instance.FindViewById<TextView>(Resource.Id.playerArtist).SetTextColor(text);
+            //MainActivity.instance.FindViewById<TextView>(Resource.Id.playerTitle).SetTextColor(text);
+            //MainActivity.instance.FindViewById<TextView>(Resource.Id.playerArtist).SetTextColor(text);
             MainActivity.instance.FindViewById<TextView>(Resource.Id.spTitle).SetTextColor(text);
             MainActivity.instance.FindViewById<TextView>(Resource.Id.spArtist).SetTextColor(text);
-            MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).BackgroundTintList = ColorStateList.ValueOf(accentColor);
-            MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).RippleColor = accent.Rgb;
+            //MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).BackgroundTintList = ColorStateList.ValueOf(accentColor);
+            //MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).RippleColor = accent.Rgb;
 
-            //float multiplier = 0.4f;
-            ////if(Build.VERSION.SdkInt >= BuildVersionCodes.M && IsColorDark(accentColor))
-            ////    multiplier = 1.6f;
+            ////float multiplier = 0.4f;
+            //////if(Build.VERSION.SdkInt >= BuildVersionCodes.M && IsColorDark(accentColor))
+            //////    multiplier = 1.6f;
 
-            //int red = (int)(Color.GetRedComponent(accentColor.ToArgb()) * multiplier);
-            //int green = (int)(Color.GetGreenComponent(accentColor.ToArgb()) * multiplier);
-            //int blue = (int)(Color.GetBlueComponent(accentColor.ToArgb()) * multiplier);
-            //Color toolbar = Color.Rgb(red, green, blue);
-            //MainActivity.instance.FindViewById(Resource.Id.playerStatus).SetBackgroundColor(toolbar);
+            ////int red = (int)(Color.GetRedComponent(accentColor.ToArgb()) * multiplier);
+            ////int green = (int)(Color.GetGreenComponent(accentColor.ToArgb()) * multiplier);
+            ////int blue = (int)(Color.GetBlueComponent(accentColor.ToArgb()) * multiplier);
+            ////Color toolbar = Color.Rgb(red, green, blue);
+            ////MainActivity.instance.FindViewById(Resource.Id.playerStatus).SetBackgroundColor(toolbar);
 
-            ////if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
-            ////{
-            ////    int statusBar = (int)MainActivity.instance.Window.DecorView.SystemUiVisibility;
-            ////    if (!IsColorDark(toolbar))
-            ////        statusBar |= (int)SystemUiFlags.LightStatusBar;
-            ////    else
-            ////        statusBar ^= (int)SystemUiFlags.LightStatusBar;
-            ////    MainActivity.instance.Window.DecorView.SystemUiVisibility = (StatusBarVisibility)statusBar;
-            ////}
+            //////if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
+            //////{
+            //////    int statusBar = (int)MainActivity.instance.Window.DecorView.SystemUiVisibility;
+            //////    if (!IsColorDark(toolbar))
+            //////        statusBar |= (int)SystemUiFlags.LightStatusBar;
+            //////    else
+            //////        statusBar ^= (int)SystemUiFlags.LightStatusBar;
+            //////    MainActivity.instance.Window.DecorView.SystemUiVisibility = (StatusBarVisibility)statusBar;
+            //////}
 
-            //Reveal for the player
-            View reveal = MainActivity.instance.FindViewById<View>(Resource.Id.reveal);
-            int centerX, centerY;
-            float endRadius;
-            if (playNext == true)
-            {
-                centerX = 0;
-                centerY = reveal.Height / 2;
-                endRadius = reveal.Width * 1.3f;
-            }
-            else if(playNext == null)
-            {
-                centerX = reveal.Width / 2;
-                centerY = reveal.Height;
-                endRadius = reveal.Width / 1.5f;
-            }
-            else
-            {
-                centerX = reveal.Width;
-                centerY = reveal.Height / 2;
-                endRadius = reveal.Width * 1.3f;
-            }
-            Animator anim = ViewAnimationUtils.CreateCircularReveal(reveal, centerX, centerY, 0, endRadius);
-            anim.AnimationStart += (sender, e) => { reveal.SetBackgroundColor(background); };
-            anim.AnimationEnd += (sender, e) => { MainActivity.instance?.FindViewById<RelativeLayout>(Resource.Id.infoPanel).SetBackgroundColor(background); };
-            anim.SetDuration(500);
-            anim.StartDelay = 200;
-            anim.Start();
+            ////Reveal for the player
+            //View reveal = MainActivity.instance.FindViewById<View>(Resource.Id.reveal);
+            //int centerX, centerY;
+            //float endRadius;
+            //if (playNext == true)
+            //{
+            //    centerX = 0;
+            //    centerY = reveal.Height / 2;
+            //    endRadius = reveal.Width * 1.3f;
+            //}
+            //else if(playNext == null)
+            //{
+            //    centerX = reveal.Width / 2;
+            //    centerY = reveal.Height;
+            //    endRadius = reveal.Width / 1.5f;
+            //}
+            //else
+            //{
+            //    centerX = reveal.Width;
+            //    centerY = reveal.Height / 2;
+            //    endRadius = reveal.Width * 1.3f;
+            //}
+            //Animator anim = ViewAnimationUtils.CreateCircularReveal(reveal, centerX, centerY, 0, endRadius);
+            //anim.AnimationStart += (sender, e) => { reveal.SetBackgroundColor(background); };
+            //anim.AnimationEnd += (sender, e) => { MainActivity.instance?.FindViewById<RelativeLayout>(Resource.Id.infoPanel).SetBackgroundColor(background); };
+            //anim.SetDuration(500);
+            //anim.StartDelay = 200;
+            //anim.Start();
 
             //Reveal for the smallPlayer
             if (prepared)
@@ -610,7 +618,7 @@ namespace MusicApp
             if (bar == null)
                 bar = MainActivity.instance.FindViewById<SeekBar>(Resource.Id.songTimer);
 
-            if(spBar == null)
+            if (spBar == null)
                 spBar = MainActivity.instance.FindViewById<ProgressBar>(Resource.Id.spProgress);
 
             bar.ProgressTintList = ColorStateList.ValueOf(accentColor);
@@ -621,7 +629,7 @@ namespace MusicApp
 
             if (IsColorDark(accent.Rgb))
             {
-                MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).ImageTintList = ColorStateList.ValueOf(Color.White);
+                //MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).ImageTintList = ColorStateList.ValueOf(Color.White);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spNext).ImageTintList = ColorStateList.ValueOf(Color.White);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spPlay).ImageTintList = ColorStateList.ValueOf(Color.White);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spLast).ImageTintList = ColorStateList.ValueOf(Color.White);
@@ -629,7 +637,7 @@ namespace MusicApp
             }
             else
             {
-                MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).ImageTintList = ColorStateList.ValueOf(Color.Black);
+                //MainActivity.instance.FindViewById<FloatingActionButton>(Resource.Id.downFAB).ImageTintList = ColorStateList.ValueOf(Color.Black);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spNext).ImageTintList = ColorStateList.ValueOf(Color.Black);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spPlay).ImageTintList = ColorStateList.ValueOf(Color.Black);
                 MainActivity.instance.FindViewById<ImageButton>(Resource.Id.spLast).ImageTintList = ColorStateList.ValueOf(Color.Black);
diff --git a/MusicApp/Resources/Resource.Designer.cs b/MusicApp/Resources/Resource.Designer.cs
index 6a1afb5..7c8006e 100644
--- a/MusicApp/Resources/Resource.Designer.cs
+++ b/MusicApp/Resources/Resource.Designer.cs
@@ -3682,26 +3682,26 @@ namespace MusicApp
 			// aapt resource value: 0x7f020057
 			public const int avd_hide_password = 2130837591;
 			
-			// aapt resource value: 0x7f0201f6
-			public const int avd_hide_password_1 = 2130838006;
-			
 			// aapt resource value: 0x7f0201f7
-			public const int avd_hide_password_2 = 2130838007;
+			public const int avd_hide_password_1 = 2130838007;
 			
 			// aapt resource value: 0x7f0201f8
-			public const int avd_hide_password_3 = 2130838008;
+			public const int avd_hide_password_2 = 2130838008;
+			
+			// aapt resource value: 0x7f0201f9
+			public const int avd_hide_password_3 = 2130838009;
 			
 			// aapt resource value: 0x7f020058
 			public const int avd_show_password = 2130837592;
 			
-			// aapt resource value: 0x7f0201f9
-			public const int avd_show_password_1 = 2130838009;
-			
 			// aapt resource value: 0x7f0201fa
-			public const int avd_show_password_2 = 2130838010;
+			public const int avd_show_password_1 = 2130838010;
 			
 			// aapt resource value: 0x7f0201fb
-			public const int avd_show_password_3 = 2130838011;
+			public const int avd_show_password_2 = 2130838011;
+			
+			// aapt resource value: 0x7f0201fc
+			public const int avd_show_password_3 = 2130838012;
 			
 			// aapt resource value: 0x7f020059
 			public const int Cancel = 2130837593;
@@ -3929,1018 +3929,1021 @@ namespace MusicApp
 			public const int common_google_signin_btn_text_light_normal_background = 2130837667;
 			
 			// aapt resource value: 0x7f0200a4
-			public const int darkRectangle = 2130837668;
+			public const int darkCircle = 2130837668;
 			
 			// aapt resource value: 0x7f0200a5
-			public const int Delete = 2130837669;
+			public const int darkLinear = 2130837669;
 			
 			// aapt resource value: 0x7f0200a6
-			public const int design_bottom_navigation_item_background = 2130837670;
+			public const int darkRectangle = 2130837670;
 			
 			// aapt resource value: 0x7f0200a7
-			public const int design_fab_background = 2130837671;
+			public const int Delete = 2130837671;
 			
 			// aapt resource value: 0x7f0200a8
-			public const int design_ic_visibility = 2130837672;
+			public const int design_bottom_navigation_item_background = 2130837672;
 			
 			// aapt resource value: 0x7f0200a9
-			public const int design_ic_visibility_off = 2130837673;
+			public const int design_fab_background = 2130837673;
 			
 			// aapt resource value: 0x7f0200aa
-			public const int design_password_eye = 2130837674;
+			public const int design_ic_visibility = 2130837674;
 			
 			// aapt resource value: 0x7f0200ab
-			public const int design_snackbar_background = 2130837675;
+			public const int design_ic_visibility_off = 2130837675;
 			
 			// aapt resource value: 0x7f0200ac
-			public const int Download = 2130837676;
+			public const int design_password_eye = 2130837676;
 			
 			// aapt resource value: 0x7f0200ad
-			public const int Edit = 2130837677;
+			public const int design_snackbar_background = 2130837677;
 			
 			// aapt resource value: 0x7f0200ae
-			public const int Error = 2130837678;
-			
-			// aapt resource value: 0x7f0201e9
-			public const int exo_controls_fastforward = 2130837993;
+			public const int Download = 2130837678;
 			
 			// aapt resource value: 0x7f0200af
-			public const int exo_controls_fullscreen_enter = 2130837679;
+			public const int Edit = 2130837679;
 			
 			// aapt resource value: 0x7f0200b0
-			public const int exo_controls_fullscreen_exit = 2130837680;
+			public const int Error = 2130837680;
 			
 			// aapt resource value: 0x7f0201ea
-			public const int exo_controls_next = 2130837994;
-			
-			// aapt resource value: 0x7f0201eb
-			public const int exo_controls_pause = 2130837995;
-			
-			// aapt resource value: 0x7f0201ec
-			public const int exo_controls_play = 2130837996;
-			
-			// aapt resource value: 0x7f0201ed
-			public const int exo_controls_previous = 2130837997;
+			public const int exo_controls_fastforward = 2130837994;
 			
 			// aapt resource value: 0x7f0200b1
-			public const int exo_controls_repeat_all = 2130837681;
+			public const int exo_controls_fullscreen_enter = 2130837681;
 			
 			// aapt resource value: 0x7f0200b2
-			public const int exo_controls_repeat_off = 2130837682;
+			public const int exo_controls_fullscreen_exit = 2130837682;
 			
-			// aapt resource value: 0x7f0200b3
-			public const int exo_controls_repeat_one = 2130837683;
+			// aapt resource value: 0x7f0201eb
+			public const int exo_controls_next = 2130837995;
+			
+			// aapt resource value: 0x7f0201ec
+			public const int exo_controls_pause = 2130837996;
+			
+			// aapt resource value: 0x7f0201ed
+			public const int exo_controls_play = 2130837997;
 			
 			// aapt resource value: 0x7f0201ee
-			public const int exo_controls_rewind = 2130837998;
+			public const int exo_controls_previous = 2130837998;
+			
+			// aapt resource value: 0x7f0200b3
+			public const int exo_controls_repeat_all = 2130837683;
 			
 			// aapt resource value: 0x7f0200b4
-			public const int exo_controls_shuffle = 2130837684;
+			public const int exo_controls_repeat_off = 2130837684;
 			
 			// aapt resource value: 0x7f0200b5
-			public const int exo_edit_mode_logo = 2130837685;
-			
-			// aapt resource value: 0x7f0200b6
-			public const int exo_icon_fastforward = 2130837686;
-			
-			// aapt resource value: 0x7f0200b7
-			public const int exo_icon_next = 2130837687;
-			
-			// aapt resource value: 0x7f0200b8
-			public const int exo_icon_pause = 2130837688;
-			
-			// aapt resource value: 0x7f0200b9
-			public const int exo_icon_play = 2130837689;
-			
-			// aapt resource value: 0x7f0200ba
-			public const int exo_icon_previous = 2130837690;
-			
-			// aapt resource value: 0x7f0200bb
-			public const int exo_icon_rewind = 2130837691;
-			
-			// aapt resource value: 0x7f0200bc
-			public const int exo_icon_stop = 2130837692;
+			public const int exo_controls_repeat_one = 2130837685;
 			
 			// aapt resource value: 0x7f0201ef
-			public const int exo_notification_fastforward = 2130837999;
+			public const int exo_controls_rewind = 2130837999;
 			
-			// aapt resource value: 0x7f0201f0
-			public const int exo_notification_next = 2130838000;
+			// aapt resource value: 0x7f0200b6
+			public const int exo_controls_shuffle = 2130837686;
 			
-			// aapt resource value: 0x7f0201f1
-			public const int exo_notification_pause = 2130838001;
+			// aapt resource value: 0x7f0200b7
+			public const int exo_edit_mode_logo = 2130837687;
 			
-			// aapt resource value: 0x7f0201f2
-			public const int exo_notification_play = 2130838002;
+			// aapt resource value: 0x7f0200b8
+			public const int exo_icon_fastforward = 2130837688;
 			
-			// aapt resource value: 0x7f0201f3
-			public const int exo_notification_previous = 2130838003;
+			// aapt resource value: 0x7f0200b9
+			public const int exo_icon_next = 2130837689;
 			
-			// aapt resource value: 0x7f0201f4
-			public const int exo_notification_rewind = 2130838004;
+			// aapt resource value: 0x7f0200ba
+			public const int exo_icon_pause = 2130837690;
+			
+			// aapt resource value: 0x7f0200bb
+			public const int exo_icon_play = 2130837691;
+			
+			// aapt resource value: 0x7f0200bc
+			public const int exo_icon_previous = 2130837692;
 			
 			// aapt resource value: 0x7f0200bd
-			public const int exo_notification_small_icon = 2130837693;
-			
-			// aapt resource value: 0x7f0201f5
-			public const int exo_notification_stop = 2130838005;
+			public const int exo_icon_rewind = 2130837693;
 			
 			// aapt resource value: 0x7f0200be
-			public const int ExpandLess = 2130837694;
+			public const int exo_icon_stop = 2130837694;
+			
+			// aapt resource value: 0x7f0201f0
+			public const int exo_notification_fastforward = 2130838000;
+			
+			// aapt resource value: 0x7f0201f1
+			public const int exo_notification_next = 2130838001;
+			
+			// aapt resource value: 0x7f0201f2
+			public const int exo_notification_pause = 2130838002;
+			
+			// aapt resource value: 0x7f0201f3
+			public const int exo_notification_play = 2130838003;
+			
+			// aapt resource value: 0x7f0201f4
+			public const int exo_notification_previous = 2130838004;
+			
+			// aapt resource value: 0x7f0201f5
+			public const int exo_notification_rewind = 2130838005;
 			
 			// aapt resource value: 0x7f0200bf
-			public const int Filter = 2130837695;
+			public const int exo_notification_small_icon = 2130837695;
+			
+			// aapt resource value: 0x7f0201f6
+			public const int exo_notification_stop = 2130838006;
 			
 			// aapt resource value: 0x7f0200c0
-			public const int FlatButtonBorder = 2130837696;
+			public const int ExpandLess = 2130837696;
 			
 			// aapt resource value: 0x7f0200c1
-			public const int Folder = 2130837697;
+			public const int Filter = 2130837697;
 			
 			// aapt resource value: 0x7f0200c2
-			public const int googleg_disabled_color_18 = 2130837698;
+			public const int FlatButtonBorder = 2130837698;
 			
 			// aapt resource value: 0x7f0200c3
-			public const int googleg_standard_color_18 = 2130837699;
+			public const int Folder = 2130837699;
 			
 			// aapt resource value: 0x7f0200c4
-			public const int GradientShape = 2130837700;
+			public const int googleg_disabled_color_18 = 2130837700;
 			
 			// aapt resource value: 0x7f0200c5
-			public const int History = 2130837701;
+			public const int googleg_standard_color_18 = 2130837701;
 			
 			// aapt resource value: 0x7f0200c6
-			public const int Home = 2130837702;
+			public const int GradientShape = 2130837702;
 			
 			// aapt resource value: 0x7f0200c7
-			public const int ic_arrow_down_24dp = 2130837703;
+			public const int History = 2130837703;
 			
 			// aapt resource value: 0x7f0200c8
-			public const int ic_audiotrack_dark = 2130837704;
+			public const int Home = 2130837704;
 			
 			// aapt resource value: 0x7f0200c9
-			public const int ic_audiotrack_light = 2130837705;
+			public const int ic_arrow_down_24dp = 2130837705;
 			
 			// aapt resource value: 0x7f0200ca
-			public const int ic_dialog_close_dark = 2130837706;
+			public const int ic_audiotrack_dark = 2130837706;
 			
 			// aapt resource value: 0x7f0200cb
-			public const int ic_dialog_close_light = 2130837707;
+			public const int ic_audiotrack_light = 2130837707;
 			
 			// aapt resource value: 0x7f0200cc
-			public const int ic_done_black_24dp = 2130837708;
+			public const int ic_dialog_close_dark = 2130837708;
 			
 			// aapt resource value: 0x7f0200cd
-			public const int ic_group_collapse_00 = 2130837709;
+			public const int ic_dialog_close_light = 2130837709;
 			
 			// aapt resource value: 0x7f0200ce
-			public const int ic_group_collapse_01 = 2130837710;
+			public const int ic_done_black_24dp = 2130837710;
 			
 			// aapt resource value: 0x7f0200cf
-			public const int ic_group_collapse_02 = 2130837711;
+			public const int ic_group_collapse_00 = 2130837711;
 			
 			// aapt resource value: 0x7f0200d0
-			public const int ic_group_collapse_03 = 2130837712;
+			public const int ic_group_collapse_01 = 2130837712;
 			
 			// aapt resource value: 0x7f0200d1
-			public const int ic_group_collapse_04 = 2130837713;
+			public const int ic_group_collapse_02 = 2130837713;
 			
 			// aapt resource value: 0x7f0200d2
-			public const int ic_group_collapse_05 = 2130837714;
+			public const int ic_group_collapse_03 = 2130837714;
 			
 			// aapt resource value: 0x7f0200d3
-			public const int ic_group_collapse_06 = 2130837715;
+			public const int ic_group_collapse_04 = 2130837715;
 			
 			// aapt resource value: 0x7f0200d4
-			public const int ic_group_collapse_07 = 2130837716;
+			public const int ic_group_collapse_05 = 2130837716;
 			
 			// aapt resource value: 0x7f0200d5
-			public const int ic_group_collapse_08 = 2130837717;
+			public const int ic_group_collapse_06 = 2130837717;
 			
 			// aapt resource value: 0x7f0200d6
-			public const int ic_group_collapse_09 = 2130837718;
+			public const int ic_group_collapse_07 = 2130837718;
 			
 			// aapt resource value: 0x7f0200d7
-			public const int ic_group_collapse_10 = 2130837719;
+			public const int ic_group_collapse_08 = 2130837719;
 			
 			// aapt resource value: 0x7f0200d8
-			public const int ic_group_collapse_11 = 2130837720;
+			public const int ic_group_collapse_09 = 2130837720;
 			
 			// aapt resource value: 0x7f0200d9
-			public const int ic_group_collapse_12 = 2130837721;
+			public const int ic_group_collapse_10 = 2130837721;
 			
 			// aapt resource value: 0x7f0200da
-			public const int ic_group_collapse_13 = 2130837722;
+			public const int ic_group_collapse_11 = 2130837722;
 			
 			// aapt resource value: 0x7f0200db
-			public const int ic_group_collapse_14 = 2130837723;
+			public const int ic_group_collapse_12 = 2130837723;
 			
 			// aapt resource value: 0x7f0200dc
-			public const int ic_group_collapse_15 = 2130837724;
+			public const int ic_group_collapse_13 = 2130837724;
 			
 			// aapt resource value: 0x7f0200dd
-			public const int ic_group_expand_00 = 2130837725;
+			public const int ic_group_collapse_14 = 2130837725;
 			
 			// aapt resource value: 0x7f0200de
-			public const int ic_group_expand_01 = 2130837726;
+			public const int ic_group_collapse_15 = 2130837726;
 			
 			// aapt resource value: 0x7f0200df
-			public const int ic_group_expand_02 = 2130837727;
+			public const int ic_group_expand_00 = 2130837727;
 			
 			// aapt resource value: 0x7f0200e0
-			public const int ic_group_expand_03 = 2130837728;
+			public const int ic_group_expand_01 = 2130837728;
 			
 			// aapt resource value: 0x7f0200e1
-			public const int ic_group_expand_04 = 2130837729;
+			public const int ic_group_expand_02 = 2130837729;
 			
 			// aapt resource value: 0x7f0200e2
-			public const int ic_group_expand_05 = 2130837730;
+			public const int ic_group_expand_03 = 2130837730;
 			
 			// aapt resource value: 0x7f0200e3
-			public const int ic_group_expand_06 = 2130837731;
+			public const int ic_group_expand_04 = 2130837731;
 			
 			// aapt resource value: 0x7f0200e4
-			public const int ic_group_expand_07 = 2130837732;
+			public const int ic_group_expand_05 = 2130837732;
 			
 			// aapt resource value: 0x7f0200e5
-			public const int ic_group_expand_08 = 2130837733;
+			public const int ic_group_expand_06 = 2130837733;
 			
 			// aapt resource value: 0x7f0200e6
-			public const int ic_group_expand_09 = 2130837734;
+			public const int ic_group_expand_07 = 2130837734;
 			
 			// aapt resource value: 0x7f0200e7
-			public const int ic_group_expand_10 = 2130837735;
+			public const int ic_group_expand_08 = 2130837735;
 			
 			// aapt resource value: 0x7f0200e8
-			public const int ic_group_expand_11 = 2130837736;
+			public const int ic_group_expand_09 = 2130837736;
 			
 			// aapt resource value: 0x7f0200e9
-			public const int ic_group_expand_12 = 2130837737;
+			public const int ic_group_expand_10 = 2130837737;
 			
 			// aapt resource value: 0x7f0200ea
-			public const int ic_group_expand_13 = 2130837738;
+			public const int ic_group_expand_11 = 2130837738;
 			
 			// aapt resource value: 0x7f0200eb
-			public const int ic_group_expand_14 = 2130837739;
+			public const int ic_group_expand_12 = 2130837739;
 			
 			// aapt resource value: 0x7f0200ec
-			public const int ic_group_expand_15 = 2130837740;
+			public const int ic_group_expand_13 = 2130837740;
 			
 			// aapt resource value: 0x7f0200ed
-			public const int ic_media_pause_dark = 2130837741;
+			public const int ic_group_expand_14 = 2130837741;
 			
 			// aapt resource value: 0x7f0200ee
-			public const int ic_media_pause_light = 2130837742;
+			public const int ic_group_expand_15 = 2130837742;
 			
 			// aapt resource value: 0x7f0200ef
-			public const int ic_media_play_dark = 2130837743;
+			public const int ic_media_pause_dark = 2130837743;
 			
 			// aapt resource value: 0x7f0200f0
-			public const int ic_media_play_light = 2130837744;
+			public const int ic_media_pause_light = 2130837744;
 			
 			// aapt resource value: 0x7f0200f1
-			public const int ic_media_stop_dark = 2130837745;
+			public const int ic_media_play_dark = 2130837745;
 			
 			// aapt resource value: 0x7f0200f2
-			public const int ic_media_stop_light = 2130837746;
+			public const int ic_media_play_light = 2130837746;
 			
 			// aapt resource value: 0x7f0200f3
-			public const int ic_mr_button_connected_00_dark = 2130837747;
+			public const int ic_media_stop_dark = 2130837747;
 			
 			// aapt resource value: 0x7f0200f4
-			public const int ic_mr_button_connected_00_light = 2130837748;
+			public const int ic_media_stop_light = 2130837748;
 			
 			// aapt resource value: 0x7f0200f5
-			public const int ic_mr_button_connected_01_dark = 2130837749;
+			public const int ic_mr_button_connected_00_dark = 2130837749;
 			
 			// aapt resource value: 0x7f0200f6
-			public const int ic_mr_button_connected_01_light = 2130837750;
+			public const int ic_mr_button_connected_00_light = 2130837750;
 			
 			// aapt resource value: 0x7f0200f7
-			public const int ic_mr_button_connected_02_dark = 2130837751;
+			public const int ic_mr_button_connected_01_dark = 2130837751;
 			
 			// aapt resource value: 0x7f0200f8
-			public const int ic_mr_button_connected_02_light = 2130837752;
+			public const int ic_mr_button_connected_01_light = 2130837752;
 			
 			// aapt resource value: 0x7f0200f9
-			public const int ic_mr_button_connected_03_dark = 2130837753;
+			public const int ic_mr_button_connected_02_dark = 2130837753;
 			
 			// aapt resource value: 0x7f0200fa
-			public const int ic_mr_button_connected_03_light = 2130837754;
+			public const int ic_mr_button_connected_02_light = 2130837754;
 			
 			// aapt resource value: 0x7f0200fb
-			public const int ic_mr_button_connected_04_dark = 2130837755;
+			public const int ic_mr_button_connected_03_dark = 2130837755;
 			
 			// aapt resource value: 0x7f0200fc
-			public const int ic_mr_button_connected_04_light = 2130837756;
+			public const int ic_mr_button_connected_03_light = 2130837756;
 			
 			// aapt resource value: 0x7f0200fd
-			public const int ic_mr_button_connected_05_dark = 2130837757;
+			public const int ic_mr_button_connected_04_dark = 2130837757;
 			
 			// aapt resource value: 0x7f0200fe
-			public const int ic_mr_button_connected_05_light = 2130837758;
+			public const int ic_mr_button_connected_04_light = 2130837758;
 			
 			// aapt resource value: 0x7f0200ff
-			public const int ic_mr_button_connected_06_dark = 2130837759;
+			public const int ic_mr_button_connected_05_dark = 2130837759;
 			
 			// aapt resource value: 0x7f020100
-			public const int ic_mr_button_connected_06_light = 2130837760;
+			public const int ic_mr_button_connected_05_light = 2130837760;
 			
 			// aapt resource value: 0x7f020101
-			public const int ic_mr_button_connected_07_dark = 2130837761;
+			public const int ic_mr_button_connected_06_dark = 2130837761;
 			
 			// aapt resource value: 0x7f020102
-			public const int ic_mr_button_connected_07_light = 2130837762;
+			public const int ic_mr_button_connected_06_light = 2130837762;
 			
 			// aapt resource value: 0x7f020103
-			public const int ic_mr_button_connected_08_dark = 2130837763;
+			public const int ic_mr_button_connected_07_dark = 2130837763;
 			
 			// aapt resource value: 0x7f020104
-			public const int ic_mr_button_connected_08_light = 2130837764;
+			public const int ic_mr_button_connected_07_light = 2130837764;
 			
 			// aapt resource value: 0x7f020105
-			public const int ic_mr_button_connected_09_dark = 2130837765;
+			public const int ic_mr_button_connected_08_dark = 2130837765;
 			
 			// aapt resource value: 0x7f020106
-			public const int ic_mr_button_connected_09_light = 2130837766;
+			public const int ic_mr_button_connected_08_light = 2130837766;
 			
 			// aapt resource value: 0x7f020107
-			public const int ic_mr_button_connected_10_dark = 2130837767;
+			public const int ic_mr_button_connected_09_dark = 2130837767;
 			
 			// aapt resource value: 0x7f020108
-			public const int ic_mr_button_connected_10_light = 2130837768;
+			public const int ic_mr_button_connected_09_light = 2130837768;
 			
 			// aapt resource value: 0x7f020109
-			public const int ic_mr_button_connected_11_dark = 2130837769;
+			public const int ic_mr_button_connected_10_dark = 2130837769;
 			
 			// aapt resource value: 0x7f02010a
-			public const int ic_mr_button_connected_11_light = 2130837770;
+			public const int ic_mr_button_connected_10_light = 2130837770;
 			
 			// aapt resource value: 0x7f02010b
-			public const int ic_mr_button_connected_12_dark = 2130837771;
+			public const int ic_mr_button_connected_11_dark = 2130837771;
 			
 			// aapt resource value: 0x7f02010c
-			public const int ic_mr_button_connected_12_light = 2130837772;
+			public const int ic_mr_button_connected_11_light = 2130837772;
 			
 			// aapt resource value: 0x7f02010d
-			public const int ic_mr_button_connected_13_dark = 2130837773;
+			public const int ic_mr_button_connected_12_dark = 2130837773;
 			
 			// aapt resource value: 0x7f02010e
-			public const int ic_mr_button_connected_13_light = 2130837774;
+			public const int ic_mr_button_connected_12_light = 2130837774;
 			
 			// aapt resource value: 0x7f02010f
-			public const int ic_mr_button_connected_14_dark = 2130837775;
+			public const int ic_mr_button_connected_13_dark = 2130837775;
 			
 			// aapt resource value: 0x7f020110
-			public const int ic_mr_button_connected_14_light = 2130837776;
+			public const int ic_mr_button_connected_13_light = 2130837776;
 			
 			// aapt resource value: 0x7f020111
-			public const int ic_mr_button_connected_15_dark = 2130837777;
+			public const int ic_mr_button_connected_14_dark = 2130837777;
 			
 			// aapt resource value: 0x7f020112
-			public const int ic_mr_button_connected_15_light = 2130837778;
+			public const int ic_mr_button_connected_14_light = 2130837778;
 			
 			// aapt resource value: 0x7f020113
-			public const int ic_mr_button_connected_16_dark = 2130837779;
+			public const int ic_mr_button_connected_15_dark = 2130837779;
 			
 			// aapt resource value: 0x7f020114
-			public const int ic_mr_button_connected_16_light = 2130837780;
+			public const int ic_mr_button_connected_15_light = 2130837780;
 			
 			// aapt resource value: 0x7f020115
-			public const int ic_mr_button_connected_17_dark = 2130837781;
+			public const int ic_mr_button_connected_16_dark = 2130837781;
 			
 			// aapt resource value: 0x7f020116
-			public const int ic_mr_button_connected_17_light = 2130837782;
+			public const int ic_mr_button_connected_16_light = 2130837782;
 			
 			// aapt resource value: 0x7f020117
-			public const int ic_mr_button_connected_18_dark = 2130837783;
+			public const int ic_mr_button_connected_17_dark = 2130837783;
 			
 			// aapt resource value: 0x7f020118
-			public const int ic_mr_button_connected_18_light = 2130837784;
+			public const int ic_mr_button_connected_17_light = 2130837784;
 			
 			// aapt resource value: 0x7f020119
-			public const int ic_mr_button_connected_19_dark = 2130837785;
+			public const int ic_mr_button_connected_18_dark = 2130837785;
 			
 			// aapt resource value: 0x7f02011a
-			public const int ic_mr_button_connected_19_light = 2130837786;
+			public const int ic_mr_button_connected_18_light = 2130837786;
 			
 			// aapt resource value: 0x7f02011b
-			public const int ic_mr_button_connected_20_dark = 2130837787;
+			public const int ic_mr_button_connected_19_dark = 2130837787;
 			
 			// aapt resource value: 0x7f02011c
-			public const int ic_mr_button_connected_20_light = 2130837788;
+			public const int ic_mr_button_connected_19_light = 2130837788;
 			
 			// aapt resource value: 0x7f02011d
-			public const int ic_mr_button_connected_21_dark = 2130837789;
+			public const int ic_mr_button_connected_20_dark = 2130837789;
 			
 			// aapt resource value: 0x7f02011e
-			public const int ic_mr_button_connected_21_light = 2130837790;
+			public const int ic_mr_button_connected_20_light = 2130837790;
 			
 			// aapt resource value: 0x7f02011f
-			public const int ic_mr_button_connected_22_dark = 2130837791;
+			public const int ic_mr_button_connected_21_dark = 2130837791;
 			
 			// aapt resource value: 0x7f020120
-			public const int ic_mr_button_connected_22_light = 2130837792;
+			public const int ic_mr_button_connected_21_light = 2130837792;
 			
 			// aapt resource value: 0x7f020121
-			public const int ic_mr_button_connected_23_dark = 2130837793;
+			public const int ic_mr_button_connected_22_dark = 2130837793;
 			
 			// aapt resource value: 0x7f020122
-			public const int ic_mr_button_connected_23_light = 2130837794;
+			public const int ic_mr_button_connected_22_light = 2130837794;
 			
 			// aapt resource value: 0x7f020123
-			public const int ic_mr_button_connected_24_dark = 2130837795;
+			public const int ic_mr_button_connected_23_dark = 2130837795;
 			
 			// aapt resource value: 0x7f020124
-			public const int ic_mr_button_connected_24_light = 2130837796;
+			public const int ic_mr_button_connected_23_light = 2130837796;
 			
 			// aapt resource value: 0x7f020125
-			public const int ic_mr_button_connected_25_dark = 2130837797;
+			public const int ic_mr_button_connected_24_dark = 2130837797;
 			
 			// aapt resource value: 0x7f020126
-			public const int ic_mr_button_connected_25_light = 2130837798;
+			public const int ic_mr_button_connected_24_light = 2130837798;
 			
 			// aapt resource value: 0x7f020127
-			public const int ic_mr_button_connected_26_dark = 2130837799;
+			public const int ic_mr_button_connected_25_dark = 2130837799;
 			
 			// aapt resource value: 0x7f020128
-			public const int ic_mr_button_connected_26_light = 2130837800;
+			public const int ic_mr_button_connected_25_light = 2130837800;
 			
 			// aapt resource value: 0x7f020129
-			public const int ic_mr_button_connected_27_dark = 2130837801;
+			public const int ic_mr_button_connected_26_dark = 2130837801;
 			
 			// aapt resource value: 0x7f02012a
-			public const int ic_mr_button_connected_27_light = 2130837802;
+			public const int ic_mr_button_connected_26_light = 2130837802;
 			
 			// aapt resource value: 0x7f02012b
-			public const int ic_mr_button_connected_28_dark = 2130837803;
+			public const int ic_mr_button_connected_27_dark = 2130837803;
 			
 			// aapt resource value: 0x7f02012c
-			public const int ic_mr_button_connected_28_light = 2130837804;
+			public const int ic_mr_button_connected_27_light = 2130837804;
 			
 			// aapt resource value: 0x7f02012d
-			public const int ic_mr_button_connected_29_dark = 2130837805;
+			public const int ic_mr_button_connected_28_dark = 2130837805;
 			
 			// aapt resource value: 0x7f02012e
-			public const int ic_mr_button_connected_29_light = 2130837806;
+			public const int ic_mr_button_connected_28_light = 2130837806;
 			
 			// aapt resource value: 0x7f02012f
-			public const int ic_mr_button_connected_30_dark = 2130837807;
+			public const int ic_mr_button_connected_29_dark = 2130837807;
 			
 			// aapt resource value: 0x7f020130
-			public const int ic_mr_button_connected_30_light = 2130837808;
+			public const int ic_mr_button_connected_29_light = 2130837808;
 			
 			// aapt resource value: 0x7f020131
-			public const int ic_mr_button_connecting_00_dark = 2130837809;
+			public const int ic_mr_button_connected_30_dark = 2130837809;
 			
 			// aapt resource value: 0x7f020132
-			public const int ic_mr_button_connecting_00_light = 2130837810;
+			public const int ic_mr_button_connected_30_light = 2130837810;
 			
 			// aapt resource value: 0x7f020133
-			public const int ic_mr_button_connecting_01_dark = 2130837811;
+			public const int ic_mr_button_connecting_00_dark = 2130837811;
 			
 			// aapt resource value: 0x7f020134
-			public const int ic_mr_button_connecting_01_light = 2130837812;
+			public const int ic_mr_button_connecting_00_light = 2130837812;
 			
 			// aapt resource value: 0x7f020135
-			public const int ic_mr_button_connecting_02_dark = 2130837813;
+			public const int ic_mr_button_connecting_01_dark = 2130837813;
 			
 			// aapt resource value: 0x7f020136
-			public const int ic_mr_button_connecting_02_light = 2130837814;
+			public const int ic_mr_button_connecting_01_light = 2130837814;
 			
 			// aapt resource value: 0x7f020137
-			public const int ic_mr_button_connecting_03_dark = 2130837815;
+			public const int ic_mr_button_connecting_02_dark = 2130837815;
 			
 			// aapt resource value: 0x7f020138
-			public const int ic_mr_button_connecting_03_light = 2130837816;
+			public const int ic_mr_button_connecting_02_light = 2130837816;
 			
 			// aapt resource value: 0x7f020139
-			public const int ic_mr_button_connecting_04_dark = 2130837817;
+			public const int ic_mr_button_connecting_03_dark = 2130837817;
 			
 			// aapt resource value: 0x7f02013a
-			public const int ic_mr_button_connecting_04_light = 2130837818;
+			public const int ic_mr_button_connecting_03_light = 2130837818;
 			
 			// aapt resource value: 0x7f02013b
-			public const int ic_mr_button_connecting_05_dark = 2130837819;
+			public const int ic_mr_button_connecting_04_dark = 2130837819;
 			
 			// aapt resource value: 0x7f02013c
-			public const int ic_mr_button_connecting_05_light = 2130837820;
+			public const int ic_mr_button_connecting_04_light = 2130837820;
 			
 			// aapt resource value: 0x7f02013d
-			public const int ic_mr_button_connecting_06_dark = 2130837821;
+			public const int ic_mr_button_connecting_05_dark = 2130837821;
 			
 			// aapt resource value: 0x7f02013e
-			public const int ic_mr_button_connecting_06_light = 2130837822;
+			public const int ic_mr_button_connecting_05_light = 2130837822;
 			
 			// aapt resource value: 0x7f02013f
-			public const int ic_mr_button_connecting_07_dark = 2130837823;
+			public const int ic_mr_button_connecting_06_dark = 2130837823;
 			
 			// aapt resource value: 0x7f020140
-			public const int ic_mr_button_connecting_07_light = 2130837824;
+			public const int ic_mr_button_connecting_06_light = 2130837824;
 			
 			// aapt resource value: 0x7f020141
-			public const int ic_mr_button_connecting_08_dark = 2130837825;
+			public const int ic_mr_button_connecting_07_dark = 2130837825;
 			
 			// aapt resource value: 0x7f020142
-			public const int ic_mr_button_connecting_08_light = 2130837826;
+			public const int ic_mr_button_connecting_07_light = 2130837826;
 			
 			// aapt resource value: 0x7f020143
-			public const int ic_mr_button_connecting_09_dark = 2130837827;
+			public const int ic_mr_button_connecting_08_dark = 2130837827;
 			
 			// aapt resource value: 0x7f020144
-			public const int ic_mr_button_connecting_09_light = 2130837828;
+			public const int ic_mr_button_connecting_08_light = 2130837828;
 			
 			// aapt resource value: 0x7f020145
-			public const int ic_mr_button_connecting_10_dark = 2130837829;
+			public const int ic_mr_button_connecting_09_dark = 2130837829;
 			
 			// aapt resource value: 0x7f020146
-			public const int ic_mr_button_connecting_10_light = 2130837830;
+			public const int ic_mr_button_connecting_09_light = 2130837830;
 			
 			// aapt resource value: 0x7f020147
-			public const int ic_mr_button_connecting_11_dark = 2130837831;
+			public const int ic_mr_button_connecting_10_dark = 2130837831;
 			
 			// aapt resource value: 0x7f020148
-			public const int ic_mr_button_connecting_11_light = 2130837832;
+			public const int ic_mr_button_connecting_10_light = 2130837832;
 			
 			// aapt resource value: 0x7f020149
-			public const int ic_mr_button_connecting_12_dark = 2130837833;
+			public const int ic_mr_button_connecting_11_dark = 2130837833;
 			
 			// aapt resource value: 0x7f02014a
-			public const int ic_mr_button_connecting_12_light = 2130837834;
+			public const int ic_mr_button_connecting_11_light = 2130837834;
 			
 			// aapt resource value: 0x7f02014b
-			public const int ic_mr_button_connecting_13_dark = 2130837835;
+			public const int ic_mr_button_connecting_12_dark = 2130837835;
 			
 			// aapt resource value: 0x7f02014c
-			public const int ic_mr_button_connecting_13_light = 2130837836;
+			public const int ic_mr_button_connecting_12_light = 2130837836;
 			
 			// aapt resource value: 0x7f02014d
-			public const int ic_mr_button_connecting_14_dark = 2130837837;
+			public const int ic_mr_button_connecting_13_dark = 2130837837;
 			
 			// aapt resource value: 0x7f02014e
-			public const int ic_mr_button_connecting_14_light = 2130837838;
+			public const int ic_mr_button_connecting_13_light = 2130837838;
 			
 			// aapt resource value: 0x7f02014f
-			public const int ic_mr_button_connecting_15_dark = 2130837839;
+			public const int ic_mr_button_connecting_14_dark = 2130837839;
 			
 			// aapt resource value: 0x7f020150
-			public const int ic_mr_button_connecting_15_light = 2130837840;
+			public const int ic_mr_button_connecting_14_light = 2130837840;
 			
 			// aapt resource value: 0x7f020151
-			public const int ic_mr_button_connecting_16_dark = 2130837841;
+			public const int ic_mr_button_connecting_15_dark = 2130837841;
 			
 			// aapt resource value: 0x7f020152
-			public const int ic_mr_button_connecting_16_light = 2130837842;
+			public const int ic_mr_button_connecting_15_light = 2130837842;
 			
 			// aapt resource value: 0x7f020153
-			public const int ic_mr_button_connecting_17_dark = 2130837843;
+			public const int ic_mr_button_connecting_16_dark = 2130837843;
 			
 			// aapt resource value: 0x7f020154
-			public const int ic_mr_button_connecting_17_light = 2130837844;
+			public const int ic_mr_button_connecting_16_light = 2130837844;
 			
 			// aapt resource value: 0x7f020155
-			public const int ic_mr_button_connecting_18_dark = 2130837845;
+			public const int ic_mr_button_connecting_17_dark = 2130837845;
 			
 			// aapt resource value: 0x7f020156
-			public const int ic_mr_button_connecting_18_light = 2130837846;
+			public const int ic_mr_button_connecting_17_light = 2130837846;
 			
 			// aapt resource value: 0x7f020157
-			public const int ic_mr_button_connecting_19_dark = 2130837847;
+			public const int ic_mr_button_connecting_18_dark = 2130837847;
 			
 			// aapt resource value: 0x7f020158
-			public const int ic_mr_button_connecting_19_light = 2130837848;
+			public const int ic_mr_button_connecting_18_light = 2130837848;
 			
 			// aapt resource value: 0x7f020159
-			public const int ic_mr_button_connecting_20_dark = 2130837849;
+			public const int ic_mr_button_connecting_19_dark = 2130837849;
 			
 			// aapt resource value: 0x7f02015a
-			public const int ic_mr_button_connecting_20_light = 2130837850;
+			public const int ic_mr_button_connecting_19_light = 2130837850;
 			
 			// aapt resource value: 0x7f02015b
-			public const int ic_mr_button_connecting_21_dark = 2130837851;
+			public const int ic_mr_button_connecting_20_dark = 2130837851;
 			
 			// aapt resource value: 0x7f02015c
-			public const int ic_mr_button_connecting_21_light = 2130837852;
+			public const int ic_mr_button_connecting_20_light = 2130837852;
 			
 			// aapt resource value: 0x7f02015d
-			public const int ic_mr_button_connecting_22_dark = 2130837853;
+			public const int ic_mr_button_connecting_21_dark = 2130837853;
 			
 			// aapt resource value: 0x7f02015e
-			public const int ic_mr_button_connecting_22_light = 2130837854;
+			public const int ic_mr_button_connecting_21_light = 2130837854;
 			
 			// aapt resource value: 0x7f02015f
-			public const int ic_mr_button_connecting_23_dark = 2130837855;
+			public const int ic_mr_button_connecting_22_dark = 2130837855;
 			
 			// aapt resource value: 0x7f020160
-			public const int ic_mr_button_connecting_23_light = 2130837856;
+			public const int ic_mr_button_connecting_22_light = 2130837856;
 			
 			// aapt resource value: 0x7f020161
-			public const int ic_mr_button_connecting_24_dark = 2130837857;
+			public const int ic_mr_button_connecting_23_dark = 2130837857;
 			
 			// aapt resource value: 0x7f020162
-			public const int ic_mr_button_connecting_24_light = 2130837858;
+			public const int ic_mr_button_connecting_23_light = 2130837858;
 			
 			// aapt resource value: 0x7f020163
-			public const int ic_mr_button_connecting_25_dark = 2130837859;
+			public const int ic_mr_button_connecting_24_dark = 2130837859;
 			
 			// aapt resource value: 0x7f020164
-			public const int ic_mr_button_connecting_25_light = 2130837860;
+			public const int ic_mr_button_connecting_24_light = 2130837860;
 			
 			// aapt resource value: 0x7f020165
-			public const int ic_mr_button_connecting_26_dark = 2130837861;
+			public const int ic_mr_button_connecting_25_dark = 2130837861;
 			
 			// aapt resource value: 0x7f020166
-			public const int ic_mr_button_connecting_26_light = 2130837862;
+			public const int ic_mr_button_connecting_25_light = 2130837862;
 			
 			// aapt resource value: 0x7f020167
-			public const int ic_mr_button_connecting_27_dark = 2130837863;
+			public const int ic_mr_button_connecting_26_dark = 2130837863;
 			
 			// aapt resource value: 0x7f020168
-			public const int ic_mr_button_connecting_27_light = 2130837864;
+			public const int ic_mr_button_connecting_26_light = 2130837864;
 			
 			// aapt resource value: 0x7f020169
-			public const int ic_mr_button_connecting_28_dark = 2130837865;
+			public const int ic_mr_button_connecting_27_dark = 2130837865;
 			
 			// aapt resource value: 0x7f02016a
-			public const int ic_mr_button_connecting_28_light = 2130837866;
+			public const int ic_mr_button_connecting_27_light = 2130837866;
 			
 			// aapt resource value: 0x7f02016b
-			public const int ic_mr_button_connecting_29_dark = 2130837867;
+			public const int ic_mr_button_connecting_28_dark = 2130837867;
 			
 			// aapt resource value: 0x7f02016c
-			public const int ic_mr_button_connecting_29_light = 2130837868;
+			public const int ic_mr_button_connecting_28_light = 2130837868;
 			
 			// aapt resource value: 0x7f02016d
-			public const int ic_mr_button_connecting_30_dark = 2130837869;
+			public const int ic_mr_button_connecting_29_dark = 2130837869;
 			
 			// aapt resource value: 0x7f02016e
-			public const int ic_mr_button_connecting_30_light = 2130837870;
+			public const int ic_mr_button_connecting_29_light = 2130837870;
 			
 			// aapt resource value: 0x7f02016f
-			public const int ic_mr_button_disabled_dark = 2130837871;
+			public const int ic_mr_button_connecting_30_dark = 2130837871;
 			
 			// aapt resource value: 0x7f020170
-			public const int ic_mr_button_disabled_light = 2130837872;
+			public const int ic_mr_button_connecting_30_light = 2130837872;
 			
 			// aapt resource value: 0x7f020171
-			public const int ic_mr_button_disconnected_dark = 2130837873;
+			public const int ic_mr_button_disabled_dark = 2130837873;
 			
 			// aapt resource value: 0x7f020172
-			public const int ic_mr_button_disconnected_light = 2130837874;
+			public const int ic_mr_button_disabled_light = 2130837874;
 			
 			// aapt resource value: 0x7f020173
-			public const int ic_mr_button_grey = 2130837875;
+			public const int ic_mr_button_disconnected_dark = 2130837875;
 			
 			// aapt resource value: 0x7f020174
-			public const int ic_mtrl_chip_checked_black = 2130837876;
+			public const int ic_mr_button_disconnected_light = 2130837876;
 			
 			// aapt resource value: 0x7f020175
-			public const int ic_mtrl_chip_checked_circle = 2130837877;
+			public const int ic_mr_button_grey = 2130837877;
 			
 			// aapt resource value: 0x7f020176
-			public const int ic_mtrl_chip_close_circle = 2130837878;
+			public const int ic_mtrl_chip_checked_black = 2130837878;
 			
 			// aapt resource value: 0x7f020177
-			public const int ic_vol_type_speaker_dark = 2130837879;
+			public const int ic_mtrl_chip_checked_circle = 2130837879;
 			
 			// aapt resource value: 0x7f020178
-			public const int ic_vol_type_speaker_group_dark = 2130837880;
+			public const int ic_mtrl_chip_close_circle = 2130837880;
 			
 			// aapt resource value: 0x7f020179
-			public const int ic_vol_type_speaker_group_light = 2130837881;
+			public const int ic_vol_type_speaker_dark = 2130837881;
 			
 			// aapt resource value: 0x7f02017a
-			public const int ic_vol_type_speaker_light = 2130837882;
+			public const int ic_vol_type_speaker_group_dark = 2130837882;
 			
 			// aapt resource value: 0x7f02017b
-			public const int ic_vol_type_tv_dark = 2130837883;
+			public const int ic_vol_type_speaker_group_light = 2130837883;
 			
 			// aapt resource value: 0x7f02017c
-			public const int ic_vol_type_tv_light = 2130837884;
+			public const int ic_vol_type_speaker_light = 2130837884;
 			
 			// aapt resource value: 0x7f02017d
-			public const int launcher_icon = 2130837885;
+			public const int ic_vol_type_tv_dark = 2130837885;
 			
 			// aapt resource value: 0x7f02017e
-			public const int LibraryAdd = 2130837886;
+			public const int ic_vol_type_tv_light = 2130837886;
 			
 			// aapt resource value: 0x7f02017f
-			public const int More = 2130837887;
+			public const int launcher_icon = 2130837887;
 			
 			// aapt resource value: 0x7f020180
-			public const int mr_button_connected_dark = 2130837888;
+			public const int LibraryAdd = 2130837888;
 			
 			// aapt resource value: 0x7f020181
-			public const int mr_button_connected_light = 2130837889;
+			public const int More = 2130837889;
 			
 			// aapt resource value: 0x7f020182
-			public const int mr_button_connecting_dark = 2130837890;
+			public const int mr_button_connected_dark = 2130837890;
 			
 			// aapt resource value: 0x7f020183
-			public const int mr_button_connecting_light = 2130837891;
+			public const int mr_button_connected_light = 2130837891;
 			
 			// aapt resource value: 0x7f020184
-			public const int mr_button_dark = 2130837892;
+			public const int mr_button_connecting_dark = 2130837892;
 			
 			// aapt resource value: 0x7f020185
-			public const int mr_button_light = 2130837893;
+			public const int mr_button_connecting_light = 2130837893;
 			
 			// aapt resource value: 0x7f020186
-			public const int mr_dialog_close_dark = 2130837894;
+			public const int mr_button_dark = 2130837894;
 			
 			// aapt resource value: 0x7f020187
-			public const int mr_dialog_close_light = 2130837895;
+			public const int mr_button_light = 2130837895;
 			
 			// aapt resource value: 0x7f020188
-			public const int mr_dialog_material_background_dark = 2130837896;
+			public const int mr_dialog_close_dark = 2130837896;
 			
 			// aapt resource value: 0x7f020189
-			public const int mr_dialog_material_background_light = 2130837897;
+			public const int mr_dialog_close_light = 2130837897;
 			
 			// aapt resource value: 0x7f02018a
-			public const int mr_group_collapse = 2130837898;
+			public const int mr_dialog_material_background_dark = 2130837898;
 			
 			// aapt resource value: 0x7f02018b
-			public const int mr_group_expand = 2130837899;
+			public const int mr_dialog_material_background_light = 2130837899;
 			
 			// aapt resource value: 0x7f02018c
-			public const int mr_media_pause_dark = 2130837900;
+			public const int mr_group_collapse = 2130837900;
 			
 			// aapt resource value: 0x7f02018d
-			public const int mr_media_pause_light = 2130837901;
+			public const int mr_group_expand = 2130837901;
 			
 			// aapt resource value: 0x7f02018e
-			public const int mr_media_play_dark = 2130837902;
+			public const int mr_media_pause_dark = 2130837902;
 			
 			// aapt resource value: 0x7f02018f
-			public const int mr_media_play_light = 2130837903;
+			public const int mr_media_pause_light = 2130837903;
 			
 			// aapt resource value: 0x7f020190
-			public const int mr_media_stop_dark = 2130837904;
+			public const int mr_media_play_dark = 2130837904;
 			
 			// aapt resource value: 0x7f020191
-			public const int mr_media_stop_light = 2130837905;
+			public const int mr_media_play_light = 2130837905;
 			
 			// aapt resource value: 0x7f020192
-			public const int mr_vol_type_audiotrack_dark = 2130837906;
+			public const int mr_media_stop_dark = 2130837906;
 			
 			// aapt resource value: 0x7f020193
-			public const int mr_vol_type_audiotrack_light = 2130837907;
+			public const int mr_media_stop_light = 2130837907;
 			
 			// aapt resource value: 0x7f020194
-			public const int mtrl_snackbar_background = 2130837908;
+			public const int mr_vol_type_audiotrack_dark = 2130837908;
 			
 			// aapt resource value: 0x7f020195
-			public const int mtrl_tabs_default_indicator = 2130837909;
+			public const int mr_vol_type_audiotrack_light = 2130837909;
 			
 			// aapt resource value: 0x7f020196
-			public const int MusicIcon = 2130837910;
+			public const int mtrl_snackbar_background = 2130837910;
 			
 			// aapt resource value: 0x7f020197
-			public const int navigation_empty_icon = 2130837911;
+			public const int mtrl_tabs_default_indicator = 2130837911;
 			
 			// aapt resource value: 0x7f020198
-			public const int needProcessing = 2130837912;
+			public const int MusicIcon = 2130837912;
 			
 			// aapt resource value: 0x7f020199
-			public const int noAlbum = 2130837913;
+			public const int navigation_empty_icon = 2130837913;
 			
 			// aapt resource value: 0x7f02019a
-			public const int notification_action_background = 2130837914;
+			public const int needProcessing = 2130837914;
 			
 			// aapt resource value: 0x7f02019b
-			public const int notification_bg = 2130837915;
+			public const int noAlbum = 2130837915;
 			
 			// aapt resource value: 0x7f02019c
-			public const int notification_bg_low = 2130837916;
+			public const int notification_action_background = 2130837916;
 			
 			// aapt resource value: 0x7f02019d
-			public const int notification_bg_low_normal = 2130837917;
+			public const int notification_bg = 2130837917;
 			
 			// aapt resource value: 0x7f02019e
-			public const int notification_bg_low_pressed = 2130837918;
+			public const int notification_bg_low = 2130837918;
 			
 			// aapt resource value: 0x7f02019f
-			public const int notification_bg_normal = 2130837919;
+			public const int notification_bg_low_normal = 2130837919;
 			
 			// aapt resource value: 0x7f0201a0
-			public const int notification_bg_normal_pressed = 2130837920;
+			public const int notification_bg_low_pressed = 2130837920;
 			
 			// aapt resource value: 0x7f0201a1
-			public const int notification_icon_background = 2130837921;
-			
-			// aapt resource value: 0x7f0201e7
-			public const int notification_template_icon_bg = 2130837991;
-			
-			// aapt resource value: 0x7f0201e8
-			public const int notification_template_icon_low_bg = 2130837992;
+			public const int notification_bg_normal = 2130837921;
 			
 			// aapt resource value: 0x7f0201a2
-			public const int notification_tile_bg = 2130837922;
+			public const int notification_bg_normal_pressed = 2130837922;
 			
 			// aapt resource value: 0x7f0201a3
-			public const int notify_panel_notification_icon_bg = 2130837923;
+			public const int notification_icon_background = 2130837923;
+			
+			// aapt resource value: 0x7f0201e8
+			public const int notification_template_icon_bg = 2130837992;
+			
+			// aapt resource value: 0x7f0201e9
+			public const int notification_template_icon_low_bg = 2130837993;
 			
 			// aapt resource value: 0x7f0201a4
-			public const int OpenInBrowser = 2130837924;
+			public const int notification_tile_bg = 2130837924;
 			
 			// aapt resource value: 0x7f0201a5
-			public const int OpenInYoutube = 2130837925;
+			public const int notify_panel_notification_icon_bg = 2130837925;
 			
 			// aapt resource value: 0x7f0201a6
-			public const int Pause = 2130837926;
+			public const int OpenInBrowser = 2130837926;
 			
 			// aapt resource value: 0x7f0201a7
-			public const int Play = 2130837927;
+			public const int Pause = 2130837927;
 			
 			// aapt resource value: 0x7f0201a8
-			public const int PlayCircle = 2130837928;
+			public const int Play = 2130837928;
 			
 			// aapt resource value: 0x7f0201a9
-			public const int PlaylistAdd = 2130837929;
+			public const int PlayCircle = 2130837929;
 			
 			// aapt resource value: 0x7f0201aa
-			public const int PlaylistPlay = 2130837930;
+			public const int PlaylistAdd = 2130837930;
 			
 			// aapt resource value: 0x7f0201ab
-			public const int preference_list_divider_material = 2130837931;
+			public const int PlaylistPlay = 2130837931;
 			
 			// aapt resource value: 0x7f0201ac
-			public const int PublicIcon = 2130837932;
+			public const int preference_list_divider_material = 2130837932;
 			
 			// aapt resource value: 0x7f0201ad
-			public const int quantum_ic_art_track_grey600_48 = 2130837933;
+			public const int PublicIcon = 2130837933;
 			
 			// aapt resource value: 0x7f0201ae
-			public const int quantum_ic_bigtop_updates_white_24 = 2130837934;
+			public const int quantum_ic_art_track_grey600_48 = 2130837934;
 			
 			// aapt resource value: 0x7f0201af
-			public const int quantum_ic_cast_connected_white_24 = 2130837935;
+			public const int quantum_ic_bigtop_updates_white_24 = 2130837935;
 			
 			// aapt resource value: 0x7f0201b0
-			public const int quantum_ic_cast_white_36 = 2130837936;
+			public const int quantum_ic_cast_connected_white_24 = 2130837936;
 			
 			// aapt resource value: 0x7f0201b1
-			public const int quantum_ic_clear_white_24 = 2130837937;
+			public const int quantum_ic_cast_white_36 = 2130837937;
 			
 			// aapt resource value: 0x7f0201b2
-			public const int quantum_ic_closed_caption_grey600_36 = 2130837938;
+			public const int quantum_ic_clear_white_24 = 2130837938;
 			
 			// aapt resource value: 0x7f0201b3
-			public const int quantum_ic_closed_caption_white_36 = 2130837939;
+			public const int quantum_ic_closed_caption_grey600_36 = 2130837939;
 			
 			// aapt resource value: 0x7f0201b4
-			public const int quantum_ic_forward_10_white_24 = 2130837940;
+			public const int quantum_ic_closed_caption_white_36 = 2130837940;
 			
 			// aapt resource value: 0x7f0201b5
-			public const int quantum_ic_forward_30_grey600_36 = 2130837941;
+			public const int quantum_ic_forward_10_white_24 = 2130837941;
 			
 			// aapt resource value: 0x7f0201b6
-			public const int quantum_ic_forward_30_white_24 = 2130837942;
+			public const int quantum_ic_forward_30_grey600_36 = 2130837942;
 			
 			// aapt resource value: 0x7f0201b7
-			public const int quantum_ic_forward_30_white_36 = 2130837943;
+			public const int quantum_ic_forward_30_white_24 = 2130837943;
 			
 			// aapt resource value: 0x7f0201b8
-			public const int quantum_ic_keyboard_arrow_down_white_36 = 2130837944;
+			public const int quantum_ic_forward_30_white_36 = 2130837944;
 			
 			// aapt resource value: 0x7f0201b9
-			public const int quantum_ic_pause_circle_filled_grey600_36 = 2130837945;
+			public const int quantum_ic_keyboard_arrow_down_white_36 = 2130837945;
 			
 			// aapt resource value: 0x7f0201ba
-			public const int quantum_ic_pause_circle_filled_white_36 = 2130837946;
+			public const int quantum_ic_pause_circle_filled_grey600_36 = 2130837946;
 			
 			// aapt resource value: 0x7f0201bb
-			public const int quantum_ic_pause_grey600_36 = 2130837947;
+			public const int quantum_ic_pause_circle_filled_white_36 = 2130837947;
 			
 			// aapt resource value: 0x7f0201bc
-			public const int quantum_ic_pause_grey600_48 = 2130837948;
+			public const int quantum_ic_pause_grey600_36 = 2130837948;
 			
 			// aapt resource value: 0x7f0201bd
-			public const int quantum_ic_pause_white_24 = 2130837949;
+			public const int quantum_ic_pause_grey600_48 = 2130837949;
 			
 			// aapt resource value: 0x7f0201be
-			public const int quantum_ic_play_arrow_grey600_36 = 2130837950;
+			public const int quantum_ic_pause_white_24 = 2130837950;
 			
 			// aapt resource value: 0x7f0201bf
-			public const int quantum_ic_play_arrow_grey600_48 = 2130837951;
+			public const int quantum_ic_play_arrow_grey600_36 = 2130837951;
 			
 			// aapt resource value: 0x7f0201c0
-			public const int quantum_ic_play_arrow_white_24 = 2130837952;
+			public const int quantum_ic_play_arrow_grey600_48 = 2130837952;
 			
 			// aapt resource value: 0x7f0201c1
-			public const int quantum_ic_play_circle_filled_grey600_36 = 2130837953;
+			public const int quantum_ic_play_arrow_white_24 = 2130837953;
 			
 			// aapt resource value: 0x7f0201c2
-			public const int quantum_ic_play_circle_filled_white_36 = 2130837954;
+			public const int quantum_ic_play_circle_filled_grey600_36 = 2130837954;
 			
 			// aapt resource value: 0x7f0201c3
-			public const int quantum_ic_refresh_white_24 = 2130837955;
+			public const int quantum_ic_play_circle_filled_white_36 = 2130837955;
 			
 			// aapt resource value: 0x7f0201c4
-			public const int quantum_ic_replay_10_white_24 = 2130837956;
+			public const int quantum_ic_refresh_white_24 = 2130837956;
 			
 			// aapt resource value: 0x7f0201c5
-			public const int quantum_ic_replay_30_grey600_36 = 2130837957;
+			public const int quantum_ic_replay_10_white_24 = 2130837957;
 			
 			// aapt resource value: 0x7f0201c6
-			public const int quantum_ic_replay_30_white_24 = 2130837958;
+			public const int quantum_ic_replay_30_grey600_36 = 2130837958;
 			
 			// aapt resource value: 0x7f0201c7
-			public const int quantum_ic_replay_30_white_36 = 2130837959;
+			public const int quantum_ic_replay_30_white_24 = 2130837959;
 			
 			// aapt resource value: 0x7f0201c8
-			public const int quantum_ic_replay_white_24 = 2130837960;
+			public const int quantum_ic_replay_30_white_36 = 2130837960;
 			
 			// aapt resource value: 0x7f0201c9
-			public const int quantum_ic_skip_next_grey600_36 = 2130837961;
+			public const int quantum_ic_replay_white_24 = 2130837961;
 			
 			// aapt resource value: 0x7f0201ca
-			public const int quantum_ic_skip_next_white_24 = 2130837962;
+			public const int quantum_ic_skip_next_grey600_36 = 2130837962;
 			
 			// aapt resource value: 0x7f0201cb
-			public const int quantum_ic_skip_next_white_36 = 2130837963;
+			public const int quantum_ic_skip_next_white_24 = 2130837963;
 			
 			// aapt resource value: 0x7f0201cc
-			public const int quantum_ic_skip_previous_grey600_36 = 2130837964;
+			public const int quantum_ic_skip_next_white_36 = 2130837964;
 			
 			// aapt resource value: 0x7f0201cd
-			public const int quantum_ic_skip_previous_white_24 = 2130837965;
+			public const int quantum_ic_skip_previous_grey600_36 = 2130837965;
 			
 			// aapt resource value: 0x7f0201ce
-			public const int quantum_ic_skip_previous_white_36 = 2130837966;
+			public const int quantum_ic_skip_previous_white_24 = 2130837966;
 			
 			// aapt resource value: 0x7f0201cf
-			public const int quantum_ic_stop_grey600_36 = 2130837967;
+			public const int quantum_ic_skip_previous_white_36 = 2130837967;
 			
 			// aapt resource value: 0x7f0201d0
-			public const int quantum_ic_stop_grey600_48 = 2130837968;
+			public const int quantum_ic_stop_grey600_36 = 2130837968;
 			
 			// aapt resource value: 0x7f0201d1
-			public const int quantum_ic_stop_white_24 = 2130837969;
+			public const int quantum_ic_stop_grey600_48 = 2130837969;
 			
 			// aapt resource value: 0x7f0201d2
-			public const int quantum_ic_volume_off_grey600_36 = 2130837970;
+			public const int quantum_ic_stop_white_24 = 2130837970;
 			
 			// aapt resource value: 0x7f0201d3
-			public const int quantum_ic_volume_off_white_36 = 2130837971;
+			public const int quantum_ic_volume_off_grey600_36 = 2130837971;
 			
 			// aapt resource value: 0x7f0201d4
-			public const int quantum_ic_volume_up_grey600_36 = 2130837972;
+			public const int quantum_ic_volume_off_white_36 = 2130837972;
 			
 			// aapt resource value: 0x7f0201d5
-			public const int quantum_ic_volume_up_white_36 = 2130837973;
+			public const int quantum_ic_volume_up_grey600_36 = 2130837973;
 			
 			// aapt resource value: 0x7f0201d6
-			public const int Queue = 2130837974;
+			public const int quantum_ic_volume_up_white_36 = 2130837974;
 			
 			// aapt resource value: 0x7f0201d7
-			public const int Refine = 2130837975;
+			public const int Queue = 2130837975;
 			
 			// aapt resource value: 0x7f0201d8
-			public const int Reorder = 2130837976;
+			public const int Refine = 2130837976;
 			
 			// aapt resource value: 0x7f0201d9
-			public const int Repeat = 2130837977;
+			public const int Reorder = 2130837977;
 			
 			// aapt resource value: 0x7f0201da
-			public const int Search = 2130837978;
+			public const int Repeat = 2130837978;
 			
 			// aapt resource value: 0x7f0201db
-			public const int Shuffle = 2130837979;
+			public const int Search = 2130837979;
 			
 			// aapt resource value: 0x7f0201dc
-			public const int SkipNext = 2130837980;
+			public const int Shuffle = 2130837980;
 			
 			// aapt resource value: 0x7f0201dd
-			public const int SkipPrevious = 2130837981;
+			public const int SkipNext = 2130837981;
 			
 			// aapt resource value: 0x7f0201de
-			public const int splashScreen = 2130837982;
+			public const int SkipPrevious = 2130837982;
 			
 			// aapt resource value: 0x7f0201df
-			public const int Sync = 2130837983;
+			public const int splashScreen = 2130837983;
 			
 			// aapt resource value: 0x7f0201e0
-			public const int SyncDisabled = 2130837984;
+			public const int Sync = 2130837984;
 			
 			// aapt resource value: 0x7f0201e1
-			public const int SyncError = 2130837985;
+			public const int SyncDisabled = 2130837985;
 			
 			// aapt resource value: 0x7f0201e2
-			public const int Timer = 2130837986;
+			public const int SyncError = 2130837986;
 			
 			// aapt resource value: 0x7f0201e3
-			public const int tooltip_frame_dark = 2130837987;
+			public const int Timer = 2130837987;
 			
 			// aapt resource value: 0x7f0201e4
-			public const int tooltip_frame_light = 2130837988;
+			public const int tooltip_frame_dark = 2130837988;
 			
 			// aapt resource value: 0x7f0201e5
-			public const int TranslucentBackground = 2130837989;
+			public const int tooltip_frame_light = 2130837989;
 			
 			// aapt resource value: 0x7f0201e6
-			public const int YtPlay = 2130837990;
+			public const int TranslucentBackground = 2130837990;
+			
+			// aapt resource value: 0x7f0201e7
+			public const int YtPlay = 2130837991;
 			
 			static Drawable()
 			{
@@ -4970,11 +4973,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0065
 			public const int META = 2131361893;
 			
-			// aapt resource value: 0x7f0a01b6
-			public const int PreferenceFragment = 2131362230;
+			// aapt resource value: 0x7f0a01ac
+			public const int PreferenceFragment = 2131362220;
 			
-			// aapt resource value: 0x7f0a01b7
-			public const int PreferenceScreen = 2131362231;
+			// aapt resource value: 0x7f0a01ad
+			public const int PreferenceScreen = 2131362221;
 			
 			// aapt resource value: 0x7f0a0066
 			public const int SHIFT = 2131361894;
@@ -4982,8 +4985,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0067
 			public const int SYM = 2131361895;
 			
-			// aapt resource value: 0x7f0a01b9
-			public const int accountPreference = 2131362233;
+			// aapt resource value: 0x7f0a01af
+			public const int accountPreference = 2131362223;
 			
 			// aapt resource value: 0x7f0a00fe
 			public const int action = 2131362046;
@@ -5069,8 +5072,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0057
 			public const int add = 2131361879;
 			
-			// aapt resource value: 0x7f0a01d5
-			public const int addToQueue = 2131362261;
+			// aapt resource value: 0x7f0a01cb
+			public const int addToQueue = 2131362251;
 			
 			// aapt resource value: 0x7f0a00cc
 			public const int added = 2131361996;
@@ -5093,11 +5096,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0068
 			public const int always = 2131361896;
 			
-			// aapt resource value: 0x7f0a01bd
-			public const int apAlbum = 2131362237;
+			// aapt resource value: 0x7f0a01b3
+			public const int apAlbum = 2131362227;
 			
-			// aapt resource value: 0x7f0a01bf
-			public const int apTitle = 2131362239;
+			// aapt resource value: 0x7f0a01b5
+			public const int apTitle = 2131362229;
 			
 			// aapt resource value: 0x7f0a011c
 			public const int appbar = 2131362076;
@@ -5114,8 +5117,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a004b
 			public const int auto = 2131361867;
 			
-			// aapt resource value: 0x7f0a01bc
-			public const int autoplay = 2131362236;
+			// aapt resource value: 0x7f0a01b2
+			public const int autoplay = 2131362226;
 			
 			// aapt resource value: 0x7f0a0120
 			public const int backToolbar = 2131362080;
@@ -5129,8 +5132,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a005f
 			public const int beginning = 2131361887;
 			
-			// aapt resource value: 0x7f0a01b8
-			public const int behavior = 2131362232;
+			// aapt resource value: 0x7f0a01ae
+			public const int behavior = 2131362222;
 			
 			// aapt resource value: 0x7f0a008e
 			public const int blocking = 2131361934;
@@ -5144,8 +5147,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0137
 			public const int bottomView = 2131362103;
 			
-			// aapt resource value: 0x7f0a01d0
-			public const int browseLayout = 2131362256;
+			// aapt resource value: 0x7f0a01c6
+			public const int browseLayout = 2131362246;
 			
 			// aapt resource value: 0x7f0a00d8
 			public const int browseList = 2131362008;
@@ -5183,9 +5186,15 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00ef
 			public const int button_play_pause_toggle = 2131362031;
 			
+			// aapt resource value: 0x7f0a018e
+			public const int buttonsRight = 2131362190;
+			
 			// aapt resource value: 0x7f0a017c
 			public const int cancel_action = 2131362172;
 			
+			// aapt resource value: 0x7f0a018f
+			public const int castButton = 2131362191;
+			
 			// aapt resource value: 0x7f0a0000
 			public const int cast_button_type_closed_caption = 2131361792;
 			
@@ -5291,8 +5300,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a010f
 			public const int coordinator = 2131362063;
 			
-			// aapt resource value: 0x7f0a01bb
-			public const int createMix = 2131362235;
+			// aapt resource value: 0x7f0a01b1
+			public const int createMix = 2131362225;
 			
 			// aapt resource value: 0x7f0a00ab
 			public const int custom = 2131361963;
@@ -5309,8 +5318,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a009e
 			public const int default_activity_button = 2131361950;
 			
-			// aapt resource value: 0x7f0a01d2
-			public const int delete = 2131362258;
+			// aapt resource value: 0x7f0a01c8
+			public const int delete = 2131362248;
 			
 			// aapt resource value: 0x7f0a0111
 			public const int design_bottom_sheet = 2131362065;
@@ -5333,20 +5342,20 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00d0
 			public const int divider = 2131362000;
 			
-			// aapt resource value: 0x7f0a01a4
-			public const int downFAB = 2131362212;
+			// aapt resource value: 0x7f0a0190
+			public const int downButton = 2131362192;
 			
-			// aapt resource value: 0x7f0a01dc
-			public const int download = 2131362268;
+			// aapt resource value: 0x7f0a01d2
+			public const int download = 2131362258;
 			
-			// aapt resource value: 0x7f0a01d3
-			public const int downloadMDfromYT = 2131362259;
+			// aapt resource value: 0x7f0a01c9
+			public const int downloadMDfromYT = 2131362249;
 			
 			// aapt resource value: 0x7f0a0119
 			public const int downloadStatus = 2131362073;
 			
-			// aapt resource value: 0x7f0a01ae
-			public const int edit = 2131362222;
+			// aapt resource value: 0x7f0a01a5
+			public const int edit = 2131362213;
 			
 			// aapt resource value: 0x7f0a00be
 			public const int edit_query = 2131361982;
@@ -5465,8 +5474,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0087
 			public const int filled = 2131361927;
 			
-			// aapt resource value: 0x7f0a01d9
-			public const int filter = 2131362265;
+			// aapt resource value: 0x7f0a01cf
+			public const int filter = 2131362255;
 			
 			// aapt resource value: 0x7f0a0092
 			public const int fit = 2131361938;
@@ -5492,8 +5501,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a008f
 			public const int forever = 2131361935;
 			
-			// aapt resource value: 0x7f0a01dd
-			public const int fork = 2131362269;
+			// aapt resource value: 0x7f0a01d3
+			public const int fork = 2131362259;
 			
 			// aapt resource value: 0x7f0a0017
 			public const int ghost_view = 2131361815;
@@ -5501,26 +5510,26 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00b0
 			public const int group_divider = 2131361968;
 			
-			// aapt resource value: 0x7f0a01a5
-			public const int headerArt = 2131362213;
+			// aapt resource value: 0x7f0a019c
+			public const int headerArt = 2131362204;
 			
-			// aapt resource value: 0x7f0a01a8
-			public const int headerAuthor = 2131362216;
+			// aapt resource value: 0x7f0a019f
+			public const int headerAuthor = 2131362207;
 			
-			// aapt resource value: 0x7f0a01ac
-			public const int headerMore = 2131362220;
+			// aapt resource value: 0x7f0a01a3
+			public const int headerMore = 2131362211;
 			
-			// aapt resource value: 0x7f0a01a9
-			public const int headerNumber = 2131362217;
+			// aapt resource value: 0x7f0a01a0
+			public const int headerNumber = 2131362208;
 			
-			// aapt resource value: 0x7f0a01aa
-			public const int headerPlay = 2131362218;
+			// aapt resource value: 0x7f0a01a1
+			public const int headerPlay = 2131362209;
 			
-			// aapt resource value: 0x7f0a01ab
-			public const int headerShuffle = 2131362219;
+			// aapt resource value: 0x7f0a01a2
+			public const int headerShuffle = 2131362210;
 			
-			// aapt resource value: 0x7f0a01a7
-			public const int headerTitle = 2131362215;
+			// aapt resource value: 0x7f0a019e
+			public const int headerTitle = 2131362206;
 			
 			// aapt resource value: 0x7f0a0012
 			public const int home = 2131361810;
@@ -5531,8 +5540,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00a0
 			public const int icon = 2131361952;
 			
-			// aapt resource value: 0x7f0a01c9
-			public const int icon1 = 2131362249;
+			// aapt resource value: 0x7f0a01bf
+			public const int icon1 = 2131362239;
 			
 			// aapt resource value: 0x7f0a0129
 			public const int icon_frame = 2131362089;
@@ -5555,11 +5564,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0185
 			public const int info = 2131362181;
 			
-			// aapt resource value: 0x7f0a0199
-			public const int infoPanel = 2131362201;
+			// aapt resource value: 0x7f0a019b
+			public const int infoPanel = 2131362203;
 			
-			// aapt resource value: 0x7f0a01c7
-			public const int isLive = 2131362247;
+			// aapt resource value: 0x7f0a01bd
+			public const int isLive = 2131362237;
 			
 			// aapt resource value: 0x7f0a0090
 			public const int italic = 2131361936;
@@ -5573,14 +5582,14 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a010d
 			public const int largeLabel = 2131362061;
 			
-			// aapt resource value: 0x7f0a018e
-			public const int lastButton = 2131362190;
+			// aapt resource value: 0x7f0a0196
+			public const int lastButton = 2131362198;
 			
 			// aapt resource value: 0x7f0a007c
 			public const int left = 2131361916;
 			
-			// aapt resource value: 0x7f0a01c5
-			public const int leftButtons = 2131362245;
+			// aapt resource value: 0x7f0a01bb
+			public const int leftButtons = 2131362235;
 			
 			// aapt resource value: 0x7f0a00d2
 			public const int leftIcon = 2131362002;
@@ -5591,8 +5600,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0029
 			public const int line1 = 2131361833;
 			
-			// aapt resource value: 0x7f0a01cc
-			public const int line2 = 2131362252;
+			// aapt resource value: 0x7f0a01c2
+			public const int line2 = 2131362242;
 			
 			// aapt resource value: 0x7f0a002a
 			public const int line3 = 2131361834;
@@ -5627,17 +5636,17 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0103
 			public const int logo = 2131362051;
 			
-			// aapt resource value: 0x7f0a01ce
-			public const int masked = 2131362254;
-			
 			// aapt resource value: 0x7f0a01c4
-			public const int maxValue = 2131362244;
+			public const int masked = 2131362244;
+			
+			// aapt resource value: 0x7f0a01ba
+			public const int maxValue = 2131362234;
 			
 			// aapt resource value: 0x7f0a017e
 			public const int media_actions = 2131362174;
 			
-			// aapt resource value: 0x7f0a01da
-			public const int media_route_menu_item = 2131362266;
+			// aapt resource value: 0x7f0a01d0
+			public const int media_route_menu_item = 2131362256;
 			
 			// aapt resource value: 0x7f0a00cb
 			public const int message = 2131361995;
@@ -5666,8 +5675,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0061
 			public const int middle = 2131361889;
 			
-			// aapt resource value: 0x7f0a01c3
-			public const int minValue = 2131362243;
+			// aapt resource value: 0x7f0a01b9
+			public const int minValue = 2131362233;
 			
 			// aapt resource value: 0x7f0a0081
 			public const int mini = 2131361921;
@@ -5684,8 +5693,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0118
 			public const int more = 2131362072;
 			
-			// aapt resource value: 0x7f0a01b0
-			public const int moreButton = 2131362224;
+			// aapt resource value: 0x7f0a019a
+			public const int moreButton = 2131362202;
 			
 			// aapt resource value: 0x7f0a0163
 			public const int mr_art = 2131362147;
@@ -5834,8 +5843,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0058
 			public const int multiply = 2131361880;
 			
-			// aapt resource value: 0x7f0a01cf
-			public const int musicLayout = 2131362255;
+			// aapt resource value: 0x7f0a01c5
+			public const int musicLayout = 2131362245;
 			
 			// aapt resource value: 0x7f0a0102
 			public const int name = 2131362050;
@@ -5846,20 +5855,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a006b
 			public const int never = 2131361899;
 			
-			// aapt resource value: 0x7f0a019e
-			public const int nextArt = 2131362206;
-			
-			// aapt resource value: 0x7f0a01a1
-			public const int nextArtist = 2131362209;
-			
-			// aapt resource value: 0x7f0a0191
-			public const int nextButton = 2131362193;
-			
-			// aapt resource value: 0x7f0a019d
-			public const int nextSong = 2131362205;
-			
-			// aapt resource value: 0x7f0a01a0
-			public const int nextTitle = 2131362208;
+			// aapt resource value: 0x7f0a0199
+			public const int nextButton = 2131362201;
 			
 			// aapt resource value: 0x7f0a0177
 			public const int noPlaylist = 2131362167;
@@ -5888,8 +5885,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0088
 			public const int outline = 2131361928;
 			
-			// aapt resource value: 0x7f0a01cb
-			public const int pager = 2131362251;
+			// aapt resource value: 0x7f0a01c1
+			public const int pager = 2131362241;
 			
 			// aapt resource value: 0x7f0a007f
 			public const int parallax = 2131361919;
@@ -5903,56 +5900,41 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0080
 			public const int pin = 2131361920;
 			
-			// aapt resource value: 0x7f0a018f
-			public const int playButton = 2131362191;
+			// aapt resource value: 0x7f0a0197
+			public const int playButton = 2131362199;
 			
 			// aapt resource value: 0x7f0a018d
 			public const int playerAlbum = 2131362189;
 			
-			// aapt resource value: 0x7f0a019b
-			public const int playerArtist = 2131362203;
+			// aapt resource value: 0x7f0a0192
+			public const int playerArtist = 2131362194;
 			
-			// aapt resource value: 0x7f0a0190
-			public const int playerBuffer = 2131362192;
+			// aapt resource value: 0x7f0a0198
+			public const int playerBuffer = 2131362200;
 			
 			// aapt resource value: 0x7f0a0145
 			public const int playerContainer = 2131362117;
 			
-			// aapt resource value: 0x7f0a0196
-			public const int playerDark = 2131362198;
-			
-			// aapt resource value: 0x7f0a0194
-			public const int playerDownload = 2131362196;
-			
-			// aapt resource value: 0x7f0a0193
-			public const int playerPlaylistAdd = 2131362195;
-			
 			// aapt resource value: 0x7f0a0138
 			public const int playerSheet = 2131362104;
 			
-			// aapt resource value: 0x7f0a0192
-			public const int playerSleep = 2131362194;
-			
-			// aapt resource value: 0x7f0a019a
-			public const int playerTitle = 2131362202;
+			// aapt resource value: 0x7f0a0191
+			public const int playerTitle = 2131362193;
 			
 			// aapt resource value: 0x7f0a018c
 			public const int playerView = 2131362188;
 			
-			// aapt resource value: 0x7f0a0195
-			public const int playerYoutube = 2131362197;
-			
 			// aapt resource value: 0x7f0a0139
 			public const int playersHolder = 2131362105;
 			
-			// aapt resource value: 0x7f0a01a6
-			public const int playlistDark = 2131362214;
+			// aapt resource value: 0x7f0a019d
+			public const int playlistDark = 2131362205;
 			
 			// aapt resource value: 0x7f0a0133
 			public const int playlistHeader = 2131362099;
 			
-			// aapt resource value: 0x7f0a01d1
-			public const int playlistLayout = 2131362257;
+			// aapt resource value: 0x7f0a01c7
+			public const int playlistLayout = 2131362247;
 			
 			// aapt resource value: 0x7f0a010b
 			public const int playlistLocation = 2131362059;
@@ -5960,8 +5942,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a010a
 			public const int playlistName = 2131362058;
 			
-			// aapt resource value: 0x7f0a01c0
-			public const int playlistURL = 2131362240;
+			// aapt resource value: 0x7f0a01b6
+			public const int playlistURL = 2131362230;
 			
 			// aapt resource value: 0x7f0a011b
 			public const int progress = 2131362075;
@@ -5975,8 +5957,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0014
 			public const int progress_horizontal = 2131361812;
 			
-			// aapt resource value: 0x7f0a01ba
-			public const int queueSwitch = 2131362234;
+			// aapt resource value: 0x7f0a01b0
+			public const int queueSwitch = 2131362224;
 			
 			// aapt resource value: 0x7f0a00b6
 			public const int radio = 2131361974;
@@ -5984,32 +5966,29 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00cf
 			public const int recycler = 2131361999;
 			
-			// aapt resource value: 0x7f0a01b2
-			public const int recycler_view = 2131362226;
+			// aapt resource value: 0x7f0a01a8
+			public const int recycler_view = 2131362216;
 			
-			// aapt resource value: 0x7f0a01ca
-			public const int refine = 2131362250;
+			// aapt resource value: 0x7f0a01c0
+			public const int refine = 2131362240;
 			
-			// aapt resource value: 0x7f0a01d6
-			public const int rename = 2131362262;
+			// aapt resource value: 0x7f0a01cc
+			public const int rename = 2131362252;
 			
-			// aapt resource value: 0x7f0a01c6
-			public const int reorder = 2131362246;
+			// aapt resource value: 0x7f0a01bc
+			public const int reorder = 2131362236;
 			
-			// aapt resource value: 0x7f0a01d8
-			public const int repeat = 2131362264;
-			
-			// aapt resource value: 0x7f0a019c
-			public const int reveal = 2131362204;
+			// aapt resource value: 0x7f0a01ce
+			public const int repeat = 2131362254;
 			
 			// aapt resource value: 0x7f0a007d
 			public const int right = 2131361917;
 			
-			// aapt resource value: 0x7f0a01ad
-			public const int rightButtons = 2131362221;
+			// aapt resource value: 0x7f0a01a4
+			public const int rightButtons = 2131362212;
 			
-			// aapt resource value: 0x7f0a01be
-			public const int rightIcon = 2131362238;
+			// aapt resource value: 0x7f0a01b4
+			public const int rightIcon = 2131362228;
 			
 			// aapt resource value: 0x7f0a0186
 			public const int right_icon = 2131362182;
@@ -6044,11 +6023,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0085
 			public const int scrollable = 2131361925;
 			
-			// aapt resource value: 0x7f0a01c1
-			public const int search = 2131362241;
+			// aapt resource value: 0x7f0a01b7
+			public const int search = 2131362231;
 			
-			// aapt resource value: 0x7f0a01c2
-			public const int searchSuggestions = 2131362242;
+			// aapt resource value: 0x7f0a01b8
+			public const int searchSuggestions = 2131362232;
 			
 			// aapt resource value: 0x7f0a00c0
 			public const int search_badge = 2131361984;
@@ -6086,11 +6065,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00e7
 			public const int seek_bar_controls = 2131362023;
 			
-			// aapt resource value: 0x7f0a01b3
-			public const int seekbar = 2131362227;
+			// aapt resource value: 0x7f0a01a9
+			public const int seekbar = 2131362217;
 			
-			// aapt resource value: 0x7f0a01b4
-			public const int seekbar_value = 2131362228;
+			// aapt resource value: 0x7f0a01aa
+			public const int seekbar_value = 2131362218;
 			
 			// aapt resource value: 0x7f0a00ca
 			public const int select_dialog_listview = 2131361994;
@@ -6098,8 +6077,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0077
 			public const int selected = 2131361911;
 			
-			// aapt resource value: 0x7f0a01db
-			public const int settings = 2131362267;
+			// aapt resource value: 0x7f0a01d1
+			public const int settings = 2131362257;
 			
 			// aapt resource value: 0x7f0a00b2
 			public const int shortcut = 2131361970;
@@ -6110,14 +6089,14 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0054
 			public const int showHome = 2131361876;
 			
-			// aapt resource value: 0x7f0a01a2
-			public const int showQueue = 2131362210;
+			// aapt resource value: 0x7f0a0195
+			public const int showQueue = 2131362197;
 			
 			// aapt resource value: 0x7f0a0055
 			public const int showTitle = 2131361877;
 			
-			// aapt resource value: 0x7f0a01d7
-			public const int shuffle = 2131362263;
+			// aapt resource value: 0x7f0a01cd
+			public const int shuffle = 2131362253;
 			
 			// aapt resource value: 0x7f0a010c
 			public const int smallLabel = 2131362060;
@@ -6125,9 +6104,6 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a013a
 			public const int smallPlayer = 2131362106;
 			
-			// aapt resource value: 0x7f0a019f
-			public const int smallQueue = 2131362207;
-			
 			// aapt resource value: 0x7f0a0146
 			public const int snackBar = 2131362118;
 			
@@ -6143,8 +6119,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0074
 			public const int snapMargins = 2131361908;
 			
-			// aapt resource value: 0x7f0a01a3
-			public const int songTimer = 2131362211;
+			// aapt resource value: 0x7f0a0193
+			public const int songTimer = 2131362195;
 			
 			// aapt resource value: 0x7f0a013d
 			public const int spArt = 2131362109;
@@ -6179,8 +6155,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a00a2
 			public const int spacer = 2131361954;
 			
-			// aapt resource value: 0x7f0a01b1
-			public const int spinner = 2131362225;
+			// aapt resource value: 0x7f0a01a7
+			public const int spinner = 2131362215;
 			
 			// aapt resource value: 0x7f0a0015
 			public const int split_action_bar = 2131361813;
@@ -6227,11 +6203,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0096
 			public const int surface_view = 2131361942;
 			
-			// aapt resource value: 0x7f0a01b5
-			public const int switchWidget = 2131362229;
+			// aapt resource value: 0x7f0a01ab
+			public const int switchWidget = 2131362219;
 			
-			// aapt resource value: 0x7f0a01af
-			public const int sync = 2131362223;
+			// aapt resource value: 0x7f0a01a6
+			public const int sync = 2131362214;
 			
 			// aapt resource value: 0x7f0a00ce
 			public const int syncLoading = 2131361998;
@@ -6299,11 +6275,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0183
 			public const int time = 2131362179;
 			
-			// aapt resource value: 0x7f0a0198
-			public const int timerEnd = 2131362200;
-			
-			// aapt resource value: 0x7f0a0197
-			public const int timerStart = 2131362199;
+			// aapt resource value: 0x7f0a0194
+			public const int timer = 2131362196;
 			
 			// aapt resource value: 0x7f0a0030
 			public const int title = 2131361840;
@@ -6344,8 +6317,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0020
 			public const int transition_transform = 2131361824;
 			
-			// aapt resource value: 0x7f0a01d4
-			public const int undoChange = 2131362260;
+			// aapt resource value: 0x7f0a01ca
+			public const int undoChange = 2131362250;
 			
 			// aapt resource value: 0x7f0a005d
 			public const int uniform = 2131361885;
@@ -6365,8 +6338,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a0028
 			public const int view_offset_helper = 2131361832;
 			
-			// aapt resource value: 0x7f0a01cd
-			public const int visible = 2131362253;
+			// aapt resource value: 0x7f0a01c3
+			public const int visible = 2131362243;
 			
 			// aapt resource value: 0x7f0a0169
 			public const int volume_item_container = 2131362153;
@@ -6380,8 +6353,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0a005e
 			public const int wrap_content = 2131361886;
 			
-			// aapt resource value: 0x7f0a01c8
-			public const int youtubeIcon = 2131362248;
+			// aapt resource value: 0x7f0a01be
+			public const int youtubeIcon = 2131362238;
 			
 			// aapt resource value: 0x7f0a0130
 			public const int ytProgress = 2131362096;
@@ -7177,59 +7150,59 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0072
 			public const int abc_toolbar_collapse_description = 2131492978;
 			
-			// aapt resource value: 0x7f0c0128
-			public const int add = 2131493160;
+			// aapt resource value: 0x7f0c012a
+			public const int add = 2131493162;
 			
-			// aapt resource value: 0x7f0c00fa
-			public const int add_playlist = 2131493114;
+			// aapt resource value: 0x7f0c00fc
+			public const int add_playlist = 2131493116;
 			
-			// aapt resource value: 0x7f0c0109
-			public const int add_playlist_msg = 2131493129;
+			// aapt resource value: 0x7f0c010b
+			public const int add_playlist_msg = 2131493131;
 			
-			// aapt resource value: 0x7f0c00dc
-			public const int add_to_library = 2131493084;
+			// aapt resource value: 0x7f0c00de
+			public const int add_to_library = 2131493086;
 			
-			// aapt resource value: 0x7f0c00ce
-			public const int add_to_playlist = 2131493070;
+			// aapt resource value: 0x7f0c00d0
+			public const int add_to_playlist = 2131493072;
 			
-			// aapt resource value: 0x7f0c00d6
-			public const int add_to_queue = 2131493078;
+			// aapt resource value: 0x7f0c00d8
+			public const int add_to_queue = 2131493080;
 			
-			// aapt resource value: 0x7f0c0113
-			public const int album = 2131493139;
+			// aapt resource value: 0x7f0c0115
+			public const int album = 2131493141;
 			
-			// aapt resource value: 0x7f0c00e8
-			public const int all = 2131493096;
+			// aapt resource value: 0x7f0c00ea
+			public const int all = 2131493098;
 			
-			// aapt resource value: 0x7f0c012f
-			public const int and = 2131493167;
+			// aapt resource value: 0x7f0c0131
+			public const int and = 2131493169;
 			
-			// aapt resource value: 0x7f0c0130
-			public const int and_more = 2131493168;
+			// aapt resource value: 0x7f0c0132
+			public const int and_more = 2131493170;
 			
 			// aapt resource value: 0x7f0c0080
 			public const int appbar_scrolling_view_behavior = 2131492992;
 			
-			// aapt resource value: 0x7f0c0136
-			public const int appearances = 2131493174;
+			// aapt resource value: 0x7f0c0138
+			public const int appearances = 2131493176;
 			
-			// aapt resource value: 0x7f0c0125
-			public const int apply = 2131493157;
+			// aapt resource value: 0x7f0c0127
+			public const int apply = 2131493159;
 			
-			// aapt resource value: 0x7f0c0112
-			public const int artist = 2131493138;
+			// aapt resource value: 0x7f0c0114
+			public const int artist = 2131493140;
 			
-			// aapt resource value: 0x7f0c00c7
-			public const int autoplay = 2131493063;
+			// aapt resource value: 0x7f0c00c9
+			public const int autoplay = 2131493065;
 			
-			// aapt resource value: 0x7f0c00c8
-			public const int autoplay_desc = 2131493064;
+			// aapt resource value: 0x7f0c00ca
+			public const int autoplay_desc = 2131493066;
 			
-			// aapt resource value: 0x7f0c012c
-			public const int behavior = 2131493164;
+			// aapt resource value: 0x7f0c012e
+			public const int behavior = 2131493166;
 			
-			// aapt resource value: 0x7f0c014d
-			public const int beta_available = 2131493197;
+			// aapt resource value: 0x7f0c014f
+			public const int beta_available = 2131493199;
 			
 			// aapt resource value: 0x7f0c0081
 			public const int bottom_sheet_behavior = 2131492993;
@@ -7237,17 +7210,17 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c00b3
 			public const int browse = 2131493043;
 			
-			// aapt resource value: 0x7f0c0126
-			public const int cancel = 2131493158;
+			// aapt resource value: 0x7f0c0128
+			public const int cancel = 2131493160;
 			
-			// aapt resource value: 0x7f0c0153
-			public const int cancelling = 2131493203;
+			// aapt resource value: 0x7f0c0155
+			public const int cancelling = 2131493205;
 			
-			// aapt resource value: 0x7f0c00f0
-			public const int cant_delete = 2131493104;
+			// aapt resource value: 0x7f0c00f2
+			public const int cant_delete = 2131493106;
 			
-			// aapt resource value: 0x7f0c0150
-			public const int cant_play_non_youtube = 2131493200;
+			// aapt resource value: 0x7f0c0152
+			public const int cant_play_non_youtube = 2131493202;
 			
 			// aapt resource value: 0x7f0c00b8
 			public const int cast = 2131493048;
@@ -7330,11 +7303,11 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0015
 			public const int cast_play = 2131492885;
 			
-			// aapt resource value: 0x7f0c0123
-			public const int cast_queue_push = 2131493155;
+			// aapt resource value: 0x7f0c0125
+			public const int cast_queue_push = 2131493157;
 			
-			// aapt resource value: 0x7f0c0124
-			public const int cast_queue_pushed = 2131493156;
+			// aapt resource value: 0x7f0c0126
+			public const int cast_queue_pushed = 2131493158;
 			
 			// aapt resource value: 0x7f0c0016
 			public const int cast_rewind = 2131492886;
@@ -7384,14 +7357,14 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0025
 			public const int cast_unmute = 2131492901;
 			
-			// aapt resource value: 0x7f0c0115
-			public const int change_albumart = 2131493141;
+			// aapt resource value: 0x7f0c0117
+			public const int change_albumart = 2131493143;
 			
-			// aapt resource value: 0x7f0c011a
-			public const int changes_saved = 2131493146;
+			// aapt resource value: 0x7f0c011c
+			public const int changes_saved = 2131493148;
 			
-			// aapt resource value: 0x7f0c00ea
-			public const int channels = 2131493098;
+			// aapt resource value: 0x7f0c00ec
+			public const int channels = 2131493100;
 			
 			// aapt resource value: 0x7f0c0082
 			public const int character_counter_content_description = 2131492994;
@@ -7399,8 +7372,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0083
 			public const int character_counter_pattern = 2131492995;
 			
-			// aapt resource value: 0x7f0c013c
-			public const int check_updates = 2131493180;
+			// aapt resource value: 0x7f0c013e
+			public const int check_updates = 2131493182;
 			
 			// aapt resource value: 0x7f0c00b0
 			public const int clientID = 2131493040;
@@ -7462,80 +7435,80 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c003b
 			public const int common_signin_button_text_long = 2131492923;
 			
-			// aapt resource value: 0x7f0c0122
-			public const int completed = 2131493154;
-			
-			// aapt resource value: 0x7f0c010e
-			public const int create_local = 2131493134;
-			
-			// aapt resource value: 0x7f0c00c9
-			public const int create_mix = 2131493065;
-			
-			// aapt resource value: 0x7f0c00cd
-			public const int create_mix_from_song = 2131493069;
-			
-			// aapt resource value: 0x7f0c010a
-			public const int create_playlist = 2131493130;
+			// aapt resource value: 0x7f0c0124
+			public const int completed = 2131493156;
 			
 			// aapt resource value: 0x7f0c0110
-			public const int create_synced = 2131493136;
+			public const int create_local = 2131493136;
 			
-			// aapt resource value: 0x7f0c010f
-			public const int create_youtube = 2131493135;
-			
-			// aapt resource value: 0x7f0c013a
-			public const int dark_theme = 2131493178;
-			
-			// aapt resource value: 0x7f0c00d8
-			public const int delete = 2131493080;
-			
-			// aapt resource value: 0x7f0c0105
-			public const int delete_playlist = 2131493125;
-			
-			// aapt resource value: 0x7f0c011d
-			public const int deleted_file = 2131493149;
-			
-			// aapt resource value: 0x7f0c00d0
-			public const int download = 2131493072;
-			
-			// aapt resource value: 0x7f0c0117
-			public const int download_albumart = 2131493143;
-			
-			// aapt resource value: 0x7f0c0132
-			public const int download_directory = 2131493170;
-			
-			// aapt resource value: 0x7f0c0118
-			public const int download_meta = 2131493144;
-			
-			// aapt resource value: 0x7f0c00ec
-			public const int download_path_error = 2131493100;
-			
-			// aapt resource value: 0x7f0c00eb
-			public const int download_path_not_set = 2131493099;
-			
-			// aapt resource value: 0x7f0c011c
-			public const int download_queue = 2131493148;
-			
-			// aapt resource value: 0x7f0c00ee
-			public const int downloading = 2131493102;
-			
-			// aapt resource value: 0x7f0c0151
-			public const int downloading_notification = 2131493201;
-			
-			// aapt resource value: 0x7f0c0120
-			public const int downloading_status = 2131493152;
-			
-			// aapt resource value: 0x7f0c014e
-			public const int downloading_update = 2131493198;
+			// aapt resource value: 0x7f0c00cb
+			public const int create_mix = 2131493067;
 			
 			// aapt resource value: 0x7f0c00cf
-			public const int edit_metadata = 2131493071;
+			public const int create_mix_from_song = 2131493071;
 			
-			// aapt resource value: 0x7f0c00fe
-			public const int element = 2131493118;
+			// aapt resource value: 0x7f0c010c
+			public const int create_playlist = 2131493132;
 			
-			// aapt resource value: 0x7f0c00ff
-			public const int elements = 2131493119;
+			// aapt resource value: 0x7f0c0112
+			public const int create_synced = 2131493138;
+			
+			// aapt resource value: 0x7f0c0111
+			public const int create_youtube = 2131493137;
+			
+			// aapt resource value: 0x7f0c013c
+			public const int dark_theme = 2131493180;
+			
+			// aapt resource value: 0x7f0c00da
+			public const int delete = 2131493082;
+			
+			// aapt resource value: 0x7f0c0107
+			public const int delete_playlist = 2131493127;
+			
+			// aapt resource value: 0x7f0c011f
+			public const int deleted_file = 2131493151;
+			
+			// aapt resource value: 0x7f0c00d2
+			public const int download = 2131493074;
+			
+			// aapt resource value: 0x7f0c0119
+			public const int download_albumart = 2131493145;
+			
+			// aapt resource value: 0x7f0c0134
+			public const int download_directory = 2131493172;
+			
+			// aapt resource value: 0x7f0c011a
+			public const int download_meta = 2131493146;
+			
+			// aapt resource value: 0x7f0c00ee
+			public const int download_path_error = 2131493102;
+			
+			// aapt resource value: 0x7f0c00ed
+			public const int download_path_not_set = 2131493101;
+			
+			// aapt resource value: 0x7f0c011e
+			public const int download_queue = 2131493150;
+			
+			// aapt resource value: 0x7f0c00f0
+			public const int downloading = 2131493104;
+			
+			// aapt resource value: 0x7f0c0153
+			public const int downloading_notification = 2131493203;
+			
+			// aapt resource value: 0x7f0c0122
+			public const int downloading_status = 2131493154;
+			
+			// aapt resource value: 0x7f0c0150
+			public const int downloading_update = 2131493200;
+			
+			// aapt resource value: 0x7f0c00d1
+			public const int edit_metadata = 2131493073;
+			
+			// aapt resource value: 0x7f0c0100
+			public const int element = 2131493120;
+			
+			// aapt resource value: 0x7f0c0101
+			public const int elements = 2131493121;
 			
 			// aapt resource value: 0x7f0c0090
 			public const int exo_controls_fastforward_description = 2131493008;
@@ -7642,17 +7615,17 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0085
 			public const int fab_transformation_sheet_behavior = 2131492997;
 			
-			// aapt resource value: 0x7f0c00e2
-			public const int featured = 2131493090;
+			// aapt resource value: 0x7f0c00e4
+			public const int featured = 2131493092;
 			
 			// aapt resource value: 0x7f0c00b7
 			public const int filter = 2131493047;
 			
-			// aapt resource value: 0x7f0c00e6
-			public const int folders = 2131493094;
+			// aapt resource value: 0x7f0c00e8
+			public const int folders = 2131493096;
 			
-			// aapt resource value: 0x7f0c012e
-			public const int genre_nothing = 2131493166;
+			// aapt resource value: 0x7f0c0130
+			public const int genre_nothing = 2131493168;
 			
 			// aapt resource value: 0x7f0c0086
 			public const int hide_bottom_view_on_scroll_behavior = 2131492998;
@@ -7666,44 +7639,44 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c00c3
 			public const int hours = 2131493059;
 			
-			// aapt resource value: 0x7f0c011e
-			public const int initialization = 2131493150;
+			// aapt resource value: 0x7f0c0120
+			public const int initialization = 2131493152;
 			
-			// aapt resource value: 0x7f0c0129
-			public const int later = 2131493161;
+			// aapt resource value: 0x7f0c012b
+			public const int later = 2131493163;
 			
-			// aapt resource value: 0x7f0c00d3
-			public const int list_songs = 2131493075;
+			// aapt resource value: 0x7f0c00d5
+			public const int list_songs = 2131493077;
 			
-			// aapt resource value: 0x7f0c00e9
-			public const int lives = 2131493097;
+			// aapt resource value: 0x7f0c00eb
+			public const int lives = 2131493099;
 			
-			// aapt resource value: 0x7f0c00fc
-			public const int local_playlist_empty = 2131493116;
+			// aapt resource value: 0x7f0c00fe
+			public const int local_playlist_empty = 2131493118;
 			
-			// aapt resource value: 0x7f0c00f8
-			public const int local_playlists = 2131493112;
+			// aapt resource value: 0x7f0c00fa
+			public const int local_playlists = 2131493114;
 			
-			// aapt resource value: 0x7f0c0140
-			public const int log_in = 2131493184;
+			// aapt resource value: 0x7f0c0142
+			public const int log_in = 2131493186;
+			
+			// aapt resource value: 0x7f0c0143
+			public const int log_out = 2131493187;
 			
 			// aapt resource value: 0x7f0c0141
-			public const int log_out = 2131493185;
+			public const int logged_in = 2131493185;
 			
-			// aapt resource value: 0x7f0c013f
-			public const int logged_in = 2131493183;
+			// aapt resource value: 0x7f0c0135
+			public const int max_download = 2131493173;
 			
-			// aapt resource value: 0x7f0c0133
-			public const int max_download = 2131493171;
+			// aapt resource value: 0x7f0c0136
+			public const int max_download_dialog = 2131493174;
 			
-			// aapt resource value: 0x7f0c0134
-			public const int max_download_dialog = 2131493172;
+			// aapt resource value: 0x7f0c0121
+			public const int metadata = 2131493153;
 			
-			// aapt resource value: 0x7f0c011f
-			public const int metadata = 2131493151;
-			
-			// aapt resource value: 0x7f0c011b
-			public const int metdata_error_noid = 2131493147;
+			// aapt resource value: 0x7f0c011d
+			public const int metdata_error_noid = 2131493149;
 			
 			// aapt resource value: 0x7f0c00c0
 			public const int minute = 2131493056;
@@ -7711,8 +7684,8 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c00c1
 			public const int minutes = 2131493057;
 			
-			// aapt resource value: 0x7f0c00e0
-			public const int more = 2131493088;
+			// aapt resource value: 0x7f0c00e2
+			public const int more = 2131493090;
 			
 			// aapt resource value: 0x7f0c0040
 			public const int mr_button_content_description = 2131492928;
@@ -7789,50 +7762,50 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c0087
 			public const int mtrl_chip_close_icon_content_description = 2131492999;
 			
-			// aapt resource value: 0x7f0c012d
-			public const int music_genre = 2131493165;
+			// aapt resource value: 0x7f0c012f
+			public const int music_genre = 2131493167;
 			
-			// aapt resource value: 0x7f0c00e3
-			public const int music_genres = 2131493091;
+			// aapt resource value: 0x7f0c00e5
+			public const int music_genres = 2131493093;
 			
-			// aapt resource value: 0x7f0c010d
-			public const int new_playlist = 2131493133;
+			// aapt resource value: 0x7f0c010f
+			public const int new_playlist = 2131493135;
 			
 			// aapt resource value: 0x7f0c00bd
 			public const int next_loading = 2131493053;
 			
-			// aapt resource value: 0x7f0c012b
-			public const int no = 2131493163;
+			// aapt resource value: 0x7f0c012d
+			public const int no = 2131493165;
+			
+			// aapt resource value: 0x7f0c00f7
+			public const int no_channel = 2131493111;
+			
+			// aapt resource value: 0x7f0c00f6
+			public const int no_lives = 2131493110;
+			
+			// aapt resource value: 0x7f0c0145
+			public const int no_permission = 2131493189;
 			
 			// aapt resource value: 0x7f0c00f5
-			public const int no_channel = 2131493109;
-			
-			// aapt resource value: 0x7f0c00f4
-			public const int no_lives = 2131493108;
-			
-			// aapt resource value: 0x7f0c0143
-			public const int no_permission = 2131493187;
+			public const int no_playlist = 2131493109;
 			
 			// aapt resource value: 0x7f0c00f3
-			public const int no_playlist = 2131493107;
+			public const int no_result = 2131493107;
 			
-			// aapt resource value: 0x7f0c00f1
-			public const int no_result = 2131493105;
+			// aapt resource value: 0x7f0c00e9
+			public const int no_song = 2131493097;
 			
-			// aapt resource value: 0x7f0c00e7
-			public const int no_song = 2131493095;
+			// aapt resource value: 0x7f0c0146
+			public const int no_song_mix = 2131493190;
 			
-			// aapt resource value: 0x7f0c0144
-			public const int no_song_mix = 2131493188;
+			// aapt resource value: 0x7f0c00f4
+			public const int no_track = 2131493108;
 			
-			// aapt resource value: 0x7f0c00f2
-			public const int no_track = 2131493106;
+			// aapt resource value: 0x7f0c0140
+			public const int not_log = 2131493184;
 			
-			// aapt resource value: 0x7f0c013e
-			public const int not_log = 2131493182;
-			
-			// aapt resource value: 0x7f0c0148
-			public const int not_streamable = 2131493192;
+			// aapt resource value: 0x7f0c014a
+			public const int not_streamable = 2131493194;
 			
 			// aapt resource value: 0x7f0c00bc
 			public const int nothing = 2131493052;
@@ -7840,11 +7813,14 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c00bf
 			public const int off = 2131493055;
 			
-			// aapt resource value: 0x7f0c0127
-			public const int ok = 2131493159;
+			// aapt resource value: 0x7f0c0129
+			public const int ok = 2131493161;
 			
-			// aapt resource value: 0x7f0c013b
-			public const int others = 2131493179;
+			// aapt resource value: 0x7f0c00c5
+			public const int open_youtube = 2131493061;
+			
+			// aapt resource value: 0x7f0c013d
+			public const int others = 2131493181;
 			
 			// aapt resource value: 0x7f0c0088
 			public const int password_toggle_content_description = 2131493000;
@@ -7861,89 +7837,89 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c008c
 			public const int path_password_strike_through = 2131493004;
 			
-			// aapt resource value: 0x7f0c00c5
-			public const int paused = 2131493061;
+			// aapt resource value: 0x7f0c00c7
+			public const int paused = 2131493063;
 			
-			// aapt resource value: 0x7f0c0116
-			public const int pick_album_local = 2131493142;
-			
-			// aapt resource value: 0x7f0c00ca
-			public const int play = 2131493066;
-			
-			// aapt resource value: 0x7f0c00d4
-			public const int play_in_order = 2131493076;
+			// aapt resource value: 0x7f0c0118
+			public const int pick_album_local = 2131493144;
 			
 			// aapt resource value: 0x7f0c00cc
-			public const int play_last = 2131493068;
+			public const int play = 2131493068;
 			
-			// aapt resource value: 0x7f0c00cb
-			public const int play_next = 2131493067;
+			// aapt resource value: 0x7f0c00d6
+			public const int play_in_order = 2131493078;
 			
-			// aapt resource value: 0x7f0c00c4
-			public const int playing = 2131493060;
+			// aapt resource value: 0x7f0c00ce
+			public const int play_last = 2131493070;
+			
+			// aapt resource value: 0x7f0c00cd
+			public const int play_next = 2131493069;
+			
+			// aapt resource value: 0x7f0c00c6
+			public const int playing = 2131493062;
+			
+			// aapt resource value: 0x7f0c0106
+			public const int playlist_add_song_not_found = 2131493126;
 			
 			// aapt resource value: 0x7f0c0104
-			public const int playlist_add_song_not_found = 2131493124;
+			public const int playlist_already_saved = 2131493124;
 			
 			// aapt resource value: 0x7f0c0102
-			public const int playlist_already_saved = 2131493122;
+			public const int playlist_empty = 2131493122;
 			
-			// aapt resource value: 0x7f0c0100
-			public const int playlist_empty = 2131493120;
-			
-			// aapt resource value: 0x7f0c0103
-			public const int playlist_not_found = 2131493123;
+			// aapt resource value: 0x7f0c0105
+			public const int playlist_not_found = 2131493125;
 			
 			// aapt resource value: 0x7f0c00b4
 			public const int playlists = 2131493044;
 			
-			// aapt resource value: 0x7f0c00e1
-			public const int queue = 2131493089;
-			
-			// aapt resource value: 0x7f0c00d5
-			public const int random_play = 2131493077;
-			
-			// aapt resource value: 0x7f0c00e4
-			public const int recommendation_explanation = 2131493092;
-			
-			// aapt resource value: 0x7f0c00f7
-			public const int remove = 2131493111;
-			
-			// aapt resource value: 0x7f0c00d2
-			public const int remove_from_playlist = 2131493074;
-			
-			// aapt resource value: 0x7f0c00d1
-			public const int remove_from_queue = 2131493073;
-			
-			// aapt resource value: 0x7f0c00f6
-			public const int remove_search = 2131493110;
-			
-			// aapt resource value: 0x7f0c0101
-			public const int removed_from_playlist = 2131493121;
-			
-			// aapt resource value: 0x7f0c00c6
-			public const int removed_from_queue = 2131493062;
+			// aapt resource value: 0x7f0c00e3
+			public const int queue = 2131493091;
 			
 			// aapt resource value: 0x7f0c00d7
-			public const int rename = 2131493079;
+			public const int random_play = 2131493079;
 			
-			// aapt resource value: 0x7f0c0106
-			public const int rename_playlist = 2131493126;
+			// aapt resource value: 0x7f0c00e6
+			public const int recommendation_explanation = 2131493094;
+			
+			// aapt resource value: 0x7f0c00f9
+			public const int remove = 2131493113;
+			
+			// aapt resource value: 0x7f0c00d4
+			public const int remove_from_playlist = 2131493076;
+			
+			// aapt resource value: 0x7f0c00d3
+			public const int remove_from_queue = 2131493075;
+			
+			// aapt resource value: 0x7f0c00f8
+			public const int remove_search = 2131493112;
+			
+			// aapt resource value: 0x7f0c0103
+			public const int removed_from_playlist = 2131493123;
+			
+			// aapt resource value: 0x7f0c00c8
+			public const int removed_from_queue = 2131493064;
+			
+			// aapt resource value: 0x7f0c00d9
+			public const int rename = 2131493081;
+			
+			// aapt resource value: 0x7f0c0108
+			public const int rename_playlist = 2131493128;
 			
 			// aapt resource value: 0x7f0c00b5
 			public const int repeat = 2131493045;
 			
-			// aapt resource value: 0x7f0c010c
-			public const int save_folder_playlist = 2131493132;
+			// aapt resource value: 0x7f0c010e
+			public const int save_folder_playlist = 2131493134;
 			
-			// aapt resource value: 0x7f0c010b
-			public const int save_playlist = 2131493131;
+			// aapt resource value: 0x7f0c010d
+			public const int save_playlist = 2131493133;
 			
 			// aapt resource value: 0x7f0c0073
 			public const int search_menu_title = 2131492979;
 			
-			// aapt resource value: 0x7f0c00ed
-			public const int set_path = 2131493101;
+			// aapt resource value: 0x7f0c00ef
+			public const int set_path = 2131493103;
 			
 			// aapt resource value: 0x7f0c00b9
 			public const int settings = 2131493049;
@@ -7951,92 +7927,95 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c00ba
 			public const int show_queue = 2131493050;
 			
-			// aapt resource value: 0x7f0c00df
-			public const int shuffle = 2131493087;
+			// aapt resource value: 0x7f0c00e1
+			public const int shuffle = 2131493089;
 			
-			// aapt resource value: 0x7f0c00de
-			public const int shuffle_all = 2131493086;
+			// aapt resource value: 0x7f0c00e0
+			public const int shuffle_all = 2131493088;
 			
 			// aapt resource value: 0x7f0c00be
 			public const int sleep_timer = 2131493054;
 			
-			// aapt resource value: 0x7f0c00e5
-			public const int songs = 2131493093;
+			// aapt resource value: 0x7f0c00e7
+			public const int songs = 2131493095;
 			
 			// aapt resource value: 0x7f0c008d
 			public const int status_bar_notification_info_overflow = 2131493005;
 			
-			// aapt resource value: 0x7f0c00db
-			public const int stop_sync = 2131493083;
+			// aapt resource value: 0x7f0c00dd
+			public const int stop_sync = 2131493085;
 			
-			// aapt resource value: 0x7f0c0107
-			public const int stop_syncing = 2131493127;
+			// aapt resource value: 0x7f0c0109
+			public const int stop_syncing = 2131493129;
 			
 			// aapt resource value: 0x7f0c003d
 			public const int summary_collapsed_preference_list = 2131492925;
 			
-			// aapt resource value: 0x7f0c00d9
-			public const int sync = 2131493081;
+			// aapt resource value: 0x7f0c00db
+			public const int sync = 2131493083;
 			
-			// aapt resource value: 0x7f0c00da
-			public const int sync_now = 2131493082;
-			
-			// aapt resource value: 0x7f0c0135
-			public const int sync_remove = 2131493173;
-			
-			// aapt resource value: 0x7f0c00ef
-			public const int syncing = 2131493103;
-			
-			// aapt resource value: 0x7f0c0152
-			public const int tap_details = 2131493202;
+			// aapt resource value: 0x7f0c00dc
+			public const int sync_now = 2131493084;
 			
 			// aapt resource value: 0x7f0c0137
-			public const int theme = 2131493175;
+			public const int sync_remove = 2131493175;
 			
-			// aapt resource value: 0x7f0c0138
-			public const int theme_dialog = 2131493176;
+			// aapt resource value: 0x7f0c00f1
+			public const int syncing = 2131493105;
 			
-			// aapt resource value: 0x7f0c0146
-			public const int timout = 2131493190;
+			// aapt resource value: 0x7f0c0154
+			public const int tap_details = 2131493204;
 			
-			// aapt resource value: 0x7f0c0111
-			public const int title = 2131493137;
+			// aapt resource value: 0x7f0c0139
+			public const int theme = 2131493177;
 			
-			// aapt resource value: 0x7f0c0142
-			public const int undo = 2131493186;
+			// aapt resource value: 0x7f0c013a
+			public const int theme_dialog = 2131493178;
 			
-			// aapt resource value: 0x7f0c0119
-			public const int undo_change = 2131493145;
+			// aapt resource value: 0x7f0c00c4
+			public const int timer = 2131493060;
 			
-			// aapt resource value: 0x7f0c00dd
-			public const int unfork = 2131493085;
+			// aapt resource value: 0x7f0c0148
+			public const int timout = 2131493192;
 			
-			// aapt resource value: 0x7f0c0108
-			public const int unfork_playlist = 2131493128;
+			// aapt resource value: 0x7f0c0113
+			public const int title = 2131493139;
 			
-			// aapt resource value: 0x7f0c0147
-			public const int unknow = 2131493191;
+			// aapt resource value: 0x7f0c0144
+			public const int undo = 2131493188;
+			
+			// aapt resource value: 0x7f0c011b
+			public const int undo_change = 2131493147;
+			
+			// aapt resource value: 0x7f0c00df
+			public const int unfork = 2131493087;
+			
+			// aapt resource value: 0x7f0c010a
+			public const int unfork_playlist = 2131493130;
+			
+			// aapt resource value: 0x7f0c0149
+			public const int unknow = 2131493193;
 			
 			// aapt resource value: 0x7f0c00bb
 			public const int up_next = 2131493051;
 			
+			// aapt resource value: 0x7f0c014e
+			public const int up_to_date = 2131493198;
+			
+			// aapt resource value: 0x7f0c0123
+			public const int up_to_date_status = 2131493155;
+			
 			// aapt resource value: 0x7f0c014c
-			public const int up_to_date = 2131493196;
+			public const int update = 2131493196;
 			
-			// aapt resource value: 0x7f0c0121
-			public const int up_to_date_status = 2131493153;
-			
-			// aapt resource value: 0x7f0c014a
-			public const int update = 2131493194;
+			// aapt resource value: 0x7f0c014d
+			public const int update_message = 2131493197;
 			
 			// aapt resource value: 0x7f0c014b
-			public const int update_message = 2131493195;
+			public const int update_no_internet = 2131493195;
 			
-			// aapt resource value: 0x7f0c0149
-			public const int update_no_internet = 2131493193;
-			
-			// aapt resource value: 0x7f0c014f
-			public const int updating = 2131493199;
+			// aapt resource value: 0x7f0c0151
+			public const int updating = 2131493201;
 			
 			// aapt resource value: 0x7f0c003e
 			public const int v7_preference_off = 2131492926;
@@ -8044,35 +8023,35 @@ namespace MusicApp
 			// aapt resource value: 0x7f0c003f
 			public const int v7_preference_on = 2131492927;
 			
-			// aapt resource value: 0x7f0c013d
-			public const int version = 2131493181;
+			// aapt resource value: 0x7f0c013f
+			public const int version = 2131493183;
 			
-			// aapt resource value: 0x7f0c0131
-			public const int volume = 2131493169;
+			// aapt resource value: 0x7f0c0133
+			public const int volume = 2131493171;
 			
-			// aapt resource value: 0x7f0c0139
-			public const int white_theme = 2131493177;
+			// aapt resource value: 0x7f0c013b
+			public const int white_theme = 2131493179;
 			
-			// aapt resource value: 0x7f0c012a
-			public const int yes = 2131493162;
+			// aapt resource value: 0x7f0c012c
+			public const int yes = 2131493164;
 			
-			// aapt resource value: 0x7f0c0145
-			public const int youtube_endpoint = 2131493189;
-			
-			// aapt resource value: 0x7f0c00fb
-			public const int youtube_loading_error = 2131493115;
+			// aapt resource value: 0x7f0c0147
+			public const int youtube_endpoint = 2131493191;
 			
 			// aapt resource value: 0x7f0c00fd
-			public const int youtube_playlist_empty = 2131493117;
+			public const int youtube_loading_error = 2131493117;
 			
-			// aapt resource value: 0x7f0c00f9
-			public const int youtube_playlists = 2131493113;
+			// aapt resource value: 0x7f0c00ff
+			public const int youtube_playlist_empty = 2131493119;
+			
+			// aapt resource value: 0x7f0c00fb
+			public const int youtube_playlists = 2131493115;
 			
 			// aapt resource value: 0x7f0c00b6
 			public const int youtube_search = 2131493046;
 			
-			// aapt resource value: 0x7f0c0114
-			public const int youtubeid = 2131493140;
+			// aapt resource value: 0x7f0c0116
+			public const int youtubeid = 2131493142;
 			
 			static String()
 			{
diff --git a/MusicApp/Resources/drawable/OpenInYoutube.png b/MusicApp/Resources/drawable/OpenInYoutube.png
deleted file mode 100644
index 9df8affeec5cf450708134571864875582fde92d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBCVRR#hEy=Vy|$6J*@34m@Y{ke
zr84I$U+!dV=a-K89JI`&m09!8)oFiD)mJTAwQ9qH<P-S|l6Q8^Ec{ig{!HS?vwhnn
zT#Dn@I^0}frrI91;JBkj!5>zR-TA+L7f1*%xa4T4=JvEX$*0GQfprGMRQ^-@^#dBY
zwsd7*WHu>${dD4d&Mx;lfqO3`J~=YWu7BCMYSk}>wxhv6t-eL41D(g<>FVdQ&MBb@
E0Ljr)%>V!Z

diff --git a/MusicApp/Resources/drawable/darkCircle.xml b/MusicApp/Resources/drawable/darkCircle.xml
new file mode 100644
index 0000000..bb2db23
--- /dev/null
+++ b/MusicApp/Resources/drawable/darkCircle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+  <solid android:color="#BF000000"/>
+  <size android:width="40dp" android:height="40dp"/>
+</shape>
\ No newline at end of file
diff --git a/MusicApp/Resources/drawable/darkLinear.xml b/MusicApp/Resources/drawable/darkLinear.xml
new file mode 100644
index 0000000..0ff07f8
--- /dev/null
+++ b/MusicApp/Resources/drawable/darkLinear.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape 
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="line">
+  <stroke
+    android:width="56dp"
+    android:color="#BF000000" />
+  <corners 
+    android:radius="40dp"/>
+  <size
+    android:width="116dp"
+    android:height="56dp" />
+</shape>
\ No newline at end of file
diff --git a/MusicApp/Resources/layout/player.xml b/MusicApp/Resources/layout/player.xml
index 049b1f9..4c2fcdc 100644
--- a/MusicApp/Resources/layout/player.xml
+++ b/MusicApp/Resources/layout/player.xml
@@ -1,275 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout 
+<RelativeLayout 
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:orientation="vertical"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
-  android:id="@+id/playerView"
-  android:background="?android:colorBackground">
+  android:id="@+id/playerView" >
+  <ImageView
+    android:id="@+id/playerAlbum"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@null"
+    android:scaleType="centerCrop"
+    android:src="@drawable/noAlbum" />
   <LinearLayout
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-    <FrameLayout
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content" >
-      <ImageView
-        android:id="@+id/playerAlbum"
-        android:layout_width="fill_parent"
-        android:background="@null"
-        android:layout_height="wrap_content"
-        android:scaleType="fitCenter"
-        android:src="@drawable/noAlbum"
-        android:transitionName="albumArt"
-        android:adjustViewBounds="true" />
-      <LinearLayout
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:paddingBottom="10dp"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="fill_parent"
-          android:gravity="center"
-          android:layout_gravity="center"
-          android:layout_height="wrap_content" >
-          <ImageButton
-            android:id="@+id/lastButton"
-            android:tint="#ffffff"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:padding="20dp"
-            android:src="@drawable/SkipPrevious"
-            android:background="@drawable/GradientShape" />
-          <ImageButton
-            android:id="@+id/playButton"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:padding="20dp"
-            android:layout_marginLeft="50dp"
-            android:layout_marginRight="50dp"
-            android:layout_gravity="center"
-            android:tint="#ffffff"
-            android:src="@drawable/Pause"
-            android:background="@drawable/GradientShape" />
-          <ProgressBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:id="@+id/playerBuffer"
-            android:padding="20dp"
-            android:layout_marginLeft="50dp"
-            android:layout_marginRight="50dp"/>
-          <ImageButton
-            android:id="@+id/nextButton"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:padding="20dp"
-            android:tint="#ffffff"
-            android:src="@drawable/SkipNext"
-            android:background="@drawable/GradientShape" />
-        </LinearLayout>
-        <LinearLayout 
-          android:orientation="horizontal"
-          android:layout_width="fill_parent"
-          android:paddingTop="10dp"
-          android:gravity="center"
-          android:layout_gravity="center"
-          android:layout_height="wrap_content" >
-          <ImageButton
-            android:id="@+id/playerSleep"
-            android:src="@drawable/Timer"
-            android:background="@drawable/GradientShape"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:tint="#ffffff"
-            android:padding="20dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"/>
-          <ImageButton
-            android:id="@+id/playerPlaylistAdd"
-            android:src="@drawable/PlaylistAdd"
-            android:background="@drawable/GradientShape"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:tint="#ffffff"
-            android:padding="20dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp" />
-          <ImageButton
-            android:id="@+id/playerDownload"
-            android:src="@drawable/Download"
-            android:background="@drawable/GradientShape"
-            android:visibility="gone"
-            android:tint="#ffffff"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:padding="20dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp" />
-          <ImageButton
-            android:id="@+id/playerYoutube"
-            android:src="@drawable/OpenInBrowser"
-            android:background="@drawable/GradientShape"
-            android:visibility="gone"
-            android:tint="#ffffff"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:padding="20dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp" />
-        </LinearLayout>
-      </LinearLayout>
-      <ImageView
-        android:src="@drawable/darkRectangle"
-        android:layout_width="fill_parent"
-        android:layout_height="256px"
-        android:adjustViewBounds="true"
-        android:id="@+id/playerDark"
-        android:layout_gravity="bottom" />
-      <TextView 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="00:00"
-        android:id="@+id/timerStart"
-        android:textColor="#ffffff"
-        android:layout_gravity="bottom|left"
-        android:padding="10dp" />
-      <TextView 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="\??:??"
-        android:id="@+id/timerEnd"
-        android:textColor="#ffffff"
-        android:layout_gravity="bottom|right"
-        android:padding="10dp" />
-    </FrameLayout>
-    <RelativeLayout
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:id="@+id/infoPanel"
-      android:background="#2b5568" >
-      <View
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/playerTitle"
-        android:layout_alignBottom="@+id/playerArtist"
-        android:id="@+id/reveal" />
-      <TextView
-        android:text="Title"
-        android:id="@+id/playerTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:paddingTop="15dp"
-        android:scrollHorizontally="true"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit ="marquee_forever"
-        android:focusable="true"
-        android:focusableInTouchMode="true" 
-        android:textSize="34sp"
-        android:textColor="#FFFFFF"
-        android:alpha="1"
-        android:textStyle="bold"
-        android:paddingLeft="60dp" />
-      <TextView
-        android:text="Artist"
-        android:id="@+id/playerArtist"
-        android:singleLine="true"
-        android:scrollHorizontally="true"
-        android:ellipsize="marquee"
-        android:paddingBottom="20dp"
-        android:marqueeRepeatLimit ="marquee_forever"
-        android:focusable="true"
-        android:focusableInTouchMode="true" 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="60dp"
-        android:alpha=".92"
-        android:layout_below="@id/playerTitle"
-        android:textSize="20sp"
-        android:textColor="#FFFFFF"/>
-    </RelativeLayout>
-    <RelativeLayout
-     android:layout_width="fill_parent"
-     android:layout_height="wrap_content"
-     android:id="@+id/nextSong"
-     android:padding="8dp">
-      <ImageView
-        android:id="@+id/nextArt"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:padding="5dp"
-        android:src="@drawable/MusicIcon"
-        android:layout_alignParentLeft="true" />
-      <ImageButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/FlatButtonBorder"
-        android:id="@+id/smallQueue"
-        android:visibility="gone"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:padding="5dp"
-        android:src="@drawable/Queue" />
-      <LinearLayout
-         android:orientation="vertical"
-         android:paddingTop="14dp"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_toLeftOf="@id/smallQueue"
-         android:layout_alignParentLeft="true"
-         android:paddingLeft="100dp">
-          <TextView
-           android:id="@+id/nextTitle"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:textColor="#000"
-           android:textSize="16dip"
-           android:textStyle="bold" />
-          <TextView
-           android:id="@+id/nextArtist"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
-           android:textSize="14dip"
-           android:textColor="#000" />
-      </LinearLayout>
-    </RelativeLayout>
-    <Button
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="10dp"
-      android:layout_marginLeft="20dp"
-      android:layout_marginRight="20dp"
-      android:background="@drawable/FlatButtonBorder"
-      android:id="@+id/showQueue"
-      android:text="@string/show_queue" />
-  </LinearLayout>
-  <SeekBar
-    android:id="@+id/songTimer"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    app:layout_anchor="@id/playerAlbum"
-    app:elevation="6dp"
-    android:padding="0dp"
-    app:layout_anchorGravity="bottom|center" />
-  <android.support.design.widget.FloatingActionButton
-    android:id="@+id/downFAB"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:layout_anchor="@id/infoPanel"
-    app:layout_anchorGravity="bottom|center"
-    android:layout_margin="10dip"
-    app:elevation="12dp"
-    app:fabSize="mini"
-    app:borderWidth="0dp"
-    android:paddingTop="20dp"
-    app:backgroundTint="#4cb5ae"
-    android:src="@drawable/arrowdown" />
-</android.support.design.widget.CoordinatorLayout>
+    android:orientation="horizontal"
+    android:layout_alignParentRight="true"
+    android:paddingTop="40dp"
+    android:paddingRight="5dp"
+    android:id="@+id/buttonsRight"
+    android:background="@drawable/darkLinear" >
+    <android.support.v7.app.MediaRouteButton
+      android:id="@+id/castButton"
+      android:layout_width="56dp"
+      android:layout_height="56dp"
+      android:background="@null" />
+    <ImageButton 
+      android:layout_width="56dp"
+      android:layout_height="56dp"
+      android:tint="#ffffff"
+      android:src="@drawable/arrowdown"
+      android:background="@null"
+      android:id="@+id/downButton" />
+  </LinearLayout>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_toLeftOf="@id/buttonsRight"
+    android:paddingTop="40dp"
+    android:paddingLeft="15dp" >
+    <TextView
+      android:text="Title"
+      android:id="@+id/playerTitle"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:padding="3dp"
+      android:maxLines="2"
+      android:textSize="20sp"
+      android:textColor="#ffffff" />
+    <TextView
+      android:text="Artist"
+      android:layout_marginTop="7dp"
+      android:id="@+id/playerArtist"
+      android:singleLine="true"
+      android:ellipsize="marquee"
+      android:marqueeRepeatLimit ="marquee_forever"
+      android:padding="3dp"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:alpha=".92"
+      android:textSize="15sp"
+      android:textColor="#FFFFFF" />
+  </LinearLayout>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_alignParentBottom="true"
+    android:layout_marginBottom="25dp">
+    <RelativeLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="10dp" >
+      <SeekBar
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/songTimer"
+        app:elevation="6dp"
+        android:padding="0dp" />
+      <TextView 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="00:00 | ??:??"
+        android:id="@+id/timer"
+        android:textColor="#ffffff"
+        android:background="#BF000000"
+        android:layout_centerHorizontal="true"
+        android:padding="3dp" />
+    </RelativeLayout>
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:layout_gravity="center_horizontal" >
+      <ImageButton
+        android:id="@+id/showQueue"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:tint="#ffffff"
+        android:background="@drawable/darkCircle"
+        android:src="@drawable/queue" />
+      <ImageButton
+        android:id="@+id/lastButton"
+        android:tint="#ffffff"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:background="@drawable/darkCircle"
+        android:src="@drawable/SkipPrevious" />
+      <ImageButton
+        android:id="@+id/playButton"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
+        android:tint="#ffffff"
+        android:background="@drawable/darkCircle"
+        android:src="@drawable/Pause" />
+      <ProgressBar
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:visibility="gone"
+        android:id="@+id/playerBuffer"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"/>
+      <ImageButton
+        android:id="@+id/nextButton"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:tint="#ffffff"
+        android:background="@drawable/darkCircle"
+        android:src="@drawable/SkipNext" />
+      <ImageButton
+        android:id="@+id/moreButton"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_margin="12dp"
+        android:tint="#ffffff"
+        android:background="@drawable/darkCircle"
+        android:src="@drawable/more" />
+    </LinearLayout>
+  </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/MusicApp/Resources/values-fr/strings.xml b/MusicApp/Resources/values-fr/strings.xml
index e644100..a6fb0e5 100644
--- a/MusicApp/Resources/values-fr/strings.xml
+++ b/MusicApp/Resources/values-fr/strings.xml
@@ -17,7 +17,7 @@
   <string name="up_next">À suivre :</string>
   <string name="nothing">Rien.</string>
   <string name="next_loading">Chargement en cours, veuillez patienter.</string>
-  <string name="sleep_timer">Arreter la musique dans</string>
+  <string name="sleep_timer">Arrêter la musique dans</string>
   <string name="off">Off</string>
   <string name="minute">minute</string>
   <string name="minutes">minutes</string>
@@ -31,7 +31,7 @@
 
   <!--Autoplay-->
   <string name="autoplay">Lecture automatique</string>
-  <string name="autoplay_desc">Ajoute automatiquement des musiques similaire</string>
+  <string name="autoplay_desc">Ajoute automatiquement des musiques similaires</string>
   <string name="create_mix">CRÉER UN MIX</string>
   
   <!--More menu (long clicks)-->
@@ -40,7 +40,7 @@
   <string name="play_last">Ajouter a la fin de la liste de lecture</string>
   <string name="create_mix_from_song">Créer un mix</string>
   <string name="add_to_playlist">Ajouter a une playlist</string>
-  <string name="edit_metadata">Modifier les metadata</string>
+  <string name="edit_metadata">Modifier les metadatas</string>
   <string name="download">Télécharger</string>
   <string name="remove_from_queue">Enlever de la liste de lecture</string>
   <string name="remove_from_playlist">Enlever de la playlist</string>
@@ -48,17 +48,17 @@
   <string name="list_songs">Lister les titres</string>
   <string name="play_in_order">Lire dans l\'ordre</string>
   <string name="random_play">Lecture aléatoire</string>
-  <string name="add_to_queue">Ajouter a la liste de lecture</string>
+  <string name="add_to_queue">Ajouter à la liste de lecture</string>
   <string name="rename">Renommer</string>
   <string name="delete">Supprimer</string>
-  <string name="sync">Synchronizer la playlist</string>
-  <string name="sync_now">Synchronizer maintenant</string>
-  <string name="stop_sync">Arreter de synchronizer</string>
+  <string name="sync">Synchroniser la playlist</string>
+  <string name="sync_now">Synchroniser maintenant</string>
+  <string name="stop_sync">Arreter de synchroniser</string>
   <string name="add_to_library">Sauvegarder la playlist</string>
   <string name="unfork">Enlever la playlist de la bibliothèque</string>
 
   <!--Home screen-->
-  <string name="shuffle_all">TOUS LIRE ALÉATOIREMENT</string>
+  <string name="shuffle_all">TOUT LIRE ALÉATOIREMENT</string>
   <string name="shuffle">Lecture aléatoire</string>
   <string name="more">PLUS</string>
   <string name="queue">Liste de lecture</string>
@@ -76,15 +76,15 @@
   <string name="playlists">Playlists</string>
   <string name="lives">Lives</string>
   <string name="channels">Chaines</string>
-  <string name="download_path_not_set">Le dossier de téléchargement n\'a pas été définie, celui par défault va être utilisé.</string>
+  <string name="download_path_not_set">Le dossier de téléchargement n\'a pas été défini, celui par défault va être utilisé.</string>
   <string name="download_path_error">Le dossier de téléchargement n\'existe plus, veuillez le changer dans les paramètres.</string>
   <string name="set_path">Definir le dossier</string>
   <string name="downloading">Téléchargement en cours...</string>
   <string name="syncing">Synchronisation en cours...</string>
-  <string name="cant_delete">Impossible de supprimer ce fichier pour le moment, veuillez réesseyer plus tard.</string>
+  <string name="cant_delete">Impossible de supprimer ce fichier pour le moment, veuillez réessayer plus tard.</string>
   <string name="no_result">Aucun résultat pour </string>
   <string name="no_track">Aucun titre pour </string>
-  <string name="no_playlist">Aucunne playlist pour </string>
+  <string name="no_playlist">Aucune playlist pour </string>
   <string name="no_lives">Aucun lives pour </string>
   <string name="no_channel">Aucune chaine pour </string>
   <string name="remove_search">Supprimer de l\'historique de recherche ?</string>
@@ -94,19 +94,19 @@
   <string name="local_playlists">Playlists locales</string>
   <string name="youtube_playlists">Playlists youtubes</string>
   <string name="add_playlist">AJOUTER UNE PLAYLIST</string>
-  <string name="youtube_loading_error">Erreur de chargement. \nVerifiez avoir séléctionné un compte et votre connection internet.</string>
+  <string name="youtube_loading_error">Erreur de chargement. \nVérifiez avoir séléctionné un compte et votre connection internet.</string>
   <string name="local_playlist_empty">Vous n\'avez aucune playlist sur cet appareil.</string>
-  <string name="youtube_playlist_empty">Vous n\'avez aucune playlist sur ce compte youtube \nAttention : Seulement les playlists présentes sur votre compte google sont affichées.</string>
+  <string name="youtube_playlist_empty">Vous n\'avez aucune playlist sur ce compte youtube \nAttention : seulement les playlists présentes sur votre compte google sont affichées.</string>
   <string name="element">titre</string>
   <string name="elements">titres</string>
   <string name="playlist_empty">Cette playlist est vide.</string>
   <string name="remove_from_playlist">Enlever %1$s de la playlist ?</string> <!--%1$s will be replaced by the song name-->
   <string name="removed_from_playlist"> a été enlevé de la playlist.</string>
-  <string name="playlist_already_saved">Cette playlist a déja été ajouté a votre bibliothèque.</string>
-  <string name="playlist_not_found">Aucune playlist n\'existe avec cet id ou cet url.</string>
+  <string name="playlist_already_saved">Cette playlist a déja été ajoutée à votre bibliothèque.</string>
+  <string name="playlist_not_found">Aucune playlist n\'existe avec cet id ou cette url.</string>
   <string name="playlist_add_song_not_found">Musique non trouvée sur youtube, impossible de l\'ajouter à une playlist youtube.</string>
   <string name="delete_playlist">Voulez vous supprimer la playlist  \"%1$s\" ?</string> <!--%1$s will be replaced by the playlist name-->
-  <string name="rename_playlist">Choissisez un nouveau nom pour cette playlist</string>
+  <string name="rename_playlist">Choisissez un nouveau nom pour cette playlist</string>
   <string name="stop_syncing">Voulez vous arreter de synchroniser la playlist \"%1s$\" ?</string> <!--%1$s will be replaced by the playlist name-->
   <string name="unfork_playlist">Voulez vous supprimer la playlist \"%1$s"\" de votre bibliothèque ?</string> <!--%1$s will be replaced by the playlist name-->
   <string name="add_playlist_msg">Entrer l\'url ou l\'id de la playlist que vous voulez ajouter</string> <!--%1$s will be replaced by the playlist name-->
@@ -128,10 +128,10 @@
   <string name="change_albumart">Changer d\'image d\'album</string>
   <string name="pick_album_local">Choisir une image depuis le stockage interne</string>
   <string name="download_albumart">Télécharger la couverture depuis youtube</string>
-  <string name="download_meta">Télécharger les metadata depuis youtube</string>
+  <string name="download_meta">Télécharger les metadatas depuis youtube</string>
   <string name="undo_change">Annuler les modifications</string>
   <string name="changes_saved">Changement sauvegardé.</string>
-  <string name="metdata_error_noid">Impossible de télécharger les metadatas depuis youtube, l\'id youtube n\'est pas défnit.</string>
+  <string name="metdata_error_noid">Impossible de télécharger les metadatas depuis youtube, l\'id youtube n\'est pas défni.</string>
 
   <!--Download Queue-->
   <string name="download_queue">Liste de téléchargement</string>
@@ -139,12 +139,12 @@
   <string name="initialization">Initialisation</string>
   <string name="metadata">Metadata</string>
   <string name="downloading_status">Téléchargement</string>
-  <string name="up_to_date_status">Déja a jour</string>
+  <string name="up_to_date_status">Déjà à jour</string>
   <string name="completed">Completé</string>
 
   <!--Chromecast-->
   <string name="cast_queue_push">Votre liste de lecture est envoyée au chromecast, veuillez patienter...</string>
-  <string name="cast_queue_pushed">Finis, la musique va commencer sous peu.</string>
+  <string name="cast_queue_pushed">Finis, la musique va bientôt commencer.</string>
 
   <!--Settings-->
   <string name="apply">Appliquer</string>
@@ -159,12 +159,12 @@
   <string name="volume">Volume</string>
   <string name="download">Téléchargement</string>
   <string name="download_directory">Dossier de téléchargement</string>
-  <string name="max_download">Nombre maximum de téléchargement simultané</string>
-  <string name="max_download_dialog">Combiens de musiques peuvent-elle être téléchargées en même temps ?</string>
-  <string name="sync_remove">Supprimer les musiques enlevée d\'une playlist synchronisée.</string>
+  <string name="max_download">Nombre maximum de téléchargements simultanés</string>
+  <string name="max_download_dialog">Combien de musiques peuvent-elle être téléchargées en même temps ?</string>
+  <string name="sync_remove">Supprimer les musiques enlevées d\'une playlist synchronisée.</string>
   <string name="appearances">Apparence</string>
   <string name="theme">Thème</string>
-  <string name="theme_dialog">Choissisez un thème</string>
+  <string name="theme_dialog">Choisissez un thème</string>
   <string name="white_theme">Thème clair</string>
   <string name="dark_theme">Thème sombre</string>
   <string name="others">Autres</string>
@@ -178,21 +178,21 @@
   <!--Snackbars and others-->
   <string name="undo">Annuler</string>
 
-  <string name="no_permission">Permission refusée, impossible de completer cette action.</string>
+  <string name="no_permission">Permission refusée, impossible de compléter cette action.</string>
   <string name="no_song_mix">Aucune musique trouvée, impossible de créer un mix.</string>
   <string name="youtube_endpoint">L\'algorithme youtube a changé, l\'application ne peut plus lire cette vidéo. Attendez la prochaine mise a jour.</string>
   <string name="timout">Timout, vérifier votre connection internet.</string>
-  <string name="unknow">Une erreur inconue est survenue.</string>
+  <string name="unknow">Une erreur inconnue est survenue.</string>
   <string name="not_streamable"> ne peut pas être lu, l\'audio n\'est pas disponible.</string> <!--//A song title will be placed before this sentence-->
-  <string name="update_no_internet">Vous n\'êtes pas connecté a internet, impossible de verifier si des mises a jours existent.</string>
+  <string name="update_no_internet">Vous n\'êtes pas connecté a internet, impossible de verifier si des mises à jour existent.</string>
   <string name="update">La version %1$s est disponible</string> <!--//%1$s will be replaced with the version number-->
-  <string name="update_message">Une mise a jour est disponible, voulez vous l\'installer maintenant ?</string>
-  <string name="up_to_date">Aucune mise a jour disponible.</string>
+  <string name="update_message">Une mise à jour est disponible, voulez vous l\'installer maintenant ?</string>
+  <string name="up_to_date">Aucune mise à jour disponible.</string>
   <string name="beta_available">Une version beta est disponible.</string>
   <string name="downloading_update">Téléchargement en cours, vous serez informer lorsque l\'installation sera prète.</string>
-  <string name="updating">Mise a jour en cours...</string>
+  <string name="updating">Mise à jour en cours...</string>
   <string name="cant_play_non_youtube">Impossible de lire ce type de vidéo.</string>
-  <string name="sleep_timer">La musique va s\'arreter dans :</string>
+  <string name="sleep_timer">La musique va s\'arrêter dans :</string>
   <string name="downloading_notification">Téléchargement :</string>
   <string name="tap_details">Tappez pour plus de détails</string>
   <string name="cancelling">Annulation en cours...</string>
diff --git a/MusicApp/Resources/values/strings.xml b/MusicApp/Resources/values/strings.xml
index 505f062..18595b8 100644
--- a/MusicApp/Resources/values/strings.xml
+++ b/MusicApp/Resources/values/strings.xml
@@ -23,6 +23,8 @@
   <string name="minutes">minutes</string>
   <string name="hour">hour</string>
   <string name="hours">hours</string>
+  <string name="timer">Sleep timer</string>
+  <string name="open_youtube">Open in the youtube app</string>
   
   <!--Queue-->
   <string name="playing">Playing</string>