Merge pull request #63 from nhaarman/release-0.14.0

Release 0.14.0
nhaarman · Oct 29, 2015 · 0fa0361 · 0fa0361
2 parents 5949e65 + a61f580
commit 0fa0361
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+Version 0.14.0 *(2015-10-29)*
+-----------------------------------
+
+ * Use view ids as a reference for creating presenters instead of a class.
+
 Version 0.13.2 *(2015-10-27)*
 -----------------------------------
 

diff --git a/README.md b/README.md
@@ -47,12 +47,8 @@ public class CounterScreen extends Screen<ApplicationComponent> {
   }
 
   @Override
-  public Presenter<?, ?> createPresenter(@NonNull final Class<? extends Presenter<?,?>> presenterClass) {
-    if (presenterClass.equals(CounterPresenter.class) {
-      return new CounterPresenter();
-    }
-
-    throw new AssertionError("Unknown Presenter class: " + presenterClass);
+  public Presenter<?, ?> createPresenter(final int viewId) {
+    return new CounterPresenter();
   }
 }
 ```
@@ -67,11 +63,11 @@ public class CounterView extends RelativeLayoutContainer<CounterPresenter, Activ
   protected TextView mCounterTV;
 
   public MyView(Context context, AttributeSet attrs) {
-    super(context, attrs, CounterPresenter.class);
+    super(context, attrs);
   }
 
   public MyView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr, CounterPresenter.class);
+    super(context, attrs, defStyleAttr);
   }
 
   @Override

diff --git a/triad-sample/app/src/main/java/com/nhaarman/triad/sample/editnote/EditNoteScreen.java b/triad-sample/app/src/main/java/com/nhaarman/triad/sample/editnote/EditNoteScreen.java
@@ -51,18 +51,14 @@ protected int getLayoutResId() {
 
   @NonNull
   @Override
-  protected Presenter<?, ?> createPresenter(@NonNull final Class<? extends Presenter<?, ?>> presenterClass) {
-    if (presenterClass.equals(EditNotePresenter.class)) {
-      return new EditNotePresenter(
-          mNote,
-          applicationComponent().noteValidator(),
-          applicationComponent().noteCreator(),
-          applicationComponent().noteRepository(),
-          applicationComponent().triad()
-      );
-    }
-
-    throw new AssertionError("Unknown class: " + presenterClass);
+  protected Presenter<?, ?> createPresenter(final int viewId) {
+    return new EditNotePresenter(
+        mNote,
+        applicationComponent().noteValidator(),
+        applicationComponent().noteCreator(),
+        applicationComponent().noteRepository(),
+        applicationComponent().triad()
+    );
   }
 
   @Override

diff --git a/triad-sample/app/src/main/java/com/nhaarman/triad/sample/editnote/EditNoteView.java b/triad-sample/app/src/main/java/com/nhaarman/triad/sample/editnote/EditNoteView.java
@@ -37,11 +37,11 @@ public class EditNoteView extends RelativeLayoutContainer<EditNotePresenter, Act
   protected EditText mContentsET;
 
   public EditNoteView(final Context context, final AttributeSet attrs) {
-    super(context, attrs, EditNotePresenter.class);
+    super(context, attrs);
   }
 
   public EditNoteView(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, EditNotePresenter.class);
+    super(context, attrs, defStyle);
   }
 
   @OnClick(R.id.view_editnote_savebutton)

diff --git a/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/NotesScreen.java b/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/NotesScreen.java
@@ -32,20 +32,20 @@ protected int getLayoutResId() {
 
   @NonNull
   @Override
-  protected Presenter<?, ?> createPresenter(@NonNull final Class<? extends Presenter<?, ?>> presenterClass) {
-    if (presenterClass.equals(NotesPresenter.class)) {
+  protected Presenter<?, ?> createPresenter(final int viewId) {
+    if (viewId == R.id.view_notes) {
       return new NotesPresenter(
           applicationComponent().triad()
       );
     }
 
-    if (presenterClass.equals(NotesListPresenter.class)) {
+    if (viewId == R.id.view_notes_noteslistview) {
       return new NotesListPresenter(
           applicationComponent().noteRepository(),
-          (NotesListPresenter.OnNoteClickedListener) getPresenter(NotesPresenter.class)
+          (NotesListPresenter.OnNoteClickedListener) getPresenter(R.id.view_notes)
       );
     }
 
-    throw new AssertionError("Unknown presenter class: " + presenterClass);
+    throw new AssertionError("Unknown presenter class for view with id: " + viewId);
   }
 }
diff --git a/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/NotesView.java b/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/NotesView.java
@@ -31,11 +31,11 @@ public class NotesView extends RelativeLayoutContainer<NotesPresenter, ActivityC
   protected NotesListView mNotesListView;
 
   public NotesView(final Context context, final AttributeSet attrs) {
-    super(context, attrs, NotesPresenter.class);
+    super(context, attrs);
   }
 
   public NotesView(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, NotesPresenter.class);
+    super(context, attrs, defStyle);
   }
 
   @OnClick(R.id.view_notes_createnotebutton)

diff --git a/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/noteslist/NotesListView.java b/triad-sample/app/src/main/java/com/nhaarman/triad/sample/notes/noteslist/NotesListView.java
@@ -43,7 +43,7 @@ public NotesListView(final Context context, final AttributeSet attrs) {
   }
 
   public NotesListView(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, NotesListPresenter.class);
+    super(context, attrs, defStyle);
     mAdapter = new MyAdapter();
   }
 

diff --git a/...e/app/src/test/java/com/nhaarman/triad/sample/notes/noteslist/NotesListPresenterTest.java b/...e/app/src/test/java/com/nhaarman/triad/sample/notes/noteslist/NotesListPresenterTest.java
@@ -7,16 +7,12 @@
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
+import org.mockito.*;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
-@SuppressWarnings("rawtypes")
 public class NotesListPresenterTest {
 
   private NotesListPresenter mNotesListPresenter;

diff --git a/triad-tests/src/main/java/com/nhaarman/triad/tests/firstscreen/FirstScreen.java b/triad-tests/src/main/java/com/nhaarman/triad/tests/firstscreen/FirstScreen.java
@@ -31,7 +31,7 @@ protected int getLayoutResId() {
 
   @NonNull
   @Override
-  protected Presenter<?, ?> createPresenter(@NonNull final Class<? extends Presenter<?, ?>> presenterClass) {
+  protected Presenter<?, ?> createPresenter(final int viewId) {
     return new FirstScreenPresenter();
   }
 }
diff --git a/triad-tests/src/main/java/com/nhaarman/triad/tests/firstscreen/FirstScreenView.java b/triad-tests/src/main/java/com/nhaarman/triad/tests/firstscreen/FirstScreenView.java
@@ -27,11 +27,11 @@ public class FirstScreenView extends RelativeLayoutContainer<FirstScreenPresente
     implements FirstScreenContainer {
 
   public FirstScreenView(final Context context, final AttributeSet attrs) {
-    super(context, attrs, FirstScreenPresenter.class);
+    super(context, attrs);
   }
 
   public FirstScreenView(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, FirstScreenPresenter.class);
+    super(context, attrs, defStyle);
   }
 
   @OnClick(com.nhaarman.triad.tests.R.id.view_screen_first_button)

diff --git a/triad-tests/src/main/java/com/nhaarman/triad/tests/secondscreen/SecondScreen.java b/triad-tests/src/main/java/com/nhaarman/triad/tests/secondscreen/SecondScreen.java
@@ -31,7 +31,7 @@ protected int getLayoutResId() {
 
   @NonNull
   @Override
-  protected Presenter<?, ?> createPresenter(@NonNull final Class<? extends Presenter<?, ?>> presenterClass) {
+  protected Presenter<?, ?> createPresenter(final int viewId) {
     return new SecondScreenPresenter();
   }
 }
diff --git a/triad-tests/src/main/java/com/nhaarman/triad/tests/secondscreen/SecondScreenView.java b/triad-tests/src/main/java/com/nhaarman/triad/tests/secondscreen/SecondScreenView.java
@@ -24,10 +24,10 @@
 public class SecondScreenView extends RelativeLayoutContainer<SecondScreenPresenter, ActivityComponent> implements SecondScreenContainer {
 
   public SecondScreenView(final Context context, final AttributeSet attrs) {
-    super(context, attrs, SecondScreenPresenter.class);
+    super(context, attrs);
   }
 
   public SecondScreenView(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, SecondScreenPresenter.class);
+    super(context, attrs, defStyle);
   }
 }
diff --git a/triad/src/main/java/com/nhaarman/triad/ListViewContainer.java b/triad/src/main/java/com/nhaarman/triad/ListViewContainer.java
@@ -44,15 +44,15 @@ public abstract class ListViewContainer<
   @NonNull
   private final ActivityComponent mActivityComponent;
 
-  public ListViewContainer(final Context context, final AttributeSet attrs, final Class<P> presenterClass) {
-    this(context, attrs, 0, presenterClass);
+  public ListViewContainer(final Context context, final AttributeSet attrs) {
+    this(context, attrs, 0);
   }
 
-  public ListViewContainer(final Context context, final AttributeSet attrs, final int defStyle, final Class<P> presenterClass) {
+  public ListViewContainer(final Context context, final AttributeSet attrs, final int defStyle) {
     super(context, attrs, defStyle);
 
     mActivityComponent = findActivityComponent(context);
-    mPresenter = findPresenter(context, presenterClass);
+    mPresenter = findPresenter(context, getId());
   }
 
   /**

diff --git a/triad/src/main/java/com/nhaarman/triad/RelativeLayoutContainer.java b/triad/src/main/java/com/nhaarman/triad/RelativeLayoutContainer.java
@@ -44,15 +44,15 @@ public abstract class RelativeLayoutContainer<
   @NonNull
   private final ActivityComponent mActivityComponent;
 
-  public RelativeLayoutContainer(final Context context, final AttributeSet attrs, final Class<P> presenterClass) {
-    this(context, attrs, 0, presenterClass);
+  public RelativeLayoutContainer(final Context context, final AttributeSet attrs) {
+    this(context, attrs, 0);
   }
 
-  public RelativeLayoutContainer(final Context context, final AttributeSet attrs, final int defStyle, final Class<P> presenterClass) {
+  public RelativeLayoutContainer(final Context context, final AttributeSet attrs, final int defStyle) {
     super(context, attrs, defStyle);
 
     mActivityComponent = findActivityComponent(context);
-    mPresenter = findPresenter(context, presenterClass);
+    mPresenter = findPresenter(context, getId());
   }
 
   /**

diff --git a/triad/src/main/java/com/nhaarman/triad/Screen.java b/triad/src/main/java/com/nhaarman/triad/Screen.java
@@ -19,18 +19,17 @@
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import java.util.HashMap;
-import java.util.Map;
 
 import static com.nhaarman.triad.Preconditions.checkNotNull;
 
 public abstract class Screen<ApplicationComponent> implements TransitionAnimator {
 
   @NonNull
-  private final Map<Class<?>, Presenter<?, ?>> mPresenters = new HashMap<>();
+  private final SparseArray<Presenter<?, ?>> mPresenters = new SparseArray<>();
 
   @Nullable
   private ApplicationComponent mApplicationComponent;
@@ -44,16 +43,16 @@ protected ViewGroup createView(@NonNull final ViewGroup parent) {
   }
 
   @NonNull
-  public Presenter<?, ?> getPresenter(@NonNull final Class<? extends Presenter<?, ?>> presenterClass) {
-    if (!mPresenters.containsKey(presenterClass)) {
-      mPresenters.put(presenterClass, createPresenter(presenterClass));
+  public Presenter<?, ?> getPresenter(final int viewId) {
+    if (mPresenters.valueAt(viewId) == null) {
+      mPresenters.put(viewId, createPresenter(viewId));
     }
 
-    return mPresenters.get(presenterClass);
+    return mPresenters.get(viewId);
   }
 
   @NonNull
-  protected abstract Presenter<?, ?> createPresenter(@NonNull Class<? extends Presenter<?, ?>> presenterClass);
+  protected abstract Presenter<?, ?> createPresenter(int viewId);
 
   @Override
   public boolean animateTransition(@Nullable final View oldView,

diff --git a/triad/src/main/java/com/nhaarman/triad/TriadUtil.java b/triad/src/main/java/com/nhaarman/triad/TriadUtil.java
@@ -28,15 +28,15 @@ public static <ActivityComponent> ActivityComponent findActivityComponent(@NonNu
   }
 
   @NonNull
-  public static <P extends Presenter<?, ?>> P findPresenter(@NonNull final Context context, @NonNull final Class<P> presenterClass) {
+  public static <P extends Presenter<?, ?>> P findPresenter(@NonNull final Context context, final int viewId) {
     Context baseContext = context;
     while (!(baseContext instanceof Activity) && baseContext instanceof ContextWrapper) {
       baseContext = ((ContextWrapper) baseContext).getBaseContext();
     }
 
     if (baseContext instanceof ScreenProvider) {
       //noinspection unchecked
-      return (P) ((ScreenProvider) baseContext).getCurrentScreen().getPresenter(presenterClass);
+      return (P) ((ScreenProvider) baseContext).getCurrentScreen().getPresenter(viewId);
     } else {
        /* We return null, since the layout editor can not return the ScreenProvider. */
       //noinspection ConstantConditions

diff --git a/triad/src/test/java/com/nhaarman/triad/RelativeLayoutContainerTest.java b/triad/src/test/java/com/nhaarman/triad/RelativeLayoutContainerTest.java
@@ -7,11 +7,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.withSettings;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.*;
 
 public class RelativeLayoutContainerTest {
 
@@ -30,7 +27,7 @@ public void setUp() {
 
     Screen<ApplicationComponent> screen = mock(Screen.class);
     mPresenterMock = mock(Presenter.class);
-    when(screen.getPresenter(any(Class.class))).thenReturn(mPresenterMock);
+    when(screen.getPresenter(anyInt())).thenReturn(mPresenterMock);
 
     when(((ScreenProvider<ApplicationComponent>) activity).getCurrentScreen()).thenReturn(screen);
     mActivityComponentMock = mock(ActivityComponent.class);

diff --git a/triad/src/test/java/com/nhaarman/triad/TestRelativeLayoutContainer.java b/triad/src/test/java/com/nhaarman/triad/TestRelativeLayoutContainer.java
@@ -6,7 +6,7 @@
 public class TestRelativeLayoutContainer extends RelativeLayoutContainer<TestPresenter, ActivityComponent> {
 
   public TestRelativeLayoutContainer(final Context context, final AttributeSet attrs, final int defStyle) {
-    super(context, attrs, defStyle, TestPresenter.class);
+    super(context, attrs, defStyle);
   }
 
   @Override