Refatorando o código - criado repository e datasource com a classe de implementacao e interface na camada de data - criado o viewmodel com a classe RepositoryListRepositoryImpl na camada de presentation - modificado a config do NetworkUtils.

Author: adenilsonricardo

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/data/datasource/RepositoryListDataSource.kt

@@ -0,0 +1,8 @@
+package com.devpass.githubapp.data.datasource
+
+import com.devpass.githubapp.data.model.Repository
+import retrofit2.Call
+
+interface RepositoryListDataSource {
+    fun getRepositories(username: String): Call<List<Repository>>
+}

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/data/datasource/RepositoryListDataSourceImpl.kt

@@ -0,0 +1,14 @@
+package com.devpass.githubapp.data.datasource
+
+import com.devpass.githubapp.data.api.GitHubEndpoint
+import com.devpass.githubapp.data.model.Repository
+import retrofit2.Call
+
+class RepositoryListDataSourceImpl(
+    private val service : GitHubEndpoint
+): RepositoryListDataSource {
+
+    override fun getRepositories(username: String): Call<List<Repository>> {
+        return service.getRepositories(username = username)
+    }
+}

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/data/repository/RepositoryListRepository.kt

@@ -0,0 +1,8 @@
+package com.devpass.githubapp.data.repository
+
+import com.devpass.githubapp.data.model.Repository
+import retrofit2.Call
+
+interface RepositoryListRepository {
+    fun getRepositories(): Call<List<Repository>>
+}

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/data/repository/RepositoryListRepositoryImpl.kt

@@ -0,0 +1,15 @@
+package com.devpass.githubapp.data.repository
+
+import com.devpass.githubapp.data.datasource.RepositoryListDataSource
+import com.devpass.githubapp.data.model.Repository
+import retrofit2.Call
+
+class RepositoryListRepositoryImpl(
+    private val repositoryListDataSource: RepositoryListDataSource
+): RepositoryListRepository {
+
+    override fun getRepositories(): Call<List<Repository>> {
+        return repositoryListDataSource.getRepositories(
+            "devpass-tech")
+    }
+}

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/presentation/RepositoryListActivity.kt

@@ -4,46 +4,46 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import android.widget.Toast
 import com.devpass.githubapp.R
 import com.devpass.githubapp.data.api.GitHubEndpoint
+import com.devpass.githubapp.data.datasource.RepositoryListDataSource
+import com.devpass.githubapp.data.datasource.RepositoryListDataSourceImpl
 import com.devpass.githubapp.data.model.Repository
+import com.devpass.githubapp.data.repository.RepositoryListRepository
+import com.devpass.githubapp.data.repository.RepositoryListRepositoryImpl
 import com.devpass.githubapp.databinding.ActivityMainBinding
+import com.devpass.githubapp.presentation.viewmodel.RepositoryListViewModel
 import com.devpass.githubapp.utils.NetworkUtils
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class RepositoryListActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
+    private val service: GitHubEndpoint = NetworkUtils.getRetrofitInstance.create(GitHubEndpoint::class.java)
+    private val dataSource: RepositoryListDataSource = RepositoryListDataSourceImpl(service)
+    private val repository: RepositoryListRepository = RepositoryListRepositoryImpl(dataSource)
+    private val viewModel: RepositoryListViewModel = RepositoryListViewModel(repository)
     private lateinit var adapter: RepositoryListAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setSupportActionBar(binding.toolbar)
-
-        val retrofitClient = NetworkUtils.getRetrofitInstance("https://api.github.com")
-        val endpoint = retrofitClient.create(GitHubEndpoint::class.java)
-        val callback = endpoint.getRepositories("devpass-tech")
-
-        callback.enqueue(object : Callback<List<Repository>> {
-            override fun onFailure(call: Call<List<Repository>>, t: Throwable) {
-                Toast.makeText(baseContext, t.message, Toast.LENGTH_SHORT).show()
-            }
+        setupToolbar()
+        viewModel.repositoryList.observe(this){
+            setupRv(it)
+        }
+    }
 
-            override fun onResponse(call: Call<List<Repository>>, response: Response<List<Repository>>) {
-                val repositoryList = response.body() ?: listOf()
+    private fun setupRv(repositoryList: List<Repository>) {
+        adapter = RepositoryListAdapter(repositoryList)
+        binding.contentRepositoryListRv.adapter = adapter
+    }
 
-                adapter = RepositoryListAdapter(repositoryList)
-                binding.contentRepositoryListRv.adapter = adapter
-            }
-        })
+    private fun setupToolbar() {
+        setSupportActionBar(binding.toolbar)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -58,6 +58,10 @@ class RepositoryListActivity : AppCompatActivity() {
         val inflater: MenuInflater = menuInflater
         inflater.inflate(R.menu.menu_main, menu)
         return true
+    } private fun observer() {
+        viewModel.repositoryList.observe(this) {
+            adapter.updateList(it as MutableList<Repository>)
+        }
     }
 
 }

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/presentation/RepositoryListAdapter.kt

@@ -8,7 +8,7 @@ import com.devpass.githubapp.data.model.Repository
 import com.devpass.githubapp.databinding.RepositoryCellItemBinding
 
 class RepositoryListAdapter(
-    private val repositoryList : List<Repository>
+    private var repositoryList : List<Repository>
 ) : RecyclerView.Adapter<RepositoryCellItem>() {
 
     override fun onCreateViewHolder(
@@ -27,4 +27,8 @@ class RepositoryListAdapter(
         holder.bind(repositoryList[position])
     }
 
+    fun updateList(newList: MutableList<Repository>){
+        repositoryList = newList
+        notifyDataSetChanged()
+    }
 }

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/presentation/viewmodel/RepositoryListViewModel.kt

@@ -0,0 +1,35 @@
+package com.devpass.githubapp.presentation.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.devpass.githubapp.data.model.Repository
+import com.devpass.githubapp.data.repository.RepositoryListRepository
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class RepositoryListViewModel(
+    private val repository: RepositoryListRepository
+):ViewModel() {
+
+    private var _repositoriesList : MutableLiveData<List<Repository>> = MutableLiveData()
+    val repositoryList : LiveData<List<Repository>> = _repositoriesList
+
+    init {
+        getListRepositories()
+    }
+
+    private fun getListRepositories() {
+        repository.getRepositories().enqueue(
+            object : Callback<List<Repository>>{
+            override fun onFailure(call: Call<List<Repository>>, t: Throwable){
+            }
+            override fun onResponse(
+                call: Call<List<Repository>>, response: Response<List<Repository>>
+            ) {
+                _repositoriesList.value = response.body() ?: listOf()
+            }
+        })
+    }
+}

solutions/devsprint-bruno-almeida-1/app/src/main/java/com/devpass/githubapp/utils/NetworkUtils.kt

@@ -1,18 +1,16 @@
 package com.devpass.githubapp.utils
 
+import com.google.gson.GsonBuilder
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-class NetworkUtils {
+const val BASE_URL = "https://api.github.com"
 
-    companion object {
-
-        fun getRetrofitInstance(path : String) : Retrofit {
-            return Retrofit.Builder()
-                .baseUrl(path)
-                .addConverterFactory(GsonConverterFactory.create())
-                .build()
-        }
-    }
+object NetworkUtils {
+    val gson = GsonBuilder().setLenient().create()
 
+    val getRetrofitInstance = Retrofit.Builder()
+        .baseUrl(BASE_URL)
+        .addConverterFactory(GsonConverterFactory.create())
+        .build()
 }