diff --git a/QuickLayout.Core/App.cs b/QuickLayout.Core/App.cs index 6cfeaca..5b38e4a 100644 --- a/QuickLayout.Core/App.cs +++ b/QuickLayout.Core/App.cs @@ -1,8 +1,9 @@ -using MvvmCross.Platform.IoC; +using MvvmCross.IoC; +using MvvmCross.ViewModels; namespace QuickLayout.Core { - public class App : MvvmCross.Core.ViewModels.MvxApplication + public class App : MvxApplication { public override void Initialize() { diff --git a/QuickLayout.Core/Properties/AssemblyInfo.cs b/QuickLayout.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index 5cff67e..0000000 --- a/QuickLayout.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("QuickLayout.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("QuickLayout.Core")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/QuickLayout.Core/QuickLayout.Core.csproj b/QuickLayout.Core/QuickLayout.Core.csproj index 8ef635e..dca1e5c 100644 --- a/QuickLayout.Core/QuickLayout.Core.csproj +++ b/QuickLayout.Core/QuickLayout.Core.csproj @@ -1,80 +1,11 @@  - - + + - 10.0 - Debug - AnyCPU - {849AFB57-994A-42D9-A786-EF34FC951CDE} - Library - Properties - QuickLayout.Core - QuickLayout.Core - v4.5 - Profile111 - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + netstandard2.0 + 7.1 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - ..\packages\MvvmCross.Platform.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Platform.dll - - - ..\packages\MvvmCross.Core.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Core.dll - - - ..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Binding.dll - - - ..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Localization.dll - - - + \ No newline at end of file diff --git a/QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs b/QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs index 9d22cf2..abfbb56 100644 --- a/QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs +++ b/QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs @@ -1,4 +1,4 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { diff --git a/QuickLayout.Core/ViewModels/FirstViewModel.cs b/QuickLayout.Core/ViewModels/FirstViewModel.cs index 47998aa..da13501 100644 --- a/QuickLayout.Core/ViewModels/FirstViewModel.cs +++ b/QuickLayout.Core/ViewModels/FirstViewModel.cs @@ -1,32 +1,39 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.Logging; +using MvvmCross.Navigation; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { public class FirstViewModel - : MvxViewModel + : MvxNavigationViewModel { - public void GoDetails() => ShowViewModel(); + public FirstViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService) + : base(logProvider, navigationService) + { + } - public void GoForm() => ShowViewModel(); + public void GoDetails() => NavigationService.Navigate(); - public void GoFormGrid() => ShowViewModel(); + public void GoForm() => NavigationService.Navigate(); - public void GoSearch() => ShowViewModel(); + public void GoFormGrid() => NavigationService.Navigate(); - public void GoTip() => ShowViewModel(); + public void GoSearch() => NavigationService.Navigate(); - public void GoUpdateConstraints() => ShowViewModel(); + public void GoTip() => NavigationService.Navigate(); - public void GoAdvancedVerticalStack() => ShowViewModel(); + public void GoUpdateConstraints() => NavigationService.Navigate(); - public void GoFullSize() => ShowViewModel(); + public void GoAdvancedVerticalStack() => NavigationService.Navigate(); + + public void GoFullSize() => NavigationService.Navigate(); - public void GoDirectionForm() => ShowViewModel(); + public void GoDirectionForm() => NavigationService.Navigate(); - public void GoRightToLeft() => ShowViewModel(); + public void GoRightToLeft() => NavigationService.Navigate(); - public void GoViewWithSafeArea() => ShowViewModel(); + public void GoViewWithSafeArea() => NavigationService.Navigate(); - public void GoCenterConstraints() => ShowViewModel(); + public void GoCenterConstraints() => NavigationService.Navigate(); } } \ No newline at end of file diff --git a/QuickLayout.Core/ViewModels/FullSizeViewModel.cs b/QuickLayout.Core/ViewModels/FullSizeViewModel.cs index c7dbf93..a670632 100644 --- a/QuickLayout.Core/ViewModels/FullSizeViewModel.cs +++ b/QuickLayout.Core/ViewModels/FullSizeViewModel.cs @@ -1,9 +1,8 @@ - -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { - public class FullSizeViewModel + public class FullSizeViewModel : MvxViewModel { } diff --git a/QuickLayout.Core/ViewModels/SearchViewModel.cs b/QuickLayout.Core/ViewModels/SearchViewModel.cs index 96bcfcd..fdb62ca 100644 --- a/QuickLayout.Core/ViewModels/SearchViewModel.cs +++ b/QuickLayout.Core/ViewModels/SearchViewModel.cs @@ -1,4 +1,4 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { diff --git a/QuickLayout.Core/ViewModels/TipViewModel.cs b/QuickLayout.Core/ViewModels/TipViewModel.cs index a083cf3..f4c68cc 100644 --- a/QuickLayout.Core/ViewModels/TipViewModel.cs +++ b/QuickLayout.Core/ViewModels/TipViewModel.cs @@ -1,4 +1,4 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; using QuickLayout.Core.Services; namespace QuickLayout.Core.ViewModels @@ -37,7 +37,7 @@ public int Generosity set { _generosity = Limit(value); - MvvmCross.Platform.Core.MvxAsyncDispatcher.BeginAsync(() => RaisePropertyChanged(() => Generosity)); + InvokeOnMainThreadAsync(() => RaisePropertyChanged(() => Generosity)); Recalcuate(); } } diff --git a/QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs b/QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs index 79b5df9..ee7e7c5 100644 --- a/QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs +++ b/QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs @@ -1,4 +1,4 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { diff --git a/QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs b/QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs index 4d36349..1ac9d96 100644 --- a/QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs +++ b/QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs @@ -1,8 +1,8 @@ -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { - public class UpdateConstraintsViewModel : MvxViewModel + public class UpdateConstraintsViewModel : MvxViewModel { private bool _active = true; public bool Active diff --git a/QuickLayout.Core/ViewModels/ViewWithSafeAreaViewModel.cs b/QuickLayout.Core/ViewModels/ViewWithSafeAreaViewModel.cs index 6a5c659..37bb801 100644 --- a/QuickLayout.Core/ViewModels/ViewWithSafeAreaViewModel.cs +++ b/QuickLayout.Core/ViewModels/ViewWithSafeAreaViewModel.cs @@ -1,5 +1,4 @@ -using System; -using MvvmCross.Core.ViewModels; +using MvvmCross.ViewModels; namespace QuickLayout.Core.ViewModels { diff --git a/QuickLayout.Core/packages.config b/QuickLayout.Core/packages.config deleted file mode 100644 index c4350dd..0000000 --- a/QuickLayout.Core/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/QuickLayout.Touch/AppDelegate.cs b/QuickLayout.Touch/AppDelegate.cs index 6c4a1dc..ea9a946 100644 --- a/QuickLayout.Touch/AppDelegate.cs +++ b/QuickLayout.Touch/AppDelegate.cs @@ -1,29 +1,10 @@ using Foundation; -using UIKit; -using MvvmCross.iOS.Platform; -using MvvmCross.Core.ViewModels; -using MvvmCross.Platform; +using MvvmCross.Platforms.Ios.Core; namespace QuickLayout.Touch { [Register("AppDelegate")] - public partial class AppDelegate : MvxApplicationDelegate + public class AppDelegate : MvxApplicationDelegate, Core.App> { - UIWindow _window; - - public override bool FinishedLaunching(UIApplication app, NSDictionary options) - { - _window = new UIWindow(UIScreen.MainScreen.Bounds); - - var setup = new Setup(this, _window); - setup.Initialize(); - - var startup = Mvx.Resolve(); - startup.Start(); - - _window.MakeKeyAndVisible(); - - return true; - } } } \ No newline at end of file diff --git a/QuickLayout.Touch/Bootstrap/MethodBindingPluginBootstrap.cs b/QuickLayout.Touch/Bootstrap/MethodBindingPluginBootstrap.cs deleted file mode 100644 index e57cacd..0000000 --- a/QuickLayout.Touch/Bootstrap/MethodBindingPluginBootstrap.cs +++ /dev/null @@ -1,9 +0,0 @@ -using MvvmCross.Platform.Plugins; - -namespace QuickLayout.Touch.Bootstrap -{ - public class MethodBindingPluginBootstrap - : MvxPluginBootstrapAction - { - } -} \ No newline at end of file diff --git a/QuickLayout.Touch/DebugTrace.cs b/QuickLayout.Touch/DebugTrace.cs deleted file mode 100644 index c186291..0000000 --- a/QuickLayout.Touch/DebugTrace.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Diagnostics; -using MvvmCross.Platform.Platform; - -namespace QuickLayout.Touch -{ - public class DebugTrace : IMvxTrace - { - public void Trace(MvxTraceLevel level, string tag, Func message) - { - Debug.WriteLine(tag + ":" + level + ":" + message()); - } - - public void Trace(MvxTraceLevel level, string tag, string message) - { - Debug.WriteLine(tag + ":" + level + ":" + message); - } - - public void Trace(MvxTraceLevel level, string tag, string message, params object[] args) - { - try - { - Debug.WriteLine(string.Format(tag + ":" + level + ":" + message, args)); - } - catch (FormatException) - { - Trace(MvxTraceLevel.Error, tag, "Exception during trace of {0} {1} {2}", level, message); - } - } - } -} diff --git a/QuickLayout.Touch/LinkerPleaseInclude.cs b/QuickLayout.Touch/LinkerPleaseInclude.cs index 45a0ce1..8a25390 100644 --- a/QuickLayout.Touch/LinkerPleaseInclude.cs +++ b/QuickLayout.Touch/LinkerPleaseInclude.cs @@ -1,15 +1,27 @@ using System; using System.Collections.Specialized; using System.Windows.Input; -using UIKit; using Foundation; +using MvvmCross.Binding.BindingContext; +using MvvmCross.Navigation; +using MvvmCross.Platforms.Ios.Views; +using MvvmCross.ViewModels; +using UIKit; namespace QuickLayout.Touch { - // This class is never actually executed, but when Xamarin linking is enabled it does how to ensure types and properties - // are preserved in the deployed app + // This class is never actually executed, but when Xamarin linking is enabled it does ensure types and properties + // are preserved in the deployed app + [Foundation.Preserve(AllMembers = true)] public class LinkerPleaseInclude { + public void Include(MvxTaskBasedBindingContext c) + { + c.Dispose(); + var c2 = new MvxTaskBasedBindingContext(); + c2.Dispose(); + } + public void Include(UIButton uiButton) { uiButton.TouchUpInside += (s, e) => @@ -26,17 +38,20 @@ public void Include(UITextField textField) { textField.Text = textField.Text + ""; textField.EditingChanged += (sender, args) => { textField.Text = ""; }; + textField.EditingDidEnd += (sender, args) => { textField.Text = ""; }; } public void Include(UITextView textView) { textView.Text = textView.Text + ""; + textView.TextStorage.DidProcessEditing += (sender, e) => textView.Text = ""; textView.Changed += (sender, args) => { textView.Text = ""; }; } public void Include(UILabel label) { label.Text = label.Text + ""; + label.AttributedText = new NSAttributedString(label.AttributedText.ToString() + ""); } public void Include(UIImageView imageView) @@ -47,7 +62,7 @@ public void Include(UIImageView imageView) public void Include(UIDatePicker date) { date.Date = date.Date.AddSeconds(1); - date.ValueChanged += (sender, args) => { date.Date = (NSDate)DateTime.MaxValue; }; + date.ValueChanged += (sender, args) => { date.Date = NSDate.DistantFuture; }; } public void Include(UISlider slider) @@ -56,20 +71,83 @@ public void Include(UISlider slider) slider.ValueChanged += (sender, args) => { slider.Value = 1; }; } + public void Include(UIProgressView progress) + { + progress.Progress = progress.Progress + 1; + } + public void Include(UISwitch sw) { sw.On = !sw.On; sw.ValueChanged += (sender, args) => { sw.On = false; }; } + public void Include(MvxViewController vc) + { + vc.Title = vc.Title + ""; + } + + public void Include(UIStepper s) + { + s.Value = s.Value + 1; + s.ValueChanged += (sender, args) => { s.Value = 0; }; + } + + public void Include(UIPageControl s) + { + s.Pages = s.Pages + 1; + s.ValueChanged += (sender, args) => { s.Pages = 0; }; + } + public void Include(INotifyCollectionChanged changed) { - changed.CollectionChanged += (s,e) => { var test = string.Format("{0}{1}{2}{3}{4}", e.Action,e.NewItems, e.NewStartingIndex, e.OldItems, e.OldStartingIndex); } ; + changed.CollectionChanged += (s, e) => { var test = $"{e.Action}{e.NewItems}{e.NewStartingIndex}{e.OldItems}{e.OldStartingIndex}"; }; } - + public void Include(ICommand command) { - command.CanExecuteChanged += (s, e) => { if (command.CanExecute(null)) command.Execute(null); }; + command.CanExecuteChanged += (s, e) => { if (command.CanExecute(null)) command.Execute(null); }; + } + + public void Include(MvvmCross.IoC.MvxPropertyInjector injector) + { + injector = new MvvmCross.IoC.MvxPropertyInjector(); + } + + public void Include(System.ComponentModel.INotifyPropertyChanged changed) + { + changed.PropertyChanged += (sender, e) => { var test = e.PropertyName; }; + } + + public void Include(MvxNavigationService service, IMvxViewModelLoader loader) + { + service = new MvxNavigationService(null, loader); + } + + public void Include(UIImagePickerController uIImagePickerController) + { + var x = uIImagePickerController.SourceType; + uIImagePickerController.FinishedPickingMedia += (s, e) => { }; + uIImagePickerController.FinishedPickingImage += (s, e) => { }; + uIImagePickerController.Canceled += (s, e) => { }; + } + + public void Include(ConsoleColor color) + { + Console.Write(""); + Console.WriteLine(""); + color = Console.ForegroundColor; + Console.ForegroundColor = ConsoleColor.Red; + Console.ForegroundColor = ConsoleColor.Yellow; + Console.ForegroundColor = ConsoleColor.Magenta; + Console.ForegroundColor = ConsoleColor.White; + Console.ForegroundColor = ConsoleColor.Gray; + Console.ForegroundColor = ConsoleColor.DarkGray; + } + + public void Include(MvvmCross.Plugin.MethodBinding.Plugin p) + { + var _ = p; } - } -} \ No newline at end of file + } +} diff --git a/QuickLayout.Touch/QuickLayout.Touch.csproj b/QuickLayout.Touch/QuickLayout.Touch.csproj index fda8ceb..e8ffcaf 100644 --- a/QuickLayout.Touch/QuickLayout.Touch.csproj +++ b/QuickLayout.Touch/QuickLayout.Touch.csproj @@ -85,11 +85,9 @@ ARMv7 - - @@ -103,8 +101,6 @@ - - @@ -113,38 +109,17 @@ - - ..\packages\MvvmCross.Platform.4.4.0\lib\Xamarin.iOS10\MvvmCross.Platform.dll - False - - - ..\packages\MvvmCross.Platform.4.4.0\lib\Xamarin.iOS10\MvvmCross.Platform.iOS.dll - False - - - ..\packages\MvvmCross.Core.4.4.0\lib\Xamarin.iOS10\MvvmCross.Core.dll - False - - - ..\packages\MvvmCross.Core.4.4.0\lib\Xamarin.iOS10\MvvmCross.iOS.dll - False - - - ..\packages\MvvmCross.Binding.4.4.0\lib\Xamarin.iOS10\MvvmCross.Binding.dll - False - - - ..\packages\MvvmCross.Binding.4.4.0\lib\Xamarin.iOS10\MvvmCross.Binding.iOS.dll - False - - - ..\packages\MvvmCross.Binding.4.4.0\lib\Xamarin.iOS10\MvvmCross.Localization.dll - False - - - ..\packages\MvvmCross.Plugin.MethodBinding.4.4.0\lib\Xamarin.iOS10\MvvmCross.Plugins.MethodBinding.dll - False - + + + + + + + 6.4.0 + + + 6.4.0 + diff --git a/QuickLayout.Touch/Setup.cs b/QuickLayout.Touch/Setup.cs deleted file mode 100644 index 146505a..0000000 --- a/QuickLayout.Touch/Setup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UIKit; -using MvvmCross.Core.ViewModels; -using MvvmCross.iOS.Platform; -using MvvmCross.Platform.Platform; - -namespace QuickLayout.Touch -{ - public class Setup : MvxIosSetup - { - public Setup(MvxApplicationDelegate applicationDelegate, UIWindow window) - : base(applicationDelegate, window) - { - } - - protected override IMvxApplication CreateApp() => new Core.App(); - - protected override IMvxTrace CreateDebugTrace() => new DebugTrace(); - } -} \ No newline at end of file diff --git a/QuickLayout.Touch/Views/AdvancedVerticalStackView.cs b/QuickLayout.Touch/Views/AdvancedVerticalStackView.cs index a0bcbee..2acfedd 100644 --- a/QuickLayout.Touch/Views/AdvancedVerticalStackView.cs +++ b/QuickLayout.Touch/Views/AdvancedVerticalStackView.cs @@ -5,12 +5,12 @@ using Foundation; using QuickLayout.Core.ViewModels; using ObjCRuntime; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using MvvmCross.Binding.BindingContext; namespace QuickLayout.Touch { - [Register("AdvancedVerticalStackView")] + [Register("AdvancedVerticalStackView")] public class AdvancedVerticalStackView : MvxViewController { public override void ViewDidLoad() diff --git a/QuickLayout.Touch/Views/DetailsView.cs b/QuickLayout.Touch/Views/DetailsView.cs index de39523..9897322 100644 --- a/QuickLayout.Touch/Views/DetailsView.cs +++ b/QuickLayout.Touch/Views/DetailsView.cs @@ -1,7 +1,7 @@ using System.Reflection; using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using UIKit; using Foundation; using QuickLayout.Core.ViewModels; diff --git a/QuickLayout.Touch/Views/DirectionFormView.cs b/QuickLayout.Touch/Views/DirectionFormView.cs index 6a0d549..904df56 100644 --- a/QuickLayout.Touch/Views/DirectionFormView.cs +++ b/QuickLayout.Touch/Views/DirectionFormView.cs @@ -1,7 +1,7 @@ using Cirrious.FluentLayouts; using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using ObjCRuntime; using UIKit; diff --git a/QuickLayout.Touch/Views/FirstView.cs b/QuickLayout.Touch/Views/FirstView.cs index fe7175e..7ee8c7d 100644 --- a/QuickLayout.Touch/Views/FirstView.cs +++ b/QuickLayout.Touch/Views/FirstView.cs @@ -1,14 +1,16 @@ using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using UIKit; using ObjCRuntime; using QuickLayout.Core.ViewModels; +using MvvmCross.Platforms.Ios.Presenters.Attributes; namespace QuickLayout.Touch.Views { [Register("FirstView")] + [MvxRootPresentation(WrapInNavigationController = true)] public class FirstView : MvxViewController { private UIButton _viewForm, _viewFormGrid, _viewDetails, _viewSearch, _viewTip, _viewUpdateConstaints, _viewAdvancedVerticalStack, _fullSize, _directionFormView, _rightToLeft, _viewSafeArea, _viewCenterConstraints; diff --git a/QuickLayout.Touch/Views/FormGridView.cs b/QuickLayout.Touch/Views/FormGridView.cs index 69ebc30..d53751b 100644 --- a/QuickLayout.Touch/Views/FormGridView.cs +++ b/QuickLayout.Touch/Views/FormGridView.cs @@ -2,7 +2,7 @@ using Cirrious.FluentLayouts.Touch; using Cirrious.FluentLayouts.Touch.RowSet; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using UIKit; using ObjCRuntime; diff --git a/QuickLayout.Touch/Views/FormView.cs b/QuickLayout.Touch/Views/FormView.cs index f7ba721..69865ef 100644 --- a/QuickLayout.Touch/Views/FormView.cs +++ b/QuickLayout.Touch/Views/FormView.cs @@ -1,7 +1,7 @@ using Cirrious.FluentLayouts; using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using ObjCRuntime; using UIKit; diff --git a/QuickLayout.Touch/Views/FullSizeView.cs b/QuickLayout.Touch/Views/FullSizeView.cs index a9dbb2f..adb7bca 100644 --- a/QuickLayout.Touch/Views/FullSizeView.cs +++ b/QuickLayout.Touch/Views/FullSizeView.cs @@ -2,14 +2,13 @@ using System.Collections.Generic; using Cirrious.FluentLayouts.Touch; using Foundation; -using MvvmCross.iOS.Views; -using MvvmCross.Platform; +using MvvmCross.Platforms.Ios.Views; using ObjCRuntime; using UIKit; namespace QuickLayout.Touch.Views { - [Register("FullSizeView")] + [Register("FullSizeView")] public class FullSizeView : MvxViewController { private IEnumerable _cyanLayouts; diff --git a/QuickLayout.Touch/Views/RightToLeftView.cs b/QuickLayout.Touch/Views/RightToLeftView.cs index b49e3de..8436214 100644 --- a/QuickLayout.Touch/Views/RightToLeftView.cs +++ b/QuickLayout.Touch/Views/RightToLeftView.cs @@ -1,6 +1,6 @@ using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using ObjCRuntime; using UIKit; diff --git a/QuickLayout.Touch/Views/SearchView.cs b/QuickLayout.Touch/Views/SearchView.cs index 9dc6fea..47e6555 100644 --- a/QuickLayout.Touch/Views/SearchView.cs +++ b/QuickLayout.Touch/Views/SearchView.cs @@ -1,7 +1,7 @@ using Cirrious.FluentLayouts; using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using UIKit; using ObjCRuntime; diff --git a/QuickLayout.Touch/Views/TipView.cs b/QuickLayout.Touch/Views/TipView.cs index 6d5c67f..c98afee 100644 --- a/QuickLayout.Touch/Views/TipView.cs +++ b/QuickLayout.Touch/Views/TipView.cs @@ -1,7 +1,7 @@ using System.Drawing; using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using Foundation; using UIKit; using ObjCRuntime; diff --git a/QuickLayout.Touch/Views/ToCenterConstraintsView.cs b/QuickLayout.Touch/Views/ToCenterConstraintsView.cs index 9261592..6982695 100644 --- a/QuickLayout.Touch/Views/ToCenterConstraintsView.cs +++ b/QuickLayout.Touch/Views/ToCenterConstraintsView.cs @@ -1,6 +1,6 @@ using Cirrious.FluentLayouts.Touch; using Foundation; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using QuickLayout.Core.ViewModels; using UIKit; diff --git a/QuickLayout.Touch/Views/UpdateConstraintsView.cs b/QuickLayout.Touch/Views/UpdateConstraintsView.cs index c4e0d21..fcfc38a 100644 --- a/QuickLayout.Touch/Views/UpdateConstraintsView.cs +++ b/QuickLayout.Touch/Views/UpdateConstraintsView.cs @@ -1,6 +1,6 @@ using Cirrious.FluentLayouts.Touch; using MvvmCross.Binding.BindingContext; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using UIKit; using ObjCRuntime; using QuickLayout.Core.ViewModels; diff --git a/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs b/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs index f97b964..0a24a80 100644 --- a/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs +++ b/QuickLayout.Touch/Views/ViewWithSafeAreaView.cs @@ -1,7 +1,7 @@ using System; using Cirrious.FluentLayouts.Touch; using Foundation; -using MvvmCross.iOS.Views; +using MvvmCross.Platforms.Ios.Views; using UIKit; namespace QuickLayout.Touch.Views diff --git a/QuickLayout.Touch/packages.config b/QuickLayout.Touch/packages.config deleted file mode 100644 index 089dfcb..0000000 --- a/QuickLayout.Touch/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file