Skip to content
This repository has been archived by the owner on Mar 1, 2021. It is now read-only.

Commit

Permalink
Merge pull request #58 from nhaarman/release-0.11.2
Browse files Browse the repository at this point in the history
Release 0.11.2
  • Loading branch information
nhaarman committed Aug 27, 2015
2 parents c1cff8e + b7be503 commit 44c20db
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

Version 0.11.2 *(2015-08-27)*
-----------------------------------

* Set Triad instance to drawer presenter

Version 0.11.1 *(2015-08-25)*
-----------------------------------

Expand Down
5 changes: 3 additions & 2 deletions triad/src/main/java/com/nhaarman/triad/DrawerScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ public abstract class DrawerScreen<
* @return The {@link P}.
*/
@NonNull
private DP getDrawerPresenter(@NonNull final ApplicationComponent applicationComponent) {
private DP getDrawerPresenter(@NonNull final ApplicationComponent applicationComponent, @NonNull final Triad triad) {
if (mDrawerPresenter == null) {
mDrawerPresenter = createDrawerPresenter(applicationComponent);
mDrawerPresenter.setTriad(triad);
}

return mDrawerPresenter;
Expand All @@ -59,7 +60,7 @@ void acquirePresenter(@NonNull final ApplicationComponent applicationComponent,
@NonNull final ViewGroup container) {
DC dc = (DC) container.getChildAt(1);

dc.setPresenterAndActivityComponent(getDrawerPresenter(applicationComponent), activityComponent);
dc.setPresenterAndActivityComponent(getDrawerPresenter(applicationComponent, triad), activityComponent);
super.acquirePresenter(applicationComponent, activityComponent, triad, (ViewGroup) container.getChildAt(0));
}
}

0 comments on commit 44c20db

Please sign in to comment.