Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 07:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Remove autoLink attribute which was causing warnings to show twice, and highlight links in comments before a blog is expanded

Browse Source
This commit is contained in:
Katelyn Dickey
2023-01-05 17:20:40 -05:00
parent 5e44e4d308
commit f959c32935
10 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java
View File

@@ -171,9 +171,10 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
// TODO make author clickable #624 // TODO make author clickable #624
text.setText(c.getComment()); text.setText(c.getComment());
Linkify.addLinks(text, Linkify.WEB_URLS);
text.setMovementMethod(null);
if (fullText) { if (fullText) {
text.setTextIsSelectable(true); text.setTextIsSelectable(true);
Linkify.addLinks(text, Linkify.WEB_URLS);
makeLinksClickable(text, listener::onLinkClick); makeLinksClickable(text, listener::onLinkClick);
} }

2
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
View File

@@ -1,6 +1,7 @@
package org.briarproject.briar.android.conversation; package org.briarproject.briar.android.conversation;
import android.content.Context; import android.content.Context;
import android.text.util.Linkify;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@@ -59,6 +60,7 @@ abstract class ConversationItemViewHolder extends ViewHolder {
if (item.getText() != null) { if (item.getText() != null) {
text.setText(trim(item.getText())); text.setText(trim(item.getText()));
Linkify.addLinks(text, Linkify.WEB_URLS);
makeLinksClickable(text, listener::onLinkClick); makeLinksClickable(text, listener::onLinkClick);
} }

2
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.android.conversation; package org.briarproject.briar.android.conversation;
import android.text.util.Linkify;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@@ -41,6 +42,7 @@ class ConversationNoticeViewHolder extends ConversationItemViewHolder {
} else { } else {
msgText.setVisibility(VISIBLE); msgText.setVisibility(VISIBLE);
msgText.setText(trim(text)); msgText.setText(trim(text));
Linkify.addLinks(msgText, Linkify.WEB_URLS);
makeLinksClickable(msgText, listener::onLinkClick); makeLinksClickable(msgText, listener::onLinkClick);
layout.setBackgroundResource(isIncoming() ? layout.setBackgroundResource(isIncoming() ?
R.drawable.notice_in_bottom : R.drawable.notice_out_bottom); R.drawable.notice_in_bottom : R.drawable.notice_out_bottom);

2
briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java
View File

@@ -4,6 +4,7 @@ import android.animation.Animator;
import android.animation.ArgbEvaluator; import android.animation.ArgbEvaluator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.content.Context; import android.content.Context;
import android.text.util.Linkify;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator; import android.view.animation.AccelerateInterpolator;
@@ -44,6 +45,7 @@ public abstract class BaseThreadItemViewHolder<I extends ThreadItem>
@CallSuper @CallSuper
public void bind(I item, ThreadItemListener<I> listener) { public void bind(I item, ThreadItemListener<I> listener) {
textView.setText(StringUtils.trim(item.getText())); textView.setText(StringUtils.trim(item.getText()));
Linkify.addLinks(textView, Linkify.WEB_URLS);
makeLinksClickable(textView, listener::onLinkClick); makeLinksClickable(textView, listener::onLinkClick);
author.setAuthor(item.getAuthor(), item.getAuthorInfo()); author.setAuthor(item.getAuthor(), item.getAuthorInfo());

1
briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml
View File

@@ -42,7 +42,6 @@
android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textColorLink="@color/briar_text_link" android:textColorLink="@color/briar_text_link"
android:autoLink="web"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintBottom_toTopOf="@+id/statusLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

1
briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
View File

@@ -50,7 +50,6 @@
android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
android:textColorLink="@color/briar_text_link_inverse" android:textColorLink="@color/briar_text_link_inverse"
android:autoLink="web"
app:layout_constrainedWidth="true" app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintBottom_toTopOf="@+id/statusLayout"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

1
briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
View File

@@ -22,7 +22,6 @@
android:background="@drawable/msg_in_top" android:background="@drawable/msg_in_top"
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
android:textColorLink="@color/briar_text_link" android:textColorLink="@color/briar_text_link"
android:autoLink="web"
tools:text="Short message" tools:text="Short message"
tools:visibility="visible" /> tools:visibility="visible" />

1
briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
View File

@@ -24,7 +24,6 @@
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
android:textColorLink="@color/briar_text_link_inverse" android:textColorLink="@color/briar_text_link_inverse"
android:autoLink="web"
tools:text="This is a long long long message that spans over several lines.\n\nIt ends here." tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."
tools:visibility="visible" /> tools:visibility="visible" />

1
briar-android/src/main/res/layout/list_item_conversation_request.xml
View File

@@ -23,7 +23,6 @@
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textColorLink="@color/briar_text_link" android:textColorLink="@color/briar_text_link"
android:autoLink="web"
tools:text="Short message" tools:text="Short message"
tools:visibility="visible" /> tools:visibility="visible" />

1
briar-android/src/main/res/layout/list_item_thread.xml
View File

@@ -115,7 +115,6 @@
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium" android:textSize="@dimen/text_size_medium"
android:textColorLink="@color/briar_text_link" android:textColorLink="@color/briar_text_link"
android:autoLink="web"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"