Merge pull request #1188 from dbeattie71/4.0

Fix merge of PR 1186

Cirrious/Cirrious.MvvmCross.Droid.FullFragging/Cirrious.MvvmCross.Droid.FullFragging.csproj

@@ -66,9 +66,9 @@
     <Compile Include="Fragments\MvxSimpleLayoutInflaterHolder.cs" />
     <Compile Include="MvxCachingFragmentActivity.cs" />
     <Compile Include="MvxCreateViewParameters.cs" />
+    <Compile Include="MvxFragmentAttributeExtensionMethods.cs" />
     <Compile Include="MvxFragmentViewExtensionMethods.cs" />
     <Compile Include="MvxFragmentAttribute.cs" />
-    <Compile Include="MvxFragmentAttributeExtensionMethods.cs" />
     <Compile Include="MvxTabsFragmentActivity.cs" />
     <Compile Include="Presenter\IMvxFragmentHost.cs" />
     <Compile Include="Presenter\IMvxFragmentsPresenter.cs" />

Cirrious/Cirrious.MvvmCross.Droid.FullFragging/Fragments/MvxBindingFragmentAdapter.cs

@@ -34,7 +34,7 @@ public MvxBindingFragmentAdapter(IMvxEventSourceFragment eventSource)
         protected override void HandlePauseCalled(object sender, EventArgs e)
         {
             base.HandlePauseCalled(sender, e);
-            if (!FragmentView.GetType().IsFragmentCacheable())
+            if (!FragmentView.GetType().IsCacheableFragmentAttribute())
                 return;
 
             FragmentView.RegisterFragmentViewToCacheIfNeeded();
@@ -44,7 +44,7 @@ protected override void HandleCreateCalled(object sender, MvxValueEventArgs<Bund
         {
             FragmentView.EnsureSetupInitialized();
 
-            if (!FragmentView.GetType().IsFragmentCacheable())
+            if (!FragmentView.GetType().IsCacheableFragmentAttribute())
                 return;
 
             Bundle bundle = null;
@@ -100,7 +100,7 @@ protected override void HandleCreateCalled(object sender, MvxValueEventArgs<Bund
 
         protected override void HandleSaveInstanceStateCalled(object sender, MvxValueEventArgs<Bundle> bundleArgs)
         {
-            if (!FragmentView.GetType().IsFragmentCacheable())
+            if (!FragmentView.GetType().IsCacheableFragmentAttribute())
                 return;
 
             var mvxBundle = FragmentView.CreateSaveStateBundle();

Cirrious/Cirrious.MvvmCross.Droid.FullFragging/Fragments/MvxFragmentExtensions.cs

@@ -59,10 +59,10 @@ public static Type FindAssociatedViewModelType(this IMvxFragmentView fragmentVie
 
             if (viewModelType == null)
             {
-                if (!type.HasMvxFragmentAttribute())
+                if (!type.IsCacheableFragmentAttribute())
                     throw new InvalidOperationException($"Your fragment is not generic and it does not have {nameof(MvxFragmentAttribute)} attribute set!");
 
-                var cacheableFragmentAttribute = type.GetMvxFragmentAttribute();
+                var cacheableFragmentAttribute = type.GetCacheableFragmentAttribute();
                 if (cacheableFragmentAttribute.ViewModelType == null)
                     throw new InvalidOperationException($"Your fragment is not generic and it does not use {nameof(MvxFragmentAttribute)} with ViewModel Type constructor.");
 

Cirrious/Cirrious.MvvmCross.Droid.FullFragging/MvxCachingFragmentActivity.cs

@@ -261,7 +261,7 @@ protected IEnumerable<Fragment> GetCurrentCacheableFragments()
             return currentFragments
                 .Where(fragment => fragment != null)
                 // we are not interested in fragments which are not supposed to cache!
-                .Where(fragment => fragment.GetType().IsFragmentCacheable());
+                .Where(fragment => fragment.GetType().IsCacheableFragmentAttribute());
         }
 
         protected IMvxCachedFragmentInfo GetLastFragmentInfo()

Cirrious/Cirrious.MvvmCross.Droid.FullFragging/MvxFragmentAttributeExtensionMethods.cs

@@ -0,0 +1,32 @@
+// MvxConventionAttributeExtensionMethods.cs
+// (c) Copyright Cirrious Ltd. http://www.cirrious.com
+// MvvmCross is licensed using Microsoft Public License (Ms-PL)
+// Contributions and inspirations noted in readme.md and license.txt
+//
+// Project Lead - Stuart Lodge, @slodge, me@slodge.com
+
+using System;
+using System.Linq;
+
+namespace Cirrious.MvvmCross.Droid.FullFragging
+{
+    public static class MvxFragmentAttributeExtensionMethods
+    {
+        public static bool IsCacheableFragmentAttribute(this Type candidateType)
+        {
+            var attributes = candidateType.GetCustomAttributes(typeof(MvxFragmentAttribute), true);
+            return attributes.Length > 0;
+        }
+
+        public static MvxFragmentAttribute GetCacheableFragmentAttribute(this Type fromFragmentType)
+        {
+            var attributes = fromFragmentType.GetCustomAttributes(typeof (MvxFragmentAttribute), true);
+
+            if (!attributes.Any())
+                throw new InvalidOperationException($"Type does not have {nameof(MvxFragmentAttribute)} attribute!");
+
+            var cacheableFragmentAttribute = attributes.First() as MvxFragmentAttribute;
+            return cacheableFragmentAttribute;
+        }
+    }
+}