From adf5a618db480ca6aa0eddca1cff7abb81321329 Mon Sep 17 00:00:00 2001 From: ycastonguay Date: Wed, 10 Apr 2013 20:59:34 -0400 Subject: [PATCH] iOS: Renamed EffectsViewController to EqualizerPresetsViewController. iOS: Added EqualizerPresetDetailsViewController. MVP: Renamed EffectsPresenter/View to EqualizerPresetsPresenter/View. MVP: Added EqualizerPresetDetailsPresenter/View. Related to issue #397, issue #405 and issue #417. --- MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs | 3 +- MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj | 9 +- .../MobileNavigationManagerCommandMessage.cs | 2 +- .../Navigation/MobileNavigationManager.cs | 28 ++-- ....cs => EqualizerPresetDetailsPresenter.cs} | 19 +-- .../Presenters/EqualizerPresetsPresenter.cs | 70 ++++++++++ ...cs => IEqualizerPresetDetailsPresenter.cs} | 5 +- .../Interfaces/IEqualizerPresetsPresenter.cs | 34 +++++ .../Presenters/MobileOptionsMenuPresenter.cs | 8 +- ...View.cs => IEqualizerPresetDetailsView.cs} | 6 +- MPfm/MPfm.MVP/Views/IEqualizerPresetsView.cs | 27 ++++ MPfm/MPfm.MVP/Views/IMobileOptionsMenuView.cs | 2 +- .../EqualizerPresetDetailsViewController.cs | 89 +++++++++++++ ...zerPresetDetailsViewController.designer.cs | 18 +++ ...r.cs => EqualizerPresetsViewController.cs} | 6 +- ...qualizerPresetsViewController.designer.cs} | 2 +- .../Classes/Controllers/MoreViewController.cs | 2 +- .../Controls/MPfmNavigationController.cs | 2 +- .../MPfm.iOS/Classes/Delegates/AppDelegate.cs | 45 ++++--- .../Navigation/iOSNavigationManager.cs | 4 +- MPfm/MPfm.iOS/MPfm.iOS.csproj | 18 ++- ...alizerPresetDetailsViewController_iPad.xib | 121 ++++++++++++++++++ ...> EqualizerPresetsViewController_iPad.xib} | 0 ...izerPresetDetailsViewController_iPhone.xib | 118 +++++++++++++++++ ...EqualizerPresetsViewController_iPhone.xib} | 44 +------ 25 files changed, 558 insertions(+), 124 deletions(-) rename MPfm/MPfm.MVP/Presenters/{EffectsPresenter.cs => EqualizerPresetDetailsPresenter.cs} (74%) create mode 100644 MPfm/MPfm.MVP/Presenters/EqualizerPresetsPresenter.cs rename MPfm/MPfm.MVP/Presenters/Interfaces/{IEffectsPresenter.cs => IEqualizerPresetDetailsPresenter.cs} (85%) create mode 100644 MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetsPresenter.cs rename MPfm/MPfm.MVP/Views/{IEffectsView.cs => IEqualizerPresetDetailsView.cs} (86%) create mode 100644 MPfm/MPfm.MVP/Views/IEqualizerPresetsView.cs create mode 100644 MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs create mode 100644 MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.designer.cs rename MPfm/MPfm.iOS/Classes/Controllers/{EffectsViewController.cs => EqualizerPresetsViewController.cs} (90%) rename MPfm/MPfm.iOS/Classes/Controllers/{EffectsViewController.designer.cs => EqualizerPresetsViewController.designer.cs} (96%) create mode 100644 MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetDetailsViewController_iPad.xib rename MPfm/MPfm.iOS/XIB/iPad/{EffectsViewController_iPad.xib => EqualizerPresetsViewController_iPad.xib} (100%) create mode 100644 MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetDetailsViewController_iPhone.xib rename MPfm/MPfm.iOS/XIB/iPhone/{EffectsViewController_iPhone.xib => EqualizerPresetsViewController_iPhone.xib} (76%) diff --git a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs index d6b10087..84699c97 100644 --- a/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs +++ b/MPfm/MPfm.MVP/Bootstrap/Bootstrapper.cs @@ -60,7 +60,8 @@ static Bootstrapper() container.Register().AsSingleton(); container.Register().AsSingleton(); container.Register().AsSingleton(); - container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); container.Register().AsSingleton(); container.Register().AsSingleton(); container.Register().AsSingleton(); diff --git a/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj b/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj index fbc83338..a8b858ac 100644 --- a/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj +++ b/MPfm/MPfm.MVP/MPfm.MVP.iOS.csproj @@ -240,9 +240,6 @@ - - - @@ -296,5 +293,11 @@ + + + + + + \ No newline at end of file diff --git a/MPfm/MPfm.MVP/Messages/MobileNavigationManagerCommandMessage.cs b/MPfm/MPfm.MVP/Messages/MobileNavigationManagerCommandMessage.cs index 045dcd0f..58697798 100644 --- a/MPfm/MPfm.MVP/Messages/MobileNavigationManagerCommandMessage.cs +++ b/MPfm/MPfm.MVP/Messages/MobileNavigationManagerCommandMessage.cs @@ -39,6 +39,6 @@ public MobileNavigationManagerCommandMessage(object sender, MobileNavigationMana public enum MobileNavigationManagerCommandMessageType { ShowPlayerView = 0, - ShowEffectsView = 1 + ShowEqualizerPresetsView = 1 } } diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs index d5449182..56f4a78b 100644 --- a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs +++ b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs @@ -40,8 +40,10 @@ public abstract class MobileNavigationManager private IMobileOptionsMenuPresenter _optionsMenuPresenter; private IUpdateLibraryView _updateLibraryView; private IUpdateLibraryPresenter _updateLibraryPresenter; - private IEffectsView _effectsView; - private IEffectsPresenter _effectsPresenter; + private IEqualizerPresetsView _equalizerPresetsView; + private IEqualizerPresetsPresenter _equalizerPresetsPresenter; + private IEqualizerPresetDetailsView _equalizerPresetDetailsView; + private IEqualizerPresetDetailsPresenter _equalizerPresetDetailsPresenter; private IPlayerView _playerView; private IPlayerPresenter _playerPresenter; @@ -120,10 +122,10 @@ protected void ShowPlayerView(MobileNavigationTabType tabType) PushTabView(tabType, _playerView); } - protected void ShowEffectsView() + protected void ShowEqualizerPresetsView() { - var view = CreateEffectsView(); - PushDialogView("Effects", view); + var view = CreateEqualizerPresetsView(); + PushDialogView("EqualizerPresets", view); } public virtual void BindOptionsMenuView(IMobileOptionsMenuView view) @@ -438,23 +440,23 @@ public virtual IPitchShiftingView CreatePitchShiftingView() return _pitchShiftingView; } - public virtual IEffectsView CreateEffectsView() + public virtual IEqualizerPresetsView CreateEqualizerPresetsView() { // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view. Action onViewReady = (view) => { - _effectsPresenter = Bootstrapper.GetContainer().Resolve(); - _effectsPresenter.BindView((IEffectsView)view); + _equalizerPresetsPresenter = Bootstrapper.GetContainer().Resolve(); + _equalizerPresetsPresenter.BindView((IEqualizerPresetsView)view); }; // Create view and manage view destruction - _effectsView = Bootstrapper.GetContainer().Resolve(new NamedParameterOverloads() { { "onViewReady", onViewReady } }); - _effectsView.OnViewDestroy = (view) => + _equalizerPresetsView = Bootstrapper.GetContainer().Resolve(new NamedParameterOverloads() { { "onViewReady", onViewReady } }); + _equalizerPresetsView.OnViewDestroy = (view) => { - _effectsView = null; - _effectsPresenter = null; + _equalizerPresetsView = null; + _equalizerPresetsPresenter = null; }; - return _effectsView; + return _equalizerPresetsView; } } diff --git a/MPfm/MPfm.MVP/Presenters/EffectsPresenter.cs b/MPfm/MPfm.MVP/Presenters/EqualizerPresetDetailsPresenter.cs similarity index 74% rename from MPfm/MPfm.MVP/Presenters/EffectsPresenter.cs rename to MPfm/MPfm.MVP/Presenters/EqualizerPresetDetailsPresenter.cs index 0b902984..cf6df086 100644 --- a/MPfm/MPfm.MVP/Presenters/EffectsPresenter.cs +++ b/MPfm/MPfm.MVP/Presenters/EqualizerPresetDetailsPresenter.cs @@ -21,31 +21,16 @@ namespace MPfm.MVP.Presenters { - /// - /// Effects presenter. - /// - public class EffectsPresenter : BasePresenter, IEffectsPresenter + public class EqualizerPresetDetailsPresenter : BasePresenter, IEqualizerPresetDetailsPresenter { - // Private variables - //IEffectsView view = null; readonly IPlayerService playerService; - #region Constructor and Dispose - - /// - /// Initializes a new instance of the class. - /// - /// - /// Player service. - /// - public EffectsPresenter(IPlayerService playerService) + public EqualizerPresetDetailsPresenter(IPlayerService playerService) { // Set properties this.playerService = playerService; } - #endregion - public void SetEQParam(int index, float value) { // Set EQ and update UI diff --git a/MPfm/MPfm.MVP/Presenters/EqualizerPresetsPresenter.cs b/MPfm/MPfm.MVP/Presenters/EqualizerPresetsPresenter.cs new file mode 100644 index 00000000..4de176b3 --- /dev/null +++ b/MPfm/MPfm.MVP/Presenters/EqualizerPresetsPresenter.cs @@ -0,0 +1,70 @@ +// 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 . + +using MPfm.MVP.Presenters.Interfaces; +using MPfm.MVP.Services.Interfaces; +using MPfm.MVP.Views; + +namespace MPfm.MVP.Presenters +{ + public class EqualizerPresetsPresenter : BasePresenter, IEqualizerPresetsPresenter + { + readonly IPlayerService playerService; + + public EqualizerPresetsPresenter(IPlayerService playerService) + { + // Set properties + this.playerService = playerService; + } + + public void SetEQParam(int index, float value) + { + // Set EQ and update UI + playerService.UpdateEQBand(index, value, true); + View.UpdateFader(index, value); + } + + public void BypassEQ() + { + playerService.BypassEQ(); + } + + public void AutoLevel() + { + } + + public void Reset() + { + playerService.ResetEQ(); + for (int a = 0; a < 18; a++) + View.UpdateFader(a, 0); + } + + public void LoadPreset(string presetName) + { + } + + public void SavePreset(string presetName) + { + } + + public void DeletePreset(string presetName) + { + } + } +} + diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/IEffectsPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetDetailsPresenter.cs similarity index 85% rename from MPfm/MPfm.MVP/Presenters/Interfaces/IEffectsPresenter.cs rename to MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetDetailsPresenter.cs index cafcd6bd..aa8d5032 100644 --- a/MPfm/MPfm.MVP/Presenters/Interfaces/IEffectsPresenter.cs +++ b/MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetDetailsPresenter.cs @@ -19,10 +19,7 @@ namespace MPfm.MVP.Presenters.Interfaces { - /// - /// Effects presenter interface. - /// - public interface IEffectsPresenter : IBasePresenter + public interface IEqualizerPresetDetailsPresenter : IBasePresenter { void SetEQParam(int index, float value); void BypassEQ(); diff --git a/MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetsPresenter.cs b/MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetsPresenter.cs new file mode 100644 index 00000000..f785aad0 --- /dev/null +++ b/MPfm/MPfm.MVP/Presenters/Interfaces/IEqualizerPresetsPresenter.cs @@ -0,0 +1,34 @@ +// 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 . + +using MPfm.MVP.Views; + +namespace MPfm.MVP.Presenters.Interfaces +{ + public interface IEqualizerPresetsPresenter : IBasePresenter + { + void SetEQParam(int index, float value); + void BypassEQ(); + void AutoLevel(); + void Reset(); + + void LoadPreset(string presetName); + void SavePreset(string presetName); + void DeletePreset(string presetName); + } +} + diff --git a/MPfm/MPfm.MVP/Presenters/MobileOptionsMenuPresenter.cs b/MPfm/MPfm.MVP/Presenters/MobileOptionsMenuPresenter.cs index d8346f88..a2755d35 100644 --- a/MPfm/MPfm.MVP/Presenters/MobileOptionsMenuPresenter.cs +++ b/MPfm/MPfm.MVP/Presenters/MobileOptionsMenuPresenter.cs @@ -53,7 +53,7 @@ private void Initialize() { _items = new List>(); _items.Add(new KeyValuePair(MobileOptionsMenuType.UpdateLibrary, "Update Library")); - _items.Add(new KeyValuePair(MobileOptionsMenuType.Effects, "Effects")); + _items.Add(new KeyValuePair(MobileOptionsMenuType.EqualizerPresets, "Equalizer Presets")); _items.Add(new KeyValuePair(MobileOptionsMenuType.Preferences, "Preferences")); _items.Add(new KeyValuePair(MobileOptionsMenuType.About, "About MPfm")); View.RefreshMenu(_items); @@ -73,10 +73,10 @@ private void OnItemClick(MobileOptionsMenuType menuType) _navigationManager.PushDialogView("Update Library", view); break; } - case MobileOptionsMenuType.Effects: + case MobileOptionsMenuType.EqualizerPresets: { - var view = _navigationManager.CreateEffectsView(); - _navigationManager.PushDialogView("Effects", view); + var view = _navigationManager.CreateEqualizerPresetsView(); + _navigationManager.PushDialogView("Equalizer Presets", view); break; } case MobileOptionsMenuType.Preferences: diff --git a/MPfm/MPfm.MVP/Views/IEffectsView.cs b/MPfm/MPfm.MVP/Views/IEqualizerPresetDetailsView.cs similarity index 86% rename from MPfm/MPfm.MVP/Views/IEffectsView.cs rename to MPfm/MPfm.MVP/Views/IEqualizerPresetDetailsView.cs index 98511c2d..99bd4b4d 100644 --- a/MPfm/MPfm.MVP/Views/IEffectsView.cs +++ b/MPfm/MPfm.MVP/Views/IEqualizerPresetDetailsView.cs @@ -19,13 +19,9 @@ namespace MPfm.MVP.Views { - /// - /// Effects view interface. - /// - public interface IEffectsView : IBaseView + public interface IEqualizerPresetDetailsView : IBaseView { void UpdateFader(int index, float value); void UpdatePresetList(IEnumerable presets); } } - diff --git a/MPfm/MPfm.MVP/Views/IEqualizerPresetsView.cs b/MPfm/MPfm.MVP/Views/IEqualizerPresetsView.cs new file mode 100644 index 00000000..932c7ec2 --- /dev/null +++ b/MPfm/MPfm.MVP/Views/IEqualizerPresetsView.cs @@ -0,0 +1,27 @@ +// 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 . + +using System.Collections.Generic; + +namespace MPfm.MVP.Views +{ + public interface IEqualizerPresetsView : IBaseView + { + void UpdateFader(int index, float value); + void UpdatePresetList(IEnumerable presets); + } +} diff --git a/MPfm/MPfm.MVP/Views/IMobileOptionsMenuView.cs b/MPfm/MPfm.MVP/Views/IMobileOptionsMenuView.cs index 614080dc..b4c4ce82 100644 --- a/MPfm/MPfm.MVP/Views/IMobileOptionsMenuView.cs +++ b/MPfm/MPfm.MVP/Views/IMobileOptionsMenuView.cs @@ -34,7 +34,7 @@ public enum MobileOptionsMenuType { About = 0, Preferences = 1, - Effects = 2, + EqualizerPresets = 2, UpdateLibrary = 3 } } diff --git a/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs new file mode 100644 index 00000000..0bbc6554 --- /dev/null +++ b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.cs @@ -0,0 +1,89 @@ +// 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 . + +using System; +using System.Drawing; +using MPfm.MVP.Navigation; +using MPfm.MVP.Views; +using MonoTouch.CoreAnimation; +using MonoTouch.CoreGraphics; +using MonoTouch.Foundation; +using MonoTouch.UIKit; +using MPfm.iOS.Classes.Controllers.Base; +using MPfm.iOS.Classes.Controls; +using MPfm.iOS.Classes.Objects; + +namespace MPfm.iOS +{ + public partial class EqualizerPresetDetailsViewController : BaseViewController, IEqualizerPresetDetailsView + { + UIBarButtonItem _btnAdd; + UIBarButtonItem _btnDone; + + public EqualizerPresetDetailsViewController(Action onViewReady) + : base (onViewReady, UserInterfaceIdiomIsPhone ? "EqualizerPresetDetailsViewController_iPhone" : "EqualizerPresetDetailsViewController_iPad", null) + { + } + + public override void ViewDidLoad() + { + // Add navigation controller buttons + var btnDone = new UIButton(UIButtonType.Custom); + btnDone.SetTitle("Done", UIControlState.Normal); + btnDone.Layer.CornerRadius = 8; + btnDone.Layer.BackgroundColor = GlobalTheme.SecondaryColor.CGColor; + btnDone.Font = UIFont.FromName("HelveticaNeue-Bold", 12.0f); + btnDone.Frame = new RectangleF(0, 20, 60, 30); + btnDone.TouchUpInside += (sender, e) => { + this.DismissViewController(true, null); + }; + _btnDone = new UIBarButtonItem(btnDone); + + var btnAdd = new UIButton(UIButtonType.Custom); + btnAdd.SetTitle("+", UIControlState.Normal); + btnAdd.Layer.CornerRadius = 8; + btnAdd.Layer.BackgroundColor = GlobalTheme.SecondaryColor.CGColor; + btnAdd.Font = UIFont.FromName("HelveticaNeue-Bold", 18.0f); + btnAdd.Frame = new RectangleF(0, 12, 60, 30); + btnAdd.TouchUpInside += (sender, e) => { + this.DismissViewController(true, null); + }; + _btnAdd = new UIBarButtonItem(btnAdd); + + NavigationItem.SetLeftBarButtonItem(_btnDone, true); + NavigationItem.SetRightBarButtonItem(_btnAdd, true); + + var navCtrl = (MPfmNavigationController)NavigationController; + navCtrl.SetBackButtonVisible(false); + navCtrl.SetTitle("Effects", "Equalizer Presets"); + + base.ViewDidLoad(); + } + + #region IEffectsView implementation + + public void UpdateFader(int index, float value) + { + } + + public void UpdatePresetList(System.Collections.Generic.IEnumerable presets) + { + } + + #endregion + } +} diff --git a/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.designer.cs b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.designer.cs new file mode 100644 index 00000000..a20e535a --- /dev/null +++ b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetDetailsViewController.designer.cs @@ -0,0 +1,18 @@ +// +// This file has been generated automatically by MonoDevelop to store outlets and +// actions made in the Xcode designer. If it is removed, they will be lost. +// Manual changes to this file may not be handled correctly. +// +using MonoTouch.Foundation; + +namespace MPfm.iOS +{ + [Register ("EqualizerPresetDetailsViewController")] + partial class EqualizerPresetDetailsViewController + { + void ReleaseDesignerOutlets() + { + } + } +} + diff --git a/MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.cs similarity index 90% rename from MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.cs rename to MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.cs index 46ed988e..137730f2 100644 --- a/MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.cs +++ b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.cs @@ -29,13 +29,13 @@ namespace MPfm.iOS { - public partial class EffectsViewController : BaseViewController, IEffectsView + public partial class EqualizerPresetsViewController : BaseViewController, IEqualizerPresetsView { UIBarButtonItem _btnAdd; UIBarButtonItem _btnDone; - public EffectsViewController(Action onViewReady) - : base (onViewReady, UserInterfaceIdiomIsPhone ? "EffectsViewController_iPhone" : "EffectsViewController_iPad", null) + public EqualizerPresetsViewController(Action onViewReady) + : base (onViewReady, UserInterfaceIdiomIsPhone ? "EqualizerPresetsViewController_iPhone" : "EqualizerPresetsViewController_iPad", null) { } diff --git a/MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.designer.cs b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.designer.cs similarity index 96% rename from MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.designer.cs rename to MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.designer.cs index 3ccc0883..8dfd0ab4 100644 --- a/MPfm/MPfm.iOS/Classes/Controllers/EffectsViewController.designer.cs +++ b/MPfm/MPfm.iOS/Classes/Controllers/EqualizerPresetsViewController.designer.cs @@ -9,7 +9,7 @@ namespace MPfm.iOS { [Register ("EffectsViewController")] - partial class EffectsViewController + partial class EqualizerPresetsViewController { [Outlet] MonoTouch.UIKit.UIToolbar toolBar { get; set; } diff --git a/MPfm/MPfm.iOS/Classes/Controllers/MoreViewController.cs b/MPfm/MPfm.iOS/Classes/Controllers/MoreViewController.cs index 88b2e0fa..d9bb87e3 100644 --- a/MPfm/MPfm.iOS/Classes/Controllers/MoreViewController.cs +++ b/MPfm/MPfm.iOS/Classes/Controllers/MoreViewController.cs @@ -74,7 +74,7 @@ public UITableViewCell GetCell(UITableView tableView, NSIndexPath indexPath) cell.TextLabel.Text = _items[indexPath.Row].Value; // Set font - cell.TextLabel.Font = UIFont.FromName("OstrichSans-Medium", 26); + cell.TextLabel.Font = UIFont.FromName("HelveticaNeue-Bold", 14); // Set chevron cell.Accessory = UITableViewCellAccessory.DisclosureIndicator; diff --git a/MPfm/MPfm.iOS/Classes/Controls/MPfmNavigationController.cs b/MPfm/MPfm.iOS/Classes/Controls/MPfmNavigationController.cs index c2b4d40b..c5755d9b 100644 --- a/MPfm/MPfm.iOS/Classes/Controls/MPfmNavigationController.cs +++ b/MPfm/MPfm.iOS/Classes/Controls/MPfmNavigationController.cs @@ -105,7 +105,7 @@ public MPfmNavigationController(MobileNavigationTabType tabType) : base(typeof(M _btnEffects.SetImage(UIImage.FromBundle("Images/effects.png"), UIControlState.Normal); _btnEffects.Alpha = 0; _btnEffects.TouchUpInside += (sender, e) => { - _messengerHub.PublishAsync(new MobileNavigationManagerCommandMessage(this, MobileNavigationManagerCommandMessageType.ShowEffectsView)); + _messengerHub.PublishAsync(new MobileNavigationManagerCommandMessage(this, MobileNavigationManagerCommandMessageType.ShowEqualizerPresetsView)); }; _btnNowPlaying = new UIButton(UIButtonType.Custom); diff --git a/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs b/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs index c3db0185..510fd89b 100644 --- a/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs +++ b/MPfm/MPfm.iOS/Classes/Delegates/AppDelegate.cs @@ -54,25 +54,8 @@ public partial class AppDelegate : UIApplicationDelegate // public override bool FinishedLaunching(UIApplication app, NSDictionary options) { - // Complete IoC configuration - TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer(); - container.Register().AsSingleton(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - //container.Register().AsMultiInstance(); - //container.Register().AsMultiInstance(); - //container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); - container.Register().AsMultiInstance(); + TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer(); + RegisterViews(); UINavigationBar.Appearance.SetBackgroundImage(new UIImage(), UIBarMetrics.Default); UINavigationBar.Appearance.BackgroundColor = GlobalTheme.MainColor; @@ -105,6 +88,30 @@ public override void WillTerminate(UIApplication application) MPfm.Player.Player.CurrentPlayer.Dispose(); } + public void RegisterViews() + { + // Complete IoC configuration + TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer(); + container.Register().AsSingleton(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + //container.Register().AsMultiInstance(); + //container.Register().AsMultiInstance(); + //container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + container.Register().AsMultiInstance(); + } + public void ShowSplash(SplashViewController viewController) { InvokeOnMainThread(() => { diff --git a/MPfm/MPfm.iOS/Classes/Navigation/iOSNavigationManager.cs b/MPfm/MPfm.iOS/Classes/Navigation/iOSNavigationManager.cs index 91c053cd..ce1efb02 100644 --- a/MPfm/MPfm.iOS/Classes/Navigation/iOSNavigationManager.cs +++ b/MPfm/MPfm.iOS/Classes/Navigation/iOSNavigationManager.cs @@ -46,8 +46,8 @@ public iOSNavigationManager(ITinyMessengerHub messageHub) var navCtrl = (MPfmNavigationController)m.Sender; ShowPlayerView(navCtrl.TabType); break; - case MobileNavigationManagerCommandMessageType.ShowEffectsView: - ShowEffectsView(); + case MobileNavigationManagerCommandMessageType.ShowEqualizerPresetsView: + ShowEqualizerPresetsView(); break; } }); diff --git a/MPfm/MPfm.iOS/MPfm.iOS.csproj b/MPfm/MPfm.iOS/MPfm.iOS.csproj index 6237e49b..431144f4 100644 --- a/MPfm/MPfm.iOS/MPfm.iOS.csproj +++ b/MPfm/MPfm.iOS/MPfm.iOS.csproj @@ -154,10 +154,6 @@ MarkersViewController.cs - - - EffectsViewController.cs - TimeShiftingViewController.cs @@ -192,6 +188,14 @@ + + + EqualizerPresetsViewController.cs + + + + EqualizerPresetDetailsViewController.cs + @@ -208,8 +212,6 @@ - - @@ -220,6 +222,10 @@ + + + + diff --git a/MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetDetailsViewController_iPad.xib b/MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetDetailsViewController_iPad.xib new file mode 100644 index 00000000..9cc5e1c3 --- /dev/null +++ b/MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetDetailsViewController_iPad.xib @@ -0,0 +1,121 @@ + + + + 1280 + 11C25 + 1919 + 1138.11 + 566.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 916 + + + IBProxyObject + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + {{0, 20}, {768, 1004}} + + + + 3 + MQA + + 2 + + + NO + + 2 + + IBIPadFramework + + + + + + + view + + + + 3 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + EqualizerPresetDetailsViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 3 + + + + + EqualizerPresetDetailsViewController + UITableViewController + + IBProjectSource + EqualizerPresetDetailsViewController.h + + + + + 0 + IBIPadFramework + YES + 3 + 916 + + diff --git a/MPfm/MPfm.iOS/XIB/iPad/EffectsViewController_iPad.xib b/MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetsViewController_iPad.xib similarity index 100% rename from MPfm/MPfm.iOS/XIB/iPad/EffectsViewController_iPad.xib rename to MPfm/MPfm.iOS/XIB/iPad/EqualizerPresetsViewController_iPad.xib diff --git a/MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetDetailsViewController_iPhone.xib b/MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetDetailsViewController_iPhone.xib new file mode 100644 index 00000000..9cfade73 --- /dev/null +++ b/MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetDetailsViewController_iPhone.xib @@ -0,0 +1,118 @@ + + + + 1280 + 11C25 + 1919 + 1138.11 + 566.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 916 + + + IBProxyObject + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + {{0, 20}, {320, 460}} + + + + 3 + MQA + + 2 + + + + IBCocoaTouchFramework + + + + + + + view + + + + 3 + + + + + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + EqualizerPresetDetailsViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 3 + + + + + EqualizerPresetDetailsViewController + UIViewController + + IBProjectSource + EqualizerPresetDetailsViewController.h + + + + + 0 + IBCocoaTouchFramework + YES + 3 + 916 + + diff --git a/MPfm/MPfm.iOS/XIB/iPhone/EffectsViewController_iPhone.xib b/MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetsViewController_iPhone.xib similarity index 76% rename from MPfm/MPfm.iOS/XIB/iPhone/EffectsViewController_iPhone.xib rename to MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetsViewController_iPhone.xib index 0631a963..7319d498 100644 --- a/MPfm/MPfm.iOS/XIB/iPhone/EffectsViewController_iPhone.xib +++ b/MPfm/MPfm.iOS/XIB/iPhone/EqualizerPresetsViewController_iPhone.xib @@ -124,7 +124,7 @@ - EffectsViewController + EqualizerPresetsViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -137,47 +137,7 @@ 49 - - - - EffectsViewController - UIViewController - - UIBarButtonItem - UIBarButtonItem - UINavigationBar - UITableView - UIToolbar - - - - btnBarAdd - UIBarButtonItem - - - btnBarDone - UIBarButtonItem - - - navigationBar - UINavigationBar - - - tableView - UITableView - - - toolBar - UIToolbar - - - - IBProjectSource - ./Classes/EffectsViewController.h - - - - + 0 IBCocoaTouchFramework YES