Skip to content
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

Star wars sample update to v.6.2.0 #130

Merged
merged 3 commits into from
Sep 14, 2018
Merged

Star wars sample update to v.6.2.0 #130

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e25ed30
Update MvvmCross and Plugins from 6.1.2 to 6.2.0.
FabriBertani Sep 14, 2018
7991852
Fix StarWarsSample.Forms.Android issue: app stuck on SplashScreen aft…
FabriBertani Sep 14, 2018
fff9b4e
Removed unnecessary method from StarWarsSample.Forms.Android Setup
FabriBertani Sep 14, 2018
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
2 changes: 1 addition & 1 deletion StarWarsSample/StarWarsSample.Core/App.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public override void Initialize()
.AsInterfaces()
.RegisterAsLazySingleton();

Mvx.RegisterSingleton<IUserDialogs>(() => UserDialogs.Instance);
Mvx.IoCProvider.RegisterSingleton<IUserDialogs>(() => UserDialogs.Instance);

// register the appstart object
RegisterCustomAppStart<AppStart>();
Expand Down
13 changes: 7 additions & 6 deletions StarWarsSample/StarWarsSample.Core/AppStart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using MvvmCross.Navigation;
using System.Threading.Tasks;
using MvvmCross.Navigation;
using MvvmCross.ViewModels;
using StarWarsSample.Core.ViewModels;

Expand All @@ -9,11 +10,11 @@ public class AppStart : MvxAppStart
public AppStart(IMvxApplication app, IMvxNavigationService mvxNavigationService)
: base(app, mvxNavigationService)
{
}

protected override void NavigateToFirstViewModel(object hint = null)
{
NavigationService.Navigate<MainViewModel>();
}
protected override Task NavigateToFirstViewModel(object hint = null)
{
return NavigationService.Navigate<MainViewModel>();
}
}
}
8 changes: 4 additions & 4 deletions StarWarsSample/StarWarsSample.Core/StarWarsSample.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.0.1" />
<PackageReference Include="OxyPlot.Core" Version="2.0.0-unstable1035" />
<PackageReference Include="MvvmCross" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="6.1.2" />
<PackageReference Include="MvvmCross" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="6.2.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\Strings.resx">
Expand Down
44 changes: 33 additions & 11 deletions StarWarsSample/StarWarsSample.Droid/StarWarsSample.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,6 @@
<PackageReference Include="OxyPlot.Xamarin.Android" Version="1.1.0-unstable0011" />
<PackageReference Include="Refractored.Controls.CircleImageView" Version="1.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="MvvmCross" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.Core.UI" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.Core.Utils" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.Design" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.Fragment" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.V7.AppCompat" Version="6.1.2" />
<PackageReference Include="MvvmCross.Droid.Support.V7.RecyclerView" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Color" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="6.1.2" />
<PackageReference Include="Com.Airbnb.Android.Lottie" Version="2.5.4" />
<PackageReference Include="Xamarin.Android.Arch.Core.Common" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Android.Arch.Lifecycle.Common" Version="1.0.3.1" />
Expand All @@ -87,6 +76,39 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="27.0.2.1" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="27.0.2.1" />
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
<PackageReference Include="MvvmCross">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Core.UI">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Core.Utils">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Design">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Fragment">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.V7.AppCompat">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.V7.RecyclerView">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Color">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Visibility">
<Version>6.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Resources\Resource.designer.cs" />
Expand Down
5 changes: 2 additions & 3 deletions StarWarsSample/StarWarsSample.Forms/StarWarsSample.Forms.Android/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ public class Setup : MvxFormsAndroidSetup<Core.App, App>
{
protected override IMvxFormsPagePresenter CreateFormsPagePresenter(IMvxFormsViewPresenter viewPresenter)
{
// workaround which should be removed when https://github.com/MvvmCross/MvvmCross/pull/2972 is released
var presenter = base.CreateFormsPagePresenter(viewPresenter);
Mvx.RegisterSingleton<IMvxFormsPagePresenter>(presenter);
var presenter = new MvxFormsPagePresenter(viewPresenter);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these lines if the workaround isn't necessary anymore.

Mvx.IoCProvider.RegisterSingleton<IMvxFormsPagePresenter>(presenter);
return presenter;
}
}
Expand Down
11 changes: 6 additions & 5 deletions StarWarsSample/StarWarsSample.Forms/StarWarsSample.Forms.Android/SplashScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Android.App;
using System.Threading.Tasks;
using Android.App;
using Android.Content.PM;
using Android.OS;
using MvvmCross.Forms.Platforms.Android.Views;
Expand All @@ -18,12 +19,12 @@ public class SplashScreen : MvxFormsSplashScreenActivity<Setup, Core.App, App>
public SplashScreen()
: base(Resource.Layout.SplashScreen)
{
}
}

protected override void RunAppStart(Bundle bundle)
{
protected override Task RunAppStartAsync(Bundle bundle)
{
StartActivity(typeof(RootActivity));
base.RunAppStart(bundle);
return Task.CompletedTask;
}
}
}
54 changes: 27 additions & 27 deletions ...ample/StarWarsSample.Forms/StarWarsSample.Forms.Android/StarWarsSample.Forms.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,6 @@
<PackageReference Include="Acr.UserDialogs">
<Version>7.0.1</Version>
</PackageReference>
<PackageReference Include="MvvmCross">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Design">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Fragment">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.V7.AppCompat">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Forms">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.JsonLocalization">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.ResourceLoader">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
</PackageReference>
Expand Down Expand Up @@ -141,6 +114,33 @@
<PackageReference Include="OxyPlot.Xamarin.Forms">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Forms">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.JsonLocalization">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.ResourceLoader">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Design">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.Fragment">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Droid.Support.V7.AppCompat">
<Version>6.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="LinkerPleaseInclude.cs" />
Expand Down
36 changes: 18 additions & 18 deletions StarWarsSample/StarWarsSample.Forms/StarWarsSample.Forms.iOS/StarWarsSample.Forms.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,24 +131,6 @@
<PackageReference Include="Acr.UserDialogs">
<Version>7.0.1</Version>
</PackageReference>
<PackageReference Include="MvvmCross">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Forms">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.JsonLocalization">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.ResourceLoader">
<Version>6.1.2</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
</PackageReference>
Expand All @@ -174,6 +156,24 @@
<PackageReference Include="OxyPlot.Xamarin.Forms">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Forms">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.JsonLocalization">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.ResourceLoader">
<Version>6.2.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions StarWarsSample/StarWarsSample.Forms/StarWarsSample.Forms/StarWarsSample.Forms.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MvvmCross" Version="6.1.2" />
<PackageReference Include="MvvmCross.Forms" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.ResourceLoader" Version="6.1.2" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.3.840" />
<PackageReference Include="Xamarin.FFImageLoading.Svg" Version="2.4.3.840" />
<PackageReference Include="Xamarin.FFImageLoading.Svg.Forms" Version="2.4.3.840" />
Expand All @@ -19,6 +13,12 @@
<PackageReference Include="Acr.UserDialogs" Version="7.0.1" />
<PackageReference Include="Com.Airbnb.Xamarin.Forms.Lottie" Version="2.5.4" />
<PackageReference Include="OxyPlot.Xamarin.Forms" Version="1.0.0" />
<PackageReference Include="MvvmCross" Version="6.2.0" />
<PackageReference Include="MvvmCross.Forms" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.2.0" />
<PackageReference Include="MvvmCross.Plugin.ResourceLoader" Version="6.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 15 additions & 5 deletions StarWarsSample/StarWarsSample.iOS/StarWarsSample.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,28 @@
<PackageReference Include="OxyPlot.Core" Version="2.0.0-unstable1035" />
<PackageReference Include="OxyPlot.Xamarin.iOS" Version="1.1.0-unstable0011" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="MvvmCross" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Json" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Color" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="6.1.2" />
<PackageReference Include="MvvmCross.Plugin.Visibility" Version="6.1.2" />
<PackageReference Include="TZStackView" Version="1.1.1" />
<PackageReference Include="Com.Airbnb.iOS.Lottie">
<Version>2.5.4</Version>
</PackageReference>
<PackageReference Include="Cirrious.FluentLayout">
<Version>2.7.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Color">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Json">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Messenger">
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmCross.Plugin.Visibility">
<Version>6.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StarWarsSample.Core\StarWarsSample.Core.csproj">
Expand Down