empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Preserve tab state between configuration changes.

Browse source
This commit is contained in:
Alex Hart 2022-04-06 10:34:06 -03:00 • committed by Cody Henthorne
parent a75d2cfa34
commit ca79bdb16b
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsFragment.kt
View file

@ -63,10 +63,12 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
viewModel.onStoriesSelected() viewModel.onStoriesSelected()
} }
viewModel.state.observe(viewLifecycleOwner, this::update) update(viewModel.stateSnapshot, true)
viewModel.state.observe(viewLifecycleOwner) { update(it, false) }
} }
private fun update(state: ConversationListTabsState) { private fun update(state: ConversationListTabsState, immediate: Boolean) {
val wasChatSelected = chatsIcon.isSelected val wasChatSelected = chatsIcon.isSelected
chatsIcon.isSelected = state.tab == ConversationListTab.CHATS chatsIcon.isSelected = state.tab == ConversationListTab.CHATS
@ -75,9 +77,18 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
chatsPill.isSelected = chatsIcon.isSelected chatsPill.isSelected = chatsIcon.isSelected
storiesPill.isSelected = storiesIcon.isSelected storiesPill.isSelected = storiesIcon.isSelected
if (chatsIcon.isSelected xor wasChatSelected) { val hasStateChange = chatsIcon.isSelected xor wasChatSelected
if (immediate) {
chatsIcon.pauseAnimation()
storiesIcon.pauseAnimation()
chatsIcon.progress = if (chatsIcon.isSelected) 1f else 0f
storiesIcon.progress = if (storiesIcon.isSelected) 1f else 0f
runPillAnimation(0, chatsPill, storiesPill)
} else if (hasStateChange) {
runLottieAnimations(chatsIcon, storiesIcon) runLottieAnimations(chatsIcon, storiesIcon)
runPillAnimation(chatsPill, storiesPill) runPillAnimation(150, chatsPill, storiesPill)
} }
chatsUnreadIndicator.visible = state.unreadChatsCount > 0 chatsUnreadIndicator.visible = state.unreadChatsCount > 0
@ -103,12 +114,12 @@ class ConversationListTabsFragment : Fragment(R.layout.conversation_list_tabs) {
} }
} }
private fun runPillAnimation(vararg toAnimate: ImageView) { private fun runPillAnimation(duration: Long, vararg toAnimate: ImageView) {
val (selected, unselected) = toAnimate.partition { it.isSelected } val (selected, unselected) = toAnimate.partition { it.isSelected }
pillAnimator?.cancel() pillAnimator?.cancel()
pillAnimator = AnimatorSet().apply { pillAnimator = AnimatorSet().apply {
duration = 150 this.duration = duration
interpolator = PathInterpolatorCompat.create(0.17f, 0.17f, 0f, 1f) interpolator = PathInterpolatorCompat.create(0.17f, 0.17f, 0f, 1f)
playTogether( playTogether(
selected.map { view -> selected.map { view ->

1
app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabsViewModel.kt
View file

@ -10,6 +10,7 @@ import org.thoughtcrime.securesms.util.livedata.Store
class ConversationListTabsViewModel(repository: ConversationListTabRepository) : ViewModel() { class ConversationListTabsViewModel(repository: ConversationListTabRepository) : ViewModel() {
private val store = Store(ConversationListTabsState()) private val store = Store(ConversationListTabsState())
val stateSnapshot: ConversationListTabsState = store.state
val state: LiveData<ConversationListTabsState> = store.stateLiveData val state: LiveData<ConversationListTabsState> = store.stateLiveData
val disposables = CompositeDisposable() val disposables = CompositeDisposable()