Fix opening long messages.

fork-5.53.8
Alex Hart 2022-04-06 14:37:16 -03:00 zatwierdzone przez Cody Henthorne
rodzic 7fb5ceeda4
commit dabea5169b
1 zmienionych plików z 20 dodań i 4 usunięć

Wyświetl plik

@ -335,6 +335,15 @@ class StoryViewerPageFragment :
viewModel.setIsFragmentResumed(false) viewModel.setIsFragmentResumed(false)
} }
override fun onDestroyView() {
super.onDestroyView()
childFragmentManager.fragments.forEach {
if (it is MediaPreviewFragment) {
it.cleanUp()
}
}
}
override fun onFinishForwardAction() = Unit override fun onFinishForwardAction() = Unit
override fun onDismissForwardSheet() { override fun onDismissForwardSheet() {
@ -471,6 +480,10 @@ class StoryViewerPageFragment :
return return
} }
if (fragment is MediaPreviewFragment) {
fragment.cleanUp()
}
if (post.content.uri == null) { if (post.content.uri == null) {
progressBar.setPosition(index) progressBar.setPosition(index)
progressBar.invalidate() progressBar.invalidate()
@ -553,7 +566,7 @@ class StoryViewerPageFragment :
caption.doOnNextLayout { caption.doOnNextLayout {
val maxLines = 5 val maxLines = 5
if (caption.lineCount > maxLines) { if (displayBody.isNotEmpty() && caption.lineCount > maxLines) {
val lastCharShown = caption.layout.getLineVisibleEnd(maxLines - 1) val lastCharShown = caption.layout.getLineVisibleEnd(maxLines - 1)
caption.maxLines = maxLines caption.maxLines = maxLines
@ -576,12 +589,15 @@ class StoryViewerPageFragment :
} }
caption.text = displayBody.substring(0, lastCharShown - offset) + seeMore caption.text = displayBody.substring(0, lastCharShown - offset) + seeMore
}
if (caption.text.length == displayBody.length) {
caption.setOnClickListener(null)
caption.isClickable = false
} else {
caption.setOnClickListener { caption.setOnClickListener {
onShowCaptionOverlay(caption, largeCaption, largeCaptionOverlay) onShowCaptionOverlay(caption, largeCaption, largeCaptionOverlay)
} }
} else {
caption.setOnClickListener(null)
caption.isClickable = false
} }
} }
} }