Merge airbnb:master

epoxy-adapter/src/main/java/com/airbnb/epoxy/EpoxyModel.java

@@ -20,7 +20,10 @@
 
 /**
  * Helper to bind data to a view using a builder style. The parameterized type should extend
- * Android's View.
+ * Android's View or EpoxyHolder.
+ *
+ * @see EpoxyModelWithHolder
+ * @see EpoxyModelWithView
  */
 public abstract class EpoxyModel<T> {
 
@@ -53,7 +56,7 @@ public abstract class EpoxyModel<T> {
   /**
    * Models are staged when they are changed. This allows them to be automatically added when they
    * are done being changed (eg the next model is changed/added or buildModels finishes). It is only
-   * allowed for AutoModels, and only if implicity adding is enabled.
+   * allowed for AutoModels, and only if implicit adding is enabled.
    */
   EpoxyController controllerToStageTo;
   private boolean currentlyInInterceptors;

epoxy-adapter/src/main/java/com/airbnb/epoxy/EpoxyModelWithHolder.java

@@ -46,20 +46,20 @@ public void unbind(@NonNull T holder) {
 
 
   @Override
-  public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T view) {
-    super.onVisibilityStateChanged(visibilityState, view);
+  public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T holder) {
+    super.onVisibilityStateChanged(visibilityState, holder);
   }
 
   @Override
   public void onVisibilityChanged(
       @FloatRange(from = 0, to = 100) float percentVisibleHeight,
       @FloatRange(from = 0, to = 100) float percentVisibleWidth,
       @Px int visibleHeight, @Px int visibleWidth,
-      @NonNull T view) {
+      @NonNull T holder) {
     super.onVisibilityChanged(
         percentVisibleHeight, percentVisibleWidth,
         visibleHeight, visibleWidth,
-        view);
+        holder);
   }
 
   @Override

epoxy-adapter/src/main/java/com/airbnb/epoxy/EpoxyViewHolder.java

@@ -26,7 +26,7 @@ public EpoxyViewHolder(View view, boolean saveInitialState) {
     if (saveInitialState) {
       // We save the initial state of the view when it is created so that we can reset this initial
       // state before a model is bound for the first time. Otherwise the view may carry over
-      // state from a previously bound view.
+      // state from a previously bound model.
       initialViewState = new ViewState();
       initialViewState.save(itemView);
     }

epoxy-adapter/src/main/java/com/airbnb/epoxy/GeneratedModel.java

@@ -15,7 +15,7 @@ public interface GeneratedModel<T> {
    * listener.
    * <p>
    * We don't want to rely on the main onBind method to dispatch the onBind listener call because
-   * there on two onBind methods (one for payloads and one for no payloads), and one can call into
+   * there are two onBind methods (one for payloads and one for no payloads), and one can call into
    * the other. We don't want to dispatch two onBind listener calls in that case.
    */
   void handlePostBind(T objectToBind, int position);

epoxy-adapter/src/main/java/com/airbnb/epoxy/OnModelCheckedChangeListener.java

@@ -8,7 +8,7 @@ public interface OnModelCheckedChangeListener<T extends EpoxyModel<?>, V> {
    *
    * @param model       The model that the view is bound to.
    * @param parentView  The view bound to the model which received the click.
-   * @param clickedView The view that received the click. This is either a child of the parentView
+   * @param checkedView The view that received the click. This is either a child of the parentView
    *                    or the parentView itself
    * @param isChecked   The new value for isChecked property.
    * @param position    The position of the model in the adapter.