jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7311 from vector-im/feature/bma/fix_bc 

Fix breadcrumbs
This commit is contained in:
Benoit Marty 2022-10-10 10:08:03 +02:00 committed by GitHub
parent 9827ffb1e5 bbc4b35b23
commit 34cc5e8bd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
View File

@ -53,8 +53,8 @@ import com.airbnb.epoxy.OnModelBuildFinishedListener
import com.airbnb.epoxy.addGlidePreloader
import com.airbnb.epoxy.glidePreloader
import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.activityViewModel
import com.airbnb.mvrx.args
import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.hilt.android.AndroidEntryPoint
@ -256,8 +256,8 @@ class TimelineFragment :
private val timelineArgs: TimelineArgs by args()
private val timelineViewModel: TimelineViewModel by activityViewModel()
private val messageComposerViewModel: MessageComposerViewModel by activityViewModel()
private val timelineViewModel: TimelineViewModel by fragmentViewModel()
private val messageComposerViewModel: MessageComposerViewModel by fragmentViewModel()
private val debouncer = Debouncer(createUIHandler())
private lateinit var scrollOnNewMessageCallback: ScrollOnNewMessageCallback
@ -282,8 +282,6 @@ class TimelineFragment :
private lateinit var callActionsHandler: StartCallActionsHandler
private val currentCallsViewPresenter = CurrentCallsViewPresenter()
private val isEmojiKeyboardVisible: Boolean
get() = vectorPreferences.showEmojiKeyboard()
private val lazyLoadedViews = RoomDetailLazyLoadedViews()

6
vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
View File

@ -41,7 +41,7 @@ import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import com.airbnb.mvrx.activityViewModel
import com.airbnb.mvrx.parentFragmentViewModel
import com.airbnb.mvrx.withState
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.vanniktech.emoji.EmojiPopup
@ -157,8 +157,8 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
private lateinit var attachmentsHelper: AttachmentsHelper
private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
private val timelineViewModel: TimelineViewModel by activityViewModel()
private val messageComposerViewModel: MessageComposerViewModel by activityViewModel()
private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
private val messageComposerViewModel: MessageComposerViewModel by parentFragmentViewModel()
private lateinit var sharedActionViewModel: MessageSharedActionViewModel
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentComposerBinding {

6
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceRecorderFragment.kt
View File

@ -21,7 +21,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isVisible
import com.airbnb.mvrx.activityViewModel
import com.airbnb.mvrx.parentFragmentViewModel
import com.airbnb.mvrx.withState
import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R
@ -46,8 +46,8 @@ class VoiceRecorderFragment : VectorBaseFragment<FragmentVoiceRecorderBinding>()
@Inject lateinit var audioMessagePlaybackTracker: AudioMessagePlaybackTracker
@Inject lateinit var clock: Clock
private val timelineViewModel: TimelineViewModel by activityViewModel()
private val messageComposerViewModel: MessageComposerViewModel by activityViewModel()
private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
private val messageComposerViewModel: MessageComposerViewModel by parentFragmentViewModel()
private val permissionVoiceMessageLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
if (allGranted) {