OTR & another.im #23

Merged
Sergei Poljanski merged 65 commits from develop into master 2024-12-09 18:42:00 +00:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 635e5675d1 - Show all commits

View file

@ -2517,8 +2517,8 @@ public class ConversationFragment extends XmppFragment
if (activity != null && conversation != null) { if (activity != null && conversation != null) {
Uri uri = ChatBackgroundHelper.getBgUri(activity, conversation.getUuid()); Uri uri = ChatBackgroundHelper.getBgUri(activity, conversation.getUuid());
if (uri != null) { if (uri != null) {
binding.backgroundImage.setImageURI(uri); // binding.backgroundImage.setImageURI(uri);
binding.backgroundImage.setVisibility(View.VISIBLE); binding.backgroundImage.setVisibility(View.GONE);
} else { } else {
binding.backgroundImage.setVisibility(View.GONE); binding.backgroundImage.setVisibility(View.GONE);
} }

View file

@ -86,6 +86,7 @@
android:layout_above="@+id/snackbar" android:layout_above="@+id/snackbar"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@android:color/holo_blue_bright"
android:divider="@null" android:divider="@null"
android:listSelector="@android:color/transparent" android:listSelector="@android:color/transparent"
android:stackFromBottom="true" android:stackFromBottom="true"