Library fixes

-fixed location of upper arrow pointer
-decreased size of vertical list icons
-code cleanup

Author: rgocal

library/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 3
-        versionName "2.01"
+        versionName "2.04"
     }
     buildTypes {
         release {

library/src/main/java/com/gsd/mpm/materialpopupmenu/GoogleTextView.java

@@ -16,7 +16,6 @@ public GoogleTextView(Context context) {
     public GoogleTextView(Context context, AttributeSet attrs) {
         super(context, attrs);
         setFont();
-
     }
 
     private void setFont() {
@@ -27,10 +26,8 @@ private void setFont() {
     public GoogleTextView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         setFont();
-
     }
 
-
     @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         if(focused)
@@ -43,7 +40,6 @@ public void onWindowFocusChanged(boolean focused) {
             super.onWindowFocusChanged(focused);
     }
 
-
     @Override
     public boolean isFocused() {
         return true;

library/src/main/java/com/gsd/mpm/materialpopupmenu/PopUpMenu.java

@@ -16,20 +16,19 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PopUpMenu extends PopupWindows implements OnDismissListener {
 
     private ImageView mArrowUp, mArrowDown;
@@ -45,9 +44,6 @@ public class PopUpMenu extends PopupWindows implements OnDismissListener {
     private ScrollView vertScroll;
     private View menu_header, menu_footer, top_menu_footer, top_menu_header;
 
-    private List<ActionItem> mActionItemList = new ArrayList<>();
-    private List<ActionItem> mActionItemVerticalList = new ArrayList<>();
-
     private boolean mDidAction;
     private boolean mAnimateTrack;
     private boolean isLight;
@@ -68,17 +64,22 @@ public class PopUpMenu extends PopupWindows implements OnDismissListener {
     private int mBodyColor;
     private boolean enableHeaderTitle;
 
+    private float iconDensity;
+
+    private List<ActionItem> mActionItemList = new ArrayList<>();
+    private List<ActionItem> mActionItemVerticalList = new ArrayList<>();
+
     private ActionItem getActionItem(int index) {
         return mActionItemList.get(index);
     }
-
     private ActionItem getVertActionItem(int index) {
         return mActionItemVerticalList.get(index);
     }
 
     public PopUpMenu(Context context) {
         super(context);
         setRootViewId(R.layout.quick_action_menu);
+        iconDensity = context.getResources().getDisplayMetrics().density * 48;
     }
 
     //Set Menu Title or Text
@@ -209,9 +210,8 @@ public void themeVerticalIcons(boolean enable) {
     }
 
     //Set a custom anim style
-    public int setAnimStyle(int mAnimStyle) {
+    public void setAnimStyle(int mAnimStyle) {
         this.mAnimStyle = mAnimStyle;
-        return mAnimStyle;
     }
 
     //Set Light or Dark styled icons and text
@@ -442,10 +442,11 @@ private void setAnimationStyle(int screenWidth, int requestedX, boolean onTop) {
     private void showArrow(int whichArrow, int requestedX) {
         final ImageView showArrow = (whichArrow == R.id.arrow_up) ? mArrowUp : mArrowDown;
         final View hideArrow = (whichArrow == R.id.arrow_up) ? mArrowDown : mArrowUp;
-        final int arrowWidth = mArrowUp.getMeasuredWidth();
+        final int arrowWidth = (int) iconDensity;
         showArrow.setVisibility(View.VISIBLE);
         showArrow.setColorFilter(getBodyColor(), PorterDuff.Mode.SRC_IN);
-        ViewGroup.MarginLayoutParams param = (ViewGroup.MarginLayoutParams)showArrow.getLayoutParams();
+        ViewGroup.MarginLayoutParams param = (ViewGroup.MarginLayoutParams)
+                showArrow.getLayoutParams();
         param.leftMargin = requestedX - arrowWidth / 2;
         hideArrow.setVisibility(View.INVISIBLE);
     }

library/src/main/java/com/gsd/mpm/materialpopupmenu/PopupWindows.java

@@ -32,14 +32,12 @@ void preShow() {
         if (mRootView == null)
             throw new IllegalStateException("Needs a root view!");
         onShow();
-
-            mWindow.setBackgroundDrawable(mBackground);
+        mWindow.setBackgroundDrawable(mBackground);
         mWindow.setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
         mWindow.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
         mWindow.setTouchable(true);
         mWindow.setFocusable(true);
         mWindow.setOutsideTouchable(true);
-
         mWindow.setContentView(mRootView);
     }
 

library/src/main/res/layout/quick_action_item.xml

@@ -9,7 +9,7 @@
     android:focusable="true"
     android:background="?android:selectableItemBackground">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_icon"
         android:scaleType="centerInside"
         android:layout_width="42dp"

library/src/main/res/layout/quick_action_list_item.xml

@@ -9,11 +9,11 @@
     android:focusable="true"
     android:background="?android:selectableItemBackground">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_icon"
         android:layout_alignParentStart="true"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
+        android:layout_width="38dp"
+        android:layout_height="38dp"
         android:src="@drawable/ic_settings"/>
 
     <com.gsd.mpm.materialpopupmenu.GoogleTextView
@@ -29,7 +29,7 @@
         android:textSize="14sp"
         android:text="Title"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_item"
         android:layout_alignParentEnd="true"
         android:scaleType="centerInside"

library/src/main/res/layout/quick_action_menu.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:id="@+id/header2"
         android:orientation="vertical"
         android:layout_marginStart="8dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/arrow_up"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/up_arrow" />
 
         <View
             android:id="@+id/top_menu_header"
@@ -21,12 +26,12 @@
             android:layout_width="match_parent"
             android:layout_height="22dp"
             android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:gravity="center|start"
             android:textSize="12sp"
             style="@style/Base.TextAppearance.AppCompat.Subhead"
             android:text="Menu Title" />
 
-
         <ScrollView
             android:id="@+id/vert_scroll"
             android:layout_width="match_parent"
@@ -48,14 +53,6 @@
 
     </LinearLayout>
 
-    <ImageView
-        android:id="@+id/arrow_up"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:layout_above="@id/header2"
-        android:src="@drawable/up_arrow" />
-
     <View
         android:id="@+id/menu_header"
         android:layout_marginStart="8dp"
@@ -86,11 +83,10 @@
         android:layout_height="4dp"
         android:layout_below="@id/scroll"/>
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/arrow_down"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="22dp"
         android:layout_below="@id/menu_footer"
         android:src="@drawable/down_arrow" />