add the track to the event detail and remove the Option from the track

Author: quiro91

app/src/debug/java/net/squanchy/support/debug/DebugActivity.kt

@@ -108,9 +108,9 @@ class DebugActivity : AppCompatActivity() {
         "0",
         0,
         "UI",
-        Option(generateColor()),
-        Option(generateColor()),
-        Option.empty()
+        generateColor(),
+        generateColor(),
+        null
     )
 
     private fun generateColor(): String {

app/src/main/java/net/squanchy/eventdetails/widget/EventDetailsLayout.kt

@@ -2,6 +2,7 @@ package net.squanchy.eventdetails.widget
 
 import android.content.Context
 import android.content.res.Resources
+import android.graphics.Color
 import android.support.annotation.AttrRes
 import android.support.annotation.ColorInt
 import android.support.constraint.ConstraintLayout
@@ -12,13 +13,15 @@ import android.text.style.ForegroundColorSpan
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.View
+import android.widget.TextView
 import androidx.view.isVisible
 import arrow.core.Option
 import kotlinx.android.synthetic.main.merge_event_details_layout.view.*
 import net.squanchy.R
 import net.squanchy.eventdetails.domain.view.ExperienceLevel
 import net.squanchy.schedule.domain.view.Event
 import net.squanchy.schedule.domain.view.Place
+import net.squanchy.schedule.domain.view.Track
 import net.squanchy.support.lang.getOrThrow
 import net.squanchy.support.text.parseHtml
 import org.joda.time.DateTimeZone
@@ -43,6 +46,7 @@ class EventDetailsLayout @JvmOverloads constructor(
         updateWhen(event.startTime, event.timeZone)
         updateWhere(event.place)
         updateLevel(event.experienceLevel)
+        updateTrack(event.track)
         updateDescription(event.description)
     }
 
@@ -77,34 +81,50 @@ class EventDetailsLayout @JvmOverloads constructor(
         return builder
     }
 
+    private fun createColorSpan(targetView: View, @AttrRes attributeResId: Int): ForegroundColorSpan {
+        val color = getColorFromTheme(targetView.context.theme, attributeResId)
+        return ForegroundColorSpan(color)
+    }
+
+    @ColorInt
+    private fun getColorFromTheme(theme: Resources.Theme, @AttrRes attributeId: Int): Int {
+        val typedValue = TypedValue()
+        theme.resolveAttribute(attributeId, typedValue, true)
+        return typedValue.data
+    }
+
     private fun updateLevel(level: Option<ExperienceLevel>) {
         if (level.isDefined()) {
             levelGroup.isVisible = true
 
             val experienceLevel = level.getOrThrow()
             levelValue.setText(experienceLevel.labelStringResId)
-            tintCompoundDrawableEnd(experienceLevel)
+            val experienceColor = ContextCompat.getColor(context, experienceLevel.colorResId)
+            tintCompoundDrawableEnd(levelValue, experienceColor)
         } else {
             levelGroup.isVisible = false
         }
     }
 
-    private fun tintCompoundDrawableEnd(experienceLevel: ExperienceLevel) {
-        val compoundDrawables = levelValue.compoundDrawablesRelative
+    private fun tintCompoundDrawableEnd(textView: TextView, @ColorInt color: Int) {
+        val compoundDrawables = textView.compoundDrawablesRelative
         val endCompoundDrawable = compoundDrawables[2]
-        endCompoundDrawable?.setTint(ContextCompat.getColor(context, experienceLevel.colorResId))
+        endCompoundDrawable?.setTint(color)
     }
 
-    private fun createColorSpan(targetView: View, @AttrRes attributeResId: Int): ForegroundColorSpan {
-        val color = getColorFromTheme(targetView.context.theme, attributeResId)
-        return ForegroundColorSpan(color)
-    }
+    private fun updateTrack(trackOption: Option<Track>) {
+        if (trackOption.isDefined()) {
+            trackGroup.isVisible = true
 
-    @ColorInt
-    private fun getColorFromTheme(theme: Resources.Theme, @AttrRes attributeId: Int): Int {
-        val typedValue = TypedValue()
-        theme.resolveAttribute(attributeId, typedValue, true)
-        return typedValue.data
+            val track = trackOption.getOrThrow()
+            trackValue.text = track.name
+            track.accentColor?.let {
+                val trackColor = Color.parseColor(it)
+                tintCompoundDrawableEnd(trackValue, trackColor)
+            }
+        } else {
+            trackGroup.isVisible = false
+        }
     }
 
     private fun updateDescription(description: Option<String>) {

app/src/main/java/net/squanchy/schedule/domain/view/Track.kt

@@ -1,12 +1,10 @@
 package net.squanchy.schedule.domain.view
 
-import arrow.core.Option
-
 data class Track(
     val id: String,
     val numericId: Long,
     val name: String,
-    val accentColor: Option<String> = Option.empty(),
-    val textColor: Option<String> = Option.empty(),
-    val iconUrl: Option<String> = Option.empty()
+    val accentColor: String? = null,
+    val textColor: String? = null,
+    val iconUrl: String? = null
 )

app/src/main/java/net/squanchy/schedule/tracksfilter/TracksFilterAdapter.kt

@@ -11,8 +11,6 @@ import android.view.ViewGroup
 import net.squanchy.R
 import net.squanchy.schedule.domain.view.Track
 import net.squanchy.schedule.tracksfilter.widget.FilterChipView
-import net.squanchy.support.lang.getOrThrow
-import net.squanchy.support.lang.or
 
 internal class TracksFilterAdapter(
     context: Context,
@@ -57,9 +55,11 @@ internal class TrackViewHolder(val item: FilterChipView) : RecyclerView.ViewHold
         item.apply {
             text = track.name
 
-            color = track.accentColor
-                .map { Color.parseColor(track.accentColor.getOrThrow()) }
-                .or(ContextCompat.getColor(context, R.color.chip_default_background_tint))
+            if (track.accentColor != null) {
+                color = Color.parseColor(track.accentColor)
+            } else {
+                color = ContextCompat.getColor(context, R.color.chip_default_background_tint)
+            }
 
             onCheckedChangeListener = { _, checked -> listener.invoke(track, checked) }
             isChecked = selected

app/src/main/java/net/squanchy/service/firebase/FirestoreMappers.kt

@@ -22,9 +22,9 @@ fun FirestoreTrack.toTrack(checksum: Checksum) = Track(
     id = id,
     numericId = checksum.getChecksumOf("track_$id"),
     name = name,
-    accentColor = accentColor.option(),
-    textColor = textColor.option(),
-    iconUrl = iconUrl.option()
+    accentColor = accentColor,
+    textColor = textColor,
+    iconUrl = iconUrl
 )
 
 fun FirestoreSpeaker.toSpeaker(checksum: Checksum) = Speaker(

app/src/main/res/layout/merge_event_details_layout.xml

@@ -127,13 +127,48 @@
     app:constraint_referenced_ids="levelValue,levelLabel"
     tools:visibility="visible" />
 
+  <TextView
+    android:id="@+id/trackLabel"
+    style="@style/EventDetails.Body.Label.Track"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/event_details_body_row_margin_top"
+    app:layout_constraintStart_toStartOf="@+id/labelsStartMargin"
+    app:layout_constraintTop_toBottomOf="@+id/levelBarrier" />
+
+  <TextView
+    android:id="@+id/trackValue"
+    style="@style/EventDetails.Body.Value.Level"
+    android:layout_width="@dimen/match_constraint"
+    android:layout_height="wrap_content"
+    app:layout_constraintStart_toEndOf="@+id/valuesBarrier"
+    app:layout_constraintEnd_toEndOf="@+id/whenValue"
+    app:layout_constraintBaseline_toBaselineOf="@+id/trackLabel"
+    tools:text="Tools" />
+
+  <android.support.constraint.Barrier
+    android:id="@+id/trackBarrier"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:barrierDirection="bottom"
+    app:barrierAllowsGoneWidgets="true"
+    app:constraint_referenced_ids="trackLabel,trackValue" />
+
+  <android.support.constraint.Group
+    android:id="@+id/trackGroup"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    app:constraint_referenced_ids="trackValue,trackLabel"
+    tools:visibility="visible" />
+
   <TextView
     android:id="@+id/descriptionLabel"
     style="@style/EventDetails.Body.Label.About"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/event_details_body_row_margin_top"
-    app:layout_constraintTop_toBottomOf="@id/levelBarrier"
+    app:layout_constraintTop_toBottomOf="@id/trackBarrier"
     app:layout_constraintStart_toStartOf="@+id/labelsStartMargin"
     tools:visibility="visible" />
 

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

@@ -52,6 +52,7 @@
   <string name="event_details_body_label_where_text">Where</string>
   <string name="event_details_body_label_level_text">Level</string>
   <string name="event_details_body_label_about_text">About</string>
+  <string name="event_details_body_label_track_text">Track</string>
 
   <string name="menu_speaker_twitter">Twitter profile</string>
   <string name="menu_speaker_website">Personal page</string>

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

@@ -235,6 +235,10 @@
     <item name="android:text">@string/event_details_body_label_level_text</item>
   </style>
 
+  <style name="EventDetails.Body.Label.Track" parent="EventDetails.Body.Label">
+    <item name="android:text">@string/event_details_body_label_track_text</item>
+  </style>
+
   <style name="EventDetails.Body.Label.About" parent="EventDetails.Body.Label">
     <item name="android:gravity">start|center_vertical</item>
     <item name="android:text">@string/event_details_body_label_about_text</item>
@@ -783,5 +787,4 @@
   </style>
 
   <style name="TextAppearance.Squanchy.WifiConfigError.Button" parent="TextAppearance.Squanchy.Button.Colored" />
-
 </resources>

app/src/test/java/net/squanchy/schedule/domain/view/ScheduleFixtures.kt

@@ -82,9 +82,9 @@ fun aTrack(
     id: String = "a track id",
     numericId: Long = 0,
     name: String = "a track name",
-    accentColor: Option<String> = Option("#ABCDEF"),
-    textColor: Option<String> = Option("#FEDCBA"),
-    iconUrl: Option<String> = Option("www.squanchy.net")
+    accentColor: String? = "#ABCDEF",
+    textColor: String? = "#FEDCBA",
+    iconUrl: String? = "www.squanchy.net"
 ) = Track(
     id = id,
     numericId = numericId,