Rename Delegates coherently; Fix #14 ; Fix #23; Fix #24

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/MvpActivity.java

@@ -19,7 +19,7 @@
 import android.os.Bundle;
 import com.hannesdorfmann.mosby.MosbyActivity;
 import com.hannesdorfmann.mosby.mvp.delegate.ActivityMvpDelegate;
-import com.hannesdorfmann.mosby.mvp.delegate.DefaultActivityMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ActivityMvpDelegateImpl;
 import com.hannesdorfmann.mosby.mvp.delegate.MvpDelegateCallback;
 
 /**
@@ -104,11 +104,11 @@ public abstract class MvpActivity<V extends MvpView, P extends MvpPresenter<V>>
    * Only override this method if you really know what you are doing.
    * </p>
    *
-   * @return {@link DefaultActivityMvpDelegate}
+   * @return {@link ActivityMvpDelegateImpl}
    */
   protected ActivityMvpDelegate<V, P> getMvpDelegate() {
     if (mvpDelegate == null) {
-      mvpDelegate = new DefaultActivityMvpDelegate(this);
+      mvpDelegate = new ActivityMvpDelegateImpl(this);
     }
 
     return mvpDelegate;

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/MvpFragment.java

@@ -21,7 +21,7 @@
 import android.support.annotation.Nullable;
 import android.view.View;
 import com.hannesdorfmann.mosby.MosbyFragment;
-import com.hannesdorfmann.mosby.mvp.delegate.DefaultFragmentMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.FragmentMvpDelegateImpl;
 import com.hannesdorfmann.mosby.mvp.delegate.FragmentMvpDelegate;
 import com.hannesdorfmann.mosby.mvp.delegate.MvpDelegateCallback;
 
@@ -62,11 +62,11 @@ public abstract class MvpFragment<V extends MvpView, P extends MvpPresenter<V>>
    * Only override this method if you really know what you are doing.
    * </p>
    *
-   * @return {@link DefaultFragmentMvpDelegate}
+   * @return {@link FragmentMvpDelegateImpl}
    */
   protected FragmentMvpDelegate<V, P> getMvpDelegate() {
     if (mvpDelegate == null) {
-      mvpDelegate = new DefaultFragmentMvpDelegate<>(this);
+      mvpDelegate = new FragmentMvpDelegateImpl<>(this);
     }
 
     return mvpDelegate;

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/DefaultActivityMvpDelegate.java → mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ActivityMvpDelegateImpl.java

@@ -29,13 +29,13 @@
  * @see ActivityMvpDelegate
  * @since 1.1.0
  */
-public class DefaultActivityMvpDelegate<V extends MvpView, P extends MvpPresenter<V>>
+public class ActivityMvpDelegateImpl<V extends MvpView, P extends MvpPresenter<V>>
     implements ActivityMvpDelegate {
 
   protected MvpInternalDelegate<V, P> internalDelegate;
   protected MvpDelegateCallback<V, P> delegateCallback;
 
-  public DefaultActivityMvpDelegate(MvpDelegateCallback<V, P> delegateCallback) {
+  public ActivityMvpDelegateImpl(MvpDelegateCallback<V, P> delegateCallback) {
     if (delegateCallback == null){
       throw new NullPointerException(delegateCallback.getClass().getSimpleName()+" is null!");
     }

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/DefaultFragmentMvpDelegate.java → mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/FragmentMvpDelegateImpl.java

@@ -32,13 +32,13 @@
  * @see FragmentMvpDelegate
  * @since 1.1.0
  */
-public class DefaultFragmentMvpDelegate<V extends MvpView, P extends MvpPresenter<V>>
+public class FragmentMvpDelegateImpl<V extends MvpView, P extends MvpPresenter<V>>
     implements FragmentMvpDelegate<V, P> {
 
   protected MvpDelegateCallback<V, P> delegateCallback;
   protected MvpInternalDelegate<V, P> internalDelegate;
 
-  public DefaultFragmentMvpDelegate(MvpDelegateCallback<V, P> delegateCallback) {
+  public FragmentMvpDelegateImpl(MvpDelegateCallback<V, P> delegateCallback) {
     if (delegateCallback == null) {
       throw new NullPointerException(delegateCallback.getClass().getSimpleName() + " is null!");
     }

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/MvpDelegateCallback.java

@@ -21,7 +21,7 @@
 
 /**
  * The MvpDelegate callback that will be called from {@link ActivityMvpDelegate} or {@link
- * FragmentMvpDelegate} or {@link ViewMvpDelegate}. This interface must be implemented by all
+ * FragmentMvpDelegate} or {@link ViewGroupMvpDelegate}. This interface must be implemented by all
  * Activity,
  * Fragment or android.view.View that you want to support mosbys mvp.y
  *

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ViewMvpDelegate.java → mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ViewGroupMvpDelegate.java

@@ -36,7 +36,7 @@
  * @author Hannes Dorfmann
  * @since 1.1.0
  */
-public interface ViewMvpDelegate<V extends MvpView, P extends MvpPresenter<V>> {
+public interface ViewGroupMvpDelegate<V extends MvpView, P extends MvpPresenter<V>> {
 
   /**
    * Must be called from {@link View#onAttachedToWindow()}

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/DefaultViewMvpDelegate.java → mvp/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ViewGroupMvpDelegateImpl.java

@@ -20,19 +20,19 @@
 import com.hannesdorfmann.mosby.mvp.MvpView;
 
 /**
- * The default implementation of {@link ViewMvpDelegate}
+ * The default implementation of {@link ViewGroupMvpDelegate}
  *
  * @author Hannes Dorfmann
- * @see ViewMvpDelegate
+ * @see ViewGroupMvpDelegate
  * @since 1.1.0
  */
-public class DefaultViewMvpDelegate<V extends MvpView, P extends MvpPresenter<V>>
-    implements ViewMvpDelegate<V, P> {
+public class ViewGroupMvpDelegateImpl<V extends MvpView, P extends MvpPresenter<V>>
+    implements ViewGroupMvpDelegate<V, P> {
 
   protected MvpDelegateCallback<V, P> delegateCallback;
   protected MvpInternalDelegate<V, P> internalDelegate;
 
-  public DefaultViewMvpDelegate(MvpDelegateCallback<V, P> delegateCallback) {
+  public ViewGroupMvpDelegateImpl(MvpDelegateCallback<V, P> delegateCallback) {
     if (delegateCallback == null) {
       throw new NullPointerException(delegateCallback.getClass().getSimpleName() + " is null!");
     }

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/layout/MvpFrameLayout.java

@@ -22,9 +22,9 @@
 import butterknife.ButterKnife;
 import com.hannesdorfmann.mosby.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby.mvp.MvpView;
-import com.hannesdorfmann.mosby.mvp.delegate.DefaultViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegateImpl;
 import com.hannesdorfmann.mosby.mvp.delegate.MvpDelegateCallback;
-import com.hannesdorfmann.mosby.mvp.delegate.ViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegate;
 
 /**
  * A FrameLayout that can be used as View with an presenter
@@ -36,7 +36,7 @@ public abstract class MvpFrameLayout<V extends MvpView, P extends MvpPresenter<V
     extends FrameLayout implements MvpDelegateCallback<V, P>, MvpView {
 
   protected P presenter;
-  protected ViewMvpDelegate<V, P> mvpDelegate;
+  protected ViewGroupMvpDelegate<V, P> mvpDelegate;
 
   public MvpFrameLayout(Context context) {
     super(context);
@@ -74,11 +74,11 @@ public MvpFrameLayout(Context context, AttributeSet attrs, int defStyleAttr, int
    * Only override this method if you really know what you are doing.
    * </p>
    *
-   * @return {@link DefaultViewMvpDelegate}
+   * @return {@link ViewGroupMvpDelegateImpl}
    */
-  protected ViewMvpDelegate<V, P> getMvpDelegate() {
+  protected ViewGroupMvpDelegate<V, P> getMvpDelegate() {
     if (mvpDelegate == null) {
-      mvpDelegate = new DefaultViewMvpDelegate<>(this);
+      mvpDelegate = new ViewGroupMvpDelegateImpl<>(this);
     }
 
     return mvpDelegate;

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/layout/MvpLinearLayout.java

@@ -22,9 +22,9 @@
 import butterknife.ButterKnife;
 import com.hannesdorfmann.mosby.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby.mvp.MvpView;
-import com.hannesdorfmann.mosby.mvp.delegate.DefaultViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegateImpl;
 import com.hannesdorfmann.mosby.mvp.delegate.MvpDelegateCallback;
-import com.hannesdorfmann.mosby.mvp.delegate.ViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegate;
 
 /**
  * A LinearLayout that can be used as view with an presenter
@@ -36,7 +36,7 @@ public abstract class MvpLinearLayout<V extends MvpView, P extends MvpPresenter<
     extends LinearLayout implements MvpView, MvpDelegateCallback<V, P> {
 
   protected P presenter;
-  protected ViewMvpDelegate<V, P> mvpDelegate;
+  protected ViewGroupMvpDelegate<V, P> mvpDelegate;
 
   public MvpLinearLayout(Context context) {
     super(context);
@@ -72,11 +72,11 @@ public MvpLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, in
    * Only override this method if you really know what you are doing.
    * </p>
    *
-   * @return {@link DefaultViewMvpDelegate}
+   * @return {@link ViewGroupMvpDelegateImpl}
    */
-  protected ViewMvpDelegate<V, P> getMvpDelegate() {
+  protected ViewGroupMvpDelegate<V, P> getMvpDelegate() {
     if (mvpDelegate == null) {
-      mvpDelegate = new DefaultViewMvpDelegate<>(this);
+      mvpDelegate = new ViewGroupMvpDelegateImpl<>(this);
     }
 
     return mvpDelegate;

mvp/src/main/java/com/hannesdorfmann/mosby/mvp/layout/MvpRelativeLayout.java

@@ -22,9 +22,9 @@
 import butterknife.ButterKnife;
 import com.hannesdorfmann.mosby.mvp.MvpPresenter;
 import com.hannesdorfmann.mosby.mvp.MvpView;
-import com.hannesdorfmann.mosby.mvp.delegate.DefaultViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegateImpl;
 import com.hannesdorfmann.mosby.mvp.delegate.MvpDelegateCallback;
-import com.hannesdorfmann.mosby.mvp.delegate.ViewMvpDelegate;
+import com.hannesdorfmann.mosby.mvp.delegate.ViewGroupMvpDelegate;
 
 /**
  * A RelativeLayout that can be used as view with an presenter.
@@ -36,7 +36,7 @@ public abstract class MvpRelativeLayout<V extends MvpView, P extends MvpPresente
     extends RelativeLayout implements MvpView, MvpDelegateCallback<V, P> {
 
   protected P presenter;
-  protected ViewMvpDelegate<V, P> mvpDelegate;
+  protected ViewGroupMvpDelegate<V, P> mvpDelegate;
 
   public MvpRelativeLayout(Context context) {
     super(context);
@@ -72,11 +72,11 @@ public MvpRelativeLayout(Context context, AttributeSet attrs, int defStyleAttr,
    * Only override this method if you really know what you are doing.
    * </p>
    *
-   * @return {@link DefaultViewMvpDelegate}
+   * @return {@link ViewGroupMvpDelegateImpl}
    */
-  protected ViewMvpDelegate<V, P> getMvpDelegate() {
+  protected ViewGroupMvpDelegate<V, P> getMvpDelegate() {
     if (mvpDelegate == null) {
-      mvpDelegate = new DefaultViewMvpDelegate<>(this);
+      mvpDelegate = new ViewGroupMvpDelegateImpl<>(this);
     }
 
     return mvpDelegate;

viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/DefaultActivityMvpViewStateDelegate.java → viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ActivityMvpViewStateDelegateImpl.java

@@ -27,17 +27,17 @@
  * @author Hannes Dorfmann
  * @since 1.1.0
  */
-public class DefaultActivityMvpViewStateDelegate<V extends MvpView, P extends MvpPresenter<V>>
-    extends DefaultActivityMvpDelegate<V, P> {
+public class ActivityMvpViewStateDelegateImpl<V extends MvpView, P extends MvpPresenter<V>>
+    extends ActivityMvpDelegateImpl<V, P> {
 
-  public DefaultActivityMvpViewStateDelegate(ViewStateDelegateCallback<V, P> delegateCallback) {
+  public ActivityMvpViewStateDelegateImpl(MvpViewStateDelegateCallback<V, P> delegateCallback) {
     super(delegateCallback);
   }
 
   @Override protected MvpInternalDelegate<V, P> getInternalDelegate() {
     if (internalDelegate == null) {
       internalDelegate =
-          new MvpViewStateInternalDelegate<>((ViewStateDelegateCallback) delegateCallback);
+          new MvpViewStateInternalDelegate<>((MvpViewStateDelegateCallback) delegateCallback);
     }
 
     return internalDelegate;

viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/DefaultFragmentMvpViewStateDelegate.java → viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/FragmentMvpViewStateDelegateImpl.java

@@ -22,22 +22,22 @@
 import com.hannesdorfmann.mosby.mvp.viewstate.ViewState;
 
 /**
- * The {@link DefaultFragmentMvpDelegate} with {@link ViewState} support
+ * The {@link FragmentMvpDelegateImpl} with {@link ViewState} support
  *
  * @author Hannes Dorfmann
  * @since 1.1.0
  */
-public class DefaultFragmentMvpViewStateDelegate<V extends MvpView, P extends MvpPresenter<V>>
-    extends DefaultFragmentMvpDelegate<V, P> {
+public class FragmentMvpViewStateDelegateImpl<V extends MvpView, P extends MvpPresenter<V>>
+    extends FragmentMvpDelegateImpl<V, P> {
 
-  public DefaultFragmentMvpViewStateDelegate(ViewStateDelegateCallback<V, P> delegateCallback) {
+  public FragmentMvpViewStateDelegateImpl(MvpViewStateDelegateCallback<V, P> delegateCallback) {
     super(delegateCallback);
   }
 
   @Override protected MvpInternalDelegate<V, P> getInternalDelegate() {
     if (internalDelegate == null) {
       internalDelegate =
-          new MvpViewStateInternalDelegate<V, P>((ViewStateDelegateCallback) delegateCallback);
+          new MvpViewStateInternalDelegate<V, P>((MvpViewStateDelegateCallback) delegateCallback);
     }
 
     return internalDelegate;

viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/MvpInternalLayoutViewStateDelegate.java

@@ -28,7 +28,7 @@
 /**
  * This class
  * is used to save, restore and apply a {@link ViewState} by using {@link
- * ViewStateDelegateCallback}. It's
+ * MvpViewStateDelegateCallback}. It's
  * just a little helper / utils class that avoids to many copy & paste code clones.
  * This class is designed to be for custom Layouts like {@link MvpViewStateFrameLayout} etc.
  *
@@ -41,7 +41,7 @@ class MvpInternalLayoutViewStateDelegate<V extends MvpView, P extends MvpPresent
   private boolean applyViewState = false;
   private boolean createOrRestoreCalled = false;
 
-  MvpInternalLayoutViewStateDelegate(ViewStateLayoutDelegateCallback<V, P> delegateCallback) {
+  MvpInternalLayoutViewStateDelegate(MvpViewStateViewGroupDelegateCallback<V, P> delegateCallback) {
     super(delegateCallback);
   }
 
@@ -51,9 +51,9 @@ class MvpInternalLayoutViewStateDelegate<V extends MvpView, P extends MvpPresent
    *
    * @return true, if the viewstate has been restored (in other words restored from parcelable)
    * (calls {@link
-   * ViewStateDelegateCallback#onViewStateInstanceRestored(boolean) after having restored the
+   * MvpViewStateDelegateCallback#onViewStateInstanceRestored(boolean) after having restored the
    * viewstate}.
-   * Otherwise returns false and calls {@link ViewStateDelegateCallback#onNewViewStateInstance()}
+   * Otherwise returns false and calls {@link MvpViewStateDelegateCallback#onNewViewStateInstance()}
    */
   public boolean createOrRestoreViewState(ViewStateSavedState savedState) {
 
@@ -62,7 +62,7 @@ public boolean createOrRestoreViewState(ViewStateSavedState savedState) {
     }
     createOrRestoreCalled = true;
 
-    ViewStateLayoutDelegateCallback delegate = (ViewStateLayoutDelegateCallback) delegateCallback;
+    MvpViewStateViewGroupDelegateCallback delegate = (MvpViewStateViewGroupDelegateCallback) delegateCallback;
 
     // ViewState already exists (Fragment retainsInstanceState == true)
     if (delegate.getViewState() != null) {
@@ -101,7 +101,7 @@ public boolean createOrRestoreViewState(ViewStateSavedState savedState) {
    */
   public boolean applyViewState() {
 
-    ViewStateLayoutDelegateCallback delegate = (ViewStateLayoutDelegateCallback) delegateCallback;
+    MvpViewStateViewGroupDelegateCallback delegate = (MvpViewStateViewGroupDelegateCallback) delegateCallback;
 
     if (applyViewState) {
       delegate.setRestoringViewState(true);
@@ -121,7 +121,7 @@ public boolean applyViewState() {
    */
   public Parcelable saveViewState(Parcelable superState) {
 
-    ViewStateLayoutDelegateCallback delegate = (ViewStateLayoutDelegateCallback) delegateCallback;
+    MvpViewStateViewGroupDelegateCallback delegate = (MvpViewStateViewGroupDelegateCallback) delegateCallback;
 
     boolean retainingInstanceState = delegate.isRetainingInstance();
 

viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/ViewStateDelegateCallback.java → viewstate/src/main/java/com/hannesdorfmann/mosby/mvp/delegate/MvpViewStateDelegateCallback.java

@@ -30,7 +30,7 @@
  * @author Hannes Dorfmann
  * @since 1.0.0
  */
-public interface ViewStateDelegateCallback<V extends MvpView, P extends MvpPresenter<V>>
+public interface MvpViewStateDelegateCallback<V extends MvpView, P extends MvpPresenter<V>>
     extends MvpDelegateCallback<V, P> {
 
   /**