Refactoring arch

app/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlinx-serialization'
 apply plugin: 'koin'
 apply plugin: 'com.google.gms.google-services'
 
@@ -43,6 +42,7 @@ android {
 }
 
 dependencies {
+    implementation project(':data')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.1'
@@ -91,7 +91,6 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:$ok_http_version"
     testImplementation "com.squareup.okhttp3:mockwebserver:$ok_http_version"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
     implementation "androidx.cardview:cardview:1.0.0"
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"

app/src/main/java/com/dhruvdroid/sampleott/adapter/ContentListAdapter.kt

@@ -5,8 +5,8 @@ import android.view.ViewGroup
 import android.widget.Filter
 import android.widget.Filterable
 import androidx.recyclerview.widget.RecyclerView
+import com.dhruvdroid.data.Content
 import com.dhruvdroid.sampleott.R
-import com.dhruvdroid.sampleott.data.Content
 import com.dhruvdroid.sampleott.databinding.MovieItemBinding
 
 //
@@ -15,7 +15,7 @@ import com.dhruvdroid.sampleott.databinding.MovieItemBinding
 class ContentListAdapter(val list: MutableList<Content>) :
     RecyclerView.Adapter<ContentListAdapter.MovieViewHolder>(), Filterable {
 
-    private lateinit var listFiltered: MutableList<Content>
+    private var listFiltered: MutableList<Content>
 
     init {
         listFiltered = list
@@ -33,7 +33,7 @@ class ContentListAdapter(val list: MutableList<Content>) :
     inner class MovieViewHolder(private val viewBinder: MovieItemBinding) :
         RecyclerView.ViewHolder(viewBinder.root) {
 
-        fun viewBinding(data: Content) {
+        fun viewBinding(data: com.dhruvdroid.data.Content) {
             viewBinder.title.text = data.name
             viewBinder.movieCard.setBackgroundResource(getDrawableResource(data.posterImage))
         }
@@ -82,7 +82,7 @@ class ContentListAdapter(val list: MutableList<Content>) :
         return listFiltered.size
     }
 
-    fun updateList(content: List<Content>) {
+    fun updateList(content: List<com.dhruvdroid.data.Content>) {
         this.list.addAll(content)
         notifyDataSetChanged()
     }
@@ -94,7 +94,7 @@ class ContentListAdapter(val list: MutableList<Content>) :
                 listFiltered = if (charString.isEmpty()) {
                     list
                 } else {
-                    val filteredList: MutableList<Content> = ArrayList()
+                    val filteredList: MutableList<com.dhruvdroid.data.Content> = ArrayList()
                     for (item in list) {
                         if (item.name.toLowerCase().contains(charString.toLowerCase())) {
                             filteredList.add(item)
@@ -109,7 +109,7 @@ class ContentListAdapter(val list: MutableList<Content>) :
             }
 
             override fun publishResults(charSequence: CharSequence, filterResults: FilterResults) {
-                listFiltered = filterResults.values as MutableList<Content>
+                listFiltered = filterResults.values as MutableList<com.dhruvdroid.data.Content>
                 notifyDataSetChanged()
             }
         }

app/src/main/java/com/dhruvdroid/sampleott/adapter/MovieListAdapter.kt

@@ -6,22 +6,21 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.dhruvdroid.sampleott.R
-import com.dhruvdroid.sampleott.data.Content
 import com.dhruvdroid.sampleott.databinding.MovieItemBinding
 
 //
 // Created by Dhruv on 15/08/20.
 //
-class MovieListAdapter : ListAdapter<Content, MovieListAdapter.MovieViewHolder>(DIFF_CHECK) {
+class MovieListAdapter : ListAdapter<com.dhruvdroid.data.Content, MovieListAdapter.MovieViewHolder>(DIFF_CHECK) {
 
     companion object {
-        private val DIFF_CHECK = object : DiffUtil.ItemCallback<Content>() {
-            override fun areItemsTheSame(oldItem: Content, newItem: Content): Boolean {
+        private val DIFF_CHECK = object : DiffUtil.ItemCallback<com.dhruvdroid.data.Content>() {
+            override fun areItemsTheSame(oldItem: com.dhruvdroid.data.Content, newItem: com.dhruvdroid.data.Content): Boolean {
                 return oldItem.id == newItem.id
             }
 
 
-            override fun areContentsTheSame(oldItem: Content, newItem: Content): Boolean {
+            override fun areContentsTheSame(oldItem: com.dhruvdroid.data.Content, newItem: com.dhruvdroid.data.Content): Boolean {
                 return oldItem == newItem
             }
 
@@ -40,7 +39,7 @@ class MovieListAdapter : ListAdapter<Content, MovieListAdapter.MovieViewHolder>(
     inner class MovieViewHolder(private val viewBinder: MovieItemBinding) :
         RecyclerView.ViewHolder(viewBinder.root) {
 
-        fun viewBinding(data: Content) {
+        fun viewBinding(data: com.dhruvdroid.data.Content) {
             viewBinder.title.text = data.name
             viewBinder.movieCard.setBackgroundResource(getDrawableResource(data.posterImage))
         }

app/src/main/java/com/dhruvdroid/sampleott/database/TrayDao.kt

@@ -3,7 +3,6 @@ package com.dhruvdroid.sampleott.database
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
-import com.dhruvdroid.sampleott.data.Tray
 
 //
 // Created by Dhruv on 14/08/20.
@@ -13,7 +12,7 @@ import com.dhruvdroid.sampleott.data.Tray
 interface TrayDao {
 
   @Insert(onConflict = OnConflictStrategy.REPLACE)
-  suspend fun insertMovieList(movieList: List<Tray>)
+  suspend fun insertMovieList(movieList: List<com.dhruvdroid.data.Tray>)
 
 //  @Query("SELECT * FROM Tray WHERE page = :page_")
 //  suspend fun getMovieList(page_: Int): List<Tray>

app/src/main/java/com/dhruvdroid/sampleott/network/MovieService.kt

@@ -1,6 +1,5 @@
 package com.dhruvdroid.sampleott.network
 
-import com.dhruvdroid.sampleott.data.Tray
 import retrofit2.http.GET
 import retrofit2.http.Url
 
@@ -11,5 +10,5 @@ import retrofit2.http.Url
 interface MovieService {
 
     @GET
-    suspend fun fetchList(@Url path: String): Tray
+    suspend fun fetchList(@Url path: String): com.dhruvdroid.data.Tray
 }

app/src/main/java/com/dhruvdroid/sampleott/repository/MainRepository.kt

@@ -1,9 +1,6 @@
 package com.dhruvdroid.sampleott.repository
 
 import android.util.Log
-import com.dhruvdroid.sampleott.data.Content
-import com.dhruvdroid.sampleott.data.MovieResult
-import com.dhruvdroid.sampleott.data.Tray
 import com.dhruvdroid.sampleott.network.MovieService
 import com.dhruvdroid.sampleott.utilities.AppUtils
 import com.dhruvdroid.sampleott.utilities.AppUtils.getRandomId
@@ -23,17 +20,17 @@ class MainRepository constructor(
     private val service: MovieService
 ) : Repository {
 
-    private val searchResults = ConflatedBroadcastChannel<MovieResult>()
+    private val searchResults = ConflatedBroadcastChannel<com.dhruvdroid.data.MovieResult>()
 
     // keep the last requested page. When the request is successful, increment the page number.
     private var lastRequestedPage = START_PAGE_INDEX
 
     // avoid triggering multiple requests in the same time
     private var isApiInProgress = false
 
-    private var memoryCache = mutableListOf<Content>()
+    private var memoryCache = mutableListOf<com.dhruvdroid.data.Content>()
 
-    suspend fun getMovieList(): Flow<MovieResult> {
+    suspend fun getMovieList(): Flow<com.dhruvdroid.data.MovieResult> {
         lastRequestedPage = 1
         memoryCache.clear()
         requestData()
@@ -48,18 +45,18 @@ class MainRepository constructor(
             Log.d("--", "lastRequestedPage == $lastRequestedPage")
             val response = service.fetchList(AppUtils.getApiUrl(lastRequestedPage))
             memoryCache.addAll(response.page.contentItems.content)
-            searchResults.offer(MovieResult.Success(filterItem(response)))
+            searchResults.offer(com.dhruvdroid.data.MovieResult.Success(filterItem(response)))
             isSuccess = true
         } catch (exception: IOException) {
-            searchResults.offer(MovieResult.Error(exception))
+            searchResults.offer(com.dhruvdroid.data.MovieResult.Error(exception))
         } catch (exception: HttpException) {
-            searchResults.offer(MovieResult.Error(exception))
+            searchResults.offer(com.dhruvdroid.data.MovieResult.Error(exception))
         }
         isApiInProgress = false
         return isSuccess
     }
 
-    private fun filterItem(response: Tray): Tray {
+    private fun filterItem(response: com.dhruvdroid.data.Tray): com.dhruvdroid.data.Tray {
         // adding random id to the API response
         val array = ByteArray(7)
         Random().nextBytes(array)

app/src/main/java/com/dhruvdroid/sampleott/ui/MainActivity.kt

@@ -15,10 +15,6 @@ import com.dhruvdroid.sampleott.R
 import com.dhruvdroid.sampleott.adapter.ContentListAdapter
 import com.dhruvdroid.sampleott.adapter.MovieListAdapter
 import com.dhruvdroid.sampleott.base.BaseActivity
-import com.dhruvdroid.sampleott.data.Content
-import com.dhruvdroid.sampleott.data.MovieResult
-import com.dhruvdroid.sampleott.data.Page
-import com.dhruvdroid.sampleott.data.Tray
 import com.dhruvdroid.sampleott.layoutmanager.CustomGridLayoutManager
 import com.dhruvdroid.sampleott.layoutmanager.ListDecorator
 import com.dhruvdroid.sampleott.utilities.AppUtils
@@ -35,7 +31,7 @@ class MainActivity : BaseActivity() {
 
     private var totalCount = 0
     private var contentAdapter: ContentListAdapter? = null
-    private lateinit var list: List<Content>
+    private lateinit var list: List<com.dhruvdroid.data.Content>
     private val movieAdapter = MovieListAdapter()
     private val viewModel: MainViewModel by viewModel()
 
@@ -53,12 +49,12 @@ class MainActivity : BaseActivity() {
 
         viewModel.movieResult.observe(this) { result ->
             when (result) {
-                is MovieResult.Success -> {
+                is com.dhruvdroid.data.MovieResult.Success -> {
                     showEmptyList(result.data.page)
                     setUiData(result.data)
                 }
 
-                is MovieResult.Error -> {
+                is com.dhruvdroid.data.MovieResult.Error -> {
                     Toast.makeText(
                         this,
                         " $result.message}",
@@ -69,13 +65,13 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private fun setUiData(data: Tray) {
+    private fun setUiData(data: com.dhruvdroid.data.Tray) {
 //        list = data.page.contentItems.content
 //        movieAdapter.submitList(list)
 
         if (contentAdapter == null) {
             contentAdapter =
-                ContentListAdapter(data.page.contentItems.content as MutableList<Content>)
+                ContentListAdapter(data.page.contentItems.content as MutableList<com.dhruvdroid.data.Content>)
             rvList.apply {
                 // use this setting to improve performance if you know that changes
                 // in content do not change the layout size of the RecyclerView
@@ -91,13 +87,13 @@ class MainActivity : BaseActivity() {
             }
         } else {
             totalCount += data.page.contentItems.content.size
-            contentAdapter?.updateList(data.page.contentItems.content as MutableList<Content>)
+            contentAdapter?.updateList(data.page.contentItems.content as MutableList<com.dhruvdroid.data.Content>)
         }
 
         setupScrollListener()
     }
 
-    private fun showEmptyList(page: Page) {
+    private fun showEmptyList(page: com.dhruvdroid.data.Page) {
         if (page.contentItems.content.isEmpty()) {
             emptyList.visibility = View.VISIBLE
             rvList.visibility = View.GONE

app/src/main/java/com/dhruvdroid/sampleott/ui/MainViewModel.kt

@@ -6,7 +6,6 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
 import com.dhruvdroid.sampleott.base.BaseViewModel
-import com.dhruvdroid.sampleott.data.MovieResult
 import com.dhruvdroid.sampleott.repository.MainRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -20,15 +19,15 @@ class MainViewModel constructor(
     private val repo: MainRepository
 ) : BaseViewModel() {
 
-    var movieResult: LiveData<MovieResult>
+    var movieResult: LiveData<com.dhruvdroid.data.MovieResult>
 
 
     companion object {
         private const val THRESHOLD = 10
     }
 
     init {
-        movieResult = liveData<MovieResult> {
+        movieResult = liveData<com.dhruvdroid.data.MovieResult> {
             val list = repo.getMovieList().asLiveData(Dispatchers.Main)
             emitSource(list)
         }

app/src/test/java/com/dhruvdroid/sampleott/MainViewModelTest.kt

@@ -5,8 +5,6 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.asLiveData
-import com.dhruvdroid.sampleott.data.MovieResult
-import com.dhruvdroid.sampleott.data.Tray
 import com.dhruvdroid.sampleott.network.MovieService
 import com.dhruvdroid.sampleott.repository.MainRepository
 import com.dhruvdroid.sampleott.ui.MainViewModel
@@ -53,12 +51,12 @@ class MainViewModelTest {
 
     @Test
     fun fetchMovieTest() = runBlocking {
-        val mockData = Json.parse<Tray>(MockUtil.loadJSONFromAsset(context, "page1.json"))
+        val mockData = Json.parse<com.dhruvdroid.data.Tray>(MockUtil.loadJSONFromAsset(context, "page1.json"))
         whenever(movieService.fetchList("https://run.mocky.io/v3/1297c2bf-7399-48f1-b8ee-d0f98ca45a34"))
             .thenReturn(mockData)
 
-        val observer: Observer<MovieResult> = mock()
-        val fetchedData: LiveData<MovieResult> =
+        val observer: Observer<com.dhruvdroid.data.MovieResult> = mock()
+        val fetchedData: LiveData<com.dhruvdroid.data.MovieResult> =
             mainRepository.getMovieList().asLiveData()
         fetchedData.observeForever(observer)
 

data/.gitignore

@@ -0,0 +1 @@
+/build

data/README.md

@@ -0,0 +1,11 @@
+# Different types of JSON parsing technique
+
+**Below mentioned - **
+1. Moshi-
+@Json(name = "vote_count") val voteCount: Int = -1
+
+2. GSON-
+@SerializedName(“vote_count”) val voteCount: Int = -1
+
+3. Jackson -
+@JsonProperty("vote_count") val voteCount: Int = -1