From 115daa0a8740fc72c8143e4a07fb5ae8a1424d72 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Fri, 1 Mar 2024 11:58:57 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Swap=20`with(binding)=20{=20=E2=80=A6=20}`?= =?UTF-8?q?=20with=20`with(threadViewModel)=20{=20=E2=80=A6=20}`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/infomaniak/mail/ui/main/thread/ThreadFragment.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt index 4280ab1d18..5d05afb809 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt @@ -350,18 +350,18 @@ class ThreadFragment : Fragment() { mainViewModel.toggleLightThemeForMessage.observe(viewLifecycleOwner, threadAdapter::toggleLightMode) } - private fun observeThreadLive() = with(binding) { + private fun observeThreadLive() = with(threadViewModel) { - threadViewModel.threadLive.observe(viewLifecycleOwner) { thread -> + threadLive.observe(viewLifecycleOwner) { thread -> if (thread == null) { twoPaneViewModel.closeThread() return@observe } - threadSubject.movementMethod = LinkMovementMethod.getInstance() + binding.threadSubject.movementMethod = LinkMovementMethod.getInstance() - iconFavorite.apply { + binding.iconFavorite.apply { setIconResource(if (thread.isFavorite) R.drawable.ic_star_filled else R.drawable.ic_star) val color = if (thread.isFavorite) { context.getColor(R.color.favoriteYellow) From 082bebe3122d62be0ffe3075393233322a1af898 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Fri, 1 Mar 2024 12:58:08 +0100 Subject: [PATCH 2/2] Move `LinkMovementMethod.getInstance()` to view creation --- .../java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt index 5d05afb809..370351258b 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt @@ -169,6 +169,8 @@ class ThreadFragment : Fragment() { private fun setupUi() = with(binding) { + threadSubject.movementMethod = LinkMovementMethod.getInstance() + updateNavigationIcon() toolbar.setNavigationOnClickListener { twoPaneViewModel.closeThread() } @@ -359,8 +361,6 @@ class ThreadFragment : Fragment() { return@observe } - binding.threadSubject.movementMethod = LinkMovementMethod.getInstance() - binding.iconFavorite.apply { setIconResource(if (thread.isFavorite) R.drawable.ic_star_filled else R.drawable.ic_star) val color = if (thread.isFavorite) {