Skip to content

Commit e6a2d50

Browse files
committed
Add changelog, address review comments.
1 parent e1cad01 commit e6a2d50

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

changelog.d/7285.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Refactor TimelineFragment, split it into MessageComposerFragment and VoiceRecorderFragment.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import androidx.core.view.isInvisible
4141
import androidx.core.view.isVisible
4242
import androidx.lifecycle.Lifecycle
4343
import androidx.lifecycle.lifecycleScope
44-
import com.airbnb.mvrx.existingViewModel
44+
import com.airbnb.mvrx.activityViewModel
4545
import com.airbnb.mvrx.withState
4646
import com.google.android.material.dialog.MaterialAlertDialogBuilder
4747
import com.vanniktech.emoji.EmojiPopup
@@ -156,8 +156,8 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
156156
private lateinit var attachmentsHelper: AttachmentsHelper
157157
private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
158158

159-
private val timelineViewModel: TimelineViewModel by existingViewModel()
160-
private val messageComposerViewModel: MessageComposerViewModel by existingViewModel()
159+
private val timelineViewModel: TimelineViewModel by activityViewModel()
160+
private val messageComposerViewModel: MessageComposerViewModel by activityViewModel()
161161
private lateinit var sharedActionViewModel: MessageSharedActionViewModel
162162

163163
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentComposerBinding {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import android.view.LayoutInflater
2121
import android.view.View
2222
import android.view.ViewGroup
2323
import androidx.core.view.isVisible
24-
import com.airbnb.mvrx.existingViewModel
24+
import com.airbnb.mvrx.activityViewModel
2525
import com.airbnb.mvrx.withState
2626
import dagger.hilt.android.AndroidEntryPoint
2727
import im.vector.app.R
@@ -46,8 +46,8 @@ class VoiceRecorderFragment : VectorBaseFragment<FragmentVoiceRecorderBinding>()
4646
@Inject lateinit var audioMessagePlaybackTracker: AudioMessagePlaybackTracker
4747
@Inject lateinit var clock: Clock
4848

49-
private val timelineViewModel: TimelineViewModel by existingViewModel()
50-
private val messageComposerViewModel: MessageComposerViewModel by existingViewModel()
49+
private val timelineViewModel: TimelineViewModel by activityViewModel()
50+
private val messageComposerViewModel: MessageComposerViewModel by activityViewModel()
5151

5252
private val permissionVoiceMessageLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
5353
if (allGranted) {

0 commit comments

Comments
 (0)