Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Android: Converted EqualizerPresetDetails fragment to activity. Added…
… layout for EqualizerPresets. Added empty OutputMeterView. Related to issue #406.
- Loading branch information
1 parent
8886b92
commit adcd6ad
Showing
12 changed files
with
727 additions
and
494 deletions.
There are no files selected for viewing
141 changes: 141 additions & 0 deletions
141
MPfm/MPfm.Android/Classes/Activities/EqualizerPresetDetailsActivity.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| // Copyright © 2011-2013 Yanick Castonguay | ||
| // | ||
| // This file is part of MPfm. | ||
| // | ||
| // MPfm is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // MPfm is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with MPfm. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Reflection; | ||
| using Android.App; | ||
| using Android.Content; | ||
| using Android.Content.PM; | ||
| using Android.Support.V4.App; | ||
| using Android.Views; | ||
| using Android.OS; | ||
| using MPfm.Android.Classes.Navigation; | ||
| using MPfm.MVP.Bootstrap; | ||
| using MPfm.MVP.Navigation; | ||
| using MPfm.MVP.Views; | ||
| using MPfm.Player.Objects; | ||
|
|
||
| namespace MPfm.Android | ||
| { | ||
| [Activity(Label = "Equalizer Preset Details", ScreenOrientation = ScreenOrientation.Sensor, Theme = "@style/MyAppTheme", ConfigurationChanges = ConfigChanges.KeyboardHidden | ConfigChanges.Orientation | ConfigChanges.ScreenSize)] | ||
| public class EqualizerPresetDetailsActivity : BaseActivity, IEqualizerPresetDetailsView | ||
| { | ||
| private MobileNavigationManager _navigationManager; | ||
| private string _sourceActivityType; | ||
|
|
||
| protected override void OnCreate(Bundle bundle) | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnCreate"); | ||
| base.OnCreate(bundle); | ||
|
|
||
| _navigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>(); | ||
| SetContentView(Resource.Layout.EqualizerPresetDetails); | ||
| ActionBar.SetDisplayHomeAsUpEnabled(true); | ||
| ActionBar.SetHomeButtonEnabled(true); | ||
|
|
||
| // Save the source activity type for later (for providing Up navigation) | ||
| _sourceActivityType = Intent.GetStringExtra("sourceActivity"); | ||
|
|
||
| // Since the onViewReady action could not be added to an intent, tell the NavMgr the view is ready | ||
| ((AndroidNavigationManager)_navigationManager).SetEqualizerPresetDetailsActivityInstance(this); | ||
| } | ||
|
|
||
| protected override void OnStart() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnStart"); | ||
| base.OnStart(); | ||
| } | ||
|
|
||
| protected override void OnRestart() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnRestart"); | ||
| base.OnRestart(); | ||
| } | ||
|
|
||
| protected override void OnPause() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnPause"); | ||
| base.OnPause(); | ||
| } | ||
|
|
||
| protected override void OnResume() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnResume"); | ||
| base.OnResume(); | ||
| } | ||
|
|
||
| protected override void OnStop() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnStop"); | ||
| base.OnStop(); | ||
| } | ||
|
|
||
| protected override void OnDestroy() | ||
| { | ||
| Console.WriteLine("EqualizerPresetDetailsActivity - OnDestroy"); | ||
| base.OnDestroy(); | ||
| } | ||
|
|
||
| public override bool OnOptionsItemSelected(IMenuItem item) | ||
| { | ||
| switch (item.ItemId) | ||
| { | ||
| case global::Android.Resource.Id.Home: | ||
| var type = Type.GetType(_sourceActivityType); | ||
| var intent = new Intent(this, type); | ||
| intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop); | ||
| this.StartActivity(intent); | ||
| this.Finish(); | ||
| return true; | ||
| break; | ||
| default: | ||
| return base.OnOptionsItemSelected(item); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| #region IEqualizerPresetDetailsView implementation | ||
|
|
||
| public Action OnResetPreset { get; set; } | ||
| public Action OnNormalizePreset { get; set; } | ||
| public Action OnRevertPreset { get; set; } | ||
| public Action<string> OnSavePreset { get; set; } | ||
| public Action<string, float> OnSetFaderGain { get; set; } | ||
|
|
||
| public void EqualizerPresetDetailsError(Exception ex) | ||
| { | ||
| RunOnUiThread(() => { | ||
| AlertDialog ad = new AlertDialog.Builder(this).Create(); | ||
| ad.SetCancelable(false); | ||
| ad.SetMessage(string.Format("An error has occured in EqualizerPresetDetails: {0}", ex)); | ||
| ad.SetButton("OK", (sender, args) => ad.Dismiss()); | ||
| ad.Show(); | ||
| }); | ||
| } | ||
|
|
||
| public void ShowMessage(string title, string message) | ||
| { | ||
| } | ||
|
|
||
| public void RefreshPreset(EQPreset preset) | ||
| { | ||
| } | ||
|
|
||
| #endregion | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Copyright © 2011-2013 Yanick Castonguay | ||
| // | ||
| // This file is part of MPfm. | ||
| // | ||
| // MPfm is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // MPfm is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with MPfm. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using Android.App; | ||
| using Android.Content; | ||
| using Android.OS; | ||
| using Android.Runtime; | ||
| using Android.Util; | ||
| using Android.Views; | ||
| using Android.Widget; | ||
|
|
||
| namespace org.sessionsapp.android | ||
| { | ||
| public class OutputMeterView : View | ||
| { | ||
| public OutputMeterView(Context context) : base(context) | ||
| { | ||
| Initialize(); | ||
| } | ||
|
|
||
| public OutputMeterView(Context context, IAttributeSet attrs) : base (context, attrs) | ||
| { | ||
| Initialize(); | ||
| } | ||
|
|
||
| public OutputMeterView(Context context, IAttributeSet attrs, int defStyle) : base(context, attrs, defStyle) | ||
| { | ||
| Initialize(); | ||
| } | ||
|
|
||
| public OutputMeterView(IntPtr javaReference, JniHandleOwnership transfer) | ||
| : base(javaReference, transfer) | ||
| { | ||
| Initialize(); | ||
| } | ||
|
|
||
| private void Initialize() | ||
| { | ||
| } | ||
|
|
||
| public override void Draw(global::Android.Graphics.Canvas canvas) | ||
| { | ||
| Console.WriteLine("OutputMeterView - Draw"); | ||
| base.Draw(canvas); | ||
| } | ||
| } | ||
| } |
76 changes: 0 additions & 76 deletions
76
MPfm/MPfm.Android/Classes/Fragments/EqualizerPresetDetailsFragment.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.