From bba58d25e13901cad669f4896fc6c1c1cfe2dd97 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 22 Nov 2019 14:54:22 +0100 Subject: [PATCH 1/2] Do not show long click help if only invitation are displayed --- CHANGES.md | 2 +- .../features/home/room/list/RoomSummaryController.kt | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ed85d018a3..65d046bdf3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,7 +11,7 @@ Other changes: - Bugfix 🐛: - - + - Do not show long click help if only invitation are displayed Translations 🗣: - diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt index 74dab6563f..4107bf01b2 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt @@ -24,8 +24,8 @@ import im.vector.riotx.R import im.vector.riotx.core.epoxy.helpFooterItem import im.vector.riotx.core.epoxy.noResultItem import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.RoomListDisplayMode import im.vector.riotx.core.resources.UserPreferencesProvider +import im.vector.riotx.features.home.RoomListDisplayMode import im.vector.riotx.features.home.room.filtered.FilteredRoomFooterItem import im.vector.riotx.features.home.room.filtered.filteredRoomFooterItem import javax.inject.Inject @@ -63,7 +63,7 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri RoomListDisplayMode.SHARE -> { buildFilteredRooms(nonNullViewState) } - else -> { + else -> { var showHelp = false val roomSummaries = nonNullViewState.asyncFilteredRooms() roomSummaries?.forEach { (category, summaries) -> @@ -80,7 +80,10 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri nonNullViewState.joiningErrorRoomsIds, nonNullViewState.rejectingRoomsIds, nonNullViewState.rejectingErrorRoomsIds) - showHelp = userPreferencesProvider.shouldShowLongClickOnRoomHelp() + // Never set showHelp to true for invitation + if (category != RoomCategory.INVITE) { + showHelp = userPreferencesProvider.shouldShowLongClickOnRoomHelp() + } } } } @@ -108,7 +111,7 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri when { viewState.displayMode == RoomListDisplayMode.FILTERED -> addFilterFooter(viewState) - filteredSummaries.isEmpty() -> addEmptyFooter() + filteredSummaries.isEmpty() -> addEmptyFooter() } } From 3eebf965e5a88f7d84ffd318354e7170e870e3a8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 22 Nov 2019 15:19:09 +0100 Subject: [PATCH 2/2] Fix emoji filtering not working --- CHANGES.md | 1 + .../riotx/features/reactions/EmojiSearchResultFragment.kt | 3 +-- vector/src/main/res/layout/activity_emoji_reaction_picker.xml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 65d046bdf3..c8f7d5365b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Other changes: Bugfix 🐛: - Do not show long click help if only invitation are displayed + - Fix emoji filtering not working Translations 🗣: - diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt index 029f468b70..e5b46c2176 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt @@ -20,12 +20,12 @@ import android.view.View import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.airbnb.epoxy.EpoxyRecyclerView import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import im.vector.riotx.R import im.vector.riotx.core.platform.VectorBaseFragment import im.vector.riotx.core.utils.LiveEvent +import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.* import javax.inject.Inject class EmojiSearchResultFragment @Inject constructor( @@ -50,7 +50,6 @@ class EmojiSearchResultFragment @Inject constructor( } val lmgr = LinearLayoutManager(context, RecyclerView.VERTICAL, false) - val epoxyRecyclerView = view as? EpoxyRecyclerView ?: return epoxyRecyclerView.layoutManager = lmgr val dividerItemDecoration = DividerItemDecoration(epoxyRecyclerView.context, lmgr.orientation) epoxyRecyclerView.addItemDecoration(dividerItemDecoration) diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml index 9d680e6221..16c0ae3c8b 100644 --- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml +++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml @@ -19,8 +19,9 @@ android:name="im.vector.riotx.features.reactions.EmojiSearchResultFragment" android:layout_width="match_parent" android:layout_height="match_parent" + android:visibility="gone" app:layout_behavior="@string/appbar_scrolling_view_behavior" - android:visibility="gone" /> + tools:visibility="visible" />