Merge remote-tracking branch 'upstream/master'

app/build.gradle

@@ -32,6 +32,7 @@ dependencies {
     compile 'com.google.dagger:dagger:2.0.2'
     apt 'com.google.dagger:dagger-compiler:2.0.2'
     provided 'org.glassfish:javax.annotation:10.0-b28'
+    provided 'javax.annotation:jsr250-api:1.0'
 
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.jakewharton.timber:timber:4.1.0'

app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java

@@ -2,7 +2,6 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
 
 import com.frogermcs.dagger2metrics.Dagger2Metrics;
 
@@ -14,8 +13,7 @@
 /**
  * Created by Miroslaw Stanek on 22.04.15.
  */
-    public class GithubClientApplication extends Application {
-
+public class GithubClientApplication extends Application {
     private AppComponent appComponent;
     private UserComponent userComponent;
 

app/src/main/java/frogermcs/io/githubclient/ui/activity/presenter/SplashActivityPresenter.java

@@ -1,5 +1,7 @@
 package frogermcs.io.githubclient.ui.activity.presenter;
 
+import android.os.Handler;
+
 import frogermcs.io.githubclient.HeavyLibraryWrapper;
 import frogermcs.io.githubclient.data.api.UserManager;
 import frogermcs.io.githubclient.data.model.User;
@@ -13,23 +15,22 @@
 public class SplashActivityPresenter {
     public String username;
 
-    private SplashActivity splashActivity;
-    private Validator validator;
-    private UserManager userManager;
-    private HeavyLibraryWrapper heavyLibraryWrapper;
+    private final SplashActivity splashActivity;
+    private final Validator validator;
+    private final UserManager userManager;
 
     public SplashActivityPresenter(SplashActivity splashActivity, Validator validator,
                                    UserManager userManager, HeavyLibraryWrapper heavyLibraryWrapper) {
         this.splashActivity = splashActivity;
         this.validator = validator;
         this.userManager = userManager;
-        this.heavyLibraryWrapper = heavyLibraryWrapper;
 
+        HeavyLibraryWrapper heavyLibraryWrapper1 = heavyLibraryWrapper;
         //This calls should be delivered to ExternalLibrary right after it will be initialized
-        this.heavyLibraryWrapper.callMethod();
-        this.heavyLibraryWrapper.callMethod();
-        this.heavyLibraryWrapper.callMethod();
-        this.heavyLibraryWrapper.callMethod();
+        heavyLibraryWrapper1.callMethod();
+        heavyLibraryWrapper1.callMethod();
+        heavyLibraryWrapper1.callMethod();
+        heavyLibraryWrapper1.callMethod();
     }
 
     public void onShowRepositoriesClick() {
@@ -38,7 +39,13 @@ public void onShowRepositoriesClick() {
             userManager.getUser(username).subscribe(new SimpleObserver<User>() {
                 @Override
                 public void onNext(User user) {
-                    splashActivity.showLoading(false);
+                    // To avoid prematurely hiding the progressbar, post delayed
+                    Handler handler = new Handler();
+                    handler.postDelayed(new Runnable() {
+                        @Override public void run() {
+                            splashActivity.showLoading(false);
+                        }
+                    }, 1000 /* 1 sec */);
                     splashActivity.showRepositoriesListForUser(user);
                 }
 

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha6'
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha9'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.frogermcs.dagger2metrics:dagger2metrics-plugin:0.2.1'
     }