From 887b14dae0632dff68c14dbd6551044a3ccda4fc Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Thu, 12 Dec 2019 20:15:33 +0100
Subject: small ui fixes for private messages

---
 .../messenger/ui/ConferenceDetailsActivity.java    |  1 +
 .../messenger/ui/adapter/MessageAdapter.java       |  2 +-
 src/main/res/layout/message_content.xml            | 23 ++++++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 297467558..49e0e081f 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -485,6 +485,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         } else {
             this.binding.detailsAccount.setVisibility(View.GONE);
         }
+        //todo add edit overlay to avatar and change layout
         AvatarWorkerTask.loadAvatar(mConversation, binding.detailsMucAvatar, R.dimen.avatar_big);
         AvatarWorkerTask.loadAvatar(mConversation.getAccount(), binding.yourPhoto, R.dimen.avatar_on_details_screen_size);
 
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index ecfae12ba..96e5b5b5e 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -98,7 +98,7 @@ import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube;
 
 public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextView.CopyHandler {
 
-    private ConversationFragment mConversationFragment;
+    //private ConversationFragment mConversationFragment;
 
     public static final String DATE_SEPARATOR_BODY = "DATE_SEPARATOR";
     private static final int SENT = 0;
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 147b2952e..9dfe4392e 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -55,16 +55,6 @@
         android:longClickable="true"
         android:visibility="gone" />
 
-    <ImageButton
-        android:id="@+id/answer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_gravity="right"
-        android:alpha="?attr/icon_alpha"
-        android:background="?android:selectableItemBackground"
-        android:visibility="gone" />
-
     <RelativeLayout
         android:id="@+id/audio_player"
         android:layout_width="@dimen/audio_player_width"
@@ -100,4 +90,17 @@
             android:layout_toRightOf="@+id/play_pause"
             android:progress="100" />
     </RelativeLayout>
+
+    <ImageButton
+        android:id="@+id/answer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_gravity="end"
+        android:alpha="?attr/icon_alpha"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/ic_reply_circle_black_24dp"
+        android:visibility="gone" />
+
 </merge> 
\ No newline at end of file
-- 
cgit v1.2.3