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

Merge branch 'view_controllers' of https://github.com/TouchInstinct/RoboSwag-components into view_controllers

This commit is contained in:
Ilia Kurtov 2016-03-17 18:34:04 +03:00
parent e9c7f79856 43515145ce
commit 6a87eeef75
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import android.support.v4.app.Fragment;
import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.ViewGroup;
import ru.touchin.roboswag.core.log.Lc;
@ -165,6 +166,10 @@ public class ViewController<TLogicBridge,
isDestroyed.onNext(true);
}
public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
return false;
}
/**
* Class to simplify constructor override.
*/

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

@ -27,6 +27,7 @@ import android.util.Pair;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
@ -175,6 +176,11 @@ public abstract class ViewControllerFragment<TState extends Serializable, TLogic
}
}
@Override
public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
return (viewController != null && viewController.onOptionsItemSelected(item)) || super.onOptionsItemSelected(item);
}
private void onViewControllerChanged(@Nullable final ViewController viewController) {
if (this.viewController != null) {
this.viewController.onDestroy();