Merge branch 'release/1.4.5'

README.md

@@ -76,36 +76,36 @@ Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.4.4'
-  provided 'com.arello-mobile:moxy-compiler:1.4.4'
+  compile 'com.arello-mobile:moxy:1.4.5'
+  provided 'com.arello-mobile:moxy-compiler:1.4.5'
 }
 ```
 If you want to see generated code, use `apt` instead of `provided` dependency type:
 ```groovy
 dependencies {
   ...
-  apt 'com.arello-mobile:moxy-compiler:1.4.4'
+  apt 'com.arello-mobile:moxy-compiler:1.4.5'
 }
 ```
 Note: if you use gradle plugin verion 2.2.2 and above, so you can use `annotationProcessor` instead of `apt`:
 ```groovy
 dependencies {
   ...
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.4.4'
+  annotationProcessor 'com.arello-mobile:moxy-compiler:1.4.5'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.4.4'
+  compile 'com.arello-mobile:moxy-android:1.4.5'
 }
 ```
 If you are planing to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-app-compat:1.4.4'
+  compile 'com.arello-mobile:moxy-app-compat:1.4.5'
   compile 'com.android.support:appcompat-v7:$support_version'
 }
 ```
@@ -114,7 +114,7 @@ If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type
 ```groovy
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.4.4'
+  kapt 'com.arello-mobile:moxy-compiler:1.4.5'
 }
 kapt {
     generateStubs = true

build.gradle

@@ -19,8 +19,8 @@ allprojects {
 }
 
 ext {
-    targetVersionCode = 37
-    targetVersionName = "1.4.4"
+    targetVersionCode = 38
+    targetVersionName = "1.4.5"
 }
 
 task clean(type: Delete) {

moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java

@@ -21,6 +21,13 @@ protected void onCreate(Bundle savedInstanceState) {
 		getMvpDelegate().onCreate(savedInstanceState);
 	}
 
+	@Override
+	protected void onStart() {
+		super.onStart();
+
+		getMvpDelegate().onAttach();
+	}
+
 	@Override
 	protected void onResume() {
 		super.onResume();

moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java

@@ -25,6 +25,15 @@ public void onCreate(Bundle savedInstanceState) {
 		getMvpDelegate().onCreate(savedInstanceState);
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+
+		mIsStateSaved = false;
+
+		getMvpDelegate().onAttach();
+	}
+
 	public void onResume() {
 		super.onResume();
 

moxy-android/stub-android/src/main/java/android/app/Fragment.java

@@ -12,6 +12,10 @@ public void onCreate(Bundle savedInstanceState) {
 		throw new RuntimeException("Stub!");
 	}
 
+	public void onStart() {
+		throw new RuntimeException("Stub!");
+	}
+
 	public void onResume() {
 		throw new RuntimeException("Stub!");
 	}

moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatActivity.java

@@ -22,6 +22,13 @@ protected void onCreate(Bundle savedInstanceState) {
 		getMvpDelegate().onCreate(savedInstanceState);
 	}
 
+	@Override
+	protected void onStart() {
+		super.onStart();
+
+		getMvpDelegate().onAttach();
+	}
+
 	@Override
 	protected void onResume() {
 		super.onResume();

moxy-app-compat/src/main/java/com/arellomobile/mvp/MvpAppCompatFragment.java

@@ -23,6 +23,15 @@ public void onCreate(Bundle savedInstanceState) {
 		getMvpDelegate().onCreate(savedInstanceState);
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+
+		mIsStateSaved = false;
+
+		getMvpDelegate().onAttach();
+	}
+
 	public void onResume() {
 		super.onResume();
 

moxy-app-compat/stub-appcompat/src/main/java/android/support/v4/app/Fragment.java

@@ -13,6 +13,10 @@ public void onCreate(Bundle savedInstanceState) {
 		throw new RuntimeException("Stub!");
 	}
 
+	public void onStart() {
+		throw new RuntimeException("Stub!");
+	}
+
 	public void onResume() {
 		throw new RuntimeException("Stub!");
 	}

moxy-app-compat/stub-appcompat/src/main/java/android/support/v7/app/AppCompatActivity.java

@@ -13,6 +13,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		throw new RuntimeException("Stub!");
 	}
 
+	protected void onStart() {
+		throw new RuntimeException("Stub!");
+	}
+
 	protected void onResume() {
 		throw new RuntimeException("Stub!");
 	}

moxy/src/main/java/com/arellomobile/mvp/MvpDelegate.java

@@ -133,6 +133,10 @@ public void onAttach() {
 	 */
 	public void onDetach() {
 		for (MvpPresenter<? super Delegated> presenter : mPresenters) {
+			if (!mIsAttached && !presenter.getAttachedViews().contains(mDelegated)) {
+				continue;
+			}
+
 			presenter.detachView(mDelegated);
 		}
 

sample-github/build.gradle

@@ -68,7 +68,7 @@ dependencies {
     testCompile "org.hamcrest:hamcrest-all:1.3"
     testCompile "org.robolectric:robolectric:3.1-rc1"
 
-    compile 'com.arello-mobile:moxy:1.4.4'
-    compile 'com.arello-mobile:moxy-app-compat:1.4.4'
-    annotationProcessor 'com.arello-mobile:moxy-compiler:1.4.4'
+    compile 'com.arello-mobile:moxy:1.4.5'
+    compile 'com.arello-mobile:moxy-app-compat:1.4.5'
+    annotationProcessor 'com.arello-mobile:moxy-compiler:1.4.5'
 }

sample-github/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.arellomobile.mvp.sample.github"
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="com.arellomobile.mvp.sample.github">
 
 	<uses-permission android:name="android.permission.INTERNET" />
 

sample-github/src/main/java/com/arellomobile/mvp/sample/github/common/Utils.java

@@ -0,0 +1,19 @@
+package com.arellomobile.mvp.sample.github.common;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Date: 11.01.2017
+ * Time: 16:39
+ *
+ * @author Yuri Shmakov
+ */
+
+public class Utils {
+	public static <T> Observable.Transformer<T, T> applySchedulers() {
+		return observable -> observable.subscribeOn(Schedulers.io())
+				.observeOn(AndroidSchedulers.mainThread());
+	}
+}

sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/HomePresenter.java

@@ -16,6 +16,8 @@ public class HomePresenter extends MvpPresenter<HomeView> {
 	public void onRepositorySelection(int position, Repository repository) {
 		getViewState().showDetailsContainer();
 
+		getViewState().setSelection(position);
+
 		getViewState().showDetails(position, repository);
 	}
 }

sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoriesPresenter.java

@@ -2,18 +2,18 @@
 
 import java.util.List;
 
+import com.arellomobile.mvp.InjectViewState;
 import com.arellomobile.mvp.sample.github.app.GithubApi;
 import com.arellomobile.mvp.sample.github.app.GithubApp;
+import com.arellomobile.mvp.sample.github.common.Utils;
 import com.arellomobile.mvp.sample.github.mvp.GithubService;
 import com.arellomobile.mvp.sample.github.mvp.models.Repository;
 import com.arellomobile.mvp.sample.github.mvp.views.RepositoriesView;
-import com.arellomobile.mvp.InjectViewState;
 
 import javax.inject.Inject;
 
 import rx.Observable;
 import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
 
 /**
  * Date: 22.01.2016
@@ -54,14 +54,14 @@ private void loadData(int page, boolean isPageLoading, boolean isRefreshing) {
 		}
 		mIsInLoading = true;
 
-		getViewState().hideError();
 		getViewState().onStartLoading();
 
 		showProgress(isPageLoading, isRefreshing);
 
 		final Observable<List<Repository>> observable = mGithubService.getUserRepos("JakeWharton", page, GithubApi.PAGE_SIZE);
 
-		Subscription subscription = observable.observeOn(AndroidSchedulers.mainThread())
+		Subscription subscription = observable
+				.compose(Utils.applySchedulers())
 				.subscribe(repositories -> {
 					onLoadingFinish(isPageLoading, isRefreshing);
 					onLoadingSuccess(isPageLoading, repositories);
@@ -117,7 +117,7 @@ private void hideProgress(boolean isPageLoading, boolean isRefreshing) {
 		}
 	}
 
-	public void closeError() {
+	public void onErrorCancel() {
 		getViewState().hideError();
 	}
 }

sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryLikesPresenter.java

@@ -4,12 +4,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.arellomobile.mvp.sample.github.app.GithubApp;
-import com.arellomobile.mvp.sample.github.mvp.views.RepositoryLikesView;
 import com.arellomobile.mvp.InjectViewState;
-import com.squareup.otto.Bus;
-
-import javax.inject.Inject;
+import com.arellomobile.mvp.sample.github.mvp.views.RepositoryLikesView;
 
 import rx.Observable;
 import rx.Subscription;
@@ -26,18 +22,9 @@
 public class RepositoryLikesPresenter extends BasePresenter<RepositoryLikesView> {
 	public static final String TAG = "RepositoryLikesPresenter";
 
-	@Inject
-	Bus mBus;
-
 	private List<Integer> mInProgress = new ArrayList<>();
 	private List<Integer> mLikedIds = new ArrayList<>();
 
-	public RepositoryLikesPresenter() {
-		GithubApp.getAppComponent().inject(this);
-
-		mBus.register(this);
-	}
-
 	public void toggleLike(int id) {
 		if (mInProgress.contains(id)) {
 			return;
@@ -91,10 +78,4 @@ private void onFail(int id) {
 		mInProgress.remove(Integer.valueOf(id));
 		getViewState().updateLikes(mInProgress, mLikedIds);
 	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mBus.unregister(this);
-	}
 }

sample-github/src/main/java/com/arellomobile/mvp/sample/github/mvp/presenters/RepositoryPresenter.java

@@ -15,24 +15,22 @@
  */
 @InjectViewState
 public class RepositoryPresenter extends MvpPresenter<RepositoryView> {
-	private boolean mIsInitialized = false;
+
 	private Repository mRepository;
 	private List<Integer> mInProgress;
 	private List<Integer> mLikedIds;
 
-	public RepositoryPresenter() {
+	public RepositoryPresenter(Repository repository) {
 		super();
-	}
-
-	public void setRepository(Repository repository) {
-		if (mIsInitialized) {
-			return;
-		}
-		mIsInitialized = true;
 
 		mRepository = repository;
+	}
+
+	@Override
+	protected void onFirstViewAttach() {
+		super.onFirstViewAttach();
 
-		getViewState().showRepository(repository);
+		getViewState().showRepository(mRepository);
 
 		updateLikes(mInProgress, mLikedIds);
 	}