zoriya/Opus
1
0
Fork 0
mirror of https://github.com/zoriya/Opus.git synced 2026-06-02 14:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Creating volume multiplier.

Browse Source
This commit is contained in:
Anonymous Raccoon
2018-05-16 19:17:39 +02:00
parent 150cbfa629
commit 5436825619
11 changed files with 232 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MusicApp/MusicApp.csproj
+5
View File
@@ -256,6 +256,7 @@
<Compile Include="Resources\Portable Class\HomeMultipleSong.cs" />
<Compile Include="Resources\Portable Class\ItemTouchCallback.cs" />
<Compile Include="Resources\Portable Class\MusicPlayer.cs" />
<Compile Include="Resources\Portable Class\PercentTransform.cs" />
<Compile Include="Resources\Portable Class\Player.cs" />
<None Include="packages.config" />
<Compile Include="Resources\Portable Class\Playlist.cs" />
@@ -265,6 +266,7 @@
<Compile Include="Resources\Portable Class\Queue.cs" />
<Compile Include="Resources\Portable Class\RecyclerAdapter.cs" />
<Compile Include="Resources\Portable Class\RecyclerHolder.cs" />
<Compile Include="Resources\Portable Class\SeekbarPreference.cs" />
<Compile Include="Resources\Portable Class\Sleeper.cs" />
<Compile Include="Resources\Portable Class\SnackbarCallback.cs" />
<Compile Include="Resources\Portable Class\TimerTransformer.cs" />
@@ -570,6 +572,9 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable\Download.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\SeekbarPreference.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
MusicApp/Resources/Portable Class/AccountPreference.cs
-1
View File
@@ -12,7 +12,6 @@ using MusicApp;
using MusicApp.Resources.Portable_Class;
using Square.Picasso;
using System;
using System.Threading.Tasks;
public class AccountPreference : Preference, IResultCallback
{
MusicApp/Resources/Portable Class/MusicPlayer.cs
+11 -2
View File
@@ -151,14 +151,22 @@ namespace MusicApp.Resources.Portable_Class
{
audioManager = (AudioManager)Application.Context.GetSystemService(AudioService);
notificationManager = (NotificationManager)Application.Context.GetSystemService(NotificationService);
ISharedPreferences prefManager = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
DefaultBandwidthMeter bandwithMeter = new DefaultBandwidthMeter();
AdaptiveTrackSelection.Factory trackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwithMeter);
TrackSelector trackSelector = new DefaultTrackSelector(trackSelectionFactory);
player = ExoPlayerFactory.NewSimpleInstance(Application.Context, trackSelector);
player.PlayWhenReady = true;
player.Volume = prefManager.GetInt("volumeMultiplier", 100) / 100f;
player.AddListener(this);
}
public void ChangeVolume(float volume)
{
if(player != null)
player.Volume = volume;
}
public void Play(string filePath, string title = null, string artist = null, string youtubeID = null, string thumbnailURI = null, bool addToQueue = true)
{
isRunning = true;
@@ -736,6 +744,7 @@ namespace MusicApp.Resources.Portable_Class
public void OnAudioFocusChange(AudioFocus focusChange)
{
ISharedPreferences prefManager = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
switch (focusChange)
{
case AudioFocus.Gain:
@@ -745,7 +754,7 @@ namespace MusicApp.Resources.Portable_Class
if (!isRunning)
player.PlayWhenReady = true;
player.Volume = 1;
player.Volume = prefManager.GetInt("volumeMultiplier", 100) / 100;
break;
case AudioFocus.Loss:
@@ -758,7 +767,7 @@ namespace MusicApp.Resources.Portable_Class
case AudioFocus.LossTransientCanDuck:
if (isRunning)
player.Volume = 0.2f;
player.Volume = prefManager.GetInt("volumeMultiplier", 100) / 100 * 0.2f;
break;
default:
MusicApp/Resources/Portable Class/PercentTransform.cs
+22
View File
@@ -0,0 +1,22 @@
using Org.Adw.Library.Widgets.Discreteseekbar;
namespace MusicApp.Resources.Portable_Class
{
public class PercentTransform : DiscreteSeekBar.NumericTransformer
{
public override int Transform(int value)
{
return value;
}
public override string TransformToString(int value)
{
return value + "%";
}
public override bool UseStringTransform()
{
return true;
}
}
}
MusicApp/Resources/Portable Class/Player.cs
+1
View File
@@ -178,6 +178,7 @@ namespace MusicApp.Resources.Portable_Class
bar = playerView.FindViewById<DiscreteSeekBar>(Resource.Id.songTimer);
bar.SetNumericTransformer(new TimerTransformer());
bar.LayoutParameters.Width = (int)(MainActivity.instance.Resources.DisplayMetrics.WidthPixels * 1.1f);
MusicPlayer.SetSeekBar(bar);
handler.PostDelayed(UpdateSeekBar, 1000);
MusicApp/Resources/Portable Class/Preferences.cs
-5
View File
@@ -135,11 +135,6 @@ namespace MusicApp.Resources.Portable_Class
skipExistVerification.PreferenceClick += SkipClick;
skipExistVerification.Summary = prefManager.GetBoolean("skipExistVerification", false) ? "True" : "False";
//Volume multiplier
//Preference volumeMultiplier = PreferenceScreen.FindPreference("volumeMultiplier");
//volumeMultiplier.PreferenceClick += SkipClick;
//volumeMultiplier.Summary = prefManager.GetInt("volumeMultiplier", 1).ToString();
//Local play shortcut
Preference localShortcutPreference = PreferenceScreen.FindPreference("localPlay");
localShortcutPreference.PreferenceClick += LocalShortcut;
MusicApp/Resources/Portable Class/SeekbarPreference.cs
+47
View File
@@ -0,0 +1,47 @@
using Android.App;
using Android.Content;
using Android.Preferences;
using Android.Runtime;
using Android.Util;
using Android.Views;
using MusicApp;
using MusicApp.Resources.Portable_Class;
using Org.Adw.Library.Widgets.Discreteseekbar;
using System;
public class SeekbarPreference : Preference
{
public SeekbarPreference(Context context) : base(context) { }
public SeekbarPreference(Context context, IAttributeSet attrs) : base(context, attrs) { }
public SeekbarPreference(Context context, IAttributeSet attrs, int defStyleAttr) : base(context, attrs, defStyleAttr) { }
public SeekbarPreference(Context context, IAttributeSet attrs, int defStyleAttr, int defStyleRes) : base(context, attrs, defStyleAttr, defStyleRes) { }
protected SeekbarPreference(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer) { }
protected override View OnCreateView(ViewGroup parent)
{
LayoutInflater inflater = (LayoutInflater)Context.GetSystemService(Context.LayoutInflaterService);
View view = inflater.Inflate(Resource.Layout.SeekbarPreference, parent, false);
ISharedPreferences prefManager = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
DiscreteSeekBar seekbar = view.FindViewById<DiscreteSeekBar>(Resource.Id.seekbar);
seekbar.Progress = prefManager.GetInt("volumeMultiplier", 100);
seekbar.SetNumericTransformer(new PercentTransform());
seekbar.ProgressChanged += (sender, e) =>
{
bool FromUser = e.P2;
int Progress = e.P1;
ISharedPreferences pref = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
ISharedPreferencesEditor editor = pref.Edit();
editor.PutInt("volumeMultiplier", Progress);
editor.Apply();
if (MusicPlayer.instance != null)
MusicPlayer.instance.ChangeVolume(Progress / 100f);
};
return view;
}
}
MusicApp/Resources/Resource.Designer.cs
Generated
+71 -62
View File
@@ -3130,8 +3130,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a00d8
public const int bottomView = 2131362008;
// aapt resource value: 0x7f0a0121
public const int browseLayout = 2131362081;
// aapt resource value: 0x7f0a0123
public const int browseLayout = 2131362083;
// aapt resource value: 0x7f0a00ac
public const int browseList = 2131361964;
@@ -3145,8 +3145,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a00df
public const int cancel_action = 2131362015;
// aapt resource value: 0x7f0a010f
public const int cardPlayer = 2131362063;
// aapt resource value: 0x7f0a0111
public const int cardPlayer = 2131362065;
// aapt resource value: 0x7f0a005e
public const int center = 2131361886;
@@ -3229,11 +3229,11 @@ namespace MusicApp
// aapt resource value: 0x7f0a00fe
public const int downFAB = 2131362046;
// aapt resource value: 0x7f0a0123
public const int downloadMDfromYT = 2131362083;
// aapt resource value: 0x7f0a0125
public const int downloadMDfromYT = 2131362085;
// aapt resource value: 0x7f0a011a
public const int edit = 2131362074;
// aapt resource value: 0x7f0a011c
public const int edit = 2131362076;
// aapt resource value: 0x7f0a009e
public const int edit_query = 2131361950;
@@ -3328,8 +3328,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a0061
public const int fill_vertical = 2131361889;
// aapt resource value: 0x7f0a0125
public const int filter = 2131362085;
// aapt resource value: 0x7f0a0127
public const int filter = 2131362087;
// aapt resource value: 0x7f0a0074
public const int fit = 2131361908;
@@ -3409,8 +3409,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a0017
public const int line1 = 2131361815;
// aapt resource value: 0x7f0a011d
public const int line2 = 2131362077;
// aapt resource value: 0x7f0a011f
public const int line2 = 2131362079;
// aapt resource value: 0x7f0a0018
public const int line3 = 2131361816;
@@ -3430,14 +3430,17 @@ namespace MusicApp
// aapt resource value: 0x7f0a00ce
public const int logButton = 2131361998;
// aapt resource value: 0x7f0a011f
public const int masked = 2131362079;
// aapt resource value: 0x7f0a0121
public const int masked = 2131362081;
// aapt resource value: 0x7f0a0110
public const int maxValue = 2131362064;
// aapt resource value: 0x7f0a00e1
public const int media_actions = 2131362017;
// aapt resource value: 0x7f0a011c
public const int message = 2131362076;
// aapt resource value: 0x7f0a011e
public const int message = 2131362078;
// aapt resource value: 0x7f0a00c6
public const int metadataAlbum = 2131361990;
@@ -3463,17 +3466,20 @@ namespace MusicApp
// aapt resource value: 0x7f0a004b
public const int middle = 2131361867;
// aapt resource value: 0x7f0a010f
public const int minValue = 2131362063;
// aapt resource value: 0x7f0a006c
public const int mini = 2131361900;
// aapt resource value: 0x7f0a011b
public const int moreButton = 2131362075;
// aapt resource value: 0x7f0a011d
public const int moreButton = 2131362077;
// aapt resource value: 0x7f0a0042
public const int multiply = 2131361858;
// aapt resource value: 0x7f0a0120
public const int musicLayout = 2131362080;
// aapt resource value: 0x7f0a0122
public const int musicLayout = 2131362082;
// aapt resource value: 0x7f0a00ba
public const int navigation_header_container = 2131361978;
@@ -3556,8 +3562,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a00f6
public const int playerTitle = 2131362038;
// aapt resource value: 0x7f0a0122
public const int playlistLayout = 2131362082;
// aapt resource value: 0x7f0a0124
public const int playlistLayout = 2131362084;
// aapt resource value: 0x7f0a00b1
public const int playlistName = 2131361969;
@@ -3586,8 +3592,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a010c
public const int recycler = 2131362060;
// aapt resource value: 0x7f0a0118
public const int reorder = 2131362072;
// aapt resource value: 0x7f0a011a
public const int reorder = 2131362074;
// aapt resource value: 0x7f0a0063
public const int right = 2131361891;
@@ -3667,8 +3673,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a00aa
public const int select_dialog_listview = 2131361962;
// aapt resource value: 0x7f0a0126
public const int settings = 2131362086;
// aapt resource value: 0x7f0a0128
public const int settings = 2131362088;
// aapt resource value: 0x7f0a0094
public const int shortcut = 2131361940;
@@ -3706,29 +3712,29 @@ namespace MusicApp
// aapt resource value: 0x7f0a00fd
public const int songTimer = 2131362045;
// aapt resource value: 0x7f0a0111
public const int spArt = 2131362065;
// aapt resource value: 0x7f0a0113
public const int spArtist = 2131362067;
// aapt resource value: 0x7f0a0110
public const int spContainer = 2131362064;
// aapt resource value: 0x7f0a0116
public const int spLast = 2131362070;
// aapt resource value: 0x7f0a0114
public const int spNext = 2131362068;
public const int spArt = 2131362067;
// aapt resource value: 0x7f0a0115
public const int spPlay = 2131362069;
// aapt resource value: 0x7f0a0117
public const int spProgress = 2131362071;
public const int spArtist = 2131362069;
// aapt resource value: 0x7f0a0112
public const int spTitle = 2131362066;
public const int spContainer = 2131362066;
// aapt resource value: 0x7f0a0118
public const int spLast = 2131362072;
// aapt resource value: 0x7f0a0116
public const int spNext = 2131362070;
// aapt resource value: 0x7f0a0117
public const int spPlay = 2131362071;
// aapt resource value: 0x7f0a0119
public const int spProgress = 2131362073;
// aapt resource value: 0x7f0a0114
public const int spTitle = 2131362068;
// aapt resource value: 0x7f0a0084
public const int spacer = 2131361924;
@@ -3847,8 +3853,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a0013
public const int transition_transform = 2131361811;
// aapt resource value: 0x7f0a0124
public const int undoChange = 2131362084;
// aapt resource value: 0x7f0a0126
public const int undoChange = 2131362086;
// aapt resource value: 0x7f0a0047
public const int uniform = 2131361863;
@@ -3862,8 +3868,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a0016
public const int view_offset_helper = 2131361814;
// aapt resource value: 0x7f0a011e
public const int visible = 2131362078;
// aapt resource value: 0x7f0a0120
public const int visible = 2131362080;
// aapt resource value: 0x7f0a0034
public const int wide = 2131361844;
@@ -3874,8 +3880,8 @@ namespace MusicApp
// aapt resource value: 0x7f0a0048
public const int wrap_content = 2131361864;
// aapt resource value: 0x7f0a0119
public const int youtubeIcon = 2131362073;
// aapt resource value: 0x7f0a011b
public const int youtubeIcon = 2131362075;
// aapt resource value: 0x7f0a010a
public const int ytPlay = 2131362058;
@@ -4231,40 +4237,43 @@ namespace MusicApp
public const int search_layout = 2130903134;
// aapt resource value: 0x7f03005f
public const int select_dialog_item_material = 2130903135;
public const int SeekbarPreference = 2130903135;
// aapt resource value: 0x7f030060
public const int select_dialog_multichoice_material = 2130903136;
public const int select_dialog_item_material = 2130903136;
// aapt resource value: 0x7f030061
public const int select_dialog_singlechoice_material = 2130903137;
public const int select_dialog_multichoice_material = 2130903137;
// aapt resource value: 0x7f030062
public const int SmallPlayer = 2130903138;
public const int select_dialog_singlechoice_material = 2130903138;
// aapt resource value: 0x7f030063
public const int SongList = 2130903139;
public const int SmallPlayer = 2130903139;
// aapt resource value: 0x7f030064
public const int SquareSong = 2130903140;
public const int SongList = 2130903140;
// aapt resource value: 0x7f030065
public const int support_simple_spinner_dropdown_item = 2130903141;
public const int SquareSong = 2130903141;
// aapt resource value: 0x7f030066
public const int tabs = 2130903142;
public const int support_simple_spinner_dropdown_item = 2130903142;
// aapt resource value: 0x7f030067
public const int TimerLayout = 2130903143;
public const int tabs = 2130903143;
// aapt resource value: 0x7f030068
public const int tooltip = 2130903144;
public const int TimerLayout = 2130903144;
// aapt resource value: 0x7f030069
public const int TwoLineLayout = 2130903145;
public const int tooltip = 2130903145;
// aapt resource value: 0x7f03006a
public const int YtList = 2130903146;
public const int TwoLineLayout = 2130903146;
// aapt resource value: 0x7f03006b
public const int YtList = 2130903147;
static Layout()
{
MusicApp/Resources/layout/Preferences.xml
+3
View File
@@ -20,6 +20,9 @@
android:key="skipExistVerification"
android:title="Never play local file instead of youtube one"
android:summary="Shuffle All Audio Files" />
<SeekbarPreference
android:title="Volume"
android:key="volumeMultipler" />
</PreferenceCategory>
<PreferenceCategory android:title="Appearances">
<Preference
MusicApp/Resources/layout/SeekbarPreference.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:paddingTop="20dp"
android:orientation="vertical" >
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:paddingLeft="10dp"
android:textSize="16sp"
android:text="Volume"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:gravity="right"
android:id="@+id/minValue"
android:text="0%"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:id="@+id/maxValue"
android:text="100%"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/maxValue"
android:layout_toRightOf="@id/minValue"
android:orientation="horizontal"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp">
<org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
android:id="@+id/seekbar"
app:dsb_min="0"
app:dsb_value="100"
app:dsb_max="100"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
MusicApp/Resources/layout/player.xml
+16 -14
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
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="wrap_content" >
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
@@ -183,16 +183,18 @@
android:id="@+id/showQueue"
android:text="Show Queue" />
</LinearLayout>
<org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
android:id="@+id/songTimer"
app:layout_anchor="@id/playerAlbum"
app:layout_anchorGravity="bottom|center"
android:layout_width="fill_parent"
<AbsoluteLayout
android:layout_height="wrap_content"
android:padding="0dp"
android:paddingEnd="0dp"
android:paddingStart="0dp"
app:elevation="6dp" />
android:layout_width="fill_parent"
app:layout_anchor="@id/playerAlbum"
app:elevation="6dp"
app:layout_anchorGravity="bottom|center" >
<org.adw.library.widgets.discreteseekbar.DiscreteSeekBar
android:id="@+id/songTimer"
android:layout_x="-15dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</AbsoluteLayout>
<!--<SeekBar
android:id="@+id/songTimer"
app:layout_anchor="@id/playerAlbum"