Skip to content

Commit 3d64e43

Browse files
author
Marco Bellino
committed
Moved misplaced classes from V7 to V4
1 parent f606c51 commit 3d64e43

File tree

40 files changed

+800
-813
lines changed

40 files changed

+800
-813
lines changed

‎MvvmCross.Droid.Support.V14.Preference/MvvmCross.Droid.Support.V14.Preference.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110
<None Include="packages.config" />
111111
</ItemGroup>
112112
<ItemGroup>
113-
<ProjectReference Include="..\MvvmCross.Droid.Support.V7.Fragging\MvvmCross.Droid.Support.V7.Fragging.csproj">
114-
<Project>{5B74F15E-E377-4662-9636-4233049EDDC3}</Project>
115-
<Name>MvvmCross.Droid.Support.V7.Fragging</Name>
113+
<ProjectReference Include="..\MvvmCross.Droid.Support.V4\MvvmCross.Droid.Support.V4.csproj">
114+
<Project>{24c19002-ad02-4b88-9e57-1c254819d30e}</Project>
115+
<Name>MvvmCross.Droid.Support.V4</Name>
116116
</ProjectReference>
117117
</ItemGroup>
118118
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.2.1\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.2.1\build\Xamarin.Android.Support.Vector.Drawable.targets')" />

‎MvvmCross.Droid.Support.V14.Preference/MvxEventSourcePreferenceFragment.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using Android.Support.V14.Preferences;
3-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
3+
44
using MvvmCross.Platform.Core;
55
using Android.App;
66
using Android.OS;
7-
using MvvmCross.Droid.Support.V7.Fragging;
7+
88
using Android.Runtime;
99
using Android.Views;
1010
using MvvmCross.Droid.Shared.Fragments.EventSource;

‎MvvmCross.Droid.Support.V14.Preference/MvxPreferenceFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
22
using Android.Support.V14.Preferences;
3-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
3+
44
using Android.Runtime;
55
using Android.OS;
66
using MvvmCross.Core.ViewModels;
77
using MvvmCross.Binding.BindingContext;
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V14.Preference
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceBrowseSupportFragment.cs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
108
using MvvmCross.Droid.Shared.Fragments.EventSource;
119
using MvvmCross.Droid.Shared;
1210

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceDetailsSupportFragment.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
8+
9+
1010
using MvvmCross.Droid.Shared.Fragments.EventSource;
1111
using MvvmCross.Droid.Shared;
1212

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceGuidedStepSupportFragment.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
8+
9+
1010
using MvvmCross.Droid.Shared.Fragments.EventSource;
1111
using MvvmCross.Droid.Shared;
1212

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceHeadersSupportFragment.cs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
108
using MvvmCross.Droid.Shared.Fragments.EventSource;
119
using MvvmCross.Droid.Shared;
1210

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourcePlaybackOverlaySupportFragment.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
8+
9+
1010
using MvvmCross.Droid.Shared.Fragments.EventSource;
1111
using MvvmCross.Droid.Shared;
1212

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceRowsSupportFragment.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
8+
9+
1010
using MvvmCross.Droid.Shared.Fragments.EventSource;
1111
using MvvmCross.Droid.Shared;
1212

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/EventSource/MvxEventSourceSearchSupportFragment.cs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using MvvmCross.Platform.Core;
66
using System;
77
using Android.Support.V17.Leanback.App;
8-
using MvvmCross.Droid.Support.V7.Fragging;
9-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
108
using MvvmCross.Droid.Shared.Fragments.EventSource;
119
using MvvmCross.Droid.Shared;
1210

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxBrowseSupportFragment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
87
using MvvmCross.Droid.Shared.Fragments;
8+
using MvvmCross.Droid.Support.V4;
99

1010
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1111
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxDetailsSupportFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxGuidedStepSupportFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxHeadersSupportFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxPlaybackOverlaySupportFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxRowsSupportFragment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
using MvvmCross.Droid.Support.V4;
88
using MvvmCross.Droid.Shared.Fragments;
99

1010
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments

‎MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxSearchSupportFragment.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using MvvmCross.Core.ViewModels;
55
using MvvmCross.Droid.Support.V17.Leanback.Fragments.EventSource;
66
using System;
7-
using MvvmCross.Droid.Support.V7.Fragging.Fragments;
7+
88
using MvvmCross.Droid.Shared.Fragments;
9+
using MvvmCross.Droid.Support.V4;
910

1011
namespace MvvmCross.Droid.Support.V17.Leanback.Fragments
1112
{

‎MvvmCross.Droid.Support.V17.Leanback/MvvmCross.Droid.Support.V17.Leanback.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@
148148
</ItemGroup>
149149
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
150150
<ItemGroup>
151-
<ProjectReference Include="..\MvvmCross.Droid.Support.V7.Fragging\MvvmCross.Droid.Support.V7.Fragging.csproj">
152-
<Project>{5B74F15E-E377-4662-9636-4233049EDDC3}</Project>
153-
<Name>MvvmCross.Droid.Support.V7.Fragging</Name>
151+
<ProjectReference Include="..\MvvmCross.Droid.Support.V4\MvvmCross.Droid.Support.V4.csproj">
152+
<Project>{24c19002-ad02-4b88-9e57-1c254819d30e}</Project>
153+
<Name>MvvmCross.Droid.Support.V4</Name>
154154
</ProjectReference>
155155
<ProjectReference Include="..\MvvmCross.Droid.Support.V7.RecyclerView\MvvmCross.Droid.Support.V7.RecyclerView.csproj">
156156
<Project>{31C39E0F-116E-4EAC-921D-A79E6AA28204}</Project>

‎MvvmCross.Droid.Support.V7.Fragging/Caching/CachedFragmentManager.cs ‎MvvmCross.Droid.Support.V4/Caching/CachedFragmentManager.cs

File renamed without changes.

‎MvvmCross.Droid.Support.V7.Fragging/Caching/MvxCachingFragmentActivity.cs ‎MvvmCross.Droid.Support.V4/Caching/MvxCachingFragmentActivity.cs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
using MvvmCross.Droid.Shared.Presenter;
2525
using MvvmCross.Droid.Shared.Fragments;
2626
using Fragment = Android.Support.V4.App.Fragment;
27+
using MvvmCross.Droid.Support.V4;
2728

2829
namespace MvvmCross.Droid.Support.V7.Fragging.Caching
2930
{

‎MvvmCross.Droid.Support.V7.Fragging/Fragments/EventSource/MvxBaseFragmentAdapter.cs ‎MvvmCross.Droid.Support.V4/EventSource/MvxBaseFragmentAdapter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using MvvmCross.Droid.Shared.Fragments.EventSource;
1414
using MvvmCross.Droid.Shared;
1515

16-
namespace MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource
16+
namespace MvvmCross.Droid.Support.V4.EventSource
1717
{
1818
public class MvxBaseFragmentAdapter
1919
{

‎MvvmCross.Droid.Support.V7.Fragging/Fragments/MvxBindingFragmentAdapter.cs ‎MvvmCross.Droid.Support.V4/EventSource/MvxBindingFragmentAdapter.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414
using MvvmCross.Droid.Views;
1515
using MvvmCross.Core.ViewModels;
1616
using MvvmCross.Core.Views;
17-
using MvvmCross.Droid.Support.V7.Fragging.Fragments.EventSource;
1817
using System;
1918
using MvvmCross.Droid.Shared.Fragments.EventSource;
2019
using MvvmCross.Droid.Shared.Fragments;
2120
using MvvmCross.Droid.Shared;
2221
using MvvmCross.Droid.Shared.Attributes;
2322

24-
namespace MvvmCross.Droid.Support.V7.Fragging.Fragments
23+
namespace MvvmCross.Droid.Support.V4.EventSource
2524
{
2625
public class MvxBindingFragmentAdapter
2726
: MvxBaseFragmentAdapter

0 commit comments

Comments
 (0)