Favorite session date text

feature/session/src/main/java/io/github/droidkaigi/confsched2020/session/ui/BottomSheetSessionsFragment.kt

@@ -83,7 +83,8 @@ class BottomSheetSessionsFragment : DaggerFragment() {
         binding.sessionRecycler.addItemDecoration(
             SessionsItemDecoration(
                 groupAdapter,
-                requireContext()
+                requireContext(),
+                args.page == SessionPage.Favorite
             )
         )
         binding.sessionRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {

feature/session/src/main/java/io/github/droidkaigi/confsched2020/session/ui/item/SessionItem.kt

@@ -171,6 +171,8 @@ class SessionItem @AssistedInject constructor(
         imageRequestDisposables.forEach { it.dispose() }
     }
 
+    fun startSessionDate(): String = session.startDayText
+
     fun startSessionTime(): String = session.startTimeText
 
     fun title(): LocaledString = session.title

feature/session/src/main/java/io/github/droidkaigi/confsched2020/session/ui/widget/SessionsItemDecoration.kt

@@ -15,14 +15,15 @@ import io.github.droidkaigi.confsched2020.util.AndroidRAttr
 
 class SessionsItemDecoration(
     private val adapter: GroupAdapter<*>,
-    private val context: Context
+    private val context: Context,
+    private val isShowDate: Boolean
 ) : RecyclerView.ItemDecoration() {
 
     private val res: Resources = context.resources
     private val textPaint by lazy {
         Paint().apply {
             isAntiAlias = true
-            textAlign = Paint.Align.CENTER
+            textAlign = Paint.Align.LEFT
             textSize = sessionTimeTextSizeInPx
             color = context.getThemeColor(AndroidRAttr.textColorHint)
         }
@@ -36,6 +37,9 @@ class SessionsItemDecoration(
     private val sessionTimeTextMarginTopInPx by lazy {
         res.getDimensionPixelSize(R.dimen.session_time_text_margin_top).toFloat()
     }
+    private val sessionTimeTextMarginStartInPx by lazy {
+        res.getDimensionPixelSize(R.dimen.session_time_text_margin_start).toFloat()
+    }
 
     override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         super.onDrawOver(c, parent, state)
@@ -44,7 +48,14 @@ class SessionsItemDecoration(
             if (position == RecyclerView.NO_POSITION) return
 
             val sessionItem = adapter.getItem(position) as SessionItem
-            val startTimeText = calcTimeText(position, view)
+            val isShowDateText = if (position > 0) {
+                val lastSessionItem = adapter.getItem(position - 1) as SessionItem
+                sessionItem.startSessionDate() != lastSessionItem.startSessionDate()
+            } else {
+                true
+            }
+            val startDateTimeText =
+                calcDateTimeText(position, view, this.isShowDate && isShowDateText)
 
             // we need least first session's label, skip to check if time label is same as last item on first item.
             if (position > 0 && index > 0) {
@@ -54,34 +65,94 @@ class SessionsItemDecoration(
                 }
             }
 
+            if (startDateTimeText.dateText != null) {
+                c.drawText(
+                    startDateTimeText.dateText.value,
+                    startDateTimeText.dateText.positionX,
+                    startDateTimeText.dateText.positionY,
+                    textPaint
+                )
+            }
+
             c.drawText(
-                startTimeText.value,
-                startTimeText.positionX,
-                startTimeText.positionY,
+                startDateTimeText.startTimeText.value,
+                startDateTimeText.startTimeText.positionX,
+                startDateTimeText.startTimeText.positionY,
                 textPaint
             )
         }
     }
 
-    private fun calcTimeText(position: Int, view: View): StartTimeText {
+    private fun calcDateTimeText(
+        position: Int,
+        view: View,
+        isShowDate: Boolean
+    ): StartDateTimeText {
         val sessionItem = adapter.getItem(position) as SessionItem
         val nextSessionItem = if (position < adapter.itemCount - 1) {
             adapter.getItem(position + 1) as SessionItem
         } else null
 
-        var positionY =
-            view.top.coerceAtLeast(sessionTimeTextMarginTopInPx.toInt()) +
-                sessionTimeTextMarginTopInPx + sessionTimeTextSizeInPx
+        // session date text
+        val dateText = if (isShowDate) {
+
+            var sessionDateTextPositionY =
+                view.top.coerceAtLeast(sessionTimeTextMarginTopInPx.toInt()) +
+                        sessionTimeTextMarginTopInPx + sessionTimeTextSizeInPx
+
+            if (sessionItem.startSessionTime() != nextSessionItem?.startSessionTime()) {
+                sessionDateTextPositionY =
+                    sessionDateTextPositionY.coerceAtMost(view.bottom.toFloat())
+            }
+
+            DateText(
+                value = sessionItem.startSessionDate(),
+                positionX = sessionTimeTextMarginStartInPx,
+                positionY = sessionDateTextPositionY.coerceAtMost(
+                    view.bottom.toFloat() -
+                            sessionTimeTextMarginTopInPx -
+                            sessionTimeTextSizeInPx
+                )
+            )
+        } else null
+
+        val sessionTimeTextMarginTop = if (isShowDate) {
+            sessionTimeTextMarginTopInPx + sessionTimeTextSizeInPx + sessionTimeTextMarginTopInPx
+        } else {
+            sessionTimeTextMarginTopInPx
+        }
+
+        // session time text
+        var sessionTimeTextPositionY =
+            (view.top + sessionTimeTextMarginTop.toInt() - sessionTimeTextMarginTopInPx.toInt()).coerceAtLeast(
+                sessionTimeTextMarginTop.toInt()
+            ) +
+                    sessionTimeTextMarginTopInPx + sessionTimeTextSizeInPx
+
         if (sessionItem.startSessionTime() != nextSessionItem?.startSessionTime()) {
-            positionY = positionY.coerceAtMost(view.bottom.toFloat())
+            sessionTimeTextPositionY = sessionTimeTextPositionY.coerceAtMost(view.bottom.toFloat())
         }
-        return StartTimeText(
+
+        val startTimeText = StartTimeText(
             value = sessionItem.startSessionTime(),
-            positionX = (sessionTimeSpaceInPx / 2).toFloat(),
-            positionY = positionY
+            positionX = sessionTimeTextMarginStartInPx,
+            positionY = sessionTimeTextPositionY
         )
+
+        return StartDateTimeText(dateText, startTimeText)
     }
 
+    private data class StartDateTimeText(
+        val dateText: DateText?,
+        val startTimeText: StartTimeText
+    )
+
+    private data class DateText(
+        val value: String,
+        val positionX: Float,
+        val positionY: Float
+    )
+
     private data class StartTimeText(
         val value: String,
         val positionX: Float,

feature/session/src/main/res/values/dimens.xml

@@ -3,6 +3,7 @@
     <dimen name="session_time_text_size">16sp</dimen>
     <dimen name="session_time_space">76dp</dimen>
     <dimen name="session_time_text_margin_top">8dp</dimen>
+    <dimen name="session_time_text_margin_start">16dp</dimen>
     <dimen name="session_item_margin_bottom">16dp</dimen>
     <dimen name="session_item_speaker_margin">8dp</dimen>
     <dimen name="session_filter_chip_vertical_margin">8dp</dimen>

model/src/commonMain/kotlin/io/github/droidkaigi/confsched2020/model/Session.kt

@@ -14,7 +14,7 @@ sealed class Session(
     open val room: Room,
     open val isFavorited: Boolean
 ) {
-    val startDayText by lazy { startTime.toOffset(defaultTimeZoneOffset()).format("yyyy.M.d") }
+    val startDayText by lazy { startTime.toOffset(defaultTimeZoneOffset()).format("M/d") }
 
     val startTimeText by lazy { startTime.toOffset(defaultTimeZoneOffset()).format("HH:mm") }