Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-03 15:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement specification testing for StoryViewerViewModel.

Browse Source
This commit is contained in:
Alex Hart
2022-04-01 15:36:54 -03:00
committed by Cody Henthorne
parent 469879c211
commit 19861ef0d1
5 changed files with 166 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerFragment.kt
View File

@@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.LiveDataReactiveStreams
import androidx.viewpager2.widget.ViewPager2
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.recipients.RecipientId
@@ -40,7 +41,7 @@ class StoryViewerFragment : Fragment(R.layout.stories_viewer_fragment), StoryVie
storyPager.isUserInputEnabled = !it
}
viewModel.state.observe(viewLifecycleOwner) { state ->
LiveDataReactiveStreams.fromPublisher(viewModel.state).observe(viewLifecycleOwner) { state ->
adapter.setPages(state.pages)
if (state.pages.isNotEmpty() && storyPager.currentItem != state.page) {
storyPager.setCurrentItem(state.page, state.previousPage > -1)
@@ -65,11 +66,11 @@ class StoryViewerFragment : Fragment(R.layout.stories_viewer_fragment), StoryVie
}
override fun onGoToPreviousStory(recipientId: RecipientId) {
viewModel.onGoToPreviousStory(recipientId)
viewModel.onGoToPrevious(recipientId)
}
override fun onFinishedPosts(recipientId: RecipientId) {
viewModel.onFinishedPosts(recipientId)
viewModel.onGoToNext(recipientId)
}
override fun onStoryHidden(recipientId: RecipientId) {

5
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerRepository.kt
View File

@@ -8,7 +8,10 @@ import org.thoughtcrime.securesms.database.model.StoryResult
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
class StoryViewerRepository {
/**
* Open for testing
*/
open class StoryViewerRepository {
fun getStories(): Single<List<RecipientId>> {
return Single.fromCallable {
val storyResults: List<StoryResult> = SignalDatabase.mms.orderedStoryRecipientsAndIds.distinctBy { it.recipientId }

16
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/StoryViewerViewModel.kt
View File

@@ -4,21 +4,23 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.livedata.Store
import kotlin.math.min
import org.thoughtcrime.securesms.util.rx.RxStore
import kotlin.math.max
class StoryViewerViewModel(
private val startRecipientId: RecipientId,
private val repository: StoryViewerRepository
) : ViewModel() {
private val store = Store(StoryViewerState())
private val store = RxStore(StoryViewerState())
private val disposables = CompositeDisposable()
val state: LiveData<StoryViewerState> = store.stateLiveData
val stateSnapshot: StoryViewerState get() = store.state
val state: Flowable<StoryViewerState> = store.stateFlowable
private val scrollStatePublisher: MutableLiveData<Boolean> = MutableLiveData(false)
val isScrolling: LiveData<Boolean> = scrollStatePublisher
@@ -66,7 +68,7 @@ class StoryViewerViewModel(
}
}
fun onFinishedPosts(recipientId: RecipientId) {
fun onGoToNext(recipientId: RecipientId) {
store.update {
if (it.pages[it.page] == recipientId) {
updatePages(it, it.page + 1)
@@ -76,10 +78,10 @@ class StoryViewerViewModel(
}
}
fun onGoToPreviousStory(recipientId: RecipientId) {
fun onGoToPrevious(recipientId: RecipientId) {
store.update {
if (it.pages[it.page] == recipientId) {
updatePages(it, min(0, it.page - 1))
updatePages(it, max(0, it.page - 1))
} else {
it
}

4
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt
View File

@@ -238,7 +238,7 @@ class StoryViewerPageFragment :
viewModel.setIsUserScrollingParent(isScrolling)
}
sharedViewModel.state.observe(viewLifecycleOwner) { parentState ->
LiveDataReactiveStreams.fromPublisher(sharedViewModel.state).observe(viewLifecycleOwner) { parentState ->
if (parentState.pages.size <= parentState.page) {
viewModel.setIsSelectedPage(false)
} else if (storyRecipientId == parentState.pages[parentState.page]) {
@@ -753,7 +753,7 @@ class StoryViewerPageFragment :
}
override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
val isFirstStory = sharedViewModel.state.value?.page == 0
val isFirstStory = sharedViewModel.stateSnapshot.page == 0
val isXMagnitudeGreaterThanYMagnitude = abs(distanceX) > abs(distanceY) || viewToTranslate.translationX > 0f
val isFirstAndHasYTranslationOrNegativeY = isFirstStory && (viewToTranslate.translationY > 0f || distanceY < 0f)