Improve KTP inherited java API with nullability information

build.gradle

@@ -81,6 +81,7 @@ subprojects { project ->
 
   repositories {
     jcenter()
+    google()
   }
 
   apply plugin: 'jacoco'

deps.gradle

@@ -9,6 +9,8 @@ ext.deps = [// Common
             android_plugin      : 'com.android.tools.build:gradle:3.4.2',
             supportv4           : 'com.android.support:support-v4:28.0.0',
             androidxv7          : 'androidx.appcompat:appcompat:1.0.0',
+            androidxannotations : 'androidx.annotation:annotation:1.1.0',
+
             fragment            : 'androidx.fragment:fragment:1.1.0',
             design              : 'com.google.android.material:material:1.0.0',
             coordlayout         : 'androidx.coordinatorlayout:coordinatorlayout:1.0.0',

smoothie-androidx/build.gradle

@@ -1,9 +1,5 @@
 apply plugin: 'com.android.library'
 
-repositories {
-  google()
-}
-
 android {
   compileSdkVersion 28
 

smoothie-androidx/src/main/java/toothpick/smoothie/module/SmoothieAndroidXActivityModule.java

@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.view.LayoutInflater;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.loader.app.LoaderManager;
@@ -27,7 +28,7 @@
 import toothpick.smoothie.provider.LayoutInflaterProvider;
 
 public class SmoothieAndroidXActivityModule extends Module {
-  public SmoothieAndroidXActivityModule(FragmentActivity activity) {
+  public SmoothieAndroidXActivityModule(@NonNull FragmentActivity activity) {
     bind(Activity.class).toInstance(activity);
     bind(FragmentManager.class).toProviderInstance(new AndroidXFragmentManagerProvider(activity));
     bind(LoaderManager.class).toProviderInstance(new AndroidXLoaderManagerProvider(activity));

smoothie-androidx/src/main/java/toothpick/smoothie/provider/AndroidXFragmentManagerProvider.java

@@ -17,17 +17,19 @@
 package toothpick.smoothie.provider;
 
 import android.app.Activity;
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import javax.inject.Provider;
 
 public class AndroidXFragmentManagerProvider implements Provider<FragmentManager> {
   Activity activity;
 
-  public AndroidXFragmentManagerProvider(Activity activity) {
+  public AndroidXFragmentManagerProvider(@NonNull Activity activity) {
     this.activity = activity;
   }
 
+  @NonNull
   @Override
   public FragmentManager get() {
     return ((FragmentActivity) activity).getSupportFragmentManager();

smoothie-androidx/src/main/java/toothpick/smoothie/provider/AndroidXLoaderManagerProvider.java

@@ -16,17 +16,19 @@
  */
 package toothpick.smoothie.provider;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import javax.inject.Provider;
 
 public class AndroidXLoaderManagerProvider implements Provider<LoaderManager> {
   FragmentActivity activity;
 
-  public AndroidXLoaderManagerProvider(FragmentActivity activity) {
+  public AndroidXLoaderManagerProvider(@NonNull FragmentActivity activity) {
     this.activity = activity;
   }
 
+  @NonNull
   @Override
   public LoaderManager get() {
     return LoaderManager.getInstance(activity);

smoothie-lifecycle-viewmodel/src/main/java/toothpick/smoothie/viewmodel/ViewModelProvider.java

@@ -126,6 +126,7 @@ public ViewModelProvider(@NonNull Scope scope, @NonNull T viewModel) {
     this.scope = scope;
   }
 
+  @NonNull
   @Override
   public T get() {
     if (scope != null) {

smoothie-lifecycle-viewmodel/src/main/java/toothpick/smoothie/viewmodel/ViewModelUtil.java

@@ -113,7 +113,7 @@ public static <T extends ViewModel> void installViewModelBinding(
   private static class TPViewModelFactory implements Factory {
     private Scope scope;
 
-    private TPViewModelFactory(Scope scope) {
+    private TPViewModelFactory(@NonNull Scope scope) {
       this.scope = scope;
     }
 
@@ -132,8 +132,7 @@ public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
   private static class TPViewModel extends ViewModel {
     private Scope scope;
 
-    private TPViewModel(Scope scope) {
-
+    private TPViewModel(@NonNull Scope scope) {
       this.scope = scope;
     }
 

smoothie-support/build.gradle

@@ -1,9 +1,5 @@
 apply plugin: 'com.android.library'
 
-repositories {
-  google()
-}
-
 android {
   compileSdkVersion 28
 

smoothie/build.gradle

@@ -1,10 +1,5 @@
 apply plugin: 'com.android.library'
 
-repositories {
-  google()
-}
-
-
 android {
   compileSdkVersion 28
 
@@ -30,6 +25,7 @@ android {
 dependencies {
   api project(':toothpick-runtime')
   compileOnly deps.inject
+  compileOnly deps.androidxannotations
 
   testImplementation project(':toothpick-testing')
   testImplementation deps.junit4

smoothie/src/main/java/toothpick/smoothie/module/SmoothieActivityModule.java

@@ -18,14 +18,15 @@
 
 import android.app.Activity;
 import android.view.LayoutInflater;
+import androidx.annotation.NonNull;
 import toothpick.config.Module;
 import toothpick.smoothie.provider.FragmentManagerProvider;
 import toothpick.smoothie.provider.LayoutInflaterProvider;
 import toothpick.smoothie.provider.LoaderManagerProvider;
 
 @SuppressWarnings("deprecation")
 public class SmoothieActivityModule extends Module {
-  public SmoothieActivityModule(Activity activity) {
+  public SmoothieActivityModule(@NonNull Activity activity) {
     bind(Activity.class).toInstance(activity);
     bind(android.app.FragmentManager.class)
         .toProviderInstance(new FragmentManagerProvider(activity));

smoothie/src/main/java/toothpick/smoothie/module/SmoothieApplicationModule.java

@@ -60,6 +60,8 @@
 import android.telephony.TelephonyManager;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import toothpick.config.Module;
 import toothpick.smoothie.provider.AccountManagerProvider;
 import toothpick.smoothie.provider.AssetManagerProvider;
@@ -71,11 +73,12 @@
 import toothpick.smoothie.provider.SystemServiceProvider;
 
 public class SmoothieApplicationModule extends Module {
-  public SmoothieApplicationModule(Application application) {
+  public SmoothieApplicationModule(@NonNull Application application) {
     this(application, null);
   }
 
-  public SmoothieApplicationModule(Application application, String preferencesName) {
+  public SmoothieApplicationModule(
+      @NonNull Application application, @Nullable String preferencesName) {
     bind(Application.class).toInstance(application);
     bind(AccountManager.class).toProviderInstance(new AccountManagerProvider(application));
     bind(AssetManager.class).toProviderInstance(new AssetManagerProvider(application));
@@ -89,7 +92,7 @@ public SmoothieApplicationModule(Application application, String preferencesName
     bindPackageInfo(application);
   }
 
-  private void bindPackageInfo(Application application) {
+  private void bindPackageInfo(@NonNull Application application) {
     final PackageInfo packageInfo;
     try {
       packageInfo = application.getPackageManager().getPackageInfo(application.getPackageName(), 0);
@@ -99,7 +102,7 @@ private void bindPackageInfo(Application application) {
     }
   }
 
-  private void bindSystemServices(Application application) {
+  private void bindSystemServices(@NonNull Application application) {
     bindSystemService(application, LocationManager.class, LOCATION_SERVICE);
     bindSystemService(application, WindowManager.class, WINDOW_SERVICE);
     bindSystemService(application, ActivityManager.class, ACTIVITY_SERVICE);

smoothie/src/main/java/toothpick/smoothie/provider/AccountManagerProvider.java

@@ -18,15 +18,17 @@
 
 import android.accounts.AccountManager;
 import android.app.Application;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class AccountManagerProvider implements Provider<AccountManager> {
   Application application;
 
-  public AccountManagerProvider(Application application) {
+  public AccountManagerProvider(@NonNull Application application) {
     this.application = application;
   }
 
+  @NonNull
   @Override
   public AccountManager get() {
     return AccountManager.get(application);

smoothie/src/main/java/toothpick/smoothie/provider/AssetManagerProvider.java

@@ -18,15 +18,17 @@
 
 import android.app.Application;
 import android.content.res.AssetManager;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class AssetManagerProvider implements Provider<AssetManager> {
   Application application;
 
-  public AssetManagerProvider(Application application) {
+  public AssetManagerProvider(@NonNull Application application) {
     this.application = application;
   }
 
+  @NonNull
   @Override
   public AssetManager get() {
     return application.getAssets();

smoothie/src/main/java/toothpick/smoothie/provider/ContentResolverProvider.java

@@ -18,15 +18,17 @@
 
 import android.app.Application;
 import android.content.ContentResolver;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class ContentResolverProvider implements Provider<ContentResolver> {
   Application application;
 
-  public ContentResolverProvider(Application application) {
+  public ContentResolverProvider(@NonNull Application application) {
     this.application = application;
   }
 
+  @NonNull
   @Override
   public ContentResolver get() {
     return application.getContentResolver();

smoothie/src/main/java/toothpick/smoothie/provider/FragmentManagerProvider.java

@@ -17,16 +17,18 @@
 package toothpick.smoothie.provider;
 
 import android.app.Activity;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 @SuppressWarnings("deprecation")
 public class FragmentManagerProvider implements Provider<android.app.FragmentManager> {
   Activity activity;
 
-  public FragmentManagerProvider(Activity activity) {
+  public FragmentManagerProvider(@NonNull Activity activity) {
     this.activity = activity;
   }
 
+  @NonNull
   @Override
   public android.app.FragmentManager get() {
     return activity.getFragmentManager();

smoothie/src/main/java/toothpick/smoothie/provider/HandlerProvider.java

@@ -18,11 +18,13 @@
 
 import android.os.Handler;
 import android.os.Looper;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class HandlerProvider implements Provider<Handler> {
   public HandlerProvider() {}
 
+  @NonNull
   @Override
   public Handler get() {
     return new Handler(Looper.getMainLooper());

smoothie/src/main/java/toothpick/smoothie/provider/LayoutInflaterProvider.java

@@ -18,15 +18,17 @@
 
 import android.app.Activity;
 import android.view.LayoutInflater;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class LayoutInflaterProvider implements Provider<LayoutInflater> {
   Activity activity;
 
-  public LayoutInflaterProvider(Activity activity) {
+  public LayoutInflaterProvider(@NonNull Activity activity) {
     this.activity = activity;
   }
 
+  @NonNull
   @Override
   public LayoutInflater get() {
     return LayoutInflater.from(activity);

smoothie/src/main/java/toothpick/smoothie/provider/LoaderManagerProvider.java

@@ -17,16 +17,18 @@
 package toothpick.smoothie.provider;
 
 import android.app.Activity;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 @SuppressWarnings("deprecation")
 public class LoaderManagerProvider implements Provider<android.app.LoaderManager> {
   Activity activity;
 
-  public LoaderManagerProvider(Activity activity) {
+  public LoaderManagerProvider(@NonNull Activity activity) {
     this.activity = activity;
   }
 
+  @NonNull
   @Override
   public android.app.LoaderManager get() {
     return activity.getLoaderManager();

smoothie/src/main/java/toothpick/smoothie/provider/PackageManagerProvider.java

@@ -18,15 +18,17 @@
 
 import android.app.Application;
 import android.content.pm.PackageManager;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class PackageManagerProvider implements Provider<PackageManager> {
   Application application;
 
-  public PackageManagerProvider(Application application) {
+  public PackageManagerProvider(@NonNull Application application) {
     this.application = application;
   }
 
+  @NonNull
   @Override
   public PackageManager get() {
     return application.getPackageManager();

smoothie/src/main/java/toothpick/smoothie/provider/ResourcesProvider.java

@@ -18,15 +18,17 @@
 
 import android.app.Application;
 import android.content.res.Resources;
+import androidx.annotation.NonNull;
 import javax.inject.Provider;
 
 public class ResourcesProvider implements Provider<Resources> {
   Application application;
 
-  public ResourcesProvider(Application application) {
+  public ResourcesProvider(@NonNull Application application) {
     this.application = application;
   }
 
+  @NonNull
   @Override
   public Resources get() {
     return application.getResources();

smoothie/src/main/java/toothpick/smoothie/provider/SharedPreferencesProvider.java

@@ -20,21 +20,25 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import javax.inject.Provider;
 
 public class SharedPreferencesProvider implements Provider<SharedPreferences> {
   Application application;
   String preferencesName;
 
-  public SharedPreferencesProvider(Application application) {
+  public SharedPreferencesProvider(@NonNull Application application) {
     this(application, null);
   }
 
-  public SharedPreferencesProvider(Application application, String preferencesName) {
+  public SharedPreferencesProvider(
+      @NonNull Application application, @Nullable String preferencesName) {
     this.application = application;
     this.preferencesName = preferencesName;
   }
 
+  @NonNull
   @Override
   public SharedPreferences get() {
     if (preferencesName != null) {