6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix issue with Avatar renderer in invitation screen

Browse Source
This commit is contained in:
Benoit Marty 2019-05-29 15:07:08 +02:00
parent e959fe2e9d
commit 241ee1cb9d
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt
View File

@ -67,10 +67,12 @@ object AvatarRenderer {
identifier: String, identifier: String,
name: String?, name: String?,
target: Target<Drawable>) { target: Target<Drawable>) {
if (name.isNullOrEmpty()) { val displayName = if (name.isNullOrBlank()) {
return identifier
} else {
name
} }
val placeholder = getPlaceholderDrawable(context, identifier, name) val placeholder = getPlaceholderDrawable(context, identifier, displayName)
buildGlideRequest(glideRequest, avatarUrl) buildGlideRequest(glideRequest, avatarUrl)
.placeholder(placeholder) .placeholder(placeholder)
.into(target) .into(target)

21
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
View File

@ -95,17 +95,7 @@ class RoomListFragment : VectorBaseFragment(), RoomSummaryController.Callback {
createGroupRoomButton.setOnClickListener { createGroupRoomButton.setOnClickListener {
navigator.openRoomDirectory() navigator.openRoomDirectory()
} }
}


private fun setupRecyclerView() {
val layoutManager = LinearLayoutManager(context)
val stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
epoxyRecyclerView.layoutManager = layoutManager
epoxyRecyclerView.itemAnimator = RoomListAnimator()
roomController.callback = this
roomController.addModelBuildListener { it.dispatchTo(stateRestorer) }
stateView.contentView = epoxyRecyclerView
epoxyRecyclerView.setController(roomController)
// Hide FAB when list is scrolling // Hide FAB when list is scrolling
epoxyRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { epoxyRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
@ -124,6 +114,17 @@ class RoomListFragment : VectorBaseFragment(), RoomSummaryController.Callback {
}) })
} }


private fun setupRecyclerView() {
val layoutManager = LinearLayoutManager(context)
val stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
epoxyRecyclerView.layoutManager = layoutManager
epoxyRecyclerView.itemAnimator = RoomListAnimator()
roomController.callback = this
roomController.addModelBuildListener { it.dispatchTo(stateRestorer) }
stateView.contentView = epoxyRecyclerView
epoxyRecyclerView.setController(roomController)
}

private val showFabRunnable = Runnable { private val showFabRunnable = Runnable {
fabButton.show() fabButton.show()
} }

12
vector/src/main/res/layout/vector_invite_view.xml
View File

@ -22,11 +22,11 @@


<TextView <TextView
android:id="@+id/inviteNameView" android:id="@+id/inviteNameView"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Title" android:textAppearance="@style/TextAppearance.Vector.Title"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -35,11 +35,11 @@


<TextView <TextView
android:id="@+id/inviteIdentifierView" android:id="@+id/inviteIdentifierView"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Subtitle" android:textAppearance="@style/TextAppearance.Vector.Subtitle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"