TouchInstinct
/
RoboSwag-components
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

until stop added

This commit is contained in:
Gavriil Sitnikov 2016-04-07 16:43:33 +03:00
parent 8b45d9a97a
commit 63d8979ef8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
View File

@ -135,7 +135,8 @@ public class FragmentNavigation {
@SuppressWarnings("PMD.ShortMethodName")
public boolean up() {
return backTo(backStackEntry -> backStackEntry.getName().endsWith(TOP_FRAGMENT_TAG_MARK));
return backTo(backStackEntry ->
backStackEntry.getName() != null && backStackEntry.getName().endsWith(TOP_FRAGMENT_TAG_MARK));
}
public void push(@NonNull final Class<? extends Fragment> fragmentClass) {

6
src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
View File

@ -123,6 +123,12 @@ public class ViewController<TLogic extends Logic,
.takeUntil(isDestroyedSubject.filter(isDestroyed -> isDestroyed));
}
@NonNull
protected <T> Observable<T> untilStop(@NonNull final Observable<T> observable) {
return observable.observeOn(AndroidSchedulers.mainThread())
.takeUntil(isStartedSubject.filter(isStarted -> !isStarted));
}
public void onStart() {
isStartedSubject.onNext(true);
}