From 8eff9bd35c8c2011cc92d8ccb722483f79b612a9 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 4 Mar 2017 18:18:34 +0100
Subject: =?UTF-8?q?show=20icons=20in=20pop=20menu=20with=20reflection.=20i?=
 =?UTF-8?q?magespan=20was=20not=20centred=20ver=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…tically
---
 .../pixart/messenger/ui/ConversationActivity.java  | 23 +---------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 8175d10bc..e8d61d1df 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -18,7 +18,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
@@ -29,8 +28,6 @@ import android.provider.MediaStore;
 import android.provider.Settings;
 import android.support.v4.widget.SlidingPaneLayout;
 import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
-import android.text.SpannableStringBuilder;
-import android.text.style.ImageSpan;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Gravity;
@@ -914,24 +911,6 @@ public class ConversationActivity extends XmppActivity
         builder.create().show();
     }
 
-    /**
-     * Moves icons from the PopupMenu's MenuItems' icon fields into the menu title as a Spannable with the icon and title text.
-     */
-    public static void insertMenuItemIcons(Context context, PopupMenu popupMenu) {
-        Menu menu = popupMenu.getMenu();
-        for (int i = 0; i < menu.size(); i++) {
-            MenuItem menuItem = menu.getItem(i);
-            Drawable icon = menuItem.getIcon();
-            int iconSize = context.getResources().getDimensionPixelSize(R.dimen.menu_item_icon_size);
-            icon.setBounds(0, 0, iconSize, iconSize);
-            ImageSpan imageSpan = new ImageSpan(icon);
-            SpannableStringBuilder ssb = new SpannableStringBuilder("   " + menuItem.getTitle());
-            ssb.setSpan(imageSpan, 0, 1, 0);
-            menuItem.setTitle(ssb);
-            menuItem.setIcon(null);
-        }
-    }
-
     protected void attachFileDialog() {
         View menuAttachFile = findViewById(R.id.action_attach_file);
         if (menuAttachFile == null) {
@@ -972,7 +951,7 @@ public class ConversationActivity extends XmppActivity
                 return false;
             }
         });
-        insertMenuItemIcons(getApplicationContext(), attachFilePopup);
+        UIHelper.showIconsInPopup(attachFilePopup);
         attachFilePopup.show();
     }
 
-- 
cgit v1.2.3