Remove KotterKnife dependency, use Kotlin static import instead

#29
JoaquimLey · Apr 13, 2018 · 3804953 · 3804953
1 parent 786a8b0
commit 3804953
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/transport-eta-android/mobile-ui/build.gradle b/transport-eta-android/mobile-ui/build.gradle
@@ -109,7 +109,6 @@ dependencies {
     implementation deps.glide
     implementation deps.timber
     implementation deps.lottie
-    implementation deps.kotterknife
     // ACC
     kapt deps.lifecycle.compiler
     implementation deps.lifecycle.extensions

diff --git a/...mobile-ui/src/main/java/com/joaquimley/transporteta/ui/home/favorite/FavoritesFragment.kt b/...mobile-ui/src/main/java/com/joaquimley/transporteta/ui/home/favorite/FavoritesFragment.kt
@@ -8,37 +8,29 @@ import android.support.design.widget.TextInputEditText
 import android.support.design.widget.TextInputLayout
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
-import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AlertDialog
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ProgressBar
 import com.joaquimley.transporteta.R
 import com.joaquimley.transporteta.ui.model.FavoriteView
 import com.joaquimley.transporteta.ui.model.data.ResourceState
 import com.joaquimley.transporteta.ui.util.setVisible
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_favourites.*
-import kotterknife.bindView
 import javax.inject.Inject
 
 /**
  * Created by joaquimley on 24/03/2018.
  */
 class FavoritesFragment : Fragment() {
 
-    private val recyclerView: RecyclerView by bindView(R.id.recycler_view)
-    private val contentLoadingView: ProgressBar by bindView(R.id.progress)
-    private val swipeRefreshView: SwipeRefreshLayout by bindView(R.id.swipe_refresh)
-
     @Inject lateinit var viewModelFactory: FavoritesViewModelFactory
     private lateinit var viewModel: FavoritesViewModel
     private lateinit var adapter: FavoritesAdapter
@@ -133,18 +125,18 @@ class FavoritesFragment : Fragment() {
 
     private fun setupScreenEmptyState(isEmpty: Boolean) {
         // TODO show emptyView.setVisibility(isEmpty)
-        recyclerView.setVisible(!isEmpty)
+        recycler_view.setVisible(!isEmpty)
     }
 
     private fun setupScreenForLoadingState(isLoading: Boolean) {
         setupScreenEmptyState(false)
         if (isLoading) {
-            if (swipeRefreshView.isRefreshing.not() && adapter.isEmpty()) {
-                contentLoadingView.visibility = View.VISIBLE
+            if (swipe_refresh.isRefreshing.not() && adapter.isEmpty()) {
+                progress.visibility = View.VISIBLE
             }
         } else {
-            swipeRefreshView.isRefreshing = false
-            contentLoadingView.visibility = View.GONE
+            swipe_refresh.isRefreshing = false
+            progress.visibility = View.GONE
 //            adapter.removeLoadingView()
         }
     }
@@ -175,15 +167,15 @@ class FavoritesFragment : Fragment() {
     }
 
     private fun setupRecyclerView() {
-        recyclerView.setHasFixedSize(true)
-        recyclerView.layoutManager = LinearLayoutManager(context)
+        recycler_view.setHasFixedSize(true)
+        recycler_view.layoutManager = LinearLayoutManager(context)
         adapter = FavoritesAdapter({ viewModel.onEtaRequested(it) })
-        recyclerView.adapter = adapter
+        recycler_view.adapter = adapter
     }
 
     private fun setupListeners() {
         // TODO emptyView.setListener(emptyListener)
-        swipeRefreshView.setOnRefreshListener({ viewModel.retry() })
+        swipe_refresh.setOnRefreshListener({ viewModel.retry() })
     }
 
     companion object {

diff --git a/transport-eta-android/versions.gradle b/transport-eta-android/versions.gradle
@@ -29,7 +29,6 @@ versions.timber = "4.6.0"
 versions.android_gradle_plugin = "3.1.0"
 versions.jacoco_android_version = "0.1.1"
 versions.lottie = "2.2.5"
-versions.kotterknife = "0.1.0-SNAPSHOT"
 versions.rxjava2 = "2.1.3"
 versions.rx_android = "2.0.1"
 versions.kotlin = "1.1.4-3"
@@ -131,7 +130,6 @@ deps.timber = "com.jakewharton.timber:timber:$versions.timber"
 deps.junit = "junit:junit:$versions.junit"
 deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
 deps.lottie = "com.airbnb.android:lottie:$versions.lottie"
-deps.kotterknife = "com.jakewharton:kotterknife:$versions.kotterknife"
 deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
 deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"
 deps.hamcrest = "org.hamcrest:hamcrest-all:$versions.hamcrest"
@@ -153,6 +151,5 @@ ext.app_version = app_version
 static def addRepos(RepositoryHandler handler) {
     handler.google()
     handler.jcenter()
-    handler.maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // KotterKnife
 }
 ext.addRepos = this.&addRepos