mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-25 10:55:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #702 from vector-im/feature/quick_fix

Browse source 
2 quick fixes
This commit is contained in:
Benoit Marty 2019-11-25 18:48:43 +01:00 committed by GitHub
commit 4690754f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -11,7 +11,8 @@ Other changes:
-
Bugfix 🐛:
-
- Do not show long click help if only invitation are displayed
- Fix emoji filtering not working
Translations 🗣:
-

11
vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt
View file

@ -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()
}
}

3
vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt
View file

@ -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)

3
vector/src/main/res/layout/activity_emoji_reaction_picker.xml
View file

@ -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" />
<com.google.android.material.appbar.AppBarLayout
style="@style/VectorAppBarLayoutStyle"