From cba8995aca64e9e71dee7328b4ad64e1d47f59a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 21 Dec 2023 09:33:29 -0500
Subject: [PATCH] conversation: use TextView instead of Chip
Change-Id: I8c9700227a97274066924000c67231748624a09f
---
.../java/cx/ring/adapters/ConversationAdapter.kt | 8 ++++----
.../cx/ring/viewholders/ConversationViewHolder.kt | 2 +-
.../app/src/main/res/layout/item_conv_msg_me.xml | 14 ++++++--------
.../app/src/main/res/layout/item_conv_msg_peer.xml | 14 ++++++--------
4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
index ff0f093d6..0f0070d77 100644
--- a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
+++ b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
@@ -363,7 +363,7 @@ class ConversationAdapter(
}
// Subscribe on result.
Observable.combineLatest(entry) { resultDictionary ->
- resultDictionary.map { it ->
+ resultDictionary.map {
it as Pair<ContactViewModel, List<Interaction>>
}
}
@@ -411,7 +411,7 @@ class ConversationAdapter(
chip.isVisible = true
chip.isClickable = true
chip.isFocusable = true
- chip.isChecked = false
+ //chip.isChecked = false
}
}
}
@@ -1663,8 +1663,8 @@ class ConversationAdapter(
*/
private fun setBottomMargin(view: View, margin_in_dp: Int) {
val targetSize = (margin_in_dp * view.context.resources.displayMetrics.density).toInt()
- val params = view.layoutParams as MarginLayoutParams
- params.bottomMargin = targetSize
+ val params = view.layoutParams as? MarginLayoutParams?
+ params?.bottomMargin = targetSize
}
/**
diff --git a/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
index f0c5083cc..e1a379cbf 100644
--- a/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
+++ b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
@@ -71,7 +71,7 @@ class ConversationViewHolder(v: ViewGroup, val type: MessageType) : RecyclerView
val mReplyTxt: TextView? = v.findViewById(R.id.msg_reply_txt)
val mInReplyTo: TextView? = v.findViewById(R.id.msg_in_reply_to)
val mPeerDisplayName: TextView? = v.findViewById(R.id.msg_display_name)
- val reactionChip: Chip? = v.findViewById(R.id.reaction_chip)
+ val reactionChip: TextView? = v.findViewById(R.id.reaction_chip)
val mIcon: ImageView? = when (type) {
MessageType.INCOMING_CALL_INFORMATION,
MessageType.OUTGOING_CALL_INFORMATION -> v.findViewById(R.id.call_icon)
diff --git a/jami-android/app/src/main/res/layout/item_conv_msg_me.xml b/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
index cf39f39de..6f50a3f32 100644
--- a/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
+++ b/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
@@ -139,25 +139,23 @@ along with this program; if not, write to the Free Software
android:layout_alignParentEnd="true"
android:layout_marginEnd="5dp" />
- <com.google.android.material.chip.Chip
+ <TextView
android:id="@+id/reaction_chip"
- style="@style/Widget.Material3.Chip.Suggestion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/msg_txt"
android:layout_alignEnd="@id/msg_txt"
android:layout_marginTop="-16dp"
android:layout_marginEnd="8dp"
+ android:background="@drawable/background_item_conv_image"
android:backgroundTint="@color/icon_background_color"
android:elevation="4dp"
android:outlineProvider="none"
android:text="👍 😍 3"
- app:chipCornerRadius="5dp"
- app:chipEndPadding="0dp"
- app:chipStartPadding="0dp"
- app:chipStrokeColor="@color/border_color"
- app:textEndPadding="5dp"
- app:textStartPadding="5dp" />
+ android:lines="1"
+ android:singleLine="true"
+ android:maxLines="1"
+ android:padding="5dp" />
</RelativeLayout>
diff --git a/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml b/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
index dfafa83bf..c3d51a0a5 100644
--- a/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
+++ b/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
@@ -127,25 +127,23 @@ along with this program; if not, write to the Free Software
tools:visibility="visible" />
<!-- maxEms="8" to have around 16 characters displayed -->
- <com.google.android.material.chip.Chip
+ <TextView
android:id="@+id/reaction_chip"
- style="@style/Widget.Material3.Chip.Suggestion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/msg_txt"
android:layout_alignStart="@id/msg_txt"
android:layout_marginStart="8dp"
android:layout_marginTop="-16dp"
+ android:background="@drawable/background_item_conv_image"
android:backgroundTint="@color/icon_background_color"
android:elevation="4dp"
android:outlineProvider="none"
android:text="👍😍 3"
- app:chipCornerRadius="5dp"
- app:chipEndPadding="0dp"
- app:chipStartPadding="0dp"
- app:chipStrokeColor="@color/border_color"
- app:textEndPadding="5dp"
- app:textStartPadding="5dp" />
+ android:lines="1"
+ android:singleLine="true"
+ android:maxLines="1"
+ android:padding="5dp" />
<TextView
android:id="@+id/msg_in_reply_to"
--
GitLab