awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Hosted Weblate
2024-11-11 16:11:47 +01:00
parent 86656f1155 9f8fe08c75
commit 3fbccf3408
4 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/ConversationItem.java
+10 -4
View File
@@ -111,6 +111,7 @@ public class ConversationItem extends BaseConversationItem
protected ViewGroup contactPhotoHolder;
private ViewGroup container;
private Button msgActionButton;
private Button showFullButton;
private @NonNull Stub<ConversationItemThumbnail> mediaThumbnailStub;
private @NonNull Stub<AudioView> audioViewStub;
@@ -157,6 +158,7 @@ public class ConversationItem extends BaseConversationItem
this.container = findViewById(R.id.container);
this.replyView = findViewById(R.id.reply_icon);
this.msgActionButton = findViewById(R.id.msg_action_button);
this.showFullButton = findViewById(R.id.show_full_button);
setOnClickListener(new ClickListener(null));
@@ -406,6 +408,7 @@ public class ConversationItem extends BaseConversationItem
int downloadState = messageRecord.getDownloadState();
if (downloadState == DcMsg.DC_DOWNLOAD_AVAILABLE || downloadState == DcMsg.DC_DOWNLOAD_FAILURE || downloadState == DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
showFullButton.setVisibility(View.GONE);
msgActionButton.setVisibility(View.VISIBLE);
if (downloadState==DcMsg.DC_DOWNLOAD_IN_PROGRESS) {
msgActionButton.setEnabled(false);
@@ -426,6 +429,7 @@ public class ConversationItem extends BaseConversationItem
}
});
} else if (messageRecord.getType() == DcMsg.DC_MSG_WEBXDC) {
showFullButton.setVisibility(View.GONE);
msgActionButton.setVisibility(View.VISIBLE);
msgActionButton.setEnabled(true);
msgActionButton.setText(R.string.start_app);
@@ -438,10 +442,11 @@ public class ConversationItem extends BaseConversationItem
});
}
else if (messageRecord.hasHtml()) {
msgActionButton.setVisibility(View.VISIBLE);
msgActionButton.setEnabled(true);
msgActionButton.setText(R.string.show_full_message);
msgActionButton.setOnClickListener(view -> {
msgActionButton.setVisibility(View.GONE);
showFullButton.setVisibility(View.VISIBLE);
showFullButton.setEnabled(true);
showFullButton.setText(R.string.show_full_message);
showFullButton.setOnClickListener(view -> {
if (eventListener != null && batchSelected.isEmpty()) {
eventListener.onShowFullClicked(messageRecord);
} else {
@@ -450,6 +455,7 @@ public class ConversationItem extends BaseConversationItem
});
} else {
msgActionButton.setVisibility(View.GONE);
showFullButton.setVisibility(View.GONE);
}
}
src/main/res/layout/conversation_item_received.xml
+16
View File
@@ -181,6 +181,22 @@
<Button
android:id="@+id/msg_action_button"
android:visibility="gone"
style="@style/ButtonPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:padding="@dimen/message_bubble_showmore_padding"
android:minHeight="1dp"
android:minWidth="0dp"
android:text="@string/show_full_message"
android:textAllCaps="false"/>
<Button
android:id="@+id/show_full_button"
android:visibility="gone"
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
src/main/res/layout/conversation_item_sent.xml
+16
View File
@@ -159,6 +159,22 @@
<Button
android:id="@+id/msg_action_button"
android:visibility="gone"
style="@style/ButtonPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:padding="@dimen/message_bubble_showmore_padding"
android:minHeight="1dp"
android:minWidth="0dp"
android:text="@string/show_full_message"
android:textAllCaps="false"/>
<Button
android:id="@+id/show_full_button"
android:visibility="gone"
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
src/main/res/values/dimens.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
<dimen name="message_bubble_edge_margin">32dp</dimen>
<dimen name="message_bubble_bottom_padding">6dp</dimen>
<dimen name="message_bubble_showmore_padding">4dp</dimen>
<dimen name="message_bubble_showmore_padding">8dp</dimen>
<dimen name="transparent_footer_padding">2dp</dimen>
<dimen name="media_bubble_remove_button_size">24dp</dimen>
<dimen name="media_bubble_edit_button_size">24dp</dimen>