zoriya/Opus
1
0
Fork 0
mirror of https://github.com/zoriya/Opus.git synced 2026-06-06 07:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solving a bug with queue switch from the home screen.

Browse Source
This commit is contained in:
Anonymous Raccoon
2018-08-30 23:40:10 +02:00
parent 471e139cf8
commit b3df9723bc
5 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MusicApp/MusicApp.csproj
+14 -14
View File
@@ -76,23 +76,23 @@
<Reference Include="DiscreteSeekBar, Version=1.0.1.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Karamunting.Android.AnderWeb.DiscreteSeekBar.1.0.1.1\lib\monoandroid81\DiscreteSeekBar.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.2.8.7\lib\monoandroid81\ExoPlayer.dll</HintPath>
<Reference Include="ExoPlayer, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.2.8.8\lib\monoandroid81\ExoPlayer.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer.Core, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Core.2.8.7\lib\monoandroid81\ExoPlayer.Core.dll</HintPath>
<Reference Include="ExoPlayer.Core, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Core.2.8.8\lib\monoandroid81\ExoPlayer.Core.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer.Dash, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Dash.2.8.7\lib\monoandroid81\ExoPlayer.Dash.dll</HintPath>
<Reference Include="ExoPlayer.Dash, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Dash.2.8.8\lib\monoandroid81\ExoPlayer.Dash.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer.Hls, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Hls.2.8.7\lib\monoandroid81\ExoPlayer.Hls.dll</HintPath>
<Reference Include="ExoPlayer.Hls, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.Hls.2.8.8\lib\monoandroid81\ExoPlayer.Hls.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer.SmoothStreaming, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.SmoothStreaming.2.8.7\lib\monoandroid81\ExoPlayer.SmoothStreaming.dll</HintPath>
<Reference Include="ExoPlayer.SmoothStreaming, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.SmoothStreaming.2.8.8\lib\monoandroid81\ExoPlayer.SmoothStreaming.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer.UI, Version=2.8.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.UI.2.8.7\lib\monoandroid81\ExoPlayer.UI.dll</HintPath>
<Reference Include="ExoPlayer.UI, Version=2.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.UI.2.8.8\lib\monoandroid81\ExoPlayer.UI.dll</HintPath>
</Reference>
<Reference Include="Google.Apis, Version=1.35.1.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Apis.1.35.1\lib\netstandard2.0\Google.Apis.dll</HintPath>
@@ -248,8 +248,8 @@
<Reference Include="Xamarin.GooglePlayServices.Tasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
</Reference>
<Reference Include="YoutubeExplode, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\YoutubeExplode.4.3.0\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
<Reference Include="YoutubeExplode, Version=4.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\YoutubeExplode.4.3.1\lib\netstandard2.0\YoutubeExplode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
MusicApp/Resources/Portable Class/LineAdapter.cs
+16 -2
View File
@@ -63,8 +63,22 @@ namespace MusicApp.Resources.Portable_Class
void OnClick(int position)
{
if (useQueue && MusicPlayer.instance != null)
MusicPlayer.instance.SwitchQueue(songList[position]);
if (useQueue)
{
if(MusicPlayer.instance != null)
MusicPlayer.instance.SwitchQueue(songList[position]);
else
{
Intent intent = new Intent(MainActivity.instance, typeof(MusicPlayer));
intent.SetAction("SwitchQueue");
intent.PutExtra("queueSlot", position);
MainActivity.instance.StartService(intent);
Intent player = new Intent(MainActivity.instance, typeof(Player));
MainActivity.instance.StartActivity(player);
}
}
else if (!songList[position].IsYt)
Browse.Play(songList[position], recycler.GetLayoutManager().FindViewByPosition(position).FindViewById<ImageView>(Resource.Id.albumArt));
else
MusicApp/Resources/Portable Class/MusicPlayer.cs
+4 -1
View File
@@ -11,7 +11,6 @@ using Android.Support.V4.Content;
using Android.Support.V4.Media.Session;
using Android.Support.V7.Preferences;
using Android.Support.V7.Widget;
using Android.Util;
using Android.Views;
using Android.Widget;
using Com.Google.Android.Exoplayer2;
@@ -132,6 +131,10 @@ namespace MusicApp.Resources.Portable_Class
case "SleepPause":
SleepPause();
break;
case "SwitchQueue":
SwitchQueue(queue[intent.GetIntExtra("queueSlot", -1)]);
break;
}
if (intent.Action != null)
MusicApp/Resources/Portable Class/SearchableActivity.cs
+2 -1
View File
@@ -82,11 +82,12 @@ namespace MusicApp.Resources.Portable_Class
{
try
{
using (WebClient client = new WebClient())
using (WebClient client = new WebClient { Encoding = System.Text.Encoding.UTF8 })
{
string json = client.DownloadString("http://suggestqueries.google.com/complete/search?client=youtube&ds=yt&client=firefox&q=" + e.NewText);
json = json.Substring(4 + e.NewText.Length);
json = json.Remove(json.Length - 1);
System.Console.WriteLine("&" + json);
List<string> items = JsonConvert.DeserializeObject<List<string>>(json);
suggestions = items.ConvertAll(StringToSugest);
suggestions.InsertRange(0, History.Where(x => x.Text.StartsWith(e.NewText)));
MusicApp/packages.config
+9 -9
View File
@@ -7,7 +7,7 @@
<package id="Google.Apis.YouTube.v3" version="1.35.1.1226" targetFramework="monoandroid81" />
<package id="Karamunting.Android.AnderWeb.DiscreteSeekBar" version="1.0.1.1" targetFramework="monoandroid81" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="monoandroid81" />
<package id="Microsoft.NETCore.Platforms" version="2.1.0" targetFramework="monoandroid81" />
<package id="Microsoft.NETCore.Platforms" version="2.1.1" targetFramework="monoandroid81" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid81" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="monoandroid81" />
<package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid81" />
@@ -44,7 +44,7 @@
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="monoandroid81" />
<package id="System.Reflection.TypeExtensions" version="4.5.1" targetFramework="monoandroid81" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Runtime" version="4.3.0" targetFramework="monoandroid81" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="monoandroid81" />
@@ -69,12 +69,12 @@
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid81" />
<package id="TagLib.Portable" version="1.0.4" targetFramework="monoandroid81" />
<package id="Validation" version="2.4.18" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Core" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Dash" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Hls" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.UI" version="2.8.7" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Core" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Dash" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.Hls" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.SmoothStreaming" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xam.Plugins.Android.ExoPlayer.UI" version="2.8.8" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3.1" targetFramework="monoandroid81" />
@@ -101,5 +101,5 @@
<package id="Xamarin.GooglePlayServices.Base" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid81" />
<package id="YoutubeExplode" version="4.3.0" targetFramework="monoandroid81" />
<package id="YoutubeExplode" version="4.3.1" targetFramework="monoandroid81" />
</packages>