diff --git a/BMM.Api/BMM.Api.csproj b/BMM.Api/BMM.Api.csproj index 6b1999b08..d153bd00d 100644 --- a/BMM.Api/BMM.Api.csproj +++ b/BMM.Api/BMM.Api.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable true diff --git a/BMM.Core/App.cs b/BMM.Core/App.cs index 476923ac3..3fd0148cf 100644 --- a/BMM.Core/App.cs +++ b/BMM.Core/App.cs @@ -208,7 +208,6 @@ public override void Initialize() Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); - Mvx.IoCProvider.CallbackWhenRegistered(storage => storage.InitAsync()); Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); @@ -222,7 +221,6 @@ public override void Initialize() Mvx.IoCProvider.ConstructAndRegisterSingleton(); Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); - Mvx.IoCProvider.CallbackWhenRegistered(manager => manager.InitAsync()); Mvx.IoCProvider.ConstructAndRegisterSingleton, PodcastNotificationReceiver>(); Mvx.IoCProvider.RegisterType, GeneralNotificationReceiver>(); @@ -254,7 +252,7 @@ public override void Initialize() Mvx.IoCProvider.ConstructAndRegisterSingleton(); Mvx.IoCProvider.ConstructAndRegisterSingleton(); - Mvx.IoCProvider.IoCConstruct(); + Mvx.IoCProvider.IoCConstruct(); InitializeTranslation(); Mvx.IoCProvider.Resolve() @@ -279,7 +277,6 @@ public override void Initialize() Mvx.IoCProvider.RegisterType(); Mvx.IoCProvider.ConstructAndRegisterSingleton(); - Mvx.IoCProvider.CallbackWhenRegistered(manager => manager.Initialize(CreatableTypes())); Mvx.IoCProvider.RegisterType(); Mvx.IoCProvider.LazyConstructAndRegisterSingleton(); @@ -304,6 +301,10 @@ public override void Initialize() RegisterDynamic(typeof(IBaseGuardedAction)); RegisterDynamic(typeof(IActionExceptionHandler)); RegisterCustomAppStart(); + + Mvx.IoCProvider.GetSingleton().Initialize(CreatableTypes()); + Mvx.IoCProvider.GetSingleton().InitAsync(); + Mvx.IoCProvider.GetSingleton().InitAsync(); } private static HttpClient GetHttpClient() diff --git a/BMM.Core/BMM.Core.csproj b/BMM.Core/BMM.Core.csproj index c1f5c2029..e868eadf5 100644 --- a/BMM.Core/BMM.Core.csproj +++ b/BMM.Core/BMM.Core.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable disable true @@ -14,17 +14,18 @@ - - + + - - - - + + + + + diff --git a/BMM.Core/Implementations/Connection/ConnectionStatusLogger.cs b/BMM.Core/Implementations/Connection/ConnectionStatusMonitor.cs similarity index 97% rename from BMM.Core/Implementations/Connection/ConnectionStatusLogger.cs rename to BMM.Core/Implementations/Connection/ConnectionStatusMonitor.cs index 8d92b8108..bca651080 100644 --- a/BMM.Core/Implementations/Connection/ConnectionStatusLogger.cs +++ b/BMM.Core/Implementations/Connection/ConnectionStatusMonitor.cs @@ -8,7 +8,7 @@ namespace BMM.Core.Implementations.Connection { - public class ConnectionStatusLogger + public class ConnectionStatusMonitor { private readonly IAnalytics _analytics; private readonly IMvxMessenger _messenger; @@ -16,7 +16,7 @@ public class ConnectionStatusLogger private readonly IGlobalMediaDownloader _globalMediaDownloader; private DateTime _lastConnectionChange; - public ConnectionStatusLogger( + public ConnectionStatusMonitor( IAnalytics analytics, IMvxMessenger messenger, IConnection connection, diff --git a/BMM.Tests/BMM.Api.Tests/BMM.Api.Tests.csproj b/BMM.Tests/BMM.Api.Tests/BMM.Api.Tests.csproj index bb4e24861..2b03771b7 100644 --- a/BMM.Tests/BMM.Api.Tests/BMM.Api.Tests.csproj +++ b/BMM.Tests/BMM.Api.Tests/BMM.Api.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/BMM.Tests/BMM.Core.Test/BMM.Core.Test.csproj b/BMM.Tests/BMM.Core.Test/BMM.Core.Test.csproj index a0e07e3d9..7246812f1 100644 --- a/BMM.Tests/BMM.Core.Test/BMM.Core.Test.csproj +++ b/BMM.Tests/BMM.Core.Test/BMM.Core.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable true @@ -12,7 +12,7 @@ - + diff --git a/BMM.UI.Android/AndroidSetup.cs b/BMM.UI.Android/AndroidSetup.cs index e3839229f..ff6ef603e 100644 --- a/BMM.UI.Android/AndroidSetup.cs +++ b/BMM.UI.Android/AndroidSetup.cs @@ -1,4 +1,7 @@ -using System.Net; +using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http; using System.Reflection; using Acr.UserDialogs; using Android.OS; @@ -68,6 +71,7 @@ using MvvmCross.IoC; using MvvmCross.Platforms.Android.Core; using MvvmCross.Platforms.Android.Presenters; +using MvvmCross.Plugin.Color.Platforms.Android.BindingTargets; using MvvmCross.Plugin.ResourceLoader.Platforms.Android; using MvvmCross.ViewModels; using Serilog; @@ -147,7 +151,6 @@ protected override void InitializeFirstChance(IMvxIoCProvider iocProvider) iocProvider.LazyConstructAndRegisterSingleton(); iocProvider.RegisterType(); iocProvider.LazyConstructAndRegisterSingleton(); - iocProvider.CallbackWhenRegistered(RegisterAdditionalBindings); iocProvider.LazyConstructAndRegisterSingleton(); var stopwatch = iocProvider.Resolve(); @@ -228,8 +231,10 @@ private static void InitializeImageService() }); } - private void RegisterAdditionalBindings(IMvxTargetBindingFactoryRegistry registry) + protected override void FillTargetFactories(IMvxTargetBindingFactoryRegistry registry) { + base.FillTargetFactories(registry); + registry.RegisterFactory(new MvxCustomBindingFactory("BackgroundTint", view => new MvxBackgroundTintBinding(view))); registry.RegisterFactory(new MvxCustomBindingFactory("CardVisibility", card => new MvxCardVisibility(card))); registry.RegisterFactory(new MvxCustomBindingFactory("CardCircle", card => new MvxCardCircle(card))); diff --git a/BMM.UI.Android/Application/Helpers/SetupHelper.cs b/BMM.UI.Android/Application/Helpers/SetupHelper.cs index 849d4d11d..c3fbd0f5d 100644 --- a/BMM.UI.Android/Application/Helpers/SetupHelper.cs +++ b/BMM.UI.Android/Application/Helpers/SetupHelper.cs @@ -11,7 +11,7 @@ public class SetupHelper public static void EnsureInitialized() { AppCenterHelper.DroidRegister(); - var setup = MvxAndroidSetupSingleton.EnsureSingletonAvailable(Android.App.Application.Context); + var setup = MvxAndroidSetupSingleton.EnsureSingletonAvailable(BmmApplication.Instance); setup.EnsureInitialized(); } } diff --git a/BMM.UI.Android/Application/ValueConverters/TrackPlaybackStateToColorValueConverter.cs b/BMM.UI.Android/Application/ValueConverters/TrackPlaybackStateToColorValueConverter.cs index 602aafc2e..5f23ee953 100644 --- a/BMM.UI.Android/Application/ValueConverters/TrackPlaybackStateToColorValueConverter.cs +++ b/BMM.UI.Android/Application/ValueConverters/TrackPlaybackStateToColorValueConverter.cs @@ -1,15 +1,7 @@ -using System; -using System.Diagnostics; -using System.Globalization; +using System.Globalization; using Android.Graphics; using AndroidX.Core.Content; -using BMM.Api.Abstraction; -using BMM.Api.Framework; -using BMM.Api.Implementation.Models; -using BMM.Core.Implementations.FileStorage; -using BMM.Core.Implementations.UI; using BMM.Core.Models.POs.Tracks; -using BMM.Core.ViewModels; using BMM.UI.Droid.Application.Extensions; using MvvmCross; using MvvmCross.Converters; @@ -19,15 +11,6 @@ namespace BMM.UI.Droid.Application.ValueConverters { public class TrackPlaybackStateToColorValueConverter : MvxValueConverter { - private readonly IConnection _connection; - private readonly IStorageManager _storageManager; - - public TrackPlaybackStateToColorValueConverter() - { - _connection = Mvx.IoCProvider.Resolve(); - _storageManager = Mvx.IoCProvider.Resolve(); - } - protected override Color Convert(TrackState trackState, Type targetType, object currentTrack, CultureInfo culture) { var context = Mvx.IoCProvider.Resolve().Activity; diff --git a/BMM.UI.Android/BMM.UI.Droid.csproj b/BMM.UI.Android/BMM.UI.Droid.csproj index a5bada748..298cfd34f 100644 --- a/BMM.UI.Android/BMM.UI.Droid.csproj +++ b/BMM.UI.Android/BMM.UI.Droid.csproj @@ -1,50 +1,45 @@ - net7.0-android - 33 + net8.0-android 21 Exe disable enable - true org.brunstad.bmm + 1 + 1.102.0 + 34 + true BMM.UI.Droid BMM.UI.Android - - apk - apk r8 MvvmCross;MvvmCross.Plugin.Messenger + + true + True + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/BMM.UI.Android/Resources/layout/listitem_track.axml b/BMM.UI.Android/Resources/layout/listitem_track.axml index c9a9e74d0..82625d7ee 100644 --- a/BMM.UI.Android/Resources/layout/listitem_track.axml +++ b/BMM.UI.Android/Resources/layout/listitem_track.axml @@ -18,10 +18,8 @@ android:id="@+id/trackTitle" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:textFontWeight="700" android:maxLines="1" android:ellipsize="end" - android:lineHeight="20sp" style="@style/Title2" local:layout_constraintStart_toEndOf="@+id/trackPlaybackStateIcon" local:layout_constraintTop_toTopOf="parent" diff --git a/BMM.UI.Android/SplashScreenActivity.cs b/BMM.UI.Android/SplashScreenActivity.cs index 62b88e9de..ba395a1f4 100644 --- a/BMM.UI.Android/SplashScreenActivity.cs +++ b/BMM.UI.Android/SplashScreenActivity.cs @@ -26,7 +26,7 @@ namespace BMM.UI.Droid { Intent.CategoryDefault })] - public class SplashScreenActivity : MvxSplashScreenActivity + public class SplashScreenActivity : MvxStartActivity { public static Intent UnhandledNotification; diff --git a/BMM.UI.iOS.SiriIntents/BMM.UI.iOS.SiriIntents.csproj b/BMM.UI.iOS.SiriIntents/BMM.UI.iOS.SiriIntents.csproj index 861fcae5c..6327d61ab 100644 --- a/BMM.UI.iOS.SiriIntents/BMM.UI.iOS.SiriIntents.csproj +++ b/BMM.UI.iOS.SiriIntents/BMM.UI.iOS.SiriIntents.csproj @@ -1,6 +1,6 @@ - net7.0-ios + net8.0-ios Library BMM.UI.iOS.SiriIntents Debug;Release;UITests @@ -21,14 +21,7 @@ 4 iPhone Developer false - true - <_BundlerDebug>false - true - true 38765 - None - x86_64 - iossimulator-x64 pdbonly @@ -37,12 +30,6 @@ BMM App Siri Intents Provisioning Profile bin\iPhone\Release 4 - true - true - Entitlements.plist - SdkOnly - ARM64 - ios-arm64 pdbonly @@ -50,10 +37,6 @@ bin\iPhoneSimulator\Release 4 iPhone Developer - true - None - x86_64 - iossimulator-x64 full @@ -62,16 +45,6 @@ DEBUG; 4 iPhone Developer - true - <_BundlerDebug>false - true - true - true - Entitlements.plist - 47530 - SdkOnly - ARM64 - ios-arm64 full @@ -81,15 +54,5 @@ bin\iPhone\Debug DEBUG; 4 - true - <_BundlerDebug>false - true - true - true - Entitlements.plist - 47530 - SdkOnly - ARM64 - ios-arm64 \ No newline at end of file diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/AchievementsCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/AchievementsCollectionViewCell.cs index b679a7fca..d6c0cd572 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/AchievementsCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/AchievementsCollectionViewCell.cs @@ -14,7 +14,7 @@ public partial class AchievementsCollectionViewCell : MvxCollectionViewCell public static readonly UINib Nib = UINib.FromName(nameof(AchievementsCollectionViewCell), NSBundle.MainBundle); private string _imagePath; - public AchievementsCollectionViewCell(IntPtr handle) : base(Key, handle) + public AchievementsCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/ContinueListeningTileViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/ContinueListeningTileViewCell.cs index 880fa104c..a8f844af2 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/ContinueListeningTileViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/ContinueListeningTileViewCell.cs @@ -23,7 +23,7 @@ public partial class ContinueListeningTileViewCell : MvxCollectionViewCell private string _subtitle; private bool _isCurrentlyPlaying; - public ContinueListeningTileViewCell(IntPtr handle): base(Key, handle) + public ContinueListeningTileViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/ControllerCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/ControllerCollectionViewCell.cs index e1736face..d0d50d2c2 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/ControllerCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/ControllerCollectionViewCell.cs @@ -27,7 +27,7 @@ public partial class ControllerCollectionViewCell private bool _shouldRefreshViewController; private bool _shouldSkipFirstViewWillAppear = true; - protected ControllerCollectionViewCell(IntPtr handle) : base(handle) + protected ControllerCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/CoverWithTitleCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/CoverWithTitleCollectionViewCell.cs index 1190f5587..d5dcb6792 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/CoverWithTitleCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/CoverWithTitleCollectionViewCell.cs @@ -20,7 +20,7 @@ public partial class CoverWithTitleCollectionViewCell : MvxCollectionViewCell public static readonly NSString Key = new(nameof(CoverWithTitleCollectionViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(CoverWithTitleCollectionViewCell), NSBundle.MainBundle); - public CoverWithTitleCollectionViewCell(IntPtr handle): base(Key, handle) + public CoverWithTitleCollectionViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/HeaderCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/HeaderCollectionViewCell.cs index d667ca502..f3428187f 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/HeaderCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/HeaderCollectionViewCell.cs @@ -10,7 +10,7 @@ public partial class HeaderCollectionViewCell : MvxCollectionViewCell public static readonly NSString Key = new(nameof(HeaderCollectionViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(HeaderCollectionViewCell), NSBundle.MainBundle); - public HeaderCollectionViewCell(IntPtr handle) : base(Key, handle) + public HeaderCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/MessageTileViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/MessageTileViewCell.cs index a5720c87d..d20b23412 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/MessageTileViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/MessageTileViewCell.cs @@ -15,7 +15,7 @@ public partial class MessageTileViewCell : MvxCollectionViewCell public static readonly NSString Key = new NSString(nameof(MessageTileViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(MessageTileViewCell), NSBundle.MainBundle); - public MessageTileViewCell(IntPtr handle): base(Key, handle) + public MessageTileViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/PodcastCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/PodcastCollectionViewCell.cs index 115ee32e9..85ccfb1c8 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/PodcastCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/PodcastCollectionViewCell.cs @@ -18,7 +18,7 @@ public partial class PodcastCollectionViewCell : MvxCollectionViewCell public static readonly NSString Key = new NSString("PodcastCollectionViewCell"); public static readonly UINib Nib = UINib.FromName("PodcastCollectionViewCell", NSBundle.MainBundle); - public PodcastCollectionViewCell(IntPtr handle): base(Key, handle) + public PodcastCollectionViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/ProfileAchievementsCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/ProfileAchievementsCollectionViewCell.cs index f6450aa8a..29714fe9f 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/ProfileAchievementsCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/ProfileAchievementsCollectionViewCell.cs @@ -10,7 +10,7 @@ public partial class ProfileAchievementsCollectionViewCell : MvxCollectionViewCe public static readonly NSString Key = new(nameof(ProfileAchievementsCollectionViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(ProfileAchievementsCollectionViewCell), NSBundle.MainBundle); - public ProfileAchievementsCollectionViewCell(IntPtr handle) : base(Key, handle) + public ProfileAchievementsCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/ProjectBoxAchievementsCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/ProjectBoxAchievementsCollectionViewCell.cs index 2c9f4595a..2ada4c96f 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/ProjectBoxAchievementsCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/ProjectBoxAchievementsCollectionViewCell.cs @@ -13,7 +13,7 @@ public partial class ProjectBoxAchievementsCollectionViewCell : MvxCollectionVie public static readonly NSString Key = new(nameof(ProjectBoxAchievementsCollectionViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(ProjectBoxAchievementsCollectionViewCell), NSBundle.MainBundle); - public ProjectBoxAchievementsCollectionViewCell(IntPtr handle) : base(Key, handle) + public ProjectBoxAchievementsCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/TopBarFlexibleWidthTitleCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/TopBarFlexibleWidthTitleCollectionViewCell.cs index 67d5149db..f33b39140 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/TopBarFlexibleWidthTitleCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/TopBarFlexibleWidthTitleCollectionViewCell.cs @@ -21,7 +21,7 @@ static TopBarFlexibleWidthTitleCollectionViewCell() Nib = UINib.FromName(nameof(TopBarFlexibleWidthTitleCollectionViewCell), NSBundle.MainBundle); } - protected TopBarFlexibleWidthTitleCollectionViewCell(IntPtr handle) : base(handle) + protected TopBarFlexibleWidthTitleCollectionViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { if (BindingContext is MvxTaskBasedBindingContext mvxTaskBasedBindingContext) mvxTaskBasedBindingContext.RunSynchronously = true; diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/VideoTileViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/VideoTileViewCell.cs index 850ef7035..1f86d9b91 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/VideoTileViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/VideoTileViewCell.cs @@ -16,7 +16,7 @@ public partial class VideoTileViewCell : MvxCollectionViewCell public static readonly UINib Nib = UINib.FromName(nameof(VideoTileViewCell), NSBundle.MainBundle); private string _videoUrl; - public VideoTileViewCell(IntPtr handle): base(Key, handle) + public VideoTileViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CollectionTableViewCell/YearInReviewCollectionViewCell.cs b/BMM.UI.iOS/Application/CollectionTableViewCell/YearInReviewCollectionViewCell.cs index 547fdeb88..86a64e2c8 100644 --- a/BMM.UI.iOS/Application/CollectionTableViewCell/YearInReviewCollectionViewCell.cs +++ b/BMM.UI.iOS/Application/CollectionTableViewCell/YearInReviewCollectionViewCell.cs @@ -15,7 +15,7 @@ public partial class YearInReviewCollectionViewCell : MvxCollectionViewCell public static readonly UINib Nib = UINib.FromName(nameof(YearInReviewCollectionViewCell), NSBundle.MainBundle); private string _shadowColor; - public YearInReviewCollectionViewCell(IntPtr handle): base(Key, handle) + public YearInReviewCollectionViewCell(ObjCRuntime.NativeHandle handle): base(Key, handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/CustomViews/BmmCachedImageView.cs b/BMM.UI.iOS/Application/CustomViews/BmmCachedImageView.cs index 39b23a441..2a11b472d 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmCachedImageView.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmCachedImageView.cs @@ -12,7 +12,7 @@ public BmmCachedImageView() { } - public BmmCachedImageView(IntPtr handle) : base(handle) + public BmmCachedImageView(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/BmmDialog.cs b/BMM.UI.iOS/Application/CustomViews/BmmDialog.cs index f1ccac174..483db3c61 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmDialog.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmDialog.cs @@ -20,7 +20,7 @@ public BmmDialog(CGRect bounds) Initialize(); } - public BmmDialog(IntPtr handle) : base(handle) + public BmmDialog(ObjCRuntime.NativeHandle handle) : base(handle) { Initialize(); } diff --git a/BMM.UI.iOS/Application/CustomViews/BmmFormattedLabel.cs b/BMM.UI.iOS/Application/CustomViews/BmmFormattedLabel.cs index b790db1b0..aea476b9e 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmFormattedLabel.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmFormattedLabel.cs @@ -26,7 +26,7 @@ protected BmmFormattedLabel(NSObjectFlag t) : base(t) { } - protected internal BmmFormattedLabel(IntPtr handle) : base(handle) + protected internal BmmFormattedLabel(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/BmmSeachTextField.cs b/BMM.UI.iOS/Application/CustomViews/BmmSeachTextField.cs index e50cbb115..c353f681b 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmSeachTextField.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmSeachTextField.cs @@ -16,7 +16,7 @@ public BmmSeachTextField() { } - public BmmSeachTextField(IntPtr handle) : base(handle) + public BmmSeachTextField(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/BmmSliderView.cs b/BMM.UI.iOS/Application/CustomViews/BmmSliderView.cs index e997e04aa..fd25e2a7d 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmSliderView.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmSliderView.cs @@ -15,7 +15,7 @@ public BmmSliderView() { } - public BmmSliderView(IntPtr handle) : base(handle) + public BmmSliderView(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/BmmWebView.cs b/BMM.UI.iOS/Application/CustomViews/BmmWebView.cs index d1d23ab0f..a104b469c 100644 --- a/BMM.UI.iOS/Application/CustomViews/BmmWebView.cs +++ b/BMM.UI.iOS/Application/CustomViews/BmmWebView.cs @@ -18,7 +18,7 @@ protected BmmWebView(NSObjectFlag t) : base(t) { } - protected internal BmmWebView(IntPtr handle) : base(handle) + protected internal BmmWebView(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/CustomProgressBar.cs b/BMM.UI.iOS/Application/CustomViews/CustomProgressBar.cs index 30bdbb4f3..992986240 100644 --- a/BMM.UI.iOS/Application/CustomViews/CustomProgressBar.cs +++ b/BMM.UI.iOS/Application/CustomViews/CustomProgressBar.cs @@ -38,7 +38,7 @@ public UIColor ProgressColor } } - public CustomProgressBar(IntPtr handle) : base(handle) + public CustomProgressBar(ObjCRuntime.NativeHandle handle) : base(handle) { } public override void Draw(CGRect rect) diff --git a/BMM.UI.iOS/Application/CustomViews/DownloadButton.cs b/BMM.UI.iOS/Application/CustomViews/DownloadButton.cs index b0e47a71e..e60a14d15 100644 --- a/BMM.UI.iOS/Application/CustomViews/DownloadButton.cs +++ b/BMM.UI.iOS/Application/CustomViews/DownloadButton.cs @@ -39,7 +39,7 @@ public DownloadButton(NSCoder coder) : base(coder) InitUi(); } - protected internal DownloadButton(IntPtr handle) : base(handle) + protected internal DownloadButton(ObjCRuntime.NativeHandle handle) : base(handle) { InitUi(); } diff --git a/BMM.UI.iOS/Application/CustomViews/LeftImageButton.cs b/BMM.UI.iOS/Application/CustomViews/LeftImageButton.cs index 329408541..4e47c9296 100644 --- a/BMM.UI.iOS/Application/CustomViews/LeftImageButton.cs +++ b/BMM.UI.iOS/Application/CustomViews/LeftImageButton.cs @@ -13,7 +13,7 @@ public LeftImageButton() { } - public LeftImageButton(IntPtr handle) + public LeftImageButton(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/LottieButton.cs b/BMM.UI.iOS/Application/CustomViews/LottieButton.cs index 7284a6d09..f77b7bb3b 100644 --- a/BMM.UI.iOS/Application/CustomViews/LottieButton.cs +++ b/BMM.UI.iOS/Application/CustomViews/LottieButton.cs @@ -16,7 +16,7 @@ public LottieButton() { } - public LottieButton(IntPtr handle) : base(handle) + public LottieButton(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/CustomViews/ProgressBarView.cs b/BMM.UI.iOS/Application/CustomViews/ProgressBarView.cs index 656c6057c..80f81ac43 100644 --- a/BMM.UI.iOS/Application/CustomViews/ProgressBarView.cs +++ b/BMM.UI.iOS/Application/CustomViews/ProgressBarView.cs @@ -27,7 +27,7 @@ public ProgressBarView(RectangleF bounds) : base(bounds) Initialize(); } - public ProgressBarView(IntPtr handle) : base(handle) + public ProgressBarView(ObjCRuntime.NativeHandle handle) : base(handle) { Initialize(); } diff --git a/BMM.UI.iOS/Application/CustomViews/Separator.cs b/BMM.UI.iOS/Application/CustomViews/Separator.cs index 68ab18947..31eeeec60 100644 --- a/BMM.UI.iOS/Application/CustomViews/Separator.cs +++ b/BMM.UI.iOS/Application/CustomViews/Separator.cs @@ -25,7 +25,7 @@ protected Separator(NSObjectFlag t) : base(t) InitUi(); } - protected internal Separator(IntPtr handle) : base(handle) + protected internal Separator(ObjCRuntime.NativeHandle handle) : base(handle) { InitUi(); } diff --git a/BMM.UI.iOS/Application/CustomViews/TextViewWithDescription.cs b/BMM.UI.iOS/Application/CustomViews/TextViewWithDescription.cs index ed9649297..e6496b910 100644 --- a/BMM.UI.iOS/Application/CustomViews/TextViewWithDescription.cs +++ b/BMM.UI.iOS/Application/CustomViews/TextViewWithDescription.cs @@ -35,7 +35,7 @@ public TextViewWithDescription(NSObjectFlag t) : base(t) InitUi(); } - internal TextViewWithDescription(IntPtr handle) : base(handle) + internal TextViewWithDescription(ObjCRuntime.NativeHandle handle) : base(handle) { InitUi(); } diff --git a/BMM.UI.iOS/Application/CustomViews/VideoView.cs b/BMM.UI.iOS/Application/CustomViews/VideoView.cs index ec91943c0..3dfc4e1ca 100644 --- a/BMM.UI.iOS/Application/CustomViews/VideoView.cs +++ b/BMM.UI.iOS/Application/CustomViews/VideoView.cs @@ -26,7 +26,7 @@ protected VideoView(NSObjectFlag t) : base(t) { } - protected internal VideoView(IntPtr handle) : base(handle) + protected internal VideoView(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/AppIconTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/AppIconTableViewCell.cs index 4fb6baa81..4f182b043 100644 --- a/BMM.UI.iOS/Application/TableViewCell/AppIconTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/AppIconTableViewCell.cs @@ -13,7 +13,7 @@ public partial class AppIconTableViewCell : BaseBMMTableViewCell public static readonly NSString Key = new NSString(nameof(AppIconTableViewCell)); private string _imagePath; - public AppIconTableViewCell(IntPtr handle) + public AppIconTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/AutomaticDownloadTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/AutomaticDownloadTableViewCell.cs index 6059e739a..8e3772db4 100644 --- a/BMM.UI.iOS/Application/TableViewCell/AutomaticDownloadTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/AutomaticDownloadTableViewCell.cs @@ -10,7 +10,7 @@ public partial class AutomaticDownloadTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(AutomaticDownloadTableViewCell)); - protected AutomaticDownloadTableViewCell(IntPtr handle) : base(handle) + protected AutomaticDownloadTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/Base/BaseBMMTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/Base/BaseBMMTableViewCell.cs index 897cad599..3665bb6f6 100644 --- a/BMM.UI.iOS/Application/TableViewCell/Base/BaseBMMTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/Base/BaseBMMTableViewCell.cs @@ -11,7 +11,7 @@ public abstract class BaseBMMTableViewCell : MvxTableViewCell { private UIView _selectionView; - protected BaseBMMTableViewCell(IntPtr handle) : base(handle) + protected BaseBMMTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/Base/BaseExternalRelationsPlayTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/Base/BaseExternalRelationsPlayTableViewCell.cs index dd4ec8820..2085d5b85 100644 --- a/BMM.UI.iOS/Application/TableViewCell/Base/BaseExternalRelationsPlayTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/Base/BaseExternalRelationsPlayTableViewCell.cs @@ -15,7 +15,7 @@ public abstract class BaseExternalRelationsPlayTableViewCell : BaseBMMTableViewC private LOTAnimationView _animationView; private bool _hasListened; - public BaseExternalRelationsPlayTableViewCell(IntPtr handle) : base(handle) + public BaseExternalRelationsPlayTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/Base/BaseRecommendationTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/Base/BaseRecommendationTableViewCell.cs index 17676a7db..9057ecba3 100644 --- a/BMM.UI.iOS/Application/TableViewCell/Base/BaseRecommendationTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/Base/BaseRecommendationTableViewCell.cs @@ -13,7 +13,7 @@ public abstract class BaseRecommendationTableViewCell : BaseBMMTableViewCell { private bool _isDescriptionVisible; - protected BaseRecommendationTableViewCell(IntPtr handle) : base(handle) + protected BaseRecommendationTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/BibleStudyHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/BibleStudyHeaderTableViewCell.cs index 6a15b3b80..690b22cfd 100644 --- a/BMM.UI.iOS/Application/TableViewCell/BibleStudyHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/BibleStudyHeaderTableViewCell.cs @@ -11,7 +11,7 @@ public partial class BibleStudyHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(BibleStudyHeaderTableViewCell)); - public BibleStudyHeaderTableViewCell(IntPtr handle) + public BibleStudyHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/BibleStudyProgressTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/BibleStudyProgressTableViewCell.cs index 0b6739852..c0a3ca75e 100644 --- a/BMM.UI.iOS/Application/TableViewCell/BibleStudyProgressTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/BibleStudyProgressTableViewCell.cs @@ -12,7 +12,7 @@ public partial class BibleStudyProgressTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(BibleStudyProgressTableViewCell)); - public BibleStudyProgressTableViewCell(IntPtr handle) + public BibleStudyProgressTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesContentTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesContentTableViewCell.cs index 9e8d5fa85..10b8623a8 100644 --- a/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesContentTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesContentTableViewCell.cs @@ -13,7 +13,7 @@ public partial class BibleStudyRulesContentTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(BibleStudyRulesContentTableViewCell)); - public BibleStudyRulesContentTableViewCell(IntPtr handle) + public BibleStudyRulesContentTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesHeaderTableViewCell.cs index 0fbc5e51c..f17f3d0f9 100644 --- a/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/BibleStudyRulesHeaderTableViewCell.cs @@ -13,7 +13,7 @@ public partial class BibleStudyRulesHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(BibleStudyRulesHeaderTableViewCell)); - public BibleStudyRulesHeaderTableViewCell(IntPtr handle) + public BibleStudyRulesHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ChapterHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ChapterHeaderTableViewCell.cs index b64140074..58a68c98a 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ChapterHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ChapterHeaderTableViewCell.cs @@ -12,7 +12,7 @@ public partial class ChapterHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(ChapterHeaderTableViewCell)); - public ChapterHeaderTableViewCell(IntPtr handle) + public ChapterHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ContinueListeningCollectionTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ContinueListeningCollectionTableViewCell.cs index dc3fd00ac..2a7c76453 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ContinueListeningCollectionTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ContinueListeningCollectionTableViewCell.cs @@ -15,7 +15,7 @@ public partial class ContinueListeningCollectionTableViewCell : BaseBMMTableView { public static readonly NSString Key = new NSString(nameof(ContinueListeningCollectionTableViewCell)); - public ContinueListeningCollectionTableViewCell(IntPtr handle) + public ContinueListeningCollectionTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ContributorTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ContributorTableViewCell.cs index c792768bb..b8a8fe26f 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ContributorTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ContributorTableViewCell.cs @@ -15,7 +15,7 @@ public partial class ContributorTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(ContributorTableViewCell)); - public ContributorTableViewCell(IntPtr handle) + public ContributorTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/DiscoverSectionHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/DiscoverSectionHeaderTableViewCell.cs index 1292f894e..e9a31cb16 100644 --- a/BMM.UI.iOS/Application/TableViewCell/DiscoverSectionHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/DiscoverSectionHeaderTableViewCell.cs @@ -16,7 +16,7 @@ public partial class DiscoverSectionHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(DiscoverSectionHeaderTableViewCell)); - public DiscoverSectionHeaderTableViewCell(IntPtr handle) + public DiscoverSectionHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => @@ -24,7 +24,7 @@ public DiscoverSectionHeaderTableViewCell(IntPtr handle) var set = this.CreateBindingSet(); set.Bind(Titel).To(po => po.DiscoverSectionHeader.Title); set.Bind(LinkButton).For(v => v.BindTitle()).To(po => po.TextSource).WithConversion(Translations.ExploreNewestViewModel_ShowAll); - set.Bind(LinkButton).For(v => v.Hidden).To(po => po.HasLink).WithConversion(); + set.Bind(LinkButton).For(v => v.Hidden).To(po => po.HasLink); set.Bind(LinkButton).To(po => po.DeepLinkButtonClickedCommand); set.Bind(Divider) .For(v => v.BindVisible()) diff --git a/BMM.UI.iOS/Application/TableViewCell/DownloadedContentViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/DownloadedContentViewCell.cs index 5315bd3bc..309218b25 100644 --- a/BMM.UI.iOS/Application/TableViewCell/DownloadedContentViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/DownloadedContentViewCell.cs @@ -13,7 +13,7 @@ public partial class DownloadedContentViewCell : BaseBMMTableViewCell public static readonly UINib Nib = UINib.FromName("DownloadedContentViewCell", NSBundle.MainBundle); public static readonly NSString Key = new NSString("DownloadedContentViewCell"); - public DownloadedContentViewCell(IntPtr handle) + public DownloadedContentViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenTableViewCell.cs index 37f2f5cbf..2452822a2 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenTableViewCell.cs @@ -12,7 +12,7 @@ public partial class ExternalRelationsOpenTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(ExternalRelationsOpenTableViewCell)); - public ExternalRelationsOpenTableViewCell(IntPtr handle) + public ExternalRelationsOpenTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenWithSubtitleTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenWithSubtitleTableViewCell.cs index 6cd0fbfae..42b0acd96 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenWithSubtitleTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsOpenWithSubtitleTableViewCell.cs @@ -12,7 +12,7 @@ public partial class ExternalRelationsOpenWithSubtitleTableViewCell : BaseBMMTab { public static readonly NSString Key = new(nameof(ExternalRelationsOpenWithSubtitleTableViewCell)); - public ExternalRelationsOpenWithSubtitleTableViewCell(IntPtr handle) + public ExternalRelationsOpenWithSubtitleTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayTableViewCell.cs index 597805b4b..e7994c990 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayTableViewCell.cs @@ -6,7 +6,7 @@ public partial class ExternalRelationsPlayTableViewCell : BaseExternalRelationsP { public static readonly NSString Key = new(nameof(ExternalRelationsPlayTableViewCell)); - public ExternalRelationsPlayTableViewCell(IntPtr handle) : base(handle) + public ExternalRelationsPlayTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayWithSubtitleTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayWithSubtitleTableViewCell.cs index 1dae84432..2007de546 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayWithSubtitleTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ExternalRelationsPlayWithSubtitleTableViewCell.cs @@ -9,7 +9,7 @@ public partial class ExternalRelationsPlayWithSubtitleTableViewCell : BaseExtern { public static readonly NSString Key = new(nameof(ExternalRelationsPlayWithSubtitleTableViewCell)); - public ExternalRelationsPlayWithSubtitleTableViewCell(IntPtr handle) : base(handle) + public ExternalRelationsPlayWithSubtitleTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/FeaturedPlaylistTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/FeaturedPlaylistTableViewCell.cs index ea8113786..b1a45d174 100644 --- a/BMM.UI.iOS/Application/TableViewCell/FeaturedPlaylistTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/FeaturedPlaylistTableViewCell.cs @@ -18,7 +18,7 @@ public partial class FeaturedPlaylistTableViewCell : BaseBMMTableViewCell public static readonly UINib Nib = UINib.FromName(nameof(FeaturedPlaylistTableViewCell), NSBundle.MainBundle); public static readonly NSString Key = new NSString(nameof(FeaturedPlaylistTableViewCell)); - public FeaturedPlaylistTableViewCell(IntPtr handle) + public FeaturedPlaylistTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/FollowedPodcastsViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/FollowedPodcastsViewCell.cs index 159b069d8..0f1236b84 100644 --- a/BMM.UI.iOS/Application/TableViewCell/FollowedPodcastsViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/FollowedPodcastsViewCell.cs @@ -13,7 +13,7 @@ public partial class FollowedPodcastsViewCell : BaseBMMTableViewCell public static readonly UINib Nib = UINib.FromName("FollowedPodcastsViewCell", NSBundle.MainBundle); public static readonly NSString Key = new NSString("FollowedPodcastsViewCell"); - public FollowedPodcastsViewCell(IntPtr handle) + public FollowedPodcastsViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextHeaderTableViewCell.cs index f168847b2..c1bd07e72 100644 --- a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextHeaderTableViewCell.cs @@ -9,7 +9,7 @@ public partial class HighlightedTextHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(HighlightedTextHeaderTableViewCell)); - public HighlightedTextHeaderTableViewCell(IntPtr handle) : base(handle) + public HighlightedTextHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTableViewCell.cs index d06b3d5b2..2cdf9401a 100644 --- a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTableViewCell.cs @@ -12,7 +12,7 @@ public partial class HighlightedTextTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(HighlightedTextTableViewCell)); - public HighlightedTextTableViewCell(IntPtr handle) : base(handle) + public HighlightedTextTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTrackTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTrackTableViewCell.cs index 42e0f5c22..4fbd57e74 100644 --- a/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTrackTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/HighlightedTextTrackTableViewCell.cs @@ -13,7 +13,7 @@ public partial class HighlightedTextTrackTableViewCell : BaseBMMTableViewCell private CAGradientLayer _leftGradientLayer; private CAGradientLayer _rightGradientLayer; - public HighlightedTextTrackTableViewCell(IntPtr handle) : base(handle) + public HighlightedTextTrackTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/InfoMessageTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/InfoMessageTableViewCell.cs index 8da96e15a..9f1f8b88e 100644 --- a/BMM.UI.iOS/Application/TableViewCell/InfoMessageTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/InfoMessageTableViewCell.cs @@ -12,7 +12,7 @@ public partial class InfoMessageTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(InfoMessageTableViewCell)); - public InfoMessageTableViewCell(IntPtr handle) + public InfoMessageTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/LanguageAppTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/LanguageAppTableViewCell.cs index 67b693a35..7f4f8376b 100644 --- a/BMM.UI.iOS/Application/TableViewCell/LanguageAppTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/LanguageAppTableViewCell.cs @@ -11,7 +11,7 @@ public partial class LanguageAppTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(LanguageAppTableViewCell)); - public LanguageAppTableViewCell(IntPtr handle) + public LanguageAppTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/LanguageContentTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/LanguageContentTableViewCell.cs index 77dae5377..6ba2ed575 100644 --- a/BMM.UI.iOS/Application/TableViewCell/LanguageContentTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/LanguageContentTableViewCell.cs @@ -17,7 +17,7 @@ public int Index { public static readonly NSString Key = new NSString(nameof(LanguageContentTableViewCell)); - public LanguageContentTableViewCell(IntPtr handle) + public LanguageContentTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/CheckboxListItemTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/CheckboxListItemTableViewCell.cs index af055e63f..cc03c2423 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/CheckboxListItemTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/CheckboxListItemTableViewCell.cs @@ -12,8 +12,7 @@ public partial class CheckboxListItemTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(CheckboxListItemTableViewCell)); - public CheckboxListItemTableViewCell(IntPtr handle) - : base(handle) + public CheckboxListItemTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/ExternalRelationListItemTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/ExternalRelationListItemTableViewCell.cs index 52fc129c5..ca328b427 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/ExternalRelationListItemTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/ExternalRelationListItemTableViewCell.cs @@ -16,7 +16,7 @@ static ExternalRelationListItemTableViewCell() { } - public ExternalRelationListItemTableViewCell(IntPtr handle) : base(handle) + public ExternalRelationListItemTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/ProfileListItemTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/ProfileListItemTableViewCell.cs index ccfceea46..32b05e1a3 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/ProfileListItemTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/ProfileListItemTableViewCell.cs @@ -15,7 +15,7 @@ public partial class ProfileListItemTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(ProfileListItemTableViewCell)); - public ProfileListItemTableViewCell(IntPtr handle) + public ProfileListItemTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/SectionHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/SectionHeaderTableViewCell.cs index bce8fc7c4..d48efac69 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/SectionHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/SectionHeaderTableViewCell.cs @@ -8,7 +8,7 @@ public partial class SectionHeaderTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(SectionHeaderTableViewCell)); - public SectionHeaderTableViewCell(IntPtr handle) + public SectionHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemDetailTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemDetailTableViewCell.cs index 0dbe4d494..dd1a8a129 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemDetailTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemDetailTableViewCell.cs @@ -11,7 +11,7 @@ public partial class TextListItemDetailTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(TextListItemDetailTableViewCell)); - public TextListItemDetailTableViewCell(IntPtr handle) + public TextListItemDetailTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemTableViewCell.cs index 8c4e4ed00..d707a5037 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ListItem/TextListItemTableViewCell.cs @@ -12,7 +12,7 @@ public partial class TextListItemTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(TextListItemTableViewCell)); - public TextListItemTableViewCell(IntPtr handle) + public TextListItemTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/LoadingTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/LoadingTableViewCell.cs index b792b04d3..2891ee796 100644 --- a/BMM.UI.iOS/Application/TableViewCell/LoadingTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/LoadingTableViewCell.cs @@ -8,7 +8,7 @@ public partial class LoadingTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(LoadingTableViewCell)); - public LoadingTableViewCell(IntPtr handle) : base(handle) + public LoadingTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/OrderingTrackTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/OrderingTrackTableViewCell.cs index df000a8ae..e3055313b 100644 --- a/BMM.UI.iOS/Application/TableViewCell/OrderingTrackTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/OrderingTrackTableViewCell.cs @@ -17,7 +17,7 @@ public class OrderingTrackTableViewCell : BaseBMMTableViewCell private UILabel _subtitleLabel; private UILabel _metaLabel; - public OrderingTrackTableViewCell(IntPtr handle) + public OrderingTrackTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { InitUi(); diff --git a/BMM.UI.iOS/Application/TableViewCell/PinnedItemTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/PinnedItemTableViewCell.cs index ee855102a..16df0a839 100644 --- a/BMM.UI.iOS/Application/TableViewCell/PinnedItemTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/PinnedItemTableViewCell.cs @@ -12,7 +12,7 @@ public partial class PinnedItemTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(PinnedItemTableViewCell)); - public PinnedItemTableViewCell(IntPtr handle) + public PinnedItemTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/PlaylistsCollectionTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/PlaylistsCollectionTableViewCell.cs index 8bdf13efd..de589966f 100644 --- a/BMM.UI.iOS/Application/TableViewCell/PlaylistsCollectionTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/PlaylistsCollectionTableViewCell.cs @@ -14,7 +14,7 @@ public partial class PlaylistsCollectionTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(PlaylistsCollectionTableViewCell)); - public PlaylistsCollectionTableViewCell(IntPtr handle) + public PlaylistsCollectionTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ProjectBoxCollapsedViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ProjectBoxCollapsedViewCell.cs index f1fd551e6..e70c8c495 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ProjectBoxCollapsedViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ProjectBoxCollapsedViewCell.cs @@ -17,7 +17,7 @@ public partial class ProjectBoxCollapsedViewCell : BaseBMMTableViewCell, IEvents public static readonly NSString Key = new(nameof(ProjectBoxCollapsedViewCell)); private IMvxInteraction _expandOrCollapseInteraction; - public ProjectBoxCollapsedViewCell(IntPtr handle) + public ProjectBoxCollapsedViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ProjectBoxExpandedViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ProjectBoxExpandedViewCell.cs index ef5df1594..20a91938c 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ProjectBoxExpandedViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ProjectBoxExpandedViewCell.cs @@ -28,7 +28,7 @@ public partial class ProjectBoxExpandedViewCell : BaseBMMTableViewCell, IEventsH private IMvxInteraction _expandOrCollapseInteraction; private IBmmObservableCollection _itemsSource; - public ProjectBoxExpandedViewCell(IntPtr handle) + public ProjectBoxExpandedViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/ReadTranscriptionTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/ReadTranscriptionTableViewCell.cs index eb501ef95..c784e7a47 100644 --- a/BMM.UI.iOS/Application/TableViewCell/ReadTranscriptionTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/ReadTranscriptionTableViewCell.cs @@ -10,7 +10,7 @@ public partial class ReadTranscriptionTableViewCell : BaseBMMTableViewCell public static readonly NSString Key = new(nameof(ReadTranscriptionTableViewCell)); private string _transcriptionText; - public ReadTranscriptionTableViewCell(IntPtr handle) : base(handle) + public ReadTranscriptionTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/RecommendationAlbumTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/RecommendationAlbumTableViewCell.cs index 6535d870b..902ea7c3e 100644 --- a/BMM.UI.iOS/Application/TableViewCell/RecommendationAlbumTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/RecommendationAlbumTableViewCell.cs @@ -11,7 +11,7 @@ public partial class RecommendationAlbumTableViewCell : BaseRecommendationTableV { public static readonly NSString Key = new NSString(nameof(RecommendationAlbumTableViewCell)); - public RecommendationAlbumTableViewCell(IntPtr handle) + public RecommendationAlbumTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/RecommendationContributorTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/RecommendationContributorTableViewCell.cs index 99b5d5e10..5388519dd 100644 --- a/BMM.UI.iOS/Application/TableViewCell/RecommendationContributorTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/RecommendationContributorTableViewCell.cs @@ -11,7 +11,7 @@ public partial class RecommendationContributorTableViewCell : BaseRecommendation { public static readonly NSString Key = new NSString(nameof(RecommendationContributorTableViewCell)); - public RecommendationContributorTableViewCell(IntPtr handle) + public RecommendationContributorTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/RecommendationTrackTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/RecommendationTrackTableViewCell.cs index 421522ad9..b604de78d 100644 --- a/BMM.UI.iOS/Application/TableViewCell/RecommendationTrackTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/RecommendationTrackTableViewCell.cs @@ -10,7 +10,7 @@ public partial class RecommendationTrackTableViewCell : BaseRecommendationTableV { public static readonly NSString Key = new NSString(nameof(RecommendationTrackTableViewCell)); - public RecommendationTrackTableViewCell(IntPtr handle) + public RecommendationTrackTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/SearchSuggestionTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/SearchSuggestionTableViewCell.cs index da639a4cb..11db644e6 100644 --- a/BMM.UI.iOS/Application/TableViewCell/SearchSuggestionTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/SearchSuggestionTableViewCell.cs @@ -9,7 +9,7 @@ public partial class SearchSuggestionTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(SearchSuggestionTableViewCell)); - public SearchSuggestionTableViewCell(IntPtr handle) : base(handle) + public SearchSuggestionTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/SelectThemeTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/SelectThemeTableViewCell.cs index 5219ac70d..1b4513ab6 100644 --- a/BMM.UI.iOS/Application/TableViewCell/SelectThemeTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/SelectThemeTableViewCell.cs @@ -11,7 +11,7 @@ public partial class SelectThemeTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new NSString(nameof(SelectThemeTableViewCell)); - public SelectThemeTableViewCell(IntPtr handle) + public SelectThemeTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/SimpleMarginTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/SimpleMarginTableViewCell.cs index 323cfabde..03a8e3b0c 100644 --- a/BMM.UI.iOS/Application/TableViewCell/SimpleMarginTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/SimpleMarginTableViewCell.cs @@ -7,7 +7,7 @@ public partial class SimpleMarginTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(SimpleMarginTableViewCell)); - public SimpleMarginTableViewCell(IntPtr handle) + public SimpleMarginTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { } diff --git a/BMM.UI.iOS/Application/TableViewCell/StandardHeaderTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/StandardHeaderTableViewCell.cs index 9c23ad4f6..c10b3f82b 100644 --- a/BMM.UI.iOS/Application/TableViewCell/StandardHeaderTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/StandardHeaderTableViewCell.cs @@ -14,7 +14,7 @@ public partial class StandardHeaderTableViewCell : BaseBMMTableViewCell public static readonly NSString Key = new NSString(nameof(StandardHeaderTableViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(StandardHeaderTableViewCell), NSBundle.MainBundle); - public StandardHeaderTableViewCell(IntPtr handle) + public StandardHeaderTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/StandardSelectableTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/StandardSelectableTableViewCell.cs index f2ad98acd..1f290c8d2 100644 --- a/BMM.UI.iOS/Application/TableViewCell/StandardSelectableTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/StandardSelectableTableViewCell.cs @@ -15,7 +15,7 @@ public partial class StandardSelectableTableViewCell : BaseBMMTableViewCell public static readonly NSString Key = new NSString(nameof(StandardSelectableTableViewCell)); public static readonly UINib Nib = UINib.FromName(nameof(StandardSelectableTableViewCell), NSBundle.MainBundle); - public StandardSelectableTableViewCell(IntPtr handle) + public StandardSelectableTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/StreakTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/StreakTableViewCell.cs index 4c7c460c3..b4ab99541 100644 --- a/BMM.UI.iOS/Application/TableViewCell/StreakTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/StreakTableViewCell.cs @@ -10,7 +10,7 @@ public partial class StreakTableViewCell : BaseBMMTableViewCell { public static readonly NSString Key = new(nameof(StreakTableViewCell)); - public StreakTableViewCell(IntPtr handle) + public StreakTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/SuggestEditTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/SuggestEditTableViewCell.cs index 17f8e3f88..622fa7f5c 100644 --- a/BMM.UI.iOS/Application/TableViewCell/SuggestEditTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/SuggestEditTableViewCell.cs @@ -9,7 +9,7 @@ public partial class SuggestEditTableViewCell : BaseBMMTableViewCell, IUITextVie { public static readonly NSString Key = new(nameof(SuggestEditTableViewCell)); - public SuggestEditTableViewCell(IntPtr handle) : base(handle) + public SuggestEditTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => { diff --git a/BMM.UI.iOS/Application/TableViewCell/TrackCollectionTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/TrackCollectionTableViewCell.cs index e751c0184..350fc547b 100644 --- a/BMM.UI.iOS/Application/TableViewCell/TrackCollectionTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/TrackCollectionTableViewCell.cs @@ -16,7 +16,7 @@ public partial class TrackCollectionTableViewCell : BaseBMMTableViewCell private bool _isPlaylistSharedByMe; private bool _useLikeIcon; - public TrackCollectionTableViewCell(IntPtr handle) + public TrackCollectionTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs b/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs index 351ef799a..09c86168b 100644 --- a/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/TrackTableViewCell.cs @@ -15,7 +15,7 @@ public partial class TrackTableViewCell : BaseBMMTableViewCell private TrackState _trackState; private string _offlineStateImage; - public TrackTableViewCell(IntPtr handle) + public TrackTableViewCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserCollapsedCell.cs b/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserCollapsedCell.cs index 72b1f5728..042c27e29 100644 --- a/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserCollapsedCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserCollapsedCell.cs @@ -16,7 +16,7 @@ public partial class YearInReviewTeaserCollapsedCell : BaseBMMTableViewCell, IEv public static readonly NSString Key = new(nameof(YearInReviewTeaserCollapsedCell)); private IMvxInteraction _expandOrCollapseInteraction; - public YearInReviewTeaserCollapsedCell(IntPtr handle) + public YearInReviewTeaserCollapsedCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserExpandedCell.cs b/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserExpandedCell.cs index 6cbd603d1..3d098c0bb 100644 --- a/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserExpandedCell.cs +++ b/BMM.UI.iOS/Application/TableViewCell/YearInReviewTeaserExpandedCell.cs @@ -14,7 +14,7 @@ public partial class YearInReviewTeaserExpandedCell : BaseBMMTableViewCell, IEve public static readonly NSString Key = new(nameof(YearInReviewTeaserExpandedCell)); private IMvxInteraction _expandOrCollapseInteraction; - public YearInReviewTeaserExpandedCell(IntPtr handle) + public YearInReviewTeaserExpandedCell(ObjCRuntime.NativeHandle handle) : base(handle) { this.DelayBind(() => diff --git a/BMM.UI.iOS/Application/ValueConverter/InvertedVisibilityConverter.cs b/BMM.UI.iOS/Application/ValueConverter/InvertedVisibilityConverter.cs index 46f58d2d2..b1b39a5f7 100644 --- a/BMM.UI.iOS/Application/ValueConverter/InvertedVisibilityConverter.cs +++ b/BMM.UI.iOS/Application/ValueConverter/InvertedVisibilityConverter.cs @@ -1,13 +1,14 @@ -using System; using System.Globalization; +using MvvmCross.Converters; namespace BMM.UI.iOS { - public class InvertedVisibilityConverter : VisibilityConverter + public class InvertedVisibilityConverter : MvxValueConverter { public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - return (bool)base.Convert(value, targetType, parameter, culture) == false; + bool? val = value as bool?; + return val != true; } } } \ No newline at end of file diff --git a/BMM.UI.iOS/Application/ValueConverter/VisibilityConverter.cs b/BMM.UI.iOS/Application/ValueConverter/VisibilityConverter.cs deleted file mode 100644 index 6ef966523..000000000 --- a/BMM.UI.iOS/Application/ValueConverter/VisibilityConverter.cs +++ /dev/null @@ -1,16 +0,0 @@ -using MvvmCross.Converters; -using System; -using System.Globalization; - -namespace BMM.UI.iOS -{ - public class VisibilityConverter : MvxValueConverter - { - public override object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - bool? val = value as bool?; - - return val == true; - } - } -} \ No newline at end of file diff --git a/BMM.UI.iOS/Application/ViewController/AlbumViewController.cs b/BMM.UI.iOS/Application/ViewController/AlbumViewController.cs index be9988836..a075e16cb 100644 --- a/BMM.UI.iOS/Application/ViewController/AlbumViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/AlbumViewController.cs @@ -30,7 +30,7 @@ public override void ViewDidLoad() set.Bind(this).For(c => c.Title).To(vm => vm.Album).WithConversion(); set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(AlbumCoverImageView).For(v => v.ImagePath).To(vm => vm.Album.Cover); set.Bind(TitleLabel).To(vm => vm.Album.Title); set.Bind(DescriptionLabel).To(vm => vm.Album.Description); diff --git a/BMM.UI.iOS/Application/ViewController/BrowseViewController.cs b/BMM.UI.iOS/Application/ViewController/BrowseViewController.cs index 44b9bed57..4a06ecc05 100644 --- a/BMM.UI.iOS/Application/ViewController/BrowseViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/BrowseViewController.cs @@ -52,7 +52,7 @@ public override void ViewDidLoad() set.Bind(_source) .For(s => s.IsFullyLoaded) - .To(vm => vm.IsLoading).WithConversion(); + .To(vm => vm.IsLoading).WithConversion(); set.Bind(refreshControl) .For(r => r.IsRefreshing) diff --git a/BMM.UI.iOS/Application/ViewController/CuratedPlaylistViewController.cs b/BMM.UI.iOS/Application/ViewController/CuratedPlaylistViewController.cs index 17e0e3838..0eb0a13cd 100644 --- a/BMM.UI.iOS/Application/ViewController/CuratedPlaylistViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/CuratedPlaylistViewController.cs @@ -36,7 +36,7 @@ public override void ViewDidLoad() set.Bind(this).For(c => c.Title).To(vm => vm.CuratedPlaylist.Title); set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(CuratedPlaylistCoverImageView).For(v => v.ImagePath).To(vm => vm.CuratedPlaylist.Cover); diff --git a/BMM.UI.iOS/Application/ViewController/CuratedPlaylistsViewController.cs b/BMM.UI.iOS/Application/ViewController/CuratedPlaylistsViewController.cs index 8f6acda5a..b2cd00056 100644 --- a/BMM.UI.iOS/Application/ViewController/CuratedPlaylistsViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/CuratedPlaylistsViewController.cs @@ -47,7 +47,7 @@ public override void ViewDidLoad() set.Bind(_source) .For(s => s.IsFullyLoaded) - .To(vm => vm.IsLoading).WithConversion(); + .To(vm => vm.IsLoading).WithConversion(); set.Bind(refreshControl) .For(r => r.IsRefreshing) diff --git a/BMM.UI.iOS/Application/ViewController/DownloadedContentViewController.cs b/BMM.UI.iOS/Application/ViewController/DownloadedContentViewController.cs index 947e3c72b..113967bed 100644 --- a/BMM.UI.iOS/Application/ViewController/DownloadedContentViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/DownloadedContentViewController.cs @@ -30,10 +30,10 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(OfflineBannerLabel).To(vm => vm.TextSource).WithConversion(Translations.Global_OfflineBanner); - set.Bind(NoOfflineTrackCollectionView).For(s => s.Hidden).To(vm => vm.IsEmpty).WithConversion(); + set.Bind(NoOfflineTrackCollectionView).For(s => s.Hidden).To(vm => vm.IsEmpty).WithConversion(); set.Bind(NoOfflineTrackCollectionHeadlineLabel).To(vm => vm.TextSource).WithConversion(Translations.DownloadedContentViewModel_EmptyTitle); set.Bind(NoOfflineTrackCollectionTextLabel).To(vm => vm.TextSource).WithConversion(Translations.DownloadedContentViewModel_EmptySubline); diff --git a/BMM.UI.iOS/Application/ViewController/DownloadedFollowedPodcastsViewController.cs b/BMM.UI.iOS/Application/ViewController/DownloadedFollowedPodcastsViewController.cs index 054a5104e..2b5bbf2d8 100644 --- a/BMM.UI.iOS/Application/ViewController/DownloadedFollowedPodcastsViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/DownloadedFollowedPodcastsViewController.cs @@ -37,7 +37,7 @@ public override void ViewDidLoad() set.Bind(source).For(s => s.SelectionChangedCommand).To(vm => vm.DocumentSelectedCommand); set.Bind(OfflineBannerLabel).To(vm => vm.TextSource).WithConversion(Translations.Global_OfflineBanner); - set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.ShowEmptyFollowedPodcasts).WithConversion(); + set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.ShowEmptyFollowedPodcasts).WithConversion(); set.Bind(PlaylistEmptyHeadlineLabel).To(vm => vm.TextSource).WithConversion(Translations.DownloadedFollowedPodcastsViewModel_EmptyTitle); set.Bind(PlaylistEmptyTextLabel).To(vm => vm.TextSource).WithConversion(Translations.DownloadedFollowedPodcastsViewModel_EmptySubline); diff --git a/BMM.UI.iOS/Application/ViewController/EditTrackCollectionViewController.cs b/BMM.UI.iOS/Application/ViewController/EditTrackCollectionViewController.cs index dc1d0d7b9..824b17929 100644 --- a/BMM.UI.iOS/Application/ViewController/EditTrackCollectionViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/EditTrackCollectionViewController.cs @@ -86,7 +86,7 @@ public override void ViewDidLoad() set.Bind(source).To(vm => vm.Documents); set.Bind(titleView.TitleTextField).To(vm => vm.TrackCollectionTitle); set.Bind(titleView.TitleLabel).To(vm => vm.TextSource).WithConversion(Translations.EditTrackCollectionViewModel_RenameLabel); - set.Bind(saveButton).For(v => v.Enabled).To(vm => vm.HasChanges).WithConversion(); + set.Bind(saveButton).For(v => v.Enabled).To(vm => vm.HasChanges); set.Apply(); tableView.ResizeHeaderView(); } diff --git a/BMM.UI.iOS/Application/ViewController/ExploreNewestViewController.cs b/BMM.UI.iOS/Application/ViewController/ExploreNewestViewController.cs index dc04f4b1f..1523f38b7 100644 --- a/BMM.UI.iOS/Application/ViewController/ExploreNewestViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/ExploreNewestViewController.cs @@ -1,6 +1,7 @@ using System; using BMM.Core.Implementations.Device; using BMM.Core.Translation; +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using BMM.UI.iOS.Constants; using BMM.UI.iOS.Extensions; @@ -46,7 +47,7 @@ public override void ViewDidLoad() set.Bind(source) .For(s => s.SelectionChangedCommand) .To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(refreshControl).For(r => r.IsRefreshing).To(vm => vm.IsRefreshing); set.Bind(refreshControl).For(r => r.RefreshCommand).To(vm => vm.ReloadCommand); diff --git a/BMM.UI.iOS/Application/ViewController/FollowedPodcastsViewController.cs b/BMM.UI.iOS/Application/ViewController/FollowedPodcastsViewController.cs index 075d2b5d3..1a9eb0bbe 100644 --- a/BMM.UI.iOS/Application/ViewController/FollowedPodcastsViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/FollowedPodcastsViewController.cs @@ -36,7 +36,7 @@ public override void ViewDidLoad() set.Bind(source).For(s => s.ItemsSource).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(vm => vm.DocumentSelectedCommand); - set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.ShowEmptyFollowedPodcasts).WithConversion(); + set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.ShowEmptyFollowedPodcasts).WithConversion(); set.Bind(PlaylistEmptyHeadlineLabel).To(vm => vm.TextSource).WithConversion(Translations.FollowedPodcastsViewModel_EmptyTitle); set.Bind(PlaylistEmptyTextLabel).To(vm => vm.TextSource).WithConversion(Translations.FollowedPodcastsViewModel_EmptySubline); diff --git a/BMM.UI.iOS/Application/ViewController/LanguageContentViewController.cs b/BMM.UI.iOS/Application/ViewController/LanguageContentViewController.cs index 973c05b28..00400014b 100644 --- a/BMM.UI.iOS/Application/ViewController/LanguageContentViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/LanguageContentViewController.cs @@ -1,3 +1,4 @@ +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using MvvmCross.Binding.BindingContext; using UIKit; @@ -21,7 +22,7 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(source).To(vm => vm.Languages); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Apply(); LanguagesTableView.ReloadData(); diff --git a/BMM.UI.iOS/Application/ViewController/MyContentViewController.cs b/BMM.UI.iOS/Application/ViewController/MyContentViewController.cs index ff1f242eb..08d9cca53 100644 --- a/BMM.UI.iOS/Application/ViewController/MyContentViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/MyContentViewController.cs @@ -35,7 +35,7 @@ public override void ViewDidLoad() set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(refreshControl).For(r => r.IsRefreshing).To(vm => vm.IsRefreshing); set.Bind(refreshControl).For(r => r.RefreshCommand).To(vm => vm.ReloadCommand); diff --git a/BMM.UI.iOS/Application/ViewController/MyTracksViewController.cs b/BMM.UI.iOS/Application/ViewController/MyTracksViewController.cs index f9c26707c..9cfb9babb 100644 --- a/BMM.UI.iOS/Application/ViewController/MyTracksViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/MyTracksViewController.cs @@ -41,12 +41,12 @@ public override void ViewDidLoad() set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(OfflineBannerLabel).To(vm => vm.TextSource).WithConversion(Translations.Global_OfflineBanner); HideOfflineBannerIfNecessary(); - set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.IsEmpty).WithConversion(); + set.Bind(EmptyStateView).For(s => s.Hidden).To(vm => vm.IsEmpty).WithConversion(); set.Bind(PlaylistEmptyHeadlineLabel).To(vm => vm.TextSource).WithConversion(Translations.MyTracksViewModel_EmptyTitle); set.Bind(PlaylistEmptyTextLabel).To(vm => vm.TextSource).WithConversion(Translations.MyTracksViewModel_EmptySubline); diff --git a/BMM.UI.iOS/Application/ViewController/OidcLoginViewController.cs b/BMM.UI.iOS/Application/ViewController/OidcLoginViewController.cs index 59e3ac202..b8b4b3164 100644 --- a/BMM.UI.iOS/Application/ViewController/OidcLoginViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/OidcLoginViewController.cs @@ -1,5 +1,6 @@ using System; using BMM.Core.Translation; +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using CoreAnimation; using Foundation; @@ -29,8 +30,8 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(SubtitleLabel).To(vm => vm.TextSource).WithConversion(Translations.LoginViewModel_LoginInfo); - set.Bind(SubtitleLabel).For(v => v.Hidden).To(vm => vm.IsLoading).WithConversion(); - set.Bind(LoadingSpinnerImageView).For(v => v.Hidden).To(vm => vm.IsLoading).WithConversion(); + set.Bind(SubtitleLabel).For(v => v.Hidden).To(vm => vm.IsLoading); + set.Bind(LoadingSpinnerImageView).For(v => v.Hidden).To(vm => vm.IsLoading).WithConversion(); set.Bind(LoginButton).For(v => v.Hidden).To(vm => vm.IsLoading); set.Bind(LoginButton).To(vm => vm.LoginCommand); set.Bind(LoginButton).For(v => v.BindTitle()).To(vm => vm.TextSource).WithConversion(Translations.LoginViewModel_BtnLogin_Text); diff --git a/BMM.UI.iOS/Application/ViewController/PlayerViewController.cs b/BMM.UI.iOS/Application/ViewController/PlayerViewController.cs index 31343a4b8..5f29d4fd0 100644 --- a/BMM.UI.iOS/Application/ViewController/PlayerViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/PlayerViewController.cs @@ -77,10 +77,10 @@ public override void ViewDidLoad() set.Bind(BufferedProgressSlider).For(b => b.Hidden).To(vm => vm.IsSeekingDisabled); set.Bind(SkipBackButton).To(vm => vm.SkipBackwardCommand); - set.Bind(SkipBackButton).For(v => v.Enabled).To(vm => vm.IsSeekingDisabled).WithConversion(); + set.Bind(SkipBackButton).For(v => v.Enabled).To(vm => vm.IsSeekingDisabled).WithConversion(); set.Bind(SkipForwardButton).To(vm => vm.SkipForwardCommand); - set.Bind(SkipForwardButton).For(v => v.Enabled).To(vm => vm.IsSeekingDisabled).WithConversion(); + set.Bind(SkipForwardButton).For(v => v.Enabled).To(vm => vm.IsSeekingDisabled).WithConversion(); set.Bind(NextButtton).To(vm => vm.NextCommand); set.Bind(NextButtton).For(v => v.Enabled).To(vm => vm.IsSkipToNextEnabled); diff --git a/BMM.UI.iOS/Application/ViewController/PodcastViewController.cs b/BMM.UI.iOS/Application/ViewController/PodcastViewController.cs index 94baabf6a..9e91ec35c 100644 --- a/BMM.UI.iOS/Application/ViewController/PodcastViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/PodcastViewController.cs @@ -12,6 +12,7 @@ using BMM.UI.iOS.Extensions; using BMM.UI.iOS.Helpers; using Foundation; +using MvvmCross.Binding.Combiners; using MvvmCross.Platforms.Ios.Binding; namespace BMM.UI.iOS @@ -50,7 +51,7 @@ public override void ViewDidLoad() set.Bind(PodcastCoverImageView).For(v => v.ImagePath).To(vm => vm.Podcast.Cover); set.Bind(TitelLabel).To(vm => vm.Podcast.Title); - set.Bind(FollowingButton).For(v => v.Hidden).To(vm => vm.IsFollowing).WithConversion(); + set.Bind(FollowingButton).For(v => v.Hidden).To(vm => vm.IsFollowing).WithConversion(); set.Bind(FollowingButton).To(vm => vm.ToggleFollowingCommand); set.Bind(FollowingButton).For(v => v.BindTitle()).To(vm => vm.TextSource).WithConversion(Translations.PodcastViewModel_Following); diff --git a/BMM.UI.iOS/Application/ViewController/SharedTrackCollectionViewController.cs b/BMM.UI.iOS/Application/ViewController/SharedTrackCollectionViewController.cs index 320cd8e2e..7f29855bf 100644 --- a/BMM.UI.iOS/Application/ViewController/SharedTrackCollectionViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/SharedTrackCollectionViewController.cs @@ -109,7 +109,7 @@ private void Bind() .Bind(source) .For(s => s.IsFullyLoaded) .To(vm => vm.IsLoading) - .WithConversion(); + .WithConversion(); set .Bind(AddToMyPlaylistButton) diff --git a/BMM.UI.iOS/Application/ViewController/SupportEndedViewController.cs b/BMM.UI.iOS/Application/ViewController/SupportEndedViewController.cs index db82e0fb3..efccf9fa2 100644 --- a/BMM.UI.iOS/Application/ViewController/SupportEndedViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/SupportEndedViewController.cs @@ -1,5 +1,6 @@ using System; using BMM.Core.Translation; +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using MvvmCross.Binding.BindingContext; using MvvmCross.Localization; @@ -22,7 +23,7 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(SupportEndedMessage).To(vm => vm.SupportEndedInfo); set.Bind(UpdateBmmBtn).To(vm => vm.ShowAppUpdatePageCommand); - set.Bind(UpdateBmmBtn).For(v => v.Hidden).To(vm => vm.ShouldShowAppUpdateButton).WithConversion(); + set.Bind(UpdateBmmBtn).For(v => v.Hidden).To(vm => vm.ShouldShowAppUpdateButton).WithConversion(); set.Bind(UpdateBmmBtn).For(v => v.BindTitle()).To(vm => vm.TextSource).WithConversion(Translations.SupportEndedViewModel_UpdateButton); set.Apply(); } diff --git a/BMM.UI.iOS/Application/ViewController/TopSongsCollectionViewController.cs b/BMM.UI.iOS/Application/ViewController/TopSongsCollectionViewController.cs index f9be945c9..9b1a7906f 100644 --- a/BMM.UI.iOS/Application/ViewController/TopSongsCollectionViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/TopSongsCollectionViewController.cs @@ -1,5 +1,6 @@ using System; using BMM.Core.Translation; +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using BMM.UI.iOS.Constants; using CoreGraphics; @@ -71,7 +72,7 @@ private void Bind() set.Bind(source) .For(s => s.IsFullyLoaded) .To(vm => vm.IsLoading) - .WithConversion(); + .WithConversion(); set.Bind(AddToFavouritesButton) .For(v => v.BindTitle()) diff --git a/BMM.UI.iOS/Application/ViewController/TrackCollectionViewController.cs b/BMM.UI.iOS/Application/ViewController/TrackCollectionViewController.cs index f99688171..81d91317d 100644 --- a/BMM.UI.iOS/Application/ViewController/TrackCollectionViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/TrackCollectionViewController.cs @@ -84,7 +84,7 @@ public override void ViewDidLoad() set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Bind(OfflineBannerLabel).To(vm => vm.TextSource).WithConversion(Translations.Global_OfflineBanner); HideOfflineBannerIfNecessary(); diff --git a/BMM.UI.iOS/Application/ViewController/TrackCollectionsAddToViewController.cs b/BMM.UI.iOS/Application/ViewController/TrackCollectionsAddToViewController.cs index 5cd97db86..e41e85de7 100644 --- a/BMM.UI.iOS/Application/ViewController/TrackCollectionsAddToViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/TrackCollectionsAddToViewController.cs @@ -23,7 +23,7 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(source).To(vm => vm.Documents); set.Bind(source).For(s => s.SelectionChangedCommand).To(s => s.DocumentSelectedCommand); - set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); + set.Bind(source).For(s => s.IsFullyLoaded).To(vm => vm.IsLoading).WithConversion(); set.Apply(); diff --git a/BMM.UI.iOS/Application/ViewController/UserSetupViewController.cs b/BMM.UI.iOS/Application/ViewController/UserSetupViewController.cs index d17863a0a..077d6fb04 100644 --- a/BMM.UI.iOS/Application/ViewController/UserSetupViewController.cs +++ b/BMM.UI.iOS/Application/ViewController/UserSetupViewController.cs @@ -1,5 +1,6 @@ using System; using BMM.Core.Translation; +using BMM.Core.ValueConverters; using BMM.Core.ViewModels; using CoreAnimation; using Foundation; @@ -26,7 +27,7 @@ public override void ViewDidLoad() var set = this.CreateBindingSet(); set.Bind(SettingUpMessage).To(vm => vm.TextSource).WithConversion(Translations.UserSetupViewModel_SettingUpAccountMessage); - set.Bind(LoadingSpinnerImageView).For(v => v.Hidden).To(vm => vm.IsLoading).WithConversion(); + set.Bind(LoadingSpinnerImageView).For(v => v.Hidden).To(vm => vm.IsLoading).WithConversion(); set.Apply(); AnimateSpinner(); diff --git a/BMM.UI.iOS/BMM.UI.iOS.csproj b/BMM.UI.iOS/BMM.UI.iOS.csproj index 389fef406..903653d78 100644 --- a/BMM.UI.iOS/BMM.UI.iOS.csproj +++ b/BMM.UI.iOS/BMM.UI.iOS.csproj @@ -1,6 +1,6 @@ - net7.0-ios + net8.0-ios Exe disable true @@ -602,11 +602,12 @@ - - - - - + + + + + + diff --git a/ConfettiView.Android/ConfettiView.Android.csproj b/ConfettiView.Android/ConfettiView.Android.csproj index 6cd74b033..a77577feb 100644 --- a/ConfettiView.Android/ConfettiView.Android.csproj +++ b/ConfettiView.Android/ConfettiView.Android.csproj @@ -1,6 +1,6 @@ - net7.0-android + net8.0-android enable enable true diff --git a/Lottie/Lottie.csproj b/Lottie/Lottie.csproj index bc20ba284..02a389ea1 100644 --- a/Lottie/Lottie.csproj +++ b/Lottie/Lottie.csproj @@ -1,6 +1,6 @@ - net7.0-android + net8.0-android enable enable true @@ -13,7 +13,8 @@ - - + + + \ No newline at end of file diff --git a/README.md b/README.md index 59c21a7c9..57f9e5b29 100644 --- a/README.md +++ b/README.md @@ -97,4 +97,8 @@ https://proxyman.io - it's awesome [How to set DebugView for Analytics](https://firebase.google.com/docs/analytics/debugview) ## Updating Firebase packages -When the app doesn't start after upgrading a firebase package or throws some weird message clean this folder: `~/Library/Caches/XamarinBuildDownload` \ No newline at end of file +When the app doesn't start after upgrading a firebase package or throws some weird message clean this folder: `~/Library/Caches/XamarinBuildDownload` + +# Notes about simulator / emulator +1. Android: Firebase can't be accessed leading to an error when opening Profile +2. iOS: Audio can't be played in the simulator \ No newline at end of file diff --git a/azure-pipelines-android.yaml b/azure-pipelines-android.yaml index f1fe4cce4..c55302955 100644 --- a/azure-pipelines-android.yaml +++ b/azure-pipelines-android.yaml @@ -20,9 +20,9 @@ variables: steps: - task: JavaToolInstaller@0 - displayName: 'Use Java 17' + displayName: 'Use Java 21' inputs: - versionSpec: 17 + versionSpec: 21 jdkArchitectureOption: x64 jdkSourceOption: PreInstalled - bash: | diff --git a/azure-pipelines-ios.yaml b/azure-pipelines-ios.yaml index eca70ed38..4daefa84c 100644 --- a/azure-pipelines-ios.yaml +++ b/azure-pipelines-ios.yaml @@ -174,7 +174,7 @@ steps: - task: ArchiveFiles@1 displayName: 'Create dSYM archive with symbols ' inputs: - rootFolder: 'BMM.UI.iOS/bin/iPhone/Release/net7.0-ios/ios-arm64/BMM.app.dSYM' + rootFolder: 'BMM.UI.iOS/bin/iPhone/Release/net8.0-ios/ios-arm64/BMM.app.dSYM' archiveFile: '$(Build.ArtifactStagingDirectory)/BMM.app.dSYM.zip' - task: CopyFiles@2