TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making sure we bold appropriately

Browse Source
This commit is contained in:
ThomasSession 2024-08-29 14:03:41 +10:00
parent 8e80ab08a9
commit 78a9ab7159
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
View File

@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.dependencies.DatabaseComponent
import com.bumptech.glide.RequestManager import com.bumptech.glide.RequestManager
import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
import org.thoughtcrime.securesms.showSessionDialog import org.thoughtcrime.securesms.showSessionDialog
import org.thoughtcrime.securesms.ui.getSubbedCharSequence
import org.thoughtcrime.securesms.ui.getSubbedString import org.thoughtcrime.securesms.ui.getSubbedString
class ConversationAdapter( class ConversationAdapter(
@ -159,7 +160,7 @@ class ConversationAdapter(
val titleTxt = context.getSubbedString(R.string.callsMissedCallFrom, NAME_KEY to message.individualRecipient.name!!) val titleTxt = context.getSubbedString(R.string.callsMissedCallFrom, NAME_KEY to message.individualRecipient.name!!)
title(titleTxt) title(titleTxt)
val bodyTxt = context.getSubbedString(R.string.callsYouMissedCallPermissions, NAME_KEY to message.individualRecipient.name!!) val bodyTxt = context.getSubbedCharSequence(R.string.callsYouMissedCallPermissions, NAME_KEY to message.individualRecipient.name!!)
text(bodyTxt) text(bodyTxt)
button(R.string.sessionSettings) { button(R.string.sessionSettings) {

8
app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt
View File

@ -78,21 +78,21 @@ class BlockedContactsViewModel @Inject constructor(private val storage: Storage)
fun getTitle(context: Context): String = context.getString(R.string.blockUnblock) fun getTitle(context: Context): String = context.getString(R.string.blockUnblock)
// Method to get the appropriate text to display when unblocking 1, 2, or several contacts // Method to get the appropriate text to display when unblocking 1, 2, or several contacts
fun getText(context: Context, contactsToUnblock: Set<Recipient>): String { fun getText(context: Context, contactsToUnblock: Set<Recipient>): CharSequence {
return when (contactsToUnblock.size) { return when (contactsToUnblock.size) {
// Note: We do not have to handle 0 because if no contacts are chosen then the unblock button is deactivated // Note: We do not have to handle 0 because if no contacts are chosen then the unblock button is deactivated
1 -> Phrase.from(context, R.string.blockUnblockName) 1 -> Phrase.from(context, R.string.blockUnblockName)
.put(NAME_KEY, contactsToUnblock.elementAt(0).name) .put(NAME_KEY, contactsToUnblock.elementAt(0).name)
.format().toString() .format()
2 -> Phrase.from(context, R.string.blockUnblockNameTwo) 2 -> Phrase.from(context, R.string.blockUnblockNameTwo)
.put(NAME_KEY, contactsToUnblock.elementAt(0).name) .put(NAME_KEY, contactsToUnblock.elementAt(0).name)
.format().toString() .format()
else -> { else -> {
val othersCount = contactsToUnblock.size - 1 val othersCount = contactsToUnblock.size - 1
Phrase.from(context, R.string.blockUnblockNameMultiple) Phrase.from(context, R.string.blockUnblockNameMultiple)
.put(NAME_KEY, contactsToUnblock.elementAt(0).name) .put(NAME_KEY, contactsToUnblock.elementAt(0).name)
.put(COUNT_KEY, othersCount) .put(COUNT_KEY, othersCount)
.format().toString() .format()
} }
} }
} }

13
app/src/main/java/org/thoughtcrime/securesms/util/CallNotificationBuilder.kt
View File

@ -17,6 +17,8 @@ import org.thoughtcrime.securesms.calls.WebRtcCallActivity
import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.notifications.NotificationChannels
import org.thoughtcrime.securesms.preferences.SettingsActivity import org.thoughtcrime.securesms.preferences.SettingsActivity
import org.thoughtcrime.securesms.service.WebRtcCallService import org.thoughtcrime.securesms.service.WebRtcCallService
import org.thoughtcrime.securesms.ui.getSubbedCharSequence
import org.thoughtcrime.securesms.ui.getSubbedString
class CallNotificationBuilder { class CallNotificationBuilder {
@ -41,12 +43,11 @@ class CallNotificationBuilder {
val pendingIntent = PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) val pendingIntent = PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
val titleTxt = Phrase.from(context, R.string.callsMissedCallFrom) val titleTxt = context.getSubbedString(R.string.callsMissedCallFrom, NAME_KEY to callerName)
.put(NAME_KEY, callerName) val bodyTxt = context.getSubbedCharSequence(
.format().toString() R.string.callsYouMissedCallPermissions,
val bodyTxt = Phrase.from(context, R.string.callsYouMissedCallPermissions) NAME_KEY to callerName
.put(NAME_KEY, callerName) )
.format().toString()
val builder = NotificationCompat.Builder(context, NotificationChannels.CALLS) val builder = NotificationCompat.Builder(context, NotificationChannels.CALLS)
.setSound(null) .setSound(null)