Skip to content

Updated MvvmCross to 6.4.0 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 24, 2019
Merged

Updated MvvmCross to 6.4.0 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07dcd23
Updated MvvmCross from 4.4.0 to 6.4.0 and changed QuickLayout.Core ta…
fedemkr Sep 18, 2019
050d145
Cleaned solution comments and files not used
fedemkr Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions QuickLayout.Core/App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
{
Expand Down
30 changes: 0 additions & 30 deletions QuickLayout.Core/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

79 changes: 5 additions & 74 deletions QuickLayout.Core/QuickLayout.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{849AFB57-994A-42D9-A786-EF34FC951CDE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>QuickLayout.Core</RootNamespace>
<AssemblyName>QuickLayout.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="App.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\CalculationService.cs" />
<Compile Include="Services\ICalculationService.cs" />
<Compile Include="ViewModels\BaseDetailsViewModel.cs" />
<Compile Include="ViewModels\DetailsViewModel.cs" />
<Compile Include="ViewModels\FirstViewModel.cs" />
<Compile Include="ViewModels\FormGridViewModel.cs" />
<Compile Include="ViewModels\FormViewModel.cs" />
<Compile Include="ViewModels\FullSizeViewModel.cs" />
<Compile Include="ViewModels\SearchViewModel.cs" />
<Compile Include="ViewModels\TipViewModel.cs" />
<Compile Include="ViewModels\ToCenterConstraintsViewModel.cs" />
<Compile Include="ViewModels\UpdateConstraintsViewModel.cs" />
<Compile Include="ViewModels\AdvancedVerticalStackViewModel.cs" />
<Compile Include="ViewModels\DirectionFormViewModel.cs" />
<Compile Include="ViewModels\RightToLeftViewModel.cs" />
<Compile Include="ViewModels\ViewWithSafeAreaViewModel.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<Reference Include="MvvmCross.Platform">
<HintPath>..\packages\MvvmCross.Platform.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Platform.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Core">
<HintPath>..\packages\MvvmCross.Core.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Core.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Binding">
<HintPath>..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Binding.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.Binding.4.4.0\lib\portable-net45+win+wpa81+wp80\MvvmCross.Localization.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="MvvmCross" Version="6.4.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion QuickLayout.Core/ViewModels/BaseDetailsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;

namespace QuickLayout.Core.ViewModels
{
Expand Down
35 changes: 21 additions & 14 deletions QuickLayout.Core/ViewModels/FirstViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<DetailsViewModel>();
public FirstViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService)
: base(logProvider, navigationService)
{
}

public void GoForm() => ShowViewModel<FormViewModel>();
public void GoDetails() => NavigationService.Navigate<DetailsViewModel>();

public void GoFormGrid() => ShowViewModel<FormGridViewModel>();
public void GoForm() => NavigationService.Navigate<FormViewModel>();

public void GoSearch() => ShowViewModel<SearchViewModel>();
public void GoFormGrid() => NavigationService.Navigate<FormGridViewModel>();

public void GoTip() => ShowViewModel<TipViewModel>();
public void GoSearch() => NavigationService.Navigate<SearchViewModel>();

public void GoUpdateConstraints() => ShowViewModel<UpdateConstraintsViewModel>();
public void GoTip() => NavigationService.Navigate<TipViewModel>();

public void GoAdvancedVerticalStack() => ShowViewModel<AdvancedVerticalStackViewModel>();
public void GoUpdateConstraints() => NavigationService.Navigate<UpdateConstraintsViewModel>();

public void GoFullSize() => ShowViewModel<FullSizeViewModel>();
public void GoAdvancedVerticalStack() => NavigationService.Navigate<AdvancedVerticalStackViewModel>();

public void GoFullSize() => NavigationService.Navigate<FullSizeViewModel>();

public void GoDirectionForm() => ShowViewModel<DirectionFormViewModel>();
public void GoDirectionForm() => NavigationService.Navigate<DirectionFormViewModel>();

public void GoRightToLeft() => ShowViewModel<RightToLeftViewModel>();
public void GoRightToLeft() => NavigationService.Navigate<RightToLeftViewModel>();

public void GoViewWithSafeArea() => ShowViewModel<ViewWithSafeAreaViewModel>();
public void GoViewWithSafeArea() => NavigationService.Navigate<ViewWithSafeAreaViewModel>();

public void GoCenterConstraints() => ShowViewModel<ToCenterConstraintsViewModel>();
public void GoCenterConstraints() => NavigationService.Navigate<ToCenterConstraintsViewModel>();
}
}
5 changes: 2 additions & 3 deletions QuickLayout.Core/ViewModels/FullSizeViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;

namespace QuickLayout.Core.ViewModels
{
public class FullSizeViewModel
public class FullSizeViewModel
: MvxViewModel
{
}
Expand Down
2 changes: 1 addition & 1 deletion QuickLayout.Core/ViewModels/SearchViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;

namespace QuickLayout.Core.ViewModels
{
Expand Down
4 changes: 2 additions & 2 deletions QuickLayout.Core/ViewModels/TipViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;
using QuickLayout.Core.Services;

namespace QuickLayout.Core.ViewModels
Expand Down Expand Up @@ -37,7 +37,7 @@ public int Generosity
set
{
_generosity = Limit(value);
MvvmCross.Platform.Core.MvxAsyncDispatcher.BeginAsync(() => RaisePropertyChanged(() => Generosity));
InvokeOnMainThreadAsync(() => RaisePropertyChanged(() => Generosity));
Recalcuate();
}
}
Expand Down
2 changes: 1 addition & 1 deletion QuickLayout.Core/ViewModels/ToCenterConstraintsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;

namespace QuickLayout.Core.ViewModels
{
Expand Down
4 changes: 2 additions & 2 deletions QuickLayout.Core/ViewModels/UpdateConstraintsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions QuickLayout.Core/ViewModels/ViewWithSafeAreaViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using MvvmCross.Core.ViewModels;
using MvvmCross.ViewModels;

namespace QuickLayout.Core.ViewModels
{
Expand Down
7 changes: 0 additions & 7 deletions QuickLayout.Core/packages.config
View file
Open in desktop

This file was deleted.

23 changes: 2 additions & 21 deletions QuickLayout.Touch/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<MvxIosSetup<Core.App>, 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<IMvxAppStart>();
startup.Start();

_window.MakeKeyAndVisible();

return true;
}
}
}
9 changes: 0 additions & 9 deletions QuickLayout.Touch/Bootstrap/MethodBindingPluginBootstrap.cs
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions QuickLayout.Touch/DebugTrace.cs
View file
Open in desktop

This file was deleted.

Loading