From 74bf9f2e9119072404379b1a558195aa61c6a622 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Fri, 13 Dec 2024 16:04:45 +0100 Subject: [PATCH] hide replacement view when there is no replacement set Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/chat/ChatActivity.kt | 5 +++-- .../talk/chat/viewmodels/ChatViewModel.kt | 1 + .../main/res/layout/out_of_office_view.xml | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index a7a703229..3c244ac7d 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -45,6 +45,7 @@ import android.view.animation.AccelerateDecelerateInterpolator import android.widget.AbsListView import android.widget.FrameLayout import android.widget.ImageView +import android.widget.LinearLayout import android.widget.PopupMenu import android.widget.TextView import androidx.activity.OnBackPressedCallback @@ -1153,8 +1154,8 @@ class ChatActivity : binding.outOfOfficeContainer.findViewById(R.id.replacement_user_name).text = uiState.userAbsence.replacementUserDisplayName } else { - binding.outOfOfficeContainer.findViewById(R.id.absenceReplacement).visibility = - View.GONE + binding.outOfOfficeContainer.findViewById(R.id.userAbsenceReplacement) + .visibility = View.GONE } binding.outOfOfficeContainer.findViewById(R.id.userAbsenceLongMessage).text = uiState.userAbsence.message diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt index 328170b34..ed349b5fc 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt @@ -771,6 +771,7 @@ class ChatViewModel @Inject constructor( } } + @Suppress("Detekt.TooGenericExceptionCaught") fun outOfOfficeStatusOfUser(credentials: String, baseUrl: String, userId: String) { viewModelScope.launch { try { diff --git a/app/src/main/res/layout/out_of_office_view.xml b/app/src/main/res/layout/out_of_office_view.xml index 98c7a885f..ed208ee9f 100644 --- a/app/src/main/res/layout/out_of_office_view.xml +++ b/app/src/main/res/layout/out_of_office_view.xml @@ -5,12 +5,19 @@ ~ SPDX-FileCopyrightText: 2024 Sowjanya Kota ~ SPDX-License-Identifier: GPL-3.0-or-later --> - + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + - \ No newline at end of file + + \ No newline at end of file