Merge pull request #5006 from nextcloud/sensitive_conversation

Follow-up fixes for Sensitive conversation

app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt

@@ -19,6 +19,7 @@ import android.text.TextUtils
 import android.text.format.DateUtils
 import android.text.style.ImageSpan
 import android.view.View
+import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import com.nextcloud.talk.R
@@ -155,6 +156,30 @@ class ConversationItem(
         } else {
             holder.binding.userStatusImage.visibility = View.GONE
         }
+
+        val dialogNameParams = holder.binding.dialogName.layoutParams as RelativeLayout.LayoutParams
+        val unreadBubbleParams = holder.binding.dialogUnreadBubble.layoutParams as RelativeLayout.LayoutParams
+        val relativeLayoutParams = holder.binding.relativeLayout.layoutParams as RelativeLayout.LayoutParams
+
+        if (model.hasSensitive == true) {
+            dialogNameParams.addRule(RelativeLayout.CENTER_VERTICAL)
+            relativeLayoutParams.addRule(RelativeLayout.ALIGN_TOP, R.id.dialogAvatarFrameLayout)
+            dialogNameParams.marginEnd =
+                context.resources.getDimensionPixelSize(R.dimen.standard_double_padding)
+            unreadBubbleParams.topMargin =
+                context.resources.getDimensionPixelSize(R.dimen.double_margin_between_elements)
+            unreadBubbleParams.addRule(RelativeLayout.CENTER_VERTICAL)
+        } else {
+            dialogNameParams.removeRule(RelativeLayout.CENTER_VERTICAL)
+            relativeLayoutParams.removeRule(RelativeLayout.ALIGN_TOP)
+            dialogNameParams.marginEnd = 0
+            unreadBubbleParams.topMargin = 0
+            unreadBubbleParams.removeRule(RelativeLayout.CENTER_VERTICAL)
+        }
+        holder.binding.relativeLayout.layoutParams = relativeLayoutParams
+        holder.binding.dialogUnreadBubble.layoutParams = unreadBubbleParams
+        holder.binding.dialogName.layoutParams = dialogNameParams
+
         setLastMessage(holder, appContext)
         showAvatar(holder)
     }

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -545,7 +545,8 @@ class ConversationInfoActivity :
                 binding.guestAccessView.allowGuestsSwitch,
                 binding.guestAccessView.passwordProtectionSwitch,
                 binding.recordingConsentView.recordingConsentForConversationSwitch,
-                binding.lockConversationSwitch
+                binding.lockConversationSwitch,
+                binding.notificationSettingsView.sensitiveConversationSwitch
             ).forEach(viewThemeUtils.talk::colorSwitch)
         }
     }

app/src/main/res/layout/rv_item_conversation_with_last_message.xml

@@ -64,6 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/dialogName"
         android:layout_marginTop="6dp"
+        android:id="@+id/relativeLayout"
         android:layout_toEndOf="@id/dialogAvatarFrameLayout">
 
         <androidx.emoji2.widget.EmojiTextView
@@ -121,8 +122,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/dialogAvatarFrameLayout"
         android:layout_marginTop="2dp"
-        android:layout_toStartOf="@id/dialogDate"
         android:layout_toEndOf="@id/dialogAvatarFrameLayout"
+        android:layout_toStartOf="@id/dialogDate"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"