Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust media caption height, fix rail visibility.

Browse Source
This commit is contained in:
Nicholas
2023-01-26 15:56:57 -05:00
committed by Greyson Parrelli
parent 958c52a5b8
commit ca468047ef
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
View File

@@ -337,7 +337,12 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v
albumRail.alpha = 0f
}
val railItems = albumThumbnailMedia.map { MediaRailAdapter.MediaRailItem(it, it.uri == currentItem.attachment?.uri) }
albumRailAdapter.submitList(railItems) { albumRail.post { scrollAlbumRailToCurrentAdapterPosition(!firstRailDisplay) } }
albumRailAdapter.submitList(railItems) {
albumRail.post {
scrollAlbumRailToCurrentAdapterPosition(!firstRailDisplay)
crossfadeViewIn(albumRail)
}
}
} else {
albumRail.visibility = View.GONE
albumRailAdapter.submitList(emptyList())

36
app/src/main/java/org/thoughtcrime/securesms/mediapreview/caption/ExpandingCaptionView.kt
View File

@@ -5,7 +5,6 @@ import android.text.method.ScrollingMovementMethod
import android.util.AttributeSet
import android.view.ViewGroup
import androidx.core.view.updateLayoutParams
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -23,40 +22,49 @@ class ExpandingCaptionView @JvmOverloads constructor(
set(value) {
field = value
expanded = false
updateExpansionState()
updateExpansionState(expanded)
}
init {
setOnClickListener { toggleExpansion() }
}
fun toggleExpansion() {
expanded = !expanded
updateExpansionState()
private fun toggleExpansion() {
expanded = if (isExpandable()) {
!expanded
} else {
false
}
updateExpansionState(expanded)
}
private fun updateExpansionState() {
if (expanded) {
Log.d(TAG, "The view should be expanded now.")
private fun updateExpansionState(expand: Boolean) {
if (expand) {
text = fullCaptionText
movementMethod = ScrollingMovementMethod()
scrollTo(0, 0)
updateLayoutParams { height = expandedHeight }
} else {
Log.d(TAG, "The view should be collapsed now.")
text = if (fullCaptionText.length <= CHAR_LIMIT_MESSAGE_PREVIEW) {
fullCaptionText
} else {
text = if (isExpandable()) {
context.getString(R.string.MediaPreviewFragment_see_more, fullCaptionText.substring(0, CHAR_LIMIT_MESSAGE_PREVIEW))
} else {
fullCaptionText
}
movementMethod = null
updateLayoutParams { height = ViewGroup.LayoutParams.WRAP_CONTENT }
}
setOnClickListener { toggleExpansion() }
if (isExpandable()) {
setOnClickListener { toggleExpansion() }
} else {
setOnClickListener(null)
}
}
private fun isExpandable(): Boolean {
return fullCaptionText.length > CHAR_LIMIT_MESSAGE_PREVIEW
}
companion object {
private val TAG = Log.tag(ExpandingCaptionView::class.java)
const val CHAR_LIMIT_MESSAGE_PREVIEW = 280
}
}