gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes to quoted preview

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-04-07 11:26:03 +02:00
parent a4363f01ec
commit 1c2c70e64e
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatPresenter.kt
View File

@ -118,7 +118,6 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
parentMessage.imageUrl?.let { previewMessageUrl -> parentMessage.imageUrl?.let { previewMessageUrl ->
if (previewMessageUrl == "no-preview") { if (previewMessageUrl == "no-preview") {
if (it.selectedIndividualHashMap?.containsKey("mimetype") == true) { if (it.selectedIndividualHashMap?.containsKey("mimetype") == true) {
holder.itemView.quotedPreviewImage.visibility = View.VISIBLE holder.itemView.quotedPreviewImage.visibility = View.VISIBLE
imageLoader.getImageLoader().loadAny(context, getDrawableResourceIdForMimeType(parentMessage.selectedIndividualHashMap!!["mimetype"])) { imageLoader.getImageLoader().loadAny(context, getDrawableResourceIdForMimeType(parentMessage.selectedIndividualHashMap!!["mimetype"])) {
@ -131,10 +130,10 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
holder.itemView.quotedPreviewImage.visibility = View.VISIBLE holder.itemView.quotedPreviewImage.visibility = View.VISIBLE
val mutableMap = mutableMapOf<String, String>() val mutableMap = mutableMapOf<String, String>()
if (parentMessage.selectedIndividualHashMap?.containsKey("mimetype") == true) { if (parentMessage.selectedIndividualHashMap?.containsKey("mimetype") == true) {
mutableMap["mimetype"] = it.selectedIndividualHashMap!!["mimetype"]!! mutableMap["mimetype"] = parentMessage.selectedIndividualHashMap!!["mimetype"]!!
} }
imageLoader.loadImage(holder.itemView.previewImage, previewMessageUrl, mutableMap) imageLoader.loadImage(holder.itemView.quotedPreviewImage, previewMessageUrl, mutableMap)
} }
} ?: run { } ?: run {
holder.itemView.quotedPreviewImage.visibility = View.GONE holder.itemView.quotedPreviewImage.visibility = View.GONE
@ -144,7 +143,7 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
holder.itemView.quotedAuthor.text = parentMessage.actorDisplayName holder.itemView.quotedAuthor.text = parentMessage.actorDisplayName
?: context.getText(R.string.nc_nick_guest) ?: context.getText(R.string.nc_nick_guest)
holder.itemView.quotedChatText.text = parentMessage.text holder.itemView.quotedChatText.text = parentMessage.text
holder.itemView.messageTime?.text = DateFormatter.format(it.createdAt, DateFormatter.Template.TIME) holder.itemView.quotedMessageTime?.text = DateFormatter.format(it.createdAt, DateFormatter.Template.TIME)
} ?: run { } ?: run {
holder.itemView.quotedMessageLayout.isVisible = false holder.itemView.quotedMessageLayout.isVisible = false
} }

2
app/src/main/java/com/nextcloud/talk/newarch/utils/NetworkComponents.kt
View File

@ -84,7 +84,7 @@ class NetworkComponents(
} }
okHttpClientBuilder.dispatcher(dispatcher) okHttpClientBuilder.dispatcher(dispatcher)
return okHttpClientBuilder.build() return okHttpClientBuilder.build()
} }

6
app/src/main/res/layout/item_message_quote.xml
View File

@ -9,9 +9,10 @@
<View <View
android:id="@+id/quoteColoredView" android:id="@+id/quoteColoredView"
android:layout_width="2dp" android:layout_width="2dp"
android:layout_height="100dp" android:layout_height="match_parent"
android:layout_alignTop="@id/quotedAuthorLayout"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignBottom="@id/quotedChatText" android:layout_alignBottom="@id/quotedMessageTime"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
/> />
@ -75,7 +76,6 @@
android:textSize="10sp" android:textSize="10sp"
android:textAlignment="textEnd" android:textAlignment="textEnd"
android:id="@+id/quotedMessageTime" android:id="@+id/quotedMessageTime"
android:layout_marginEnd="8dp"
tools:text="12:30"/> tools:text="12:30"/>

2
app/src/main/res/layout/rv_date_and_unread_notice_item.xml
View File

@ -9,6 +9,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
android:padding="16dp"/> android:padding="8dp"/>
</RelativeLayout> </RelativeLayout>