Merge pull request #124 from muth0mi/issue-99

Issue 99

Author: michaelbukachi

app/src/main/res/values/colors.xml

@@ -47,6 +47,7 @@
     <color name="colorBlack">#191d1d</color>
     <color name="colorWhite">#ffffff</color>
     <color name="colorYellow">#ffd858</color>
+    <color name="colorYellowFaded">#8DFFD858</color>
     <color name="superLightPurple">#0D843D95</color>
     <color name="colorAquaMarineFaded">#1D68DEA4</color>
     <color name="colorRevolver">#241527</color>

buildSrc/local.properties

@@ -4,9 +4,8 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-<<<<<<< HEAD
-#Mon Apr 13 02:46:54 EAT 2020
-=======
-#Sat Apr 11 01:32:35 EAT 2020
->>>>>>> 0e9f7f6... Refactor speaker module into the speakers module
-sdk.dir=/home/oly/Programs/Android/sdk
+#Sat May 02 22:10:28 EAT 2020
+>>>>>>>=0e9f7f6... Refactor speaker module into the speakers module
+sdk.dir=/home/oly/Programs/AndroidSdk
+=\=\=\=\=\=\=
+<<<<<<<=HEAD

features/home/src/main/java/com/android254/droidconKE2020/home/domain/Session.kt

@@ -2,8 +2,10 @@ package com.android254.droidconKE2020.home.domain
 
 data class Session(
     val id: Long,
+    val title: String,
     val description: String,
     val time: String,
     val room: String,
-    val imageUrl: String
+    val imageUrl: String,
+    val speaker: Speaker
 )

features/home/src/main/java/com/android254/droidconKE2020/home/domain/Speaker.kt

@@ -1,15 +1,15 @@
 package com.android254.droidconKE2020.home.domain
 
 data class Speaker(
-    val id: Int,
+    val id: Int = 0,
     val name: String,
-    val bio: String,
-    val work: String,
-    val company: String,
-    val skills: List<String>,
-    val imageUrl: String,
-    val stars: List<Int>,
-    val socialMedia: SocialMedia,
+    val bio: String = "",
+    val work: String = "",
+    val company: String = "",
+    val skills: List<String> = listOf(),
+    val imageUrl: String = "",
+    val stars: List<Int> = listOf(),
+    val socialMedia: SocialMedia = SocialMedia(""),
     val isKeynoteSpeaker: Boolean = false
 )
 

features/home/src/main/java/com/android254/droidconKE2020/home/ui/adapters/SessionAdapter.kt

@@ -3,13 +3,15 @@ package com.android254.droidconKE2020.home.ui.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import coil.api.load
 import com.android254.droidconKE2020.home.R
 import com.android254.droidconKE2020.home.domain.Session
 import com.android254.droidconKE2020.home.ui.views.HomeFragmentDirections
 import kotlinx.android.synthetic.main.home_item_session.view.*
+import com.android254.droidconKE2020.R as appR
 
 class SessionAdapter : RecyclerView.Adapter<SessionAdapter.SessionViewHolder>() {
 
@@ -24,7 +26,7 @@ class SessionAdapter : RecyclerView.Adapter<SessionAdapter.SessionViewHolder>()
 
     override fun onBindViewHolder(holder: SessionViewHolder, position: Int) {
         val session = sessions[position]
-        holder.bindSession(session)
+        holder.bindSession(session, position)
     }
 
     fun updateData(list: List<Session>) {
@@ -35,9 +37,21 @@ class SessionAdapter : RecyclerView.Adapter<SessionAdapter.SessionViewHolder>()
 
     inner class SessionViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
 
-        fun bindSession(session: Session) {
+        fun bindSession(session: Session, position: Int) {
+            view.sessionImg.apply {
+                val colorId = if (position % 2 == 0) appR.color.colorBermudaFaded
+                else appR.color.colorYellowFaded
+
+                val bgColor = ContextCompat.getColor(context, colorId)
+                setBackgroundColor(bgColor)
+            }
             with(session) {
-                view.sessionImg.load(imageUrl.toInt()) // ToDo: Remove the int cast upon introducing real data
+                view.imgAvatar.load(speaker.imageUrl)
+                view.tvSessionTitle.text = "$title:"
+                view.tvSessionDescription.text = description
+                view.tvSpeakerName.text = speaker.name
+                view.tvSpeakerDelegation.text =
+                    "${speaker.work}${if (!speaker.company.isBlank()) ", " + speaker.company else ""}"
                 view.time.text = time
                 view.room.text = room
                 view.description.text = description

features/home/src/main/java/com/android254/droidconKE2020/home/ui/views/HomeFragment.kt

@@ -153,7 +153,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
 
         val adapter = SessionAdapter()
         binding.sessionsList.adapter = adapter
-        binding.sessionsList.addItemDecoration(HorizontalSpaceDecoration(20))
+        binding.sessionsList.addItemDecoration(HorizontalSpaceDecoration(30))
 
         homeViewModel.sessionList.observe(viewLifecycleOwner, Observer { sessions ->
             if (sessions == null) {

features/home/src/main/java/com/android254/droidconKE2020/home/viewmodel/HomeViewModel.kt

@@ -3,11 +3,9 @@ package com.android254.droidconKE2020.home.viewmodel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.android254.droidconKE2020.home.R
-import com.android254.droidconKE2020.home.domain.Organizer
-import com.android254.droidconKE2020.home.domain.Promotion
-import com.android254.droidconKE2020.home.domain.Session
-import com.android254.droidconKE2020.home.domain.Sponsor
+import com.android254.droidconKE2020.home.domain.*
 import com.android254.droidconKE2020.home.repositories.FakeSpeakerRepository
+import com.github.javafaker.Faker
 
 class HomeViewModel(
     private val promotionRepository: FakePromotionRepository,
@@ -99,10 +97,16 @@ class FakeSessionRepository {
             db.add(
                 Session(
                     id = i.toLong(),
+                    title = if (i == 0) "KeyNote" else if (i % 2 == 0) "Kotlin Garbage Collection" else "Yet Another Architecture",
                     description = "Some short description",
                     room = "Room $i",
                     time = "10:5$i",
-                    imageUrl = "${R.drawable.dummy_session_image}"
+                    imageUrl = "${R.drawable.dummy_session_image}",
+                    speaker = Speaker(
+                        name = "Don Felker",
+                        work = "Software Developer / Podcast Host",
+                        imageUrl = Faker().avatar().image()
+                    )
                 )
             )
         }