Skip to content

Commit e9117d9

Browse files
committed
feature (room upgrade) : add "same room" permalink toast to localazy
1 parent 1361107 commit e9117d9

File tree

2 files changed

+6
-4
lines changed
  • features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl
  • libraries/ui-strings/src/main/res/values

2 files changed

+6
-4
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import io.element.android.libraries.matrix.api.room.BaseRoom
6363
import io.element.android.libraries.matrix.api.room.alias.matches
6464
import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
6565
import io.element.android.libraries.mediaplayer.api.MediaPlayer
66+
import io.element.android.libraries.ui.strings.CommonStrings
6667
import io.element.android.services.analytics.api.AnalyticsService
6768
import kotlinx.collections.immutable.ImmutableList
6869
import kotlinx.coroutines.CoroutineScope
@@ -185,7 +186,7 @@ class MessagesNode @AssistedInject constructor(
185186
eventSink(TimelineEvents.FocusOnEvent(eventId))
186187
} else {
187188
// Click on the same room, ignore
188-
context.sameRoomToast()
189+
displaySameRoomToast()
189190
}
190191
} else {
191192
callbacks.forEach { it.onPermalinkClick(roomLink) }
@@ -214,7 +215,7 @@ class MessagesNode @AssistedInject constructor(
214215

215216
override fun onNavigateToRoom(roomId: RoomId) {
216217
if (roomId == room.roomId) {
217-
context.sameRoomToast()
218+
displaySameRoomToast()
218219
} else {
219220
val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias())
220221
callbacks.forEach { it.onPermalinkClick(permalinkData) }
@@ -241,8 +242,8 @@ class MessagesNode @AssistedInject constructor(
241242
callbacks.forEach { it.onViewKnockRequests() }
242243
}
243244

244-
private fun Context.sameRoomToast() {
245-
context.toast("Already viewing this room!")
245+
private fun displaySameRoomToast() {
246+
context.toast(CommonStrings.screen_room_permalink_same_room_android)
246247
}
247248

248249
@Composable

libraries/ui-strings/src/main/res/values/localazy.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ Are you sure you want to continue?"</string>
367367
<string name="screen_room_error_failed_processing_media">"Failed processing media to upload, please try again."</string>
368368
<string name="screen_room_error_failed_retrieving_user_details">"Could not retrieve user details"</string>
369369
<string name="screen_room_event_pill">"Message in %1$s"</string>
370+
<string name="screen_room_permalink_same_room_android">"Already viewing this room!"</string>
370371
<string name="screen_room_pinned_banner_indicator">"%1$s of %2$s"</string>
371372
<string name="screen_room_pinned_banner_indicator_description">"%1$s Pinned messages"</string>
372373
<string name="screen_room_pinned_banner_loading_description">"Loading message…"</string>

0 commit comments

Comments
 (0)