[UPDATE] Update view data

adrie4mac · Oct 12, 2018 · 4822854 · 4822854
1 parent 6caf966
commit 4822854
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/Data/src/main/java/com/adriesavana/data/movie/entity/MovieListEntity.kt b/Data/src/main/java/com/adriesavana/data/movie/entity/MovieListEntity.kt
@@ -4,7 +4,7 @@ import com.adriesavana.movie.model.MovieDetail
 import com.adriesavana.movie.model.MovieList
 import com.google.gson.annotations.SerializedName
 
-class MovieListEntity(@SerializedName("page") val requestId: Int? = null,
+data class MovieListEntity(@SerializedName("page") val requestId: Int? = null,
                       @SerializedName("total_results") val totalResults: Int? = null,
                       @SerializedName("total_pages") val totalPages: Int? = null,
                       @SerializedName("results") val movies: List<MovieEntity>? = null) {

diff --git a/Movie/src/main/java/com/adriesavana/movie/usecase/GetMovieListUseCase.kt b/Movie/src/main/java/com/adriesavana/movie/usecase/GetMovieListUseCase.kt
@@ -17,7 +17,7 @@ class GetMovieListUseCase
     : UseCase.RxSingle<MovieList, GetMovieListUseCase.Params>(threadException, postExecutionThread) {
     override fun build(params: GetMovieListUseCase.Params?): Single<MovieList> {
         params?.let {
-            return repository.getMovieList(it.category!!, it.page.toString())
+            return repository.getMovieList(it.category, it.page.toString())
                     .doOnSuccess { params.page = ++params.page }
         }
 

diff --git a/app/src/main/java/com/adriesavana/themoviedb/common/base/BaseListFragment.kt b/app/src/main/java/com/adriesavana/themoviedb/common/base/BaseListFragment.kt
@@ -65,16 +65,19 @@ abstract class BaseListFragment<VM : ViewModelType> : BaseFragment<VM>() {
                 .subscribe { doLoadMore() }
                 .disposedBy(compositeDisposable)
 
-        swipeRefreshLayout.isEnabled = true
-        swipeRefreshLayout.setOnRefreshListener {
-            onRefreshed()
+        swipeRefreshLayout.apply {
+            isRefreshing = true
+            setOnRefreshListener {
+                onRefreshed()
+            }
         }
 
-        recyclerView.layoutManager = layoutManager
-        recyclerView.itemAnimator = null
-        recyclerView.adapter = fastAdapter
-        recyclerView.setHasFixedSize(true)
-
+        recyclerView.apply {
+            layoutManager = layoutManager
+            itemAnimator = null
+            adapter = fastAdapter
+            setHasFixedSize(true)
+        }
     }
 
     open fun removeLoadMore() {

diff --git a/app/src/main/java/com/adriesavana/themoviedb/movie/MovieActivity.kt b/app/src/main/java/com/adriesavana/themoviedb/movie/MovieActivity.kt
@@ -22,10 +22,15 @@ class MovieActivity : BaseActivity<MovieViewModelType>() {
 
     private fun setupViewPager() {
         val adapter = ViewPagerAdapter(supportFragmentManager)
-        adapter.addFragment(MovieFragment.newInstance(CATEGORY_POPULAR.toLowerCase()), CATEGORY_POPULAR)
-        adapter.addFragment(MovieFragment.newInstance(CATEGORY_TOP_RATED), CATEGORY_TOP_RATED)
+        adapter.apply {
+            addFragment(MovieFragment.newInstance(CATEGORY_POPULAR.toLowerCase()), CATEGORY_POPULAR)
+            addFragment(MovieFragment.newInstance(CATEGORY_TOP_RATED), CATEGORY_TOP_RATED)
+        }
+
         viewPager_movie.adapter = adapter
-        tabs_movie.setupWithViewPager(viewPager_movie)
-        tabs_movie.setTabTextColors(Color.parseColor("#66ffffff"), Color.parseColor("#FFFFFF"));
+        tabs_movie.apply {
+            setupWithViewPager(viewPager_movie)
+            setTabTextColors(Color.parseColor("#66ffffff"), Color.parseColor("#FFFFFF"));
+        }
     }
 }