gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-15 16:55:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #897 from dan0xii/834-text-contrast

Browse Source 
Improves visiblity of text and URLs in chat view.
This commit is contained in:
Biswajit Das 2020-10-02 10:49:23 +01:00 committed by GitHub
commit 30349b53d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import kotlinx.android.synthetic.main.item_message_quote.view.*
import kotlinx.android.synthetic.main.rv_chat_item.view.*
import kotlinx.android.synthetic.main.rv_chat_system_item.view.*
import kotlinx.android.synthetic.main.rv_date_and_unread_notice_item.view.*
import kotlinx.android.synthetic.main.rv_item_conversation_with_last_message.view.*
import org.koin.core.KoinComponent
open class ChatPresenter<T : Any>(context: Context, private val onElementClickPass: ((Page, Holder, Element<T>, Map<String, String>) -> Unit)?, private val onElementLongClick: ((Page, Holder, Element<T>, Map<String, String>) -> Unit)?, private val imageLoader: ImageLoaderInterface) : Presenter<T>(context), KoinComponent {
@ -147,9 +148,14 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
if (isOutgoingMessage) {
messageLayoutParams.marginEnd = 8.dp
holder.itemView.messageLayout.background = context.resources.getDrawable(R.drawable.outgoing_grouped_message_background)
holder.itemView.chatMessage.setTextColor(context.resources.getColor(R.color.fg_chat_message_sent))
holder.itemView.messageTime.setTextColor(context.resources.getColor(R.color.fg_default_high))
holder.itemView.chatMessage.setLinkTextColor(context.resources.getColor(R.color.fg_chat_message_url))
} else {
messageLayoutParams.marginStart = 40.dp
holder.itemView.messageLayout.background = context.resources.getDrawable(R.drawable.incoming_grouped_message_background)
holder.itemView.chatMessage.setTextColor(context.resources.getColor(R.color.fg_default))
holder.itemView.chatMessage.setLinkTextColor(context.resources.getColor(R.color.colorPrimary))
}
holder.itemView.messageLayout.layoutParams = messageLayoutParams
@ -158,9 +164,14 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
if (isOutgoingMessage) {
messageLayoutParams.marginEnd = 8.dp
holder.itemView.messageLayout.background = context.resources.getDrawable(R.drawable.outgoing_message_background)
holder.itemView.chatMessage.setTextColor(context.resources.getColor(R.color.fg_chat_message_sent))
holder.itemView.messageTime.setTextColor(context.resources.getColor(R.color.fg_default_high))
holder.itemView.chatMessage.setLinkTextColor(context.resources.getColor(R.color.fg_chat_message_url))
} else {
messageLayoutParams.marginStart = 0
holder.itemView.messageLayout.background = context.resources.getDrawable(R.drawable.incoming_message_background)
holder.itemView.chatMessage.setTextColor(context.resources.getColor(R.color.fg_default))
holder.itemView.chatMessage.setLinkTextColor(context.resources.getColor(R.color.colorPrimary))
}
holder.itemView.messageLayout.layoutParams = messageLayoutParams
@ -209,6 +220,10 @@ open class ChatPresenter<T : Any>(context: Context, private val onElementClickPa
holder.itemView.quotedMessageTime?.text = DateFormatter.format(it.createdAt, DateFormatter.Template.TIME)
if (isOutgoingMessage) {
holder.itemView.quoteColoredView.setBackgroundColor(context.resources.getColor(R.color.bg_message_list_incoming_bubble))
holder.itemView.quotedChatText.setTextColor(context.resources.getColor(R.color.fg_chat_message_sent))
holder.itemView.quotedMessageTime.setTextColor(context.resources.getColor(R.color.fg_default_high))
holder.itemView.quotedChatText.setLinkTextColor(context.resources.getColor(R.color.fg_chat_message_url))
holder.itemView.quotedAuthor.setTextColor(context.resources.getColor(R.color.fg_chat_message_sent))
} else {
holder.itemView.quoteColoredView.setBackgroundColor(context.resources.getColor(R.color.bg_message_list_outcoming_bubble))
}

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

@ -65,6 +65,7 @@
android:textIsSelectable="false"
android:autoLink="all"
android:textSize="14sp"
android:textColorLink="@color/colorPrimary"
tools:text="Just another chat message" />
<TextView

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

@ -74,6 +74,8 @@
android:layout_marginHorizontal="8dp"
android:id="@+id/chatMessage"
android:autoLink="all"
android:textColor="@color/fg_chat_message_sent"
android:textColorLink="@color/colorPrimary"
app:layout_alignSelf="flex_start"
app:layout_flexGrow="1"
app:layout_wrapBefore="true"

5
app/src/main/res/values-night/colors.xml
View File

@ -25,6 +25,10 @@
<bool name="is_night">true</bool>
<bool name="status_bar_light">false</bool>
<color name="colorPrimary">#0082C9</color>
<color name="colorPrimaryDark">#006AA3</color>
<color name="colorAccent">#007CC2</color>
<color name="conversation_item_header">#9FBDCC</color>
<!--<color name="conversation_item_header">#CFCFCF</color>-->
@ -34,6 +38,7 @@
<color name="fg_default">#FFFFFF</color>
<color name="fg_inverse">#222222</color>
<color name="fg_chat_message_sent">@color/fg_default</color>
<!-- Chat window incoming message text & informational -->
<color name="nc_incoming_text_default">#D8D8D8</color>

3
app/src/main/res/values/colors.xml
View File

@ -59,6 +59,9 @@
<color name="fg_default">#666666</color>
<color name="fg_inverse">#FFFFFF</color>
<color name="fg_chat_message_sent">#FFFFFF</color>
<color name="fg_chat_message_url">#dddddd</color>
<color name="fg_default_high">#cccccc</color>
<color name="bg_default">#FFFFFF</color>
<color name="bg_alt">@color/white60</color>