diff --git a/.idea/misc.xml b/.idea/misc.xml index 7063e7b..59436c9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,111 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - diff --git a/Demo.apk b/Demo.apk index 7ac7370..57989b3 100644 Binary files a/Demo.apk and b/Demo.apk differ diff --git a/library/build.gradle b/library/build.gradle index 1d42827..4fb03a7 100755 --- a/library/build.gradle +++ b/library/build.gradle @@ -7,19 +7,18 @@ android { minSdkVersion 9 targetSdkVersion 21 versionCode 1 - versionName "1.0.1" + versionName "1.1.0" } buildTypes { release { + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.nineoldandroids:library:2.4.0' compile 'com.android.support:support-v4:21.0.3' - compile 'com.android.support:cardview-v7:21.0.3' - compile 'com.joooonho:selectableroundedimageview:1.0.0' } diff --git a/library/library.iml b/library/library.iml index 21b52f6..b7391e0 100644 --- a/library/library.iml +++ b/library/library.iml @@ -84,10 +84,8 @@ - - diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index ce6de41..5bacce7 100755 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mingle.headsUp" > diff --git a/library/src/main/java/com/mingle/headsUp/FloatView.java b/library/src/main/java/com/mingle/headsUp/FloatView.java index f4c93cc..f8d6a4f 100755 --- a/library/src/main/java/com/mingle/headsUp/FloatView.java +++ b/library/src/main/java/com/mingle/headsUp/FloatView.java @@ -1,11 +1,11 @@ package com.mingle.headsUp; +import android.annotation.SuppressLint; import android.app.PendingIntent; import android.content.Context; import android.os.Handler; import android.os.Message; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -15,7 +15,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.example.administrator.ll.R; import com.nineoldandroids.animation.Animator; import com.nineoldandroids.animation.AnimatorSet; import com.nineoldandroids.animation.ObjectAnimator; @@ -25,6 +24,7 @@ /** * */ +@SuppressLint("ViewConstructor") public class FloatView extends LinearLayout { diff --git a/library/src/main/java/com/mingle/headsUp/HeadsUp.java b/library/src/main/java/com/mingle/headsUp/HeadsUp.java index be5eff6..c3277a0 100755 --- a/library/src/main/java/com/mingle/headsUp/HeadsUp.java +++ b/library/src/main/java/com/mingle/headsUp/HeadsUp.java @@ -9,7 +9,6 @@ import android.support.v4.app.NotificationCompat; import android.view.View; import android.widget.RemoteViews; - import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/mingle/headsUp/HeadsUpManager.java b/library/src/main/java/com/mingle/headsUp/HeadsUpManager.java index 1ab3cee..143e924 100755 --- a/library/src/main/java/com/mingle/headsUp/HeadsUpManager.java +++ b/library/src/main/java/com/mingle/headsUp/HeadsUpManager.java @@ -10,13 +10,10 @@ import com.nineoldandroids.animation.Animator; import com.nineoldandroids.animation.ObjectAnimator; -import java.util.Comparator; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; import java.util.Queue; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.PriorityBlockingQueue; /** * Created by zzz40500 on 2014/10/9. diff --git a/library/src/main/java/com/mingle/headsUp/widget/CircleImageView.java b/library/src/main/java/com/mingle/headsUp/widget/CircleImageView.java index 1a04969..44101fa 100644 --- a/library/src/main/java/com/mingle/headsUp/widget/CircleImageView.java +++ b/library/src/main/java/com/mingle/headsUp/widget/CircleImageView.java @@ -21,7 +21,7 @@ import android.view.MotionEvent; import android.widget.ImageView; -import com.example.administrator.ll.R; +import com.mingle.headsUp.R; public class CircleImageView extends ImageView { diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml deleted file mode 100755 index 404136f..0000000 --- a/library/src/main/res/values/styles.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -