--wip-- [skip ci]
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 2269c5a..6590c65 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -21,5 +21,8 @@
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="SwitchStatementWithTooFewBranches" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="m_limit" value="2" />
+ </inspection_tool>
</profile>
</component>
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
index 79a1583..f9ddd05 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
@@ -3,14 +3,11 @@
import androidx.annotation.Nullable;
import com.airbnb.lottie.value.Keyframe;
-import com.airbnb.lottie.value.LottieFrameInfo;
import com.airbnb.lottie.value.LottieValueCallback;
import java.util.Collections;
public class ValueCallbackKeyframeAnimation<K, A> extends BaseKeyframeAnimation<K, A> {
- private final LottieFrameInfo<A> frameInfo = new LottieFrameInfo<>();
-
private final A valueCallbackValue;
public ValueCallbackKeyframeAnimation(LottieValueCallback<A> valueCallback) {
@@ -18,7 +15,7 @@
}
public ValueCallbackKeyframeAnimation(LottieValueCallback<A> valueCallback, @Nullable A valueCallbackValue) {
- super(Collections.<Keyframe<K>>emptyList());
+ super(Collections.emptyList());
setValueCallback(valueCallback);
this.valueCallbackValue = valueCallbackValue;
}
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java b/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
index 7e488d0..ea7e473 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
@@ -7,9 +7,7 @@
import androidx.core.util.Pair;
/**
- * Non final version of {@link Pair}
- *
- * @param <T>
+ * Non final version of {@link Pair}.
*/
@RestrictTo(LIBRARY)
public class MutablePair<T> {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
index b0f3b2d..219df30 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
@@ -68,8 +68,6 @@
@Nullable
private BaseKeyframeAnimation<Float, Float> trackingCallbackAnimation;
@Nullable
- private BaseKeyframeAnimation<Float, Float> textSizeAnimation;
- @Nullable
private BaseKeyframeAnimation<Float, Float> textSizeCallbackAnimation;
@Nullable
private BaseKeyframeAnimation<Typeface, Typeface> typefaceCallbackAnimation;
@@ -162,7 +160,7 @@
if (lottieDrawable.useTextGlyphs()) {
drawTextGlyphs(documentData, parentMatrix, font, canvas);
} else {
- drawTextWithFont(documentData, font, parentMatrix, canvas);
+ drawTextWithFont(documentData, font, canvas);
}
canvas.restore();
@@ -173,8 +171,6 @@
float textSize;
if (textSizeCallbackAnimation != null) {
textSize = textSizeCallbackAnimation.getValue();
- } else if (textSizeAnimation != null) {
- textSize = textSizeAnimation.getValue();
} else {
textSize = documentData.size;
}
@@ -236,8 +232,7 @@
}
}
- private void drawTextWithFont(
- DocumentData documentData, Font font, Matrix parentMatrix, Canvas canvas) {
+ private void drawTextWithFont(DocumentData documentData, Font font, Canvas canvas) {
Typeface typeface = getTypeface(font);
if (typeface == null) {
return;
@@ -251,8 +246,6 @@
float textSize;
if (textSizeCallbackAnimation != null) {
textSize = textSizeCallbackAnimation.getValue();
- } else if (textSizeAnimation != null) {
- textSize = textSizeAnimation.getValue();
} else {
textSize = documentData.size;
}
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframesParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframesParser.java
index 05bedfb..21e3fdc 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframesParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframesParser.java
@@ -34,7 +34,6 @@
if (reader.peek() == JsonReader.Token.NUMBER) {
// For properties in which the static value is an array of numbers.
- Keyframe<T> keyframe;
keyframes.add(KeyframeParser.parse(reader, composition, scale, valueParser, false, multiDimensional));
} else {
while (reader.hasNext()) {
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java
index 1c2a48a..4950753 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionMoshiParser.java
@@ -95,7 +95,7 @@
parseChars(reader, composition, characters);
break;
case 10:
- parseMarkers(reader, composition, markers);
+ parseMarkers(reader, markers);
break;
default:
reader.skipName();
@@ -239,8 +239,7 @@
"dr"
);
- private static void parseMarkers(
- JsonReader reader, LottieComposition composition, List<Marker> markers) throws IOException {
+ private static void parseMarkers(JsonReader reader, List<Marker> markers) throws IOException {
reader.beginArray();
while (reader.hasNext()) {
String comment = null;
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/BaseLottieAnimator.java b/lottie/src/main/java/com/airbnb/lottie/utils/BaseLottieAnimator.java
index e55246a..8a7da29 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/BaseLottieAnimator.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/BaseLottieAnimator.java
@@ -40,11 +40,11 @@
updateListeners.clear();
}
- public void addListener(ValueAnimator.AnimatorListener listener) {
+ public void addListener(Animator.AnimatorListener listener) {
listeners.add(listener);
}
- public void removeListener(ValueAnimator.AnimatorListener listener) {
+ public void removeListener(Animator.AnimatorListener listener) {
listeners.remove(listener);
}
