Added support for Android 5.x

rgocal · Mar 9, 2019 · 19ec0db · 19ec0db
1 parent 6905e08
commit 19ec0db
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/example/build.gradle b/example/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.gsd.mpm.materialpopupexample"
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 28
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 28
-        versionCode 4
-        versionName "1.10"
+        versionCode 5
+        versionName "1.15"
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/gsd/mpm/materialpopupmenu/PopUpMenu.java b/library/src/main/java/com/gsd/mpm/materialpopupmenu/PopUpMenu.java
@@ -5,6 +5,7 @@
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -156,9 +157,11 @@ public float getInterpolation(float t) {
         mTrack = mRootView.findViewById(R.id.tracks);
 
         //Set the pop colors by strings if desired
-        mScrollColor = mContext.getColor(R.color.popup_scroll_color);
-        mTrackColor = mContext.getColor(R.color.popup_track_color);
-        mBodyColor = mContext.getColor(R.color.popup_body_color);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mScrollColor = mContext.getColor(R.color.popup_scroll_color);
+            mTrackColor = mContext.getColor(R.color.popup_track_color);
+            mBodyColor = mContext.getColor(R.color.popup_body_color);
+        }
 
         //Initialize the IDs
         mArrowDown = mRootView.findViewById(R.id.arrow_down);