Skip to content

Make message input chat-bubble styled #5671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyScherzinger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make message input chat-bubble styled #5671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,14 @@ class MessageInputFragment : Fragment() {
}

private fun themeMessageInputView() {
binding.messageInputContainer.apply {
viewThemeUtils.talk.themeCardView(this)
}

binding.fragmentMessageInputView.findViewById<ImageView>(R.id.microphoneEnabledInfoBackground)?.let {
viewThemeUtils.platform.themeViewBackground(it, ColorRole.SURFACE_VARIANT)
}

binding.fragmentMessageInputView.button?.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) }

binding.fragmentMessageInputView.findViewById<ImageButton>(R.id.cancelReplyButton)?.let {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ class TalkSpecificViewThemeUtils @Inject constructor(
private val appcompat: AndroidXViewThemeUtils
) : ViewThemeUtilsBase(schemes) {
private val dynamicColor = MaterialDynamicColors()

fun themeCardView(cardView: MaterialCardView) {
withScheme(cardView) { scheme ->
cardView.backgroundTintList = ColorStateList.valueOf(dynamicColor.surfaceVariant().getArgb(scheme))
}
}

fun themeIncomingMessageBubble(bubble: View, grouped: Boolean, deleted: Boolean, isPlayed: Boolean = false) {
val resources = bubble.resources

Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/layout/activity_chat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,6 @@
android:layout_marginBottom="-19dp"
android:orientation="vertical">

<View
android:id="@+id/separator_1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/chat_separator" />

<TextView
android:id="@+id/typing_indicator"
android:layout_width="match_parent"
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/res/layout/create_thread_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2025 Andy Scherzinger <info@andy-scherzinger.de>
~ SPDX-FileCopyrightText: 2025 Marcel Hibbe <dev@mhibbe.de>
~ SPDX-License-Identifier: GPL-3.0-or-later
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"

android:id="@+id/createThreadView"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -16,22 +15,24 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="50dp"
tools:ignore="RtlSymmetry">

<TextView
android:id="@+id/createThreadTitle"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="49dp"
android:text="@string/thread_title"
android:textColor="@color/grey_600" />
android:textColor="?attr/colorControlNormal" />

<com.nextcloud.talk.utils.EmojiTextInputEditText
android:id="@+id/createThreadInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="45dp"
android:imeOptions="actionDone"
android:inputType="textUri"
android:singleLine="true"
Expand Down
57 changes: 27 additions & 30 deletions app/src/main/res/layout/edit_message_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,61 @@
<!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2025 Andy Scherzinger <info@andy-scherzinger.de>
~ SPDX-FileCopyrightText: 2024 Sowjanya Kota <sowjanya.kch@gmail.com>
~ SPDX-License-Identifier: GPL-3.0-or-later
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"

android:id="@+id/editMessageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id = "@+id/editMessageView"
android:orientation = "horizontal">
android:layout_marginTop="@dimen/standard_half_margin"
android:orientation="horizontal">

<ImageView
android:id = "@+id/editIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding = "12dp"
android:src = "@drawable/ic_edit_24"
android:layout_gravity = "start|top"
android:contentDescription= "@string/nc_edit_icon"
app:tint="@color/grey_600">
android:id="@+id/editIcon"
android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="@dimen/min_size_clickable_area"
android:layout_gravity="start|top"
android:contentDescription="@string/nc_edit_icon"
android:padding="12dp"
android:src="@drawable/ic_edit_24"
app:tint="?attr/colorControlNormal">

</ImageView>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight = "1"
android:orientation = "vertical">
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id = "@+id/editMessageTitle"
android:id="@+id/editMessageTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor = "@color/grey_600"
android:text = "@string/nc_edit_message_text">
</TextView>
android:text="@string/nc_edit_message_text"
android:textColor="?attr/colorControlNormal" />

<TextView
android:id = "@+id/editMessage"
android:id="@+id/editMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines = "1"
tools:text = "Edit message very very very very very very very very very very long">
</TextView>
android:maxLines="1"
tools:text="Edit message very very very very very very very very very very long" />

</LinearLayout>

<ImageView
android:id = "@+id/clearEdit"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding = "12dp"
android:src = "@drawable/ic_clear_24"
android:id="@+id/clearEdit"
android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="@dimen/min_size_clickable_area"
android:contentDescription="@string/nc_clear_edit_button"
android:gravity = "top|end">
</ImageView>
android:gravity="top|end"
android:padding="12dp"
android:src="@drawable/ic_clear_24" />

</LinearLayout>
134 changes: 73 additions & 61 deletions app/src/main/res/layout/fragment_message_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk - Android Client
~
~ SPDX-FileCopyrightText: 2025 Andy Scherzinger <info@andy-scherzinger.de>
~ SPDX-FileCopyrightText: 2024 Julius Linus <juliuslinus1@gmail.com>
~ SPDX-License-Identifier: GPL-3.0-or-later
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">


<com.google.android.material.textview.MaterialTextView
android:id="@+id/fragment_connection_lost"
<com.google.android.material.card.MaterialCardView
android:id="@+id/messageInputContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/connection_lost_sent_messages_are_queued"
android:textColor="@color/white"
android:background="@color/hwSecurityRed"
android:visibility="gone"
tools:visibility="visible" />
android:layout_marginHorizontal="@dimen/standard_half_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
app:cardBackgroundColor="@color/bg_message_list_incoming_bubble"
app:cardCornerRadius="@dimen/button_corner_radius"
app:cardElevation="@dimen/zero"
app:strokeWidth="@dimen/zero">

<include
android:id="@+id/fragment_call_started"
layout="@layout/call_started_message"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginVertical="@dimen/standard_margin"
android:layout_marginHorizontal="@dimen/standard_quarter_margin"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<include
android:id="@+id/fragment_editView"
layout="@layout/edit_message_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp">
</include>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/fragment_connection_lost"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/hwSecurityRed"
android:gravity="center"
android:text="@string/connection_lost_sent_messages_are_queued"
android:textColor="@color/white"
android:visibility="gone"
tools:visibility="visible" />

<include
android:id="@+id/fragment_create_thread_view"
layout="@layout/create_thread_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp">
</include>
<include
android:id="@+id/fragment_call_started"
layout="@layout/call_started_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_quarter_margin"
android:layout_marginVertical="@dimen/standard_margin"
android:visibility="gone" />

<com.nextcloud.talk.ui.MessageInput
android:id="@+id/fragment_message_input_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:inputType="textLongMessage|textAutoComplete"
android:maxLength="1000"
app:attachmentButtonBackground="@color/transparent"
app:attachmentButtonHeight="48dp"
app:attachmentButtonIcon="@drawable/ic_baseline_attach_file_24"
app:attachmentButtonMargin="0dp"
app:attachmentButtonWidth="48dp"
app:delayTypingStatus="200"
app:inputButtonDefaultBgColor="@color/transparent"
app:inputButtonDefaultBgDisabledColor="@color/transparent"
app:inputButtonDefaultBgPressedColor="@color/transparent"
app:inputButtonDefaultIconColor="@color/colorPrimary"
app:inputButtonHeight="48dp"
app:inputButtonMargin="0dp"
app:inputButtonWidth="48dp"
app:inputHint="@string/nc_hint_enter_a_message"
app:inputHintColor="?attr/colorControlNormal"
app:inputTextColor="@color/nc_incoming_text_default"
app:inputTextSize="16sp"
app:showAttachmentButton="true" />
</LinearLayout>
<include
android:id="@+id/fragment_editView"
layout="@layout/edit_message_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<include
android:id="@+id/fragment_create_thread_view"
layout="@layout/create_thread_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<com.nextcloud.talk.ui.MessageInput
android:id="@+id/fragment_message_input_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:inputType="textLongMessage|textAutoComplete"
android:maxLength="1000"
app:attachmentButtonBackground="@color/transparent"
app:attachmentButtonHeight="48dp"
app:attachmentButtonIcon="@drawable/ic_baseline_attach_file_24"
app:attachmentButtonMargin="0dp"
app:attachmentButtonWidth="48dp"
app:delayTypingStatus="200"
app:inputButtonDefaultBgColor="@color/transparent"
app:inputButtonDefaultBgDisabledColor="@color/transparent"
app:inputButtonDefaultBgPressedColor="@color/transparent"
app:inputButtonDefaultIconColor="@color/colorPrimary"
app:inputButtonHeight="48dp"
app:inputButtonMargin="0dp"
app:inputButtonWidth="48dp"
app:inputHint="@string/nc_hint_enter_a_message"
app:inputHintColor="@color/nc_incoming_text_default"
app:inputTextColor="@color/nc_incoming_text_default"
app:inputTextSize="16sp"
app:showAttachmentButton="true" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
9 changes: 4 additions & 5 deletions app/src/main/res/layout/item_message_quote.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
android:id="@+id/quotedChatMessageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:background="@drawable/reply_background"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:layout_marginBottom="8dp">
android:paddingEnd="4dp"
android:paddingBottom="4dp">

<androidx.emoji2.widget.EmojiTextView
android:id="@+id/quotedMessageAuthor"
Expand Down Expand Up @@ -84,9 +84,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="@dimen/zero"
android:background="@color/transparent"
android:contentDescription="@string/nc_message_quote_cancel_reply"
android:src="@drawable/ic_cancel_black_24dp"
Expand Down
Loading
Loading