Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-14 23:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utilze localized description for calculating badge line count.

Browse Source
This commit is contained in:
Alex Hart
2026-02-04 11:39:01 -04:00
parent d86d88f313
commit c274805eb0
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/badges/models/LargeBadge.kt
View File

@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.badges.models
import android.content.Context
import android.view.View
import android.widget.TextView
import org.thoughtcrime.securesms.R
@@ -43,11 +44,7 @@ data class LargeBadge(
badge.setBadge(model.largeBadge.badge)
name.text = context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal, model.shortName)
description.text = if (model.largeBadge.badge.isSubscription()) {
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly, model.shortName)
} else {
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation, model.shortName)
}
description.text = getDescription(context, model.largeBadge.badge.isSubscription(), model.shortName)
description.setLines(model.maxLines)
description.maxLines = model.maxLines
@@ -56,6 +53,14 @@ data class LargeBadge(
}
companion object {
fun getDescription(context: Context, isSubscriptionBadge: Boolean, shortName: String): String {
return if (isSubscriptionBadge) {
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly, shortName)
} else {
context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation, shortName)
}
}
fun register(mappingAdapter: MappingAdapter) {
mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
mappingAdapter.registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))

2
app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
View File

@@ -101,7 +101,7 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
var maxLines = 3
state.allBadgesVisibleOnProfile.forEach { badge ->
val text = badge.resolveDescription(state.recipient.getShortDisplayName(requireContext()))
val text = LargeBadge.getDescription(requireContext(), badge.isSubscription(), state.recipient.getShortDisplayName(requireContext()))
textPaint.getTextBounds(text, 0, text.length, textBounds)
val estimatedLines = ceil(textBounds.width().toFloat() / textWidth).toInt()
maxLines = max(maxLines, estimatedLines)