Skip to content

Commit 024c5d6

Browse files
Override setFocusable so it affect the avatar root view
1 parent 25f416b commit 024c5d6

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ class ThreadListAdapter @Inject constructor(
416416
private fun CardviewThreadItemBinding.displayAvatar(thread: Thread) {
417417
val (recipient, bimi) = thread.computeAvatarRecipient()
418418
expeditorAvatar.loadAvatar(recipient, bimi)
419+
expeditorAvatar.isFocusable = false
419420
}
420421

421422
private fun CardviewThreadItemBinding.formatRecipientNames(recipients: List<Recipient>): String {

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
515515
}
516516

517517
private fun setupUserAvatar() {
518-
binding.userAvatar.setFocusableTest()
519-
binding.userAvatar.isFocusable = false
518+
binding.userAvatar.isFocusable = true
520519
AccountUtils.currentUser?.let(binding.userAvatar::loadAvatar)
521520
}
522521

app/src/main/java/com/infomaniak/mail/views/AvatarView.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ class AvatarView @JvmOverloads constructor(
140140
binding.root.setOnLongClickListener(onLongClickListener)
141141
}
142142

143+
override fun setFocusable(focusable: Boolean) {
144+
binding.root.isFocusable = focusable
145+
}
146+
143147
fun loadAvatar(user: User) = with(binding.avatarImage) {
144148
contentDescription = user.email
145149
loadAvatar(
@@ -237,11 +241,6 @@ class AvatarView @JvmOverloads constructor(
237241
}
238242
}
239243

240-
fun setFocusableTest() {
241-
binding.test.isFocusable = true
242-
binding.avatarImage.isFocusable = false
243-
}
244-
245244
private data class State(
246245
var correspondent: Correspondent? = null,
247246
var bimi: Bimi? = null,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
android:layout_height="48dp"
8080
android:layout_gravity="center"
8181
android:layout_marginEnd="@dimen/marginStandardMedium"
82-
android:focusable="true"
82+
android:focusable="false"
8383
app:inset="@dimen/marginStandardSmall"
8484
tools:src="@tools:sample/avatars[12]" />
8585

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
21-
android:id="@+id/test"
2221
android:layout_width="match_parent"
2322
android:layout_height="match_parent"
2423
android:backgroundTint="@android:color/transparent"
25-
android:focusable="false"
2624
app:shapeAppearance="@style/CircleImageView"
2725
app:strokeWidth="0dp"
2826
tools:layout_height="wrap_content"

0 commit comments

Comments
 (0)