Refactor

DroidKaigi · Jan 11, 2018 · a289d1e · a289d1e
1 parent c6de876
commit a289d1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...main/java/io/github/droidkaigi/confsched2018/presentation/detail/SessionDetailActivity.kt b/...main/java/io/github/droidkaigi/confsched2018/presentation/detail/SessionDetailActivity.kt
@@ -118,7 +118,6 @@ class SessionDetailActivity : BaseActivity(), HasSupportFragmentInjector {
         }
 
         override fun getCount(): Int = sessions.size
-
     }
 
     companion object {

diff --git a/...main/java/io/github/droidkaigi/confsched2018/presentation/detail/SessionDetailFragment.kt b/...main/java/io/github/droidkaigi/confsched2018/presentation/detail/SessionDetailFragment.kt
@@ -43,12 +43,12 @@ class SessionDetailFragment : Fragment(), Injectable {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val sessionId = arguments!!.getString(EXTRA_SESSION_ID)
         sessionDetailViewModel.sessions.observe(this) { result ->
             when (result) {
                 is Result.Success -> {
-                    bindSession(result
-                            .data
-                            .first { it.id == arguments!!.getString(EXTRA_SESSION_ID) })
+                    val sessions = result.data
+                    bindSession(sessions.first { it.id == sessionId })
                 }
                 is Result.Failure -> {
                     Timber.e(result.e)
@@ -59,11 +59,9 @@ class SessionDetailFragment : Fragment(), Injectable {
 
     private fun bindSession(session: Session.SpeechSession) {
         binding.session = session
-
         binding.fab.setOnClickListener {
             sessionDetailViewModel.onFavoriteClick(session)
         }
-
         binding.sessionTopic.text = session.topic.getNameByLang(lang())
         val speakerImages = arrayOf(
                 binding.speakerImage1,
@@ -88,7 +86,6 @@ class SessionDetailFragment : Fragment(), Injectable {
                 imageView.toGone()
             }
         }
-
         binding.speakers.text = session.speakers.joinToString { it.name }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             override fun getCount(): Int = sessions.size
         }
         companion object {
@@ Expand Down @@