Breadcrumbs: add some visual attributes
This commit is contained in:
parent
5373d9aa21
commit
60169d53d7
|
@ -55,6 +55,10 @@ class BreadcrumbsController @Inject constructor(
|
||||||
roomId(it.roomId)
|
roomId(it.roomId)
|
||||||
roomName(it.displayName)
|
roomName(it.displayName)
|
||||||
avatarUrl(it.avatarUrl)
|
avatarUrl(it.avatarUrl)
|
||||||
|
unreadNotificationCount(it.notificationCount)
|
||||||
|
showHighlighted(it.highlightCount > 0)
|
||||||
|
hasUnreadMessage(it.hasUnreadMessages)
|
||||||
|
hasDraft(it.userDrafts.isNotEmpty())
|
||||||
itemClickListener(
|
itemClickListener(
|
||||||
DebouncedClickListener(View.OnClickListener { _ ->
|
DebouncedClickListener(View.OnClickListener { _ ->
|
||||||
listener?.onRoomClicked(it)
|
listener?.onRoomClicked(it)
|
||||||
|
|
|
@ -19,12 +19,14 @@ package im.vector.riotx.features.home.room.breadcrumbs
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
|
import androidx.core.view.isVisible
|
||||||
import com.airbnb.epoxy.EpoxyAttribute
|
import com.airbnb.epoxy.EpoxyAttribute
|
||||||
import com.airbnb.epoxy.EpoxyModelClass
|
import com.airbnb.epoxy.EpoxyModelClass
|
||||||
import im.vector.riotx.R
|
import im.vector.riotx.R
|
||||||
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
|
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
|
||||||
import im.vector.riotx.core.epoxy.VectorEpoxyModel
|
import im.vector.riotx.core.epoxy.VectorEpoxyModel
|
||||||
import im.vector.riotx.features.home.AvatarRenderer
|
import im.vector.riotx.features.home.AvatarRenderer
|
||||||
|
import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
|
||||||
|
|
||||||
@EpoxyModelClass(layout = R.layout.item_breadcrumbs)
|
@EpoxyModelClass(layout = R.layout.item_breadcrumbs)
|
||||||
abstract class BreadcrumbsItem : VectorEpoxyModel<BreadcrumbsItem.Holder>() {
|
abstract class BreadcrumbsItem : VectorEpoxyModel<BreadcrumbsItem.Holder>() {
|
||||||
|
@ -33,20 +35,25 @@ abstract class BreadcrumbsItem : VectorEpoxyModel<BreadcrumbsItem.Holder>() {
|
||||||
@EpoxyAttribute lateinit var roomId: String
|
@EpoxyAttribute lateinit var roomId: String
|
||||||
@EpoxyAttribute lateinit var roomName: CharSequence
|
@EpoxyAttribute lateinit var roomName: CharSequence
|
||||||
@EpoxyAttribute var avatarUrl: String? = null
|
@EpoxyAttribute var avatarUrl: String? = null
|
||||||
// TODO @EpoxyAttribute var unreadNotificationCount: Int = 0
|
@EpoxyAttribute var unreadNotificationCount: Int = 0
|
||||||
// TODO @EpoxyAttribute var hasUnreadMessage: Boolean = false
|
@EpoxyAttribute var showHighlighted: Boolean = false
|
||||||
// TODO @EpoxyAttribute var showHighlighted: Boolean = false
|
@EpoxyAttribute var hasUnreadMessage: Boolean = false
|
||||||
|
@EpoxyAttribute var hasDraft: Boolean = false
|
||||||
@EpoxyAttribute var itemClickListener: View.OnClickListener? = null
|
@EpoxyAttribute var itemClickListener: View.OnClickListener? = null
|
||||||
|
|
||||||
override fun bind(holder: Holder) {
|
override fun bind(holder: Holder) {
|
||||||
super.bind(holder)
|
super.bind(holder)
|
||||||
holder.rootView.setOnClickListener(itemClickListener)
|
holder.rootView.setOnClickListener(itemClickListener)
|
||||||
|
holder.unreadIndentIndicator.isVisible = hasUnreadMessage
|
||||||
avatarRenderer.render(avatarUrl, roomId, roomName.toString(), holder.avatarImageView)
|
avatarRenderer.render(avatarUrl, roomId, roomName.toString(), holder.avatarImageView)
|
||||||
|
holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
|
||||||
|
holder.draftIndentIndicator.isVisible = hasDraft
|
||||||
}
|
}
|
||||||
|
|
||||||
class Holder : VectorEpoxyHolder() {
|
class Holder : VectorEpoxyHolder() {
|
||||||
// TODO val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.roomUnreadCounterBadgeView)
|
val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.breadcrumbsUnreadCounterBadgeView)
|
||||||
// TODO val unreadIndentIndicator by bind<View>(R.id.roomUnreadIndicator)
|
val unreadIndentIndicator by bind<View>(R.id.breadcrumbsUnreadIndicator)
|
||||||
|
val draftIndentIndicator by bind<View>(R.id.breadcrumbsDraftBadge)
|
||||||
val avatarImageView by bind<ImageView>(R.id.breadcrumbsImageView)
|
val avatarImageView by bind<ImageView>(R.id.breadcrumbsImageView)
|
||||||
val rootView by bind<ViewGroup>(R.id.breadcrumbsRoot)
|
val rootView by bind<ViewGroup>(R.id.breadcrumbsRoot)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/breadcrumbsRoot"
|
android:id="@+id/breadcrumbsRoot"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -9,6 +10,17 @@
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:foreground="?attr/selectableItemBackground">
|
android:foreground="?attr/selectableItemBackground">
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/breadcrumbsUnreadIndicator"
|
||||||
|
android:layout_width="4dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:background="?attr/colorAccent"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/breadcrumbsImageView"
|
android:id="@+id/breadcrumbsImageView"
|
||||||
android:layout_width="56dp"
|
android:layout_width="56dp"
|
||||||
|
@ -17,6 +29,40 @@
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginEnd="12dp"
|
android:layout_marginEnd="12dp"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
tools:src="@tools:sample/avatars" />
|
tools:src="@tools:sample/avatars" />
|
||||||
|
|
||||||
</FrameLayout>
|
<im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
|
||||||
|
android:id="@+id/breadcrumbsUnreadCounterBadgeView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center"
|
||||||
|
android:minWidth="16dp"
|
||||||
|
android:minHeight="16dp"
|
||||||
|
android:textColor="@android:color/white"
|
||||||
|
android:textSize="10sp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintCircle="@+id/breadcrumbsImageView"
|
||||||
|
app:layout_constraintCircleAngle="45"
|
||||||
|
app:layout_constraintCircleRadius="28dp"
|
||||||
|
tools:background="@drawable/bg_unread_highlight"
|
||||||
|
tools:text="24"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/breadcrumbsDraftBadge"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:background="@drawable/circle"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:src="@drawable/ic_edit"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintCircle="@+id/breadcrumbsImageView"
|
||||||
|
app:layout_constraintCircleAngle="135"
|
||||||
|
app:layout_constraintCircleRadius="28dp"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
Loading…
Reference in New Issue