Procházet zdrojové kódy

Add conversation description to lobby screen

Resolves: #1557

Signed-off-by: Tim Krüger <t@timkrueger.me>
Tim Krüger před 3 roky
rodič
revize
08a5088c48

+ 2 - 1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

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

+ 2 - 1
app/src/main/res/layout/lobby_view.xml

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

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -350,7 +350,8 @@
     <string name="nc_lobby">Lobby</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_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>
 
     <!-- Errors -->