kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix mp4 support and viewed dot coloring.
rodzic
c5c176a818
commit
978c6f9349
|
@ -462,6 +462,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
bodyText.setLinkTextColor(colorizer.getOutgoingBodyTextColor(context));
|
bodyText.setLinkTextColor(colorizer.getOutgoingBodyTextColor(context));
|
||||||
footer.setTextColor(colorizer.getOutgoingFooterTextColor(context));
|
footer.setTextColor(colorizer.getOutgoingFooterTextColor(context));
|
||||||
footer.setIconColor(colorizer.getOutgoingFooterIconColor(context));
|
footer.setIconColor(colorizer.getOutgoingFooterIconColor(context));
|
||||||
|
footer.setRevealDotColor(colorizer.getOutgoingFooterIconColor(context));
|
||||||
footer.setOnlyShowSendingStatus(false, messageRecord);
|
footer.setOnlyShowSendingStatus(false, messageRecord);
|
||||||
} else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) {
|
} else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) {
|
||||||
if (hasWallpaper) {
|
if (hasWallpaper) {
|
||||||
|
@ -469,6 +470,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
} else {
|
} else {
|
||||||
bodyBubble.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.signal_background_primary), PorterDuff.Mode.MULTIPLY);
|
bodyBubble.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.signal_background_primary), PorterDuff.Mode.MULTIPLY);
|
||||||
footer.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
footer.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
||||||
|
footer.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
||||||
}
|
}
|
||||||
footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
||||||
footer.setOnlyShowSendingStatus(messageRecord.isRemoteDelete(), messageRecord);
|
footer.setOnlyShowSendingStatus(messageRecord.isRemoteDelete(), messageRecord);
|
||||||
|
@ -476,6 +478,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
bodyBubble.getBackground().setColorFilter(getDefaultBubbleColor(hasWallpaper), PorterDuff.Mode.SRC_IN);
|
bodyBubble.getBackground().setColorFilter(getDefaultBubbleColor(hasWallpaper), PorterDuff.Mode.SRC_IN);
|
||||||
footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
||||||
footer.setIconColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
footer.setIconColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
||||||
|
footer.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
||||||
footer.setOnlyShowSendingStatus(false, messageRecord);
|
footer.setOnlyShowSendingStatus(false, messageRecord);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -920,7 +923,13 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
thumbnailSlides.get(0) instanceof VideoSlide)
|
thumbnailSlides.get(0) instanceof VideoSlide)
|
||||||
{
|
{
|
||||||
canPlayContent = GiphyMp4PlaybackPolicy.autoplay() || allowedToPlayInline;
|
canPlayContent = GiphyMp4PlaybackPolicy.autoplay() || allowedToPlayInline;
|
||||||
mediaSource = attachmentMediaSourceFactory.createMediaSource(Objects.requireNonNull(thumbnailSlides.get(0).getUri()));
|
|
||||||
|
Uri uri = thumbnailSlides.get(0).getUri();
|
||||||
|
if (uri != null) {
|
||||||
|
mediaSource = attachmentMediaSourceFactory.createMediaSource(uri);
|
||||||
|
} else {
|
||||||
|
mediaSource = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -1209,6 +1218,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
activeFooter.disableBubbleBackground();
|
activeFooter.disableBubbleBackground();
|
||||||
activeFooter.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
|
activeFooter.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
|
||||||
activeFooter.setIconColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
|
activeFooter.setIconColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
|
||||||
|
activeFooter.setRevealDotColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
|
||||||
} else {
|
} else {
|
||||||
activeFooter.enableBubbleBackground(R.drawable.wallpaper_bubble_background_tintable_11, getDefaultBubbleColor(hasWallpaper));
|
activeFooter.enableBubbleBackground(R.drawable.wallpaper_bubble_background_tintable_11, getDefaultBubbleColor(hasWallpaper));
|
||||||
}
|
}
|
||||||
|
@ -1216,6 +1226,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
|
||||||
activeFooter.disableBubbleBackground();
|
activeFooter.disableBubbleBackground();
|
||||||
activeFooter.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
activeFooter.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
|
||||||
activeFooter.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
activeFooter.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
||||||
|
activeFooter.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
|
||||||
} else {
|
} else {
|
||||||
activeFooter.disableBubbleBackground();
|
activeFooter.disableBubbleBackground();
|
||||||
}
|
}
|
||||||
|
|
|
@ -192,7 +192,7 @@
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:gravity="start"
|
android:gravity="start"
|
||||||
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
|
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
app:footer_reveal_dot_color="@color/core_white"
|
app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
|
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
|
||||||
|
|
||||||
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
||||||
|
@ -210,6 +210,7 @@
|
||||||
android:gravity="start"
|
android:gravity="start"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
|
||||||
app:footer_text_color="@color/signal_text_secondary" />
|
app:footer_text_color="@color/signal_text_secondary" />
|
||||||
|
|
||||||
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
||||||
|
|
|
@ -123,6 +123,7 @@
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:gravity="start"
|
android:gravity="start"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
|
||||||
app:footer_text_color="@color/signal_text_secondary" />
|
app:footer_text_color="@color/signal_text_secondary" />
|
||||||
|
|
||||||
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
||||||
|
@ -137,6 +138,7 @@
|
||||||
android:gravity="start"
|
android:gravity="start"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
|
||||||
app:footer_text_color="@color/signal_text_secondary" />
|
app:footer_text_color="@color/signal_text_secondary" />
|
||||||
|
|
||||||
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
||||||
|
|
|
@ -161,6 +161,7 @@
|
||||||
android:gravity="end"
|
android:gravity="end"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
|
||||||
app:footer_text_color="@color/signal_text_secondary" />
|
app:footer_text_color="@color/signal_text_secondary" />
|
||||||
|
|
||||||
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
||||||
|
|
|
@ -74,6 +74,7 @@
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:gravity="end"
|
android:gravity="end"
|
||||||
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
|
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
|
app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
|
app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
|
||||||
|
|
||||||
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
<org.thoughtcrime.securesms.components.ConversationItemFooter
|
||||||
|
@ -88,6 +89,7 @@
|
||||||
android:gravity="end"
|
android:gravity="end"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
app:footer_icon_color="@color/signal_icon_tint_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
|
||||||
app:footer_text_color="@color/signal_text_secondary" />
|
app:footer_text_color="@color/signal_text_secondary" />
|
||||||
|
|
||||||
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
</org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
|
android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
|
||||||
android:gravity="end"
|
android:gravity="end"
|
||||||
app:footer_text_color="@color/signal_text_toolbar_subtitle"
|
app:footer_text_color="@color/signal_text_toolbar_subtitle"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_text_toolbar_subtitle"
|
||||||
app:footer_icon_color="@color/signal_text_toolbar_subtitle"/>
|
app:footer_icon_color="@color/signal_text_toolbar_subtitle"/>
|
||||||
|
|
||||||
</merge>
|
</merge>
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:alpha="0.7"
|
android:alpha="0.7"
|
||||||
app:footer_text_color="@color/signal_text_secondary"
|
app:footer_text_color="@color/signal_text_secondary"
|
||||||
|
app:footer_reveal_dot_color="@color/signal_text_secondary"
|
||||||
app:footer_icon_color="@color/signal_icon_tint_secondary"/>
|
app:footer_icon_color="@color/signal_icon_tint_secondary"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -38,6 +38,7 @@
|
||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
app:footer_text_color="@color/conversation_item_sent_text_secondary_color"
|
app:footer_text_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
|
app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
|
||||||
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"/>
|
app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
Ładowanie…
Reference in New Issue