gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add conversation description to lobby screen

Browse Source 
Resolves: #1557

Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2021-09-17 12:21:18 +02:00
parent 2315701b3a
commit 08a5088c48
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -1127,7 +1127,8 @@ class ChatController(args: Bundle) :
DateUtils.getLocalDateStringFromTimestampForLobby( DateUtils.getLocalDateStringFromTimestampForLobby(
currentConversation?.lobbyTimer currentConversation?.lobbyTimer
?: 0 ?: 0
) ),
currentConversation!!.description
) )
} else { } else {
binding.lobby.lobbyTextView.setText(R.string.nc_lobby_waiting) binding.lobby.lobbyTextView.setText(R.string.nc_lobby_waiting)

3
app/src/main/res/layout/lobby_view.xml
View File

@ -47,6 +47,7 @@
android:text="@string/nc_lobby_waiting" android:text="@string/nc_lobby_waiting"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/grey_600" android:textColor="@color/grey_600"
android:textSize="16sp" /> android:textSize="16sp"
android:autoLink="web" />
</RelativeLayout> </RelativeLayout>

3
app/src/main/res/values/strings.xml
View File

@ -350,7 +350,8 @@
<string name="nc_lobby">Lobby</string> <string name="nc_lobby">Lobby</string>
<string name="nc_start_time">Start time</string> <string name="nc_start_time">Start time</string>
<string name="nc_lobby_waiting">You are currently waiting in the lobby.</string> <string name="nc_lobby_waiting">You are currently waiting in the lobby.</string>
<string name="nc_lobby_waiting_with_date">You are currently waiting in the lobby.\n This meeting is scheduled for %1$s.</string> <string name="nc_lobby_waiting_with_date">You are currently waiting in the lobby.\n\nThis meeting is scheduled for
%1$s.\n\n%2$s</string>
<string name="nc_manual">Not set</string> <string name="nc_manual">Not set</string>
<!-- Errors --> <!-- Errors -->