feature:

- 년간 데이터 가져오기 성공

Author: msnodeve

app/src/main/java/com/seok/gfd/retrofit/service/GithubCommitService.kt

@@ -7,5 +7,5 @@ import retrofit2.http.Path
 
 interface GithubCommitService {
     @GET("{userId}")
-    fun getCommits(@Path("userId") userId: String):Call<CommitsResponseDto>
+    fun getContribution(@Path("userId") userId: String):Call<CommitsResponseDto>
 }

app/src/main/java/com/seok/gfd/viewmodel/GithubCommitDataViewModel.kt

@@ -68,7 +68,7 @@ class GithubCommitDataViewModel: ViewModel() {
     // 깃허브 사용자 커밋 데이터 가져오기
     fun getCommitsInfo(userId : String){
         val getCommitsService = RetrofitClient.githubCommitService()
-        val getCommitsCall = getCommitsService.getCommits(userId)
+        val getCommitsCall = getCommitsService.getContribution(userId)
         getCommitsCall.enqueue(object : retrofit2.Callback<CommitsResponseDto> {
             @SuppressLint("NewApi")
             override fun onResponse(call: Call<CommitsResponseDto>, response: Response<CommitsResponseDto>) {

app/src/main/java/com/seok/gfd/viewmodel/GithubContributionViewModel.kt

@@ -0,0 +1,34 @@
+package com.seok.gfd.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.seok.gfd.retrofit.RetrofitClient
+import com.seok.gfd.retrofit.domain.resopnse.CommitsResponseDto
+import retrofit2.Call
+import retrofit2.Response
+
+class GithubContributionViewModel : ViewModel() {
+    private val _commits = MutableLiveData<CommitsResponseDto>()
+
+    val commits: LiveData<CommitsResponseDto>
+        get() = _commits
+
+
+    fun getContributionData(userId: String) {
+        val getContributionService = RetrofitClient.githubCommitService()
+        val getContributionCall = getContributionService.getContribution(userId)
+        getContributionCall.enqueue(object : retrofit2.Callback<CommitsResponseDto> {
+
+            override fun onResponse(call: Call<CommitsResponseDto>, response: Response<CommitsResponseDto>) {
+                _commits.value = response.body()
+            }
+
+            override fun onFailure(call: Call<CommitsResponseDto>, t: Throwable) {
+                Log.e(this.javaClass.simpleName, t.message.toString())
+            }
+
+        })
+    }
+}

app/src/main/java/com/seok/gfd/views/Main2Fragment.kt

@@ -6,19 +6,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.ogaclejapan.smarttablayout.utils.v4.Bundler
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItemAdapter
 import com.ogaclejapan.smarttablayout.utils.v4.FragmentPagerItems
 import com.seok.gfd.R
 import com.seok.gfd.retrofit.domain.User
 import com.seok.gfd.utils.CommonUtils
 import com.seok.gfd.utils.SharedPreference
+import com.seok.gfd.viewmodel.GithubCommitDataViewModel
+import com.seok.gfd.viewmodel.GithubContributionViewModel
 import kotlinx.android.synthetic.main.fragment_main2.*
 import java.time.LocalDate
 
 class Main2Fragment : Fragment() {
     private lateinit var commonUtils: CommonUtils
     private lateinit var sharedPreference: SharedPreference
+
+    private lateinit var githubContributionViewModel: GithubContributionViewModel
+
     private lateinit var user: User
 
     override fun onCreateView(
@@ -33,24 +39,32 @@ class Main2Fragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         init()
         initSetUI()
+        initViewModelFun()
     }
 
     private fun init() {
         sharedPreference = SharedPreference(this.activity!!.application)
         user = sharedPreference.getValueObject(getString(R.string.user_info))
         commonUtils = CommonUtils.instance
 
-        val user = User("test1","test1","test1")
-        val adapter = FragmentPagerItemAdapter(
-            activity?.supportFragmentManager, FragmentPagerItems.with(activity)
-                .add("2020", MainSub1::class.java, MainSub1.arguments(user))
-                .add("2019", MainSub2::class.java)
-                .add("2018", MainSub3::class.java).create()
-        )
+        githubContributionViewModel = ViewModelProviders.of(this).get(GithubContributionViewModel::class.java)
+
+        githubContributionViewModel.getContributionData("msnodeve")
+    }
+
+    private fun initViewModelFun(){
+        githubContributionViewModel.commits.observe(this, Observer {
+            val adapter = FragmentPagerItemAdapter(
+                activity?.supportFragmentManager, FragmentPagerItems.with(activity)
+                    .add("2020", MainSub1::class.java, MainSub1.arguments(it))
+                    .add("2019", MainSub2::class.java)
+                    .add("2018", MainSub3::class.java).create()
+            )
 
-        main_view_pager.adapter = adapter
+            main_view_pager.adapter = adapter
 
-        main_tab_smart_layout.setViewPager(main_view_pager)
+            main_tab_smart_layout.setViewPager(main_view_pager)
+        })
     }
 
     private fun initSetUI() {

app/src/main/java/com/seok/gfd/views/MainSub1.kt

@@ -7,13 +7,13 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.ogaclejapan.smarttablayout.utils.v4.Bundler
 import com.seok.gfd.R
-import com.seok.gfd.retrofit.domain.User
+import com.seok.gfd.retrofit.domain.resopnse.CommitsResponseDto
 import com.seok.gfd.utils.CommonUtils
 
 class MainSub1 : Fragment() {
 
     companion object{
-        fun arguments(param : User) : Bundle{
+        fun arguments(param : CommitsResponseDto) : Bundle{
             val str = CommonUtils.gson.toJson(param)
             return Bundler().putString("key", str).get()
         }
@@ -29,10 +29,13 @@ class MainSub1 : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+    }
+
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         val t = arguments?.getString("key")
-        val user = CommonUtils.gson.fromJson(t, User::class.java)
+        val user = CommonUtils.gson.fromJson(t, CommitsResponseDto::class.java)
         user
     }
-
 }