Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit 67795e2

Browse files
committed
Don't show favourite icon in favourite items
1 parent c919898 commit 67795e2

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/src/main/java/net/squanchy/favorites/view/FavoritesViewHolders.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sealed class FavoritesViewHolder<T : View>(itemView: T) : RecyclerView.ViewHolde
1919
class EventViewHolder(itemView: EventItemView) : FavoritesViewHolder<EventItemView>(itemView) {
2020

2121
fun updateWith(event: Event, listener: OnEventClickListener?) {
22-
(itemView as EventItemView).updateWith(event, false) // TODO import the feature flag here as well
22+
(itemView as EventItemView).updateWith(event, showRoom = true, showFavorite = false)
2323
itemView.setOnClickListener { listener?.invoke(event) }
2424
}
2525
}

app/src/main/java/net/squanchy/schedule/view/EventItemView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ abstract class EventItemView : CardLayout {
1212

1313
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
1414

15-
abstract fun updateWith(event: Event, showRoom: Boolean = false, showDay: Boolean = false)
15+
abstract fun updateWith(event: Event, showRoom: Boolean = false, showDay: Boolean = false, showFavorite: Boolean = true)
1616
}

app/src/main/java/net/squanchy/schedule/view/OtherEventItemView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class OtherEventItemView @JvmOverloads constructor(
1414
defStyleAttr: Int = R.attr.cardViewDefaultStyle
1515
) : EventItemView(context, attrs, defStyleAttr) {
1616

17-
override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean) {
17+
override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean, showFavorite: Boolean) {
1818
event.type.ensureSupported()
1919

2020
timestamp.text = startTimeAsFormattedString(event)

app/src/main/java/net/squanchy/schedule/view/TalkEventItemView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TalkEventItemView @JvmOverloads constructor(
2020
private val timeFormatter = DateTimeFormat.shortTime()
2121
private val dateFormatter = DateTimeFormat.forPattern("EEE d")
2222

23-
override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean) {
23+
override fun updateWith(event: Event, showRoom: Boolean, showDay: Boolean, showFavorite: Boolean) {
2424
ensureSupportedType(event.type)
2525

2626
timestamp.text = startTimeAsFormattedString(event, showDay)
@@ -40,7 +40,7 @@ class TalkEventItemView @JvmOverloads constructor(
4040
speaker_container.visibility = if (event.speakers.isEmpty()) View.GONE else View.VISIBLE
4141
speaker_container.updateWith(event.speakers, null)
4242

43-
favoriteIcon.isVisible = event.favorite
43+
favoriteIcon.isVisible = if (showFavorite) event.favorite else false
4444
}
4545

4646
private fun Place?.toPlaceLabel(): CharSequence? = if (this != null) "${this.name}" else null

0 commit comments

Comments
 (0)