Deeper clean up

app/build.gradle

@@ -90,11 +90,11 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     // Google Support Libraries
-    compile 'com.android.support:support-v4:25.1.0'
-    compile 'com.android.support:support-fragment:25.1.0'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.2.0'
+    compile 'com.android.support:support-fragment:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
 
     // RxJava
     compile 'io.reactivex.rxjava2:rxjava:2.0.0'
@@ -118,6 +118,10 @@ dependencies {
     // Databinding
     kapt "com.android.databinding:compiler:$android_plugin_version"
 
+    // ActivityStarter
+    compile 'com.github.marcinmoskala.activitystarter:activitystarter:0.30'
+    kapt 'com.github.marcinmoskala.activitystarter:activitystarter-compiler:0.30'
+
     // Unit Testing
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-core:1.10.19"

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ApplicationComponent.kt

@@ -23,5 +23,6 @@ interface ApplicationComponent {
     // Submodule methods
     // Every screen is its own submodule of the graph and must be added here.
     fun plus(module: ListModule): ListComponent
+
     fun plus(module: DetailModule): DetailComponent
 }

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/data/network/NetworkInteractorImpl.kt

@@ -13,11 +13,9 @@ class NetworkInteractorImpl @Inject constructor(
     override fun hasNetworkConnection(): Boolean =
             connectivityManager.activeNetworkInfo?.isConnectedOrConnecting ?: false
 
-    override fun hasNetworkConnectionCompletable(): Completable =
-            if (hasNetworkConnection()) {
-                Completable.complete()
-            } else {
-                Completable.error { NetworkInteractor.NetworkUnavailableException() }
-            }
+    override fun hasNetworkConnectionCompletable(): Completable = when {
+        hasNetworkConnection() -> Completable.complete()
+        else -> Completable.error { NetworkInteractor.NetworkUnavailableException() }
+    }
 
 }

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/data/remote/ApiModule.kt

@@ -11,30 +11,22 @@ import javax.inject.Singleton
 class ApiModule {
 
     @Provides @Singleton
-    fun provideApiService(retrofit: Retrofit): GithubApiService {
-        return retrofit.create(GithubApiService::class.java)
-    }
+    fun provideApiService(retrofit: Retrofit) = retrofit.create(GithubApiService::class.java)!!
 
     @Provides @Singleton
     fun provideRetrofit(
             rxJavaCallAdapterFactory: RxJava2CallAdapterFactory,
             gsonConverterFactory: GsonConverterFactory
-    ): Retrofit {
-        return Retrofit.Builder()
-                .baseUrl(ApiConstants.GITHUB_API_BASE_ENDPOINT)
-                .addCallAdapterFactory(rxJavaCallAdapterFactory)
-                .addConverterFactory(gsonConverterFactory)
-                .build()
-    }
+    ) = Retrofit.Builder()
+            .baseUrl(ApiConstants.GITHUB_API_BASE_ENDPOINT)
+            .addCallAdapterFactory(rxJavaCallAdapterFactory)
+            .addConverterFactory(gsonConverterFactory)
+            .build()!!
 
     @Provides @Singleton
-    fun provideGsonConverterFactory(): GsonConverterFactory {
-        return GsonConverterFactory.create()
-    }
+    fun provideGsonConverterFactory() = GsonConverterFactory.create()!!
 
     @Provides @Singleton
-    fun provideRxJavaCallAdapter(): RxJava2CallAdapterFactory {
-        return RxJava2CallAdapterFactory.create()
-    }
+    fun provideRxJavaCallAdapter() = RxJava2CallAdapterFactory.create()!!
 
 }

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/data/remote/model/Parcels.kt

@@ -12,14 +12,15 @@ interface DefaultParcelable : Parcelable {
     override fun describeContents(): Int = 0
 
     companion object {
-        fun <T> generateCreator(create: (source: Parcel) -> T): Parcelable.Creator<T> = object: Parcelable.Creator<T> {
+        fun <T> generateCreator(create: (source: Parcel) -> T): Parcelable.Creator<T> = object : Parcelable.Creator<T> {
             override fun createFromParcel(source: Parcel): T = create(source)
 
             override fun newArray(size: Int): Array<out T>? = newArray(size)
         }
 
     }
 }
+
 inline fun <reified T> Parcel.read(): T = readValue(T::class.javaClass.classLoader) as T
 fun Parcel.write(vararg values: Any?) = values.forEach { writeValue(it) }
 

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/extensions/ViewExtensions.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.support.annotation.ColorInt
 import android.support.annotation.StringRes
 import android.support.design.widget.Snackbar
+import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,41 +14,50 @@ import com.squareup.picasso.Picasso
 var View.isVisible: Boolean
     get() = visibility == View.VISIBLE
     set(value) {
-        visibility = if(value) View.VISIBLE else View.GONE
+        visibility = if (value) View.VISIBLE else View.GONE
     }
 
-fun Context.inflateLayout(layoutResId: Int): View {
-    return inflateView(this, layoutResId, null, false)
-}
-
-fun Context.inflateLayout(layoutResId: Int, parent: ViewGroup): View {
-    return inflateLayout(layoutResId, parent, true)
-}
-
-fun Context.inflateLayout(layoutResId: Int, parent: ViewGroup, attachToRoot: Boolean): View {
-    return inflateView(this, layoutResId, parent, attachToRoot)
-}
-
-private fun inflateView(context: Context, layoutResId: Int, parent: ViewGroup?, attachToRoot: Boolean): View {
-    return LayoutInflater.from(context).inflate(layoutResId, parent, attachToRoot)
-}
+fun Context.inflateLayout(
+        layoutResId: Int,
+        parent: ViewGroup? = null,
+        attachToRoot: Boolean = parent != null
+): View =
+        LayoutInflater.from(this).inflate(layoutResId, parent, attachToRoot)
 
 fun ImageView.loadImage(url: String) {
     Picasso.with(context).load(url).into(this)
 }
 
-fun View.showSnackbar(message: String, length: Int = Snackbar.LENGTH_LONG, f: (Snackbar.() -> Unit) = {}) {
-    val snack = Snackbar.make(this, message, length)
-    snack.f()
-    snack.show()
+fun View.showSnackbar(
+        message: String,
+        length: Int = Snackbar.LENGTH_LONG,
+        f: (Snackbar.() -> Unit) = {}
+) {
+    Snackbar.make(this, message, length).apply {
+        f()
+        show()
+    }
 }
 
-fun View.showSnackbar(@StringRes message: Int, length: Int = Snackbar.LENGTH_LONG, f: (Snackbar.() -> Unit) = {}) {
+fun View.showSnackbar(
+        @StringRes message: Int,
+        length: Int = Snackbar.LENGTH_LONG,
+        f: (Snackbar.() -> Unit) = {}
+) {
     showSnackbar(resources.getString(message), length, f)
 }
 
-fun Snackbar.action(action: String, @ColorInt color: Int? = null, listener: (View) -> Unit) {
+fun Snackbar.action(
+        action: String,
+        @ColorInt color: Int? = null,
+        listener: (View) -> Unit
+) {
     setAction(action, listener)
     color?.let { setActionTextColor(color) }
 }
 
+val RecyclerView.childList: List<View>
+    get() = (0..childCount - 1).map { getChildAt(it) }
+
+val View.recyclerParams: RecyclerView.LayoutParams
+    get() = layoutParams as RecyclerView.LayoutParams

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/base/AbstractViewModel.kt

@@ -2,7 +2,7 @@ package io.github.plastix.kotlinboilerplate.ui.base
 
 import android.databinding.BaseObservable
 
-abstract class AbstractViewModel : BaseObservable(),  ViewModel {
+abstract class AbstractViewModel : BaseObservable(), ViewModel {
 
     override fun bind() {
     }

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/base/BaseActivity.kt

@@ -1,16 +1,18 @@
 package io.github.plastix.kotlinboilerplate.ui.base
 
+import activitystarter.ActivityStarter
 import android.os.Bundle
 import android.support.annotation.CallSuper
 import android.support.v7.app.AppCompatActivity
 import io.github.plastix.kotlinboilerplate.ApplicationComponent
 import io.github.plastix.kotlinboilerplate.KotlinBoilerplateApp
 
-abstract class BaseActivity: AppCompatActivity() {
+abstract class BaseActivity : AppCompatActivity() {
 
     @CallSuper
-    override fun onCreate(savedInstanceState: Bundle?){
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        ActivityStarter.fill(this)
         injectDependencies(KotlinBoilerplateApp.graph)
     }
 

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/base/ViewModel.kt

@@ -1,6 +1,7 @@
 package io.github.plastix.kotlinboilerplate.ui.base
 
-interface ViewModel {
+interface
+ViewModel {
 
     fun bind()
 

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/base/ViewModelLoader.kt

@@ -31,7 +31,6 @@ class ViewModelLoader<T : ViewModel> @Inject constructor(
 
     override fun onReset() {
         super.onReset()
-
         viewModel?.onDestroy()
     }
 }

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/detail/DetailActivity.kt

@@ -1,7 +1,6 @@
 package io.github.plastix.kotlinboilerplate.ui.detail
 
-import android.content.Context
-import android.content.Intent
+import activitystarter.Arg
 import android.databinding.DataBindingUtil
 import android.os.Bundle
 import io.github.plastix.kotlinboilerplate.ApplicationComponent
@@ -13,17 +12,7 @@ import io.github.plastix.kotlinboilerplate.ui.base.ViewModelActivity
 
 open class DetailActivity : ViewModelActivity<DetailViewModel, ActivityDetailBinding>() {
 
-    companion object {
-        val EXTRA_REPO_OBJECT = "REPO_ITEM"
-
-        fun newIntent(context: Context, repo: Repo): Intent {
-            val intent = Intent(context, DetailActivity::class.java)
-            intent.putExtra(EXTRA_REPO_OBJECT, repo)
-            return intent
-        }
-    }
-
-    private val repo by lazy { intent.getParcelableExtra<Repo>(EXTRA_REPO_OBJECT) }
+    @Arg lateinit var repo: Repo
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,9 +25,8 @@ open class DetailActivity : ViewModelActivity<DetailViewModel, ActivityDetailBin
         binding.viewModel = viewModel
     }
 
-    override fun getViewBinding(): ActivityDetailBinding {
-        return DataBindingUtil.setContentView(this, R.layout.activity_detail)
-    }
+    override fun getViewBinding(): ActivityDetailBinding
+            = DataBindingUtil.setContentView(this, R.layout.activity_detail)
 
     override fun injectDependencies(graph: ApplicationComponent) {
         graph.plus(DetailModule(this, repo))

app/src/main/kotlin/io/github/plastix/kotlinboilerplate/ui/detail/DetailBindingAdapter.kt

@@ -5,6 +5,6 @@ import android.widget.ImageView
 import io.github.plastix.kotlinboilerplate.extensions.loadImage
 
 @BindingAdapter("android:src")
-fun setImageBinding(view: ImageView, url: String){
+fun setImageBinding(view: ImageView, url: String) {
     view.loadImage(url)
 }