narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +2 -3
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 28c633deb8 - Show all commits

4
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
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.GONE); binding.backgroundImage.setVisibility(View.VISIBLE);
} else { } else {
binding.backgroundImage.setVisibility(View.GONE); binding.backgroundImage.setVisibility(View.GONE);
} }

1
src/main/res/layout/fragment_conversation.xml
View file

@ -86,7 +86,6 @@
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"