Fix #4: Support nested fragments

README.md

@@ -23,7 +23,7 @@ allprojects {
 And add next dependencies in the build.gradle of the module:
 ```gradle
 dependencies {
-    compile "com.github.VictorAlbertos:RxActivityResult:0.3.0"
+    compile "com.github.VictorAlbertos:RxActivityResult:0.3.1"
     compile "io.reactivex:rxjava:1.1.0"
 }
 ```

app/src/androidTest/java/app/ApplicationTest.java

@@ -57,6 +57,17 @@ public class ApplicationTest {
         cancelUserAction();
     }
 
+    @Test public void CheckNestedFragment() {
+        onView(withId(R.id.bt_fragment_nested)).perform(click());
+        takePhoto();
+        checkIntentSender();
+    }
+
+    @Test public void CheckNestedFragmentCancelUserAction() {
+        onView(withId(R.id.bt_fragment_nested)).perform(click());
+        cancelUserAction();
+    }
+
     private void takePhoto() {
         onView(withId(R.id.bt_camera)).perform(click());
         waitTime();

app/src/main/AndroidManifest.xml

@@ -20,6 +20,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="app.HostActivitySampleFragmentNested"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <activity
             android:name="app.HostActivitySampleFragment"
             android:label="@string/app_name"

app/src/main/java/app/HostActivitySampleFragmentNested.java

@@ -1,7 +1,18 @@
 package app;
 
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import io.victoralbertos.app.R;
+
 /**
  * Created by victor on 06/05/16.
  */
-public class HostActivitySampleFragmentNested {
-}
+
+public class HostActivitySampleFragmentNested extends AppCompatActivity {
+
+    @Override protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.host_activity_sample_fragment_nested);
+    }
+}

app/src/main/java/app/SampleParentFragmentNested.java

@@ -72,8 +72,6 @@ private void printUserCanceled() {
             Toast.makeText(getActivity(), getString(R.string.user_canceled_action), Toast.LENGTH_LONG).show();
         }
     }
-
-
 }
 
 

app/src/main/java/app/StartActivity.java

@@ -19,5 +19,9 @@ public class StartActivity extends AppCompatActivity {
         findViewById(R.id.bt_fragment).setOnClickListener(view -> {
             startActivity(new Intent(StartActivity.this, HostActivitySampleFragment.class));
         });
+
+        findViewById(R.id.bt_fragment_nested).setOnClickListener(view -> {
+            startActivity(new Intent(StartActivity.this, HostActivitySampleFragmentNested.class));
+        });
     }
 }

app/src/main/res/layout/host_activity_sample_fragment_nested.xml

@@ -8,7 +8,7 @@
         android:id="@+id/sample_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        class="app.SampleFragment"
+        class="app.SampleParentFragmentNested"
         tools:layout="@layout/sample_layout" />
 
 </LinearLayout>

app/src/main/res/layout/sample_parent_fragment_nested.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fl_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </FrameLayout>
 
 </LinearLayout>

app/src/main/res/layout/start_activity.xml

@@ -16,4 +16,10 @@
         android:layout_height="wrap_content"
         android:text="@string/using_fragment" />
 
+    <Button
+        android:id="@+id/bt_fragment_nested"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/using_nested_fragment" />
+
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -5,5 +5,6 @@
     <string name="user_canceled_action">User canceled action</string>
     <string name="using_activity">Using activity</string>
     <string name="using_fragment">Using fragment</string>
+    <string name="using_nested_fragment">Using nested fragment</string>
     <string name="intent_sender">Intent sender</string>
 </resources>

rx_activity_result/src/main/java/rx_activity_result/RxActivityResult.java

@@ -123,22 +123,32 @@ private OnResult onResultFragment() {
                     FragmentActivity fragmentActivity = (FragmentActivity) activity;
                     FragmentManager fragmentManager = fragmentActivity.getSupportFragmentManager();
 
-                    List<Fragment> fragments = fragmentManager.getFragments();
-
-                    if(fragments != null) {
-                        for(Fragment fragment : fragments){
-                            if(fragment != null && fragment.isVisible() && fragment.getClass() == clazz) {
-                                subscriber.onNext(new Result<T>((T) fragment, resultCode, data));
-                                subscriber.onCompleted();
-                                return;
-                            }
-                        }
+                    Fragment targetFragment = getTargetFragment(fragmentManager.getFragments());
+
+                    if(targetFragment != null) {
+                        subscriber.onNext(new Result<T>((T) targetFragment, resultCode, data));
+                        subscriber.onCompleted();
                     }
 
                     //If code reaches this point it means some other activity has been stacked as a secondary process.
-                    //Wait until the current activity be the target activity to get the associated fragment
+                    //Do nothing until the current activity be the target activity to get the associated fragment
                 }
             };
         }
+
+        @Nullable private Fragment getTargetFragment(List<Fragment> fragments) {
+            if (fragments == null) return null;
+
+            for (Fragment fragment : fragments) {
+                if(fragment != null && fragment.isVisible() && fragment.getClass() == clazz) {
+                    return fragment;
+                } else if (fragment.getChildFragmentManager() != null) {
+                    List<Fragment> childFragments = fragment.getChildFragmentManager().getFragments();
+                    return getTargetFragment(childFragments);
+                }
+            }
+
+            return null;
+        }
     }
 }