Removed NineOldAndroids dependency.

Removed dependency on support library Fragments. Added compatibility with standard SDK Fragments.
wdullaer · Aug 18, 2014 · 7a4129b · 7a4129b
1 parent 240456a
commit 7a4129b
Show file tree

Hide file tree

Showing 66 changed files with 222 additions and 228 deletions.
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -5,5 +5,5 @@
     android:versionCode="1"
     android:versionName="1.0.0">
 
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="11" />
 </manifest>
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,10 +8,14 @@ android {
     compileSdkVersion 19
     buildToolsVersion "19.1.0"
     defaultConfig {
-        minSdkVersion 7
+        minSdkVersion 16
         targetSdkVersion 19
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -24,6 +28,5 @@ android {
 }
 
 dependencies {
-     compile 'com.android.support:support-v4:19.0.0'
-    compile 'com.nineoldandroids:library:2.4.0'
+    compile 'com.android.support:support-v4:19.0.0'
 }
diff --git a/library/src/com/doomonafireball/betterpickers/Utils.java b/library/src/com/doomonafireball/betterpickers/Utils.java
@@ -16,11 +16,9 @@
 
 package com.doomonafireball.betterpickers;
 
-import com.nineoldandroids.animation.Keyframe;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.PropertyValuesHolder;
-import com.nineoldandroids.view.animation.AnimatorProxy;
-
+import android.animation.Keyframe;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.text.format.Time;
@@ -134,9 +132,7 @@ public static ObjectAnimator getPulseAnimator(View labelToAnimate, float decreas
         PropertyValuesHolder scaleX = PropertyValuesHolder.ofKeyframe("scaleX", k0, k1, k2, k3);
         PropertyValuesHolder scaleY = PropertyValuesHolder.ofKeyframe("scaleY", k0, k1, k2, k3);
         ObjectAnimator pulseAnimator =
-                ObjectAnimator.ofPropertyValuesHolder(
-                        AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(labelToAnimate) : labelToAnimate, scaleX,
-                        scaleY);
+                ObjectAnimator.ofPropertyValuesHolder(labelToAnimate, scaleX,scaleY);
         pulseAnimator.setDuration(PULSE_ANIMATOR_DURATION);
 
         return pulseAnimator;

diff --git a/...ry/src/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java b/...ry/src/com/doomonafireball/betterpickers/calendardatepicker/CalendarDatePickerDialog.java
@@ -20,12 +20,12 @@
 import com.doomonafireball.betterpickers.R;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.calendardatepicker.MonthAdapter.CalendarDay;
-import com.nineoldandroids.animation.ObjectAnimator;
 
+import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import android.app.DialogFragment;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/library/src/com/doomonafireball/betterpickers/datepicker/DatePickerBuilder.java b/library/src/com/doomonafireball/betterpickers/datepicker/DatePickerBuilder.java
@@ -2,9 +2,9 @@
 
 import com.doomonafireball.betterpickers.datepicker.DatePickerDialogFragment.DatePickerDialogHandler;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 
 import java.util.Vector;

diff --git a/library/src/com/doomonafireball/betterpickers/datepicker/DatePickerDialogFragment.java b/library/src/com/doomonafireball/betterpickers/datepicker/DatePickerDialogFragment.java
@@ -6,8 +6,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/com/doomonafireball/betterpickers/expirationpicker/ExpirationPickerBuilder.java b/library/src/com/doomonafireball/betterpickers/expirationpicker/ExpirationPickerBuilder.java
@@ -2,9 +2,9 @@
 
 import com.doomonafireball.betterpickers.expirationpicker.ExpirationPickerDialogFragment.ExpirationPickerDialogHandler;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 
 import java.util.Vector;

diff --git a/...rc/com/doomonafireball/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java b/...rc/com/doomonafireball/betterpickers/expirationpicker/ExpirationPickerDialogFragment.java
@@ -6,8 +6,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/com/doomonafireball/betterpickers/hmspicker/HmsPickerBuilder.java b/library/src/com/doomonafireball/betterpickers/hmspicker/HmsPickerBuilder.java
@@ -2,9 +2,9 @@
 
 import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment.HmsPickerDialogHandler;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 
 import java.util.Vector;

diff --git a/library/src/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java b/library/src/com/doomonafireball/betterpickers/hmspicker/HmsPickerDialogFragment.java
@@ -3,11 +3,11 @@
 import com.doomonafireball.betterpickers.R;
 
 import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/com/doomonafireball/betterpickers/numberpicker/NumberPickerBuilder.java b/library/src/com/doomonafireball/betterpickers/numberpicker/NumberPickerBuilder.java
@@ -2,9 +2,9 @@
 
 import com.doomonafireball.betterpickers.numberpicker.NumberPickerDialogFragment.NumberPickerDialogHandler;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 
 import java.util.Vector;

diff --git a/library/src/com/doomonafireball/betterpickers/numberpicker/NumberPickerDialogFragment.java b/library/src/com/doomonafireball/betterpickers/numberpicker/NumberPickerDialogFragment.java
@@ -3,11 +3,11 @@
 import com.doomonafireball.betterpickers.R;
 
 import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java b/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialPickerLayout.java
@@ -18,10 +18,9 @@
 
 import com.doomonafireball.betterpickers.HapticFeedbackController;
 import com.doomonafireball.betterpickers.R;
-import com.nineoldandroids.animation.AnimatorSet;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
 
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
@@ -386,7 +385,7 @@ private int snapPrefer30s(int degrees) {
      * the input will be "snapped" to the closest visible degrees.
      *
      * @param degrees The input degrees
-     * @param forceAboveOrBelow The output may be forced to either the higher or lower step, or may be allowed to snap
+     * @param forceHigherOrLower The output may be forced to either the higher or lower step, or may be allowed to snap
      * to whichever is closer. Use 1 to force strictly higher, -1 to force strictly lower, and 0 to snap to the closer
      * one.
      * @return output degrees, will be a multiple of 30
@@ -546,10 +545,10 @@ public void setCurrentItemShowing(int index, boolean animate) {
         } else {
             int hourAlpha = (index == HOUR_INDEX) ? 255 : 0;
             int minuteAlpha = (index == MINUTE_INDEX) ? 255 : 0;
-            ViewHelper.setAlpha(mHourRadialTextsView, hourAlpha);
-            ViewHelper.setAlpha(mHourRadialSelectorView, hourAlpha);
-            ViewHelper.setAlpha(mMinuteRadialTextsView, minuteAlpha);
-            ViewHelper.setAlpha(mMinuteRadialSelectorView, minuteAlpha);
+            mHourRadialTextsView.setAlpha(hourAlpha);
+            mHourRadialSelectorView.setAlpha(hourAlpha);
+            mMinuteRadialTextsView.setAlpha(minuteAlpha);
+            mMinuteRadialSelectorView.setAlpha(minuteAlpha);
         }
 
     }

diff --git a/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java b/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialSelectorView.java
@@ -18,12 +18,11 @@
 
 import com.doomonafireball.betterpickers.R;
 import com.doomonafireball.betterpickers.Utils;
-import com.nineoldandroids.animation.Keyframe;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.PropertyValuesHolder;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.animation.AnimatorProxy;
 
+import android.animation.Keyframe;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -341,9 +340,9 @@ public ObjectAnimator getDisappearAnimator() {
         kf1 = Keyframe.ofFloat(1f, 0f);
         PropertyValuesHolder fadeOut = PropertyValuesHolder.ofKeyframe("alpha", kf0, kf1);
 
-        ObjectAnimator disappearAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : this, radiusDisappear, fadeOut).setDuration(
-                duration);
+        ObjectAnimator disappearAnimator = ObjectAnimator
+                .ofPropertyValuesHolder(this, radiusDisappear, fadeOut)
+                .setDuration(duration);
         disappearAnimator.addUpdateListener(mInvalidateUpdateListener);
 
         return disappearAnimator;
@@ -381,8 +380,8 @@ public ObjectAnimator getReappearAnimator() {
         kf2 = Keyframe.ofFloat(1f, 1f);
         PropertyValuesHolder fadeIn = PropertyValuesHolder.ofKeyframe("alpha", kf0, kf1, kf2);
 
-        ObjectAnimator reappearAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : this, radiusReappear, fadeIn)
+        ObjectAnimator reappearAnimator = ObjectAnimator
+                .ofPropertyValuesHolder(this, radiusReappear, fadeIn)
                 .setDuration(totalDuration);
         reappearAnimator.addUpdateListener(mInvalidateUpdateListener);
         return reappearAnimator;

diff --git a/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java b/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialTextsView.java
@@ -17,12 +17,11 @@
 package com.doomonafireball.betterpickers.radialtimepicker;
 
 import com.doomonafireball.betterpickers.R;
-import com.nineoldandroids.animation.Keyframe;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.PropertyValuesHolder;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.animation.AnimatorProxy;
 
+import android.animation.Keyframe;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -302,8 +301,8 @@ private void renderAnimations() {
         kf1 = Keyframe.ofFloat(1f, 0f);
         PropertyValuesHolder fadeOut = PropertyValuesHolder.ofKeyframe("alpha", kf0, kf1);
 
-        mDisappearAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : this, radiusDisappear, fadeOut)
+        mDisappearAnimator = ObjectAnimator
+                .ofPropertyValuesHolder(this, radiusDisappear, fadeOut)
                 .setDuration(duration);
         mDisappearAnimator.addUpdateListener(mInvalidateUpdateListener);
 
@@ -327,8 +326,8 @@ private void renderAnimations() {
         kf2 = Keyframe.ofFloat(1f, 1f);
         PropertyValuesHolder fadeIn = PropertyValuesHolder.ofKeyframe("alpha", kf0, kf1, kf2);
 
-        mReappearAnimator = ObjectAnimator.ofPropertyValuesHolder(
-                AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : this, radiusReappear, fadeIn)
+        mReappearAnimator = ObjectAnimator
+                .ofPropertyValuesHolder(this, radiusReappear, fadeIn)
                 .setDuration(totalDuration);
         mReappearAnimator.addUpdateListener(mInvalidateUpdateListener);
     }

diff --git a/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java b/library/src/com/doomonafireball/betterpickers/radialtimepicker/RadialTimePickerDialog.java
@@ -20,14 +20,14 @@
 import com.doomonafireball.betterpickers.R;
 import com.doomonafireball.betterpickers.Utils;
 import com.doomonafireball.betterpickers.radialtimepicker.RadialPickerLayout.OnValueSelectedListener;
-import com.nineoldandroids.animation.ObjectAnimator;
 
+import android.animation.ObjectAnimator;
 import android.app.ActionBar.LayoutParams;
+import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;

diff --git a/library/src/com/doomonafireball/betterpickers/recurrencepicker/RecurrencePickerDialog.java b/library/src/com/doomonafireball/betterpickers/recurrencepicker/RecurrencePickerDialog.java
@@ -19,8 +19,7 @@
 import com.doomonafireball.betterpickers.R;
 import com.doomonafireball.betterpickers.calendardatepicker.CalendarDatePickerDialog;
 
-import org.jraf.android.backport.switchwidget.Switch;
-
+import android.app.DialogFragment;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -29,8 +28,6 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.view.ViewConfigurationCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -57,6 +54,7 @@
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Spinner;
+import android.widget.Switch;
 import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;

diff --git a/library/src/com/doomonafireball/betterpickers/recurrencepicker/WeekButton.java b/library/src/com/doomonafireball/betterpickers/recurrencepicker/WeekButton.java
@@ -17,7 +17,6 @@
 package com.doomonafireball.betterpickers.recurrencepicker;
 
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -48,11 +47,11 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int w = getMeasuredWidth();
         if (h > 0 && w > 0) {
             if (w < h) {
-                if (View.MeasureSpec.getMode(ViewCompat.getMeasuredHeightAndState(this)) != MeasureSpec.EXACTLY) {
+                if (View.MeasureSpec.getMode(this.getMeasuredHeightAndState()) != MeasureSpec.EXACTLY) {
                     h = w;
                 }
             } else if (h < w) {
-                if (View.MeasureSpec.getMode(ViewCompat.getMeasuredWidthAndState(this)) != MeasureSpec.EXACTLY) {
+                if (View.MeasureSpec.getMode(this.getMeasuredWidthAndState()) != MeasureSpec.EXACTLY) {
                     w = h;
                 }
             }

diff --git a/library/src/com/doomonafireball/betterpickers/timepicker/TimePickerBuilder.java b/library/src/com/doomonafireball/betterpickers/timepicker/TimePickerBuilder.java
@@ -2,9 +2,9 @@
 
 import com.doomonafireball.betterpickers.timepicker.TimePickerDialogFragment.TimePickerDialogHandler;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.util.Log;
 
 import java.util.Vector;

diff --git a/library/src/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java b/library/src/com/doomonafireball/betterpickers/timepicker/TimePickerDialogFragment.java
@@ -6,8 +6,8 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import android.app.DialogFragment;
+import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/library/src/com/doomonafireball/betterpickers/timezonepicker/TimeZonePickerDialog.java b/library/src/com/doomonafireball/betterpickers/timezonepicker/TimeZonePickerDialog.java
@@ -17,8 +17,8 @@
 package com.doomonafireball.betterpickers.timezonepicker;
 
 import android.app.Dialog;
+import android.app.DialogFragment;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;