Skip to content

Commit

Permalink
Removed local usage of dlls
Browse files Browse the repository at this point in the history 
Made use of nuget packages
Made use of RegisterNavigationServiceAppStart
  • Loading branch information
@VenkatsQuest
VenkatsQuest committed Aug 13, 2017
1 parent 51451d8 commit 17eea70
Show file tree
Hide file tree
Showing 13 changed files with 144 additions and 154 deletions.
7 changes: 4 additions & 3 deletions OldSamples/MoreControls/MoreControls.Core/App.cs
View file
@@ -1,8 +1,9 @@
using Cirrious.CrossCore.IoC;
using MvvmCross.Core.ViewModels;
using MvvmCross.Platform.IoC;

namespace MoreControls.Core
{
public class App : Cirrious.MvvmCross.ViewModels.MvxApplication
public class App : MvxApplication
{
public override void Initialize()
{
Expand All @@ -11,7 +12,7 @@ public override void Initialize()
.AsInterfaces()
.RegisterAsLazySingleton();

RegisterAppStart<ViewModels.FirstViewModel>();
RegisterNavigationServiceAppStart<ViewModels.FirstViewModel>();
}
}
}
25 changes: 9 additions & 16 deletions OldSamples/MoreControls/MoreControls.Core/MoreControls.Core.csproj
View file
Expand Up @@ -39,28 +39,21 @@
<Compile Include="ViewModels\Shape.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.CrossCore.dll</HintPath>
<Private>True</Private>
<Reference Include="MvvmCross.Platform">
<HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Platform.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.dll</HintPath>
<Private>True</Private>
<Reference Include="MvvmCross.Core">
<HintPath>..\packages\MvvmCross.Core.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Core.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Binding, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.Binding.dll</HintPath>
<Private>True</Private>
<Reference Include="MvvmCross.Binding">
<HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Binding.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.Localization.dll</HintPath>
<Private>True</Private>
<Reference Include="MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Localization.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="ToDo-MvvmCross\_ Core.txt" />
<None Include="packages.config" />
</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.
Expand Down
23 changes: 0 additions & 23 deletions OldSamples/MoreControls/MoreControls.Core/ToDo-MvvmCross/_ Core.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion OldSamples/MoreControls/MoreControls.Core/ViewModels/FirstViewModel.cs
View file
@@ -1,5 +1,5 @@
using Cirrious.MvvmCross.ViewModels;
using System.Collections.Generic;
using MvvmCross.Core.ViewModels;

namespace MoreControls.Core.ViewModels
{
Expand Down
12 changes: 6 additions & 6 deletions OldSamples/MoreControls/MoreControls.Core/packages.config
View file
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MvvmCross" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.HotTuna.StarterPack" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.PortableSupport" version="3.0.13-beta4" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
<package id="MvvmCross" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.Binding" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.Core" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.Platform" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.PortableSupport" version="3.5.2-alpha2" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="MvvmCross.StarterPack" version="4.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>
2 changes: 1 addition & 1 deletion OldSamples/MoreControls/MoreControls.Droid/Controls/ShapeView.cs
View file
Expand Up @@ -3,7 +3,7 @@
using Android.Graphics;
using Android.Util;
using Android.Views;
using Cirrious.MvvmCross.Binding.Droid.Views;
using MvvmCross.Binding.Droid.Views;
using MoreControls.Core.ViewModels;

namespace MoreControls.Droid.Controls
Expand Down
2 changes: 1 addition & 1 deletion OldSamples/MoreControls/MoreControls.Droid/DebugTrace.cs
View file
@@ -1,6 +1,6 @@
using System;
using System.Diagnostics;
using Cirrious.CrossCore.Platform;
using MvvmCross.Platform.Platform;

namespace MoreControls.Droid
{
Expand Down
63 changes: 22 additions & 41 deletions OldSamples/MoreControls/MoreControls.Droid/MoreControls.Droid.csproj
View file
Expand Up @@ -41,52 +41,33 @@
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.CrossCore.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.Droid.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.MvvmCross, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.MvvmCross.Binding, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.MvvmCross.Binding.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.Droid.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.MvvmCross.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Droid.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="Mono.Android.Export" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Net">
<Private>True</Private>
<HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Net.dll</HintPath>
</Reference>
<Reference Include="System.Windows">
<Private>True</Private>
<HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Windows.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Serialization">
<Private>True</Private>
<HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Xml.Serialization.dll</HintPath>
<Reference Include="MvvmCross.Platform">
<HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\MonoAndroid\MvvmCross.Platform.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Platform.Droid">
<HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\MonoAndroid\MvvmCross.Platform.Droid.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Core">
<HintPath>..\packages\MvvmCross.Core.5.1.1\lib\MonoAndroid\MvvmCross.Core.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Droid">
<HintPath>..\packages\MvvmCross.Core.5.1.1\lib\MonoAndroid\MvvmCross.Droid.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Binding">
<HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Binding.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Binding.Droid">
<HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Binding.Droid.dll</HintPath>
</Reference>
<Reference Include="MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Localization.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -96,15 +77,15 @@
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Setup.cs" />
<Compile Include="SplashScreen.cs" />
<Compile Include="Views\FirstView.cs" />
<Compile Include="SplashScreen.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<AndroidResource Include="Resources\Layout\FirstView.axml" />
<AndroidResource Include="Resources\Layout\SplashScreen.axml" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\Values\Strings.xml" />
Expand Down
72 changes: 55 additions & 17 deletions OldSamples/MoreControls/MoreControls.Droid/Resources/Resource.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions OldSamples/MoreControls/MoreControls.Droid/Setup.cs
View file
@@ -1,7 +1,7 @@
using Android.Content;
using Cirrious.MvvmCross.Droid.Platform;
using Cirrious.MvvmCross.ViewModels;
using System.Collections.Generic;
using MvvmCross.Droid.Platform;
using MvvmCross.Core.ViewModels;

namespace MoreControls.Droid
{
Expand Down
42 changes: 21 additions & 21 deletions OldSamples/MoreControls/MoreControls.Droid/SplashScreen.cs
View file
@@ -1,21 +1,21 @@
using Android.App;
using Android.Content.PM;
using Cirrious.MvvmCross.Droid.Views;

namespace MoreControls.Droid
{
[Activity(
Label = "MoreControls.Droid"
, MainLauncher = true
, Icon = "@drawable/icon"
, Theme = "@style/Theme.Splash"
, NoHistory = true
, ScreenOrientation = ScreenOrientation.Portrait)]
public class SplashScreen : MvxSplashScreenActivity
{
public SplashScreen()
: base(Resource.Layout.SplashScreen)
{
}
}
}
using Android.App;
using Android.Content.PM;
using MvvmCross.Droid.Views;

namespace MoreControls.Droid
{
[Activity(
Label = "MoreControls.Droid"
, MainLauncher = true
, Icon = "@drawable/icon"
, Theme = "@style/Theme.Splash"
, NoHistory = true
, ScreenOrientation = ScreenOrientation.Portrait)]
public class SplashScreen : MvxSplashScreenActivity
{
public SplashScreen()
: base(Resource.Layout.SplashScreen)
{
}
}
}

0 comments on commit 17eea70

Please sign in to comment.