mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-28 15:15:42 +01:00
change icon, rename strings, add logic to hide "Start thread"
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe
parent
91cd342cb8
commit
fe87517128
@ -151,7 +151,7 @@ class MessageActionsDialog(
|
||||
currentConversation?.type != ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL &&
|
||||
isOnline
|
||||
)
|
||||
initMenuReplyInThread(true) // TODO: set visibility
|
||||
initMenuStartThread(!message.isThread)
|
||||
initMenuOpenThread(message.isThread && chatActivity.threadId == null)
|
||||
initMenuEditMessage(isMessageEditable)
|
||||
initMenuDeleteMessage(showMessageDeletionButton && isOnline)
|
||||
@ -416,15 +416,15 @@ class MessageActionsDialog(
|
||||
dialogMessageActionsBinding.menuReplyPrivately.visibility = getVisibility(visible)
|
||||
}
|
||||
|
||||
private fun initMenuReplyInThread(visible: Boolean) {
|
||||
private fun initMenuStartThread(visible: Boolean) {
|
||||
if (visible) {
|
||||
dialogMessageActionsBinding.menuReplyInThread.setOnClickListener {
|
||||
dialogMessageActionsBinding.menuStartThread.setOnClickListener {
|
||||
chatActivity.createThread(message)
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
dialogMessageActionsBinding.menuReplyInThread.visibility = getVisibility(visible)
|
||||
dialogMessageActionsBinding.menuStartThread.visibility = getVisibility(visible)
|
||||
}
|
||||
|
||||
private fun initMenuOpenThread(visible: Boolean) {
|
||||
|
||||
12
app/src/main/res/drawable/outline_forum_24.xml
Normal file
12
app/src/main/res/drawable/outline_forum_24.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<!--
|
||||
~ Nextcloud Talk - Android Client
|
||||
~
|
||||
~ SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
|
||||
~ SPDX-License-Identifier: GPL-3.0-or-later
|
||||
-->
|
||||
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:tint="#000000" android:viewportWidth="960" android:viewportHeight="960">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M880,880L720,720L320,720Q287,720 263.5,696.5Q240,673 240,640L240,600L680,600Q713,600 736.5,576.5Q760,553 760,520L760,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,880ZM160,487L207,440L600,440Q600,440 600,440Q600,440 600,440L600,160Q600,160 600,160Q600,160 600,160L160,160Q160,160 160,160Q160,160 160,160L160,487ZM80,680L80,160Q80,127 103.5,103.5Q127,80 160,80L600,80Q633,80 656.5,103.5Q680,127 680,160L680,440Q680,473 656.5,496.5Q633,520 600,520L240,520L80,680ZM160,440L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,440Q160,440 160,440Q160,440 160,440L160,440Z"/>
|
||||
|
||||
</vector>
|
||||
@ -1,12 +0,0 @@
|
||||
<!--
|
||||
~ Nextcloud Talk - Android Client
|
||||
~
|
||||
~ SPDX-FileCopyrightText: 2025 Your Name <your@email.com>
|
||||
~ SPDX-License-Identifier: GPL-3.0-or-later
|
||||
-->
|
||||
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:tint="#000000" android:viewportWidth="960" android:viewportHeight="960">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M554,840Q500,840 463,803Q426,766 426,714Q426,638 487.5,576.5Q549,515 641,500Q638,464 623,445.5Q608,427 582,427Q552,427 517,452Q482,477 434,534Q356,627 319.5,655Q283,683 241,683Q190,683 155,645Q120,607 120,553Q120,499 143.5,442.5Q167,386 223,307Q242,281 251,263Q260,245 260,234Q260,227 257.5,223.5Q255,220 250,220Q240,220 225,232.5Q210,245 190,271L120,200Q152,161 185,140.5Q218,120 250,120Q296,120 328,152Q360,184 360,232Q360,261 345,296Q330,331 295,380Q257,434 238.5,475Q220,516 220,547Q220,564 225.5,573.5Q231,583 241,583Q251,583 258.5,577.5Q266,572 286,551Q299,537 317,516.5Q335,496 361,466Q424,391 475,359Q526,327 582,327Q649,327 692,372Q735,417 741,495L840,495L840,595L741,595Q733,707 682.5,773.5Q632,840 554,840ZM556,740Q588,740 610,703.5Q632,667 640,602Q594,613 560,645.5Q526,678 526,710Q526,724 534,732Q542,740 556,740ZM800,280Q750,280 715,245Q680,210 680,160Q680,110 715,75Q750,40 800,40Q850,40 885,75Q920,110 920,160Q920,210 885,245Q850,280 800,280Z"/>
|
||||
|
||||
</vector>
|
||||
@ -283,7 +283,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/menu_reply_in_thread"
|
||||
android:id="@+id/menu_start_thread"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/bottom_sheet_item_height"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
@ -292,23 +292,23 @@
|
||||
tools:ignore="UseCompoundDrawables">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/menu_icon_reply_in_thread"
|
||||
android:id="@+id/menu_icon_start_thread"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@null"
|
||||
android:paddingStart="@dimen/standard_padding"
|
||||
android:paddingEnd="@dimen/zero"
|
||||
android:src="@drawable/outline_thread_unread_24"
|
||||
android:src="@drawable/outline_forum_24"
|
||||
app:tint="@color/high_emphasis_menu_icon" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/menu_text_reply_in_thread"
|
||||
android:id="@+id/menu_text_start_thread"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="start|center_vertical"
|
||||
android:paddingStart="@dimen/standard_double_padding"
|
||||
android:paddingEnd="@dimen/standard_padding"
|
||||
android:text="@string/reply_in_thread"
|
||||
android:text="@string/start_thread"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/high_emphasis_text"
|
||||
android:textSize="@dimen/bottom_sheet_text_size" />
|
||||
@ -331,7 +331,7 @@
|
||||
android:contentDescription="@null"
|
||||
android:paddingStart="@dimen/standard_padding"
|
||||
android:paddingEnd="@dimen/zero"
|
||||
android:src="@drawable/outline_thread_unread_24"
|
||||
android:src="@drawable/outline_forum_24"
|
||||
app:tint="@color/high_emphasis_menu_icon" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
|
||||
@ -549,8 +549,8 @@ How to translate with transifex:
|
||||
<string name="typing_x_others">and %1$s others are typing …</string>
|
||||
<string name="deck_card_description">%1$s in %2$s</string>
|
||||
|
||||
<string name="open_thread">See thread</string>
|
||||
<string name="reply_in_thread">Reply in thread</string>
|
||||
<string name="open_thread">Go to thread</string>
|
||||
<string name="start_thread">Start a thread</string>
|
||||
<string name="show_threads_overview">Show threads</string>
|
||||
<string name="recent_threads">Recent threads</string>
|
||||
<string name="thread_replies_amount">%1$d replies</string>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user