Merge pull request #2482 from Qwin/supportnestedfragments

[WIP] Added support for nested fragments (ChildFragmentManager)
MvvmCross · Jan 10, 2018 · 4a1fae7 · 4a1fae7
2 parents a5f61fd + 569e311
commit 4a1fae7
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 3 deletions.
diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxCachingFragmentPagerAdapter.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxCachingFragmentPagerAdapter.cs
@@ -101,6 +101,12 @@ public override Object InstantiateItem(ViewGroup container, int position)
             if (fss != null)
                 fragment.SetInitialSavedState(fss);
 
+            //if fragment tag is null let's set it to something meaning full;
+            if (string.IsNullOrEmpty(fragmentTag))
+            {
+                fragmentTag = FragmentJavaName(fragment.GetType());
+            }
+
 #if DEBUG
             Mvx.Trace("Adding item #{0}: f={1} t={2}", position, fragment, fragmentTag);
 #endif
@@ -116,6 +122,11 @@ public override Object InstantiateItem(ViewGroup container, int position)
             return fragment;
         }
 
+        protected string FragmentJavaName(Type fragmentType)
+        {
+            return Class.FromType(fragmentType).Name;
+        }
+
         public override bool IsViewFromObject(View view, Object objectValue)
         {
             return ((Fragment)objectValue).View == view;

diff --git a/...ss-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxCachingFragmentStatePagerAdapter.cs b/...ss-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxCachingFragmentStatePagerAdapter.cs
@@ -38,7 +38,7 @@ public MvxCachingFragmentStatePagerAdapter(Context context, FragmentManager frag
 
         public List<MvxViewPagerFragmentInfo> FragmentsInfo { get; }
 
-        protected static string FragmentJavaName(Type fragmentType)
+        protected string FragmentJavaName(Type fragmentType)
         {
             return Class.FromType(fragmentType).Name;
         }

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatViewPresenter.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatViewPresenter.cs
@@ -584,7 +584,36 @@ protected override IMvxFragmentView CreateFragment(MvxBasePresentationAttribute
         protected virtual new Fragment GetFragmentByViewType(Type type)
         {
             var fragmentName = FragmentJavaName(type);
-            return CurrentFragmentManager?.FindFragmentByTag(fragmentName);
+            var fragment = CurrentFragmentManager?.FindFragmentByTag(fragmentName);
+
+            if (fragment != null)
+            {
+                return fragment;
+            }
+
+            return FindFragmentInChildren(fragmentName, CurrentFragmentManager);
+        }
+
+        protected virtual Fragment FindFragmentInChildren(string fragmentName, FragmentManager fragManager)
+        {
+            if (fragManager?.Fragments != null && !fragManager.Fragments.Any()) return null;
+
+            foreach (var fragment in fragManager.Fragments)
+            {
+                //let's try again finding it
+                var frag = fragment?.ChildFragmentManager?.FindFragmentByTag(fragmentName);
+
+                //if we found the frag lets return it!
+                if (frag != null)
+                {
+                    return frag;
+                }
+
+                //reloop for other fragments
+                FindFragmentInChildren(fragmentName, fragment?.ChildFragmentManager);
+            }
+
+            return null;
         }
     }
 }
diff --git a/MvvmCross/Droid/Droid/Views/MvxAndroidViewPresenter.cs b/MvvmCross/Droid/Droid/Views/MvxAndroidViewPresenter.cs
@@ -570,7 +570,39 @@ protected virtual IMvxFragmentView CreateFragment(MvxBasePresentationAttribute a
         protected virtual Fragment GetFragmentByViewType(Type type)
         {
             var fragmentName = FragmentJavaName(type);
-            return CurrentFragmentManager.FindFragmentByTag(fragmentName);
+            var fragment = CurrentFragmentManager?.FindFragmentByTag(fragmentName);
+
+            if (fragment != null)
+            {
+                return fragment;
+            }
+
+            return FindFragmentInChildren(fragmentName, CurrentFragmentManager);
+        }
+
+        protected virtual Fragment FindFragmentInChildren(string fragmentName, FragmentManager fragManager)
+        {
+            if(fragManager.BackStackEntryCount == 0)
+                return null;
+
+            for (int i = 0; i < fragManager.BackStackEntryCount; i++)
+            {
+                var parentFrag = fragManager.FindFragmentById(fragManager.GetBackStackEntryAt(i).Id);
+
+                //let's try again finding it
+                var frag = parentFrag?.ChildFragmentManager?.FindFragmentByTag(fragmentName);
+
+                //if we found the frag lets return it!
+                if (frag != null)
+                {
+                    return frag;
+                }
+
+                //reloop for other fragments
+                FindFragmentInChildren(fragmentName, parentFrag?.ChildFragmentManager);
+            }
+
+            return null;
         }
     }
 }