Remove deprecated APIs

JakeWharton · Jan 4, 2019 · 8eb5280 · 8eb5280
1 parent 01e4e4e
commit 8eb5280
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 301 deletions.
diff --git a/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java b/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java
@@ -1,218 +1,22 @@
 package butterknife;
 
 import android.content.Context;
-import android.util.Property;
 import android.view.View;
 import androidx.test.InstrumentationRegistry;
-import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import static com.google.common.truth.Truth.assertThat;
-import static java.util.Arrays.asList;
 
 public class ButterKnifeTest {
-  private static final Property<View, Boolean> PROPERTY_ENABLED =
-      new Property<View, Boolean>(Boolean.class, "enabled") {
-        @Override public Boolean get(View view) {
-          return view.isEnabled();
-        }
-
-        @Override public void set(View view, Boolean enabled) {
-          view.setEnabled(enabled);
-        }
-      };
-  private static final ButterKnife.Setter<View, Boolean> SETTER_ENABLED =
-      (view, value, index) -> view.setEnabled(value);
-  private static final ButterKnife.Action<View> ACTION_DISABLE =
-      (view, index) -> view.setEnabled(false);
-  private static final ButterKnife.Action<View> ACTION_ZERO_ALPHA =
-      (view, index) -> view.setAlpha(0f);
-
   private final Context context = InstrumentationRegistry.getContext();
 
   @Before @After // Clear out cache of binders before and after each test.
   public void resetViewsCache() {
     ButterKnife.BINDINGS.clear();
   }
 
-  @Test public void propertyAppliedToView() {
-    View view = new View(context);
-    assertThat(view.isEnabled()).isTrue();
-
-    ButterKnife.apply(view, PROPERTY_ENABLED, false);
-    assertThat(view.isEnabled()).isFalse();
-  }
-
-  @Test public void propertyAppliedToEveryViewInList() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    List<View> views = asList(view1, view2, view3);
-    ButterKnife.apply(views, PROPERTY_ENABLED, false);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
-  @Test public void propertyAppliedToEveryViewInArray() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    View[] views = new View[] { view1, view2, view3 };
-    ButterKnife.apply(views, PROPERTY_ENABLED, false);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
-  @Test public void actionAppliedToView() {
-    View view = new View(context);
-    assertThat(view.isEnabled()).isTrue();
-
-    ButterKnife.apply(view, ACTION_DISABLE);
-
-    assertThat(view.isEnabled()).isFalse();
-  }
-
-  @Test public void actionsAppliedToView() {
-    View view = new View(context);
-    assertThat(view.isEnabled()).isTrue();
-    assertThat(view.getAlpha()).isEqualTo(1f);
-
-    ButterKnife.apply(view, ACTION_DISABLE, ACTION_ZERO_ALPHA);
-    assertThat(view.isEnabled()).isFalse();
-    assertThat(view.getAlpha()).isEqualTo(0f);
-  }
-
-  @Test public void actionAppliedToEveryViewInList() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    List<View> views = asList(view1, view2, view3);
-    ButterKnife.apply(views, ACTION_DISABLE);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
-  @Test public void actionAppliedToEveryViewInArray() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    View[] views = new View[] { view1, view2, view3 };
-    ButterKnife.apply(views, ACTION_DISABLE);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
-  @Test public void actionsAppliedToEveryViewInList() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-    assertThat(view1.getAlpha()).isEqualTo(1f);
-    assertThat(view2.getAlpha()).isEqualTo(1f);
-    assertThat(view3.getAlpha()).isEqualTo(1f);
-
-    List<View> views = asList(view1, view2, view3);
-    ButterKnife.apply(views, ACTION_DISABLE, ACTION_ZERO_ALPHA);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-    assertThat(view1.getAlpha()).isEqualTo(0f);
-    assertThat(view2.getAlpha()).isEqualTo(0f);
-    assertThat(view3.getAlpha()).isEqualTo(0f);
-  }
-
-  @Test public void actionsAppliedToEveryViewInArray() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-    assertThat(view1.getAlpha()).isEqualTo(1f);
-    assertThat(view2.getAlpha()).isEqualTo(1f);
-    assertThat(view3.getAlpha()).isEqualTo(1f);
-
-    View[] views = new View[] { view1, view2, view3 };
-    ButterKnife.apply(views, ACTION_DISABLE, ACTION_ZERO_ALPHA);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-    assertThat(view1.getAlpha()).isEqualTo(0f);
-    assertThat(view2.getAlpha()).isEqualTo(0f);
-    assertThat(view3.getAlpha()).isEqualTo(0f);
-  }
-
-  @Test public void setterAppliedToView() {
-    View view = new View(context);
-    assertThat(view.isEnabled()).isTrue();
-
-    ButterKnife.apply(view, SETTER_ENABLED, false);
-
-    assertThat(view.isEnabled()).isFalse();
-  }
-
-  @Test public void setterAppliedToEveryViewInList() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    List<View> views = asList(view1, view2, view3);
-    ButterKnife.apply(views, SETTER_ENABLED, false);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
-  @Test public void setterAppliedToEveryViewInArray() {
-    View view1 = new View(context);
-    View view2 = new View(context);
-    View view3 = new View(context);
-    assertThat(view1.isEnabled()).isTrue();
-    assertThat(view2.isEnabled()).isTrue();
-    assertThat(view3.isEnabled()).isTrue();
-
-    View[] views = new View[] { view1, view2, view3 };
-    ButterKnife.apply(views, SETTER_ENABLED, false);
-
-    assertThat(view1.isEnabled()).isFalse();
-    assertThat(view2.isEnabled()).isFalse();
-    assertThat(view3.isEnabled()).isFalse();
-  }
-
   @Test public void zeroBindingsBindDoesNotThrowExceptionAndCaches() {
     class Example {
     }

diff --git a/butterknife/src/main/java/butterknife/ButterKnife.java b/butterknife/src/main/java/butterknife/ButterKnife.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.util.Log;
-import android.util.Property;
 import android.view.View;
 import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
@@ -212,108 +211,4 @@ private static Constructor<? extends Unbinder> findBindingConstructorForClass(Cl
     BINDINGS.put(cls, bindingCtor);
     return bindingCtor;
   }
-
-  /** @deprecated Use {@link ViewCollections#run(List, butterknife.Action[])} */
-  @UiThread
-  @Deprecated
-  @SafeVarargs public static <T extends View> void apply(@NonNull List<T> list,
-      @NonNull Action<? super T>... actions) {
-    ViewCollections.run(list, actions);
-  }
-
-  /** @deprecated Use {@link ViewCollections#run(View[], butterknife.Action[])} */
-  @UiThread
-  @Deprecated
-  @SafeVarargs public static <T extends View> void apply(@NonNull T[] array,
-      @NonNull Action<? super T>... actions) {
-    ViewCollections.run(array, actions);
-  }
-
-  /** @deprecated Use {@link ViewCollections#run(List, butterknife.Action)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View> void apply(@NonNull List<T> list,
-      @NonNull Action<? super T> action) {
-    ViewCollections.run(list, action);
-  }
-
-  /** @deprecated Use {@link ViewCollections#run(View[], butterknife.Action)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View> void apply(@NonNull T[] array, @NonNull Action<? super T> action) {
-    ViewCollections.run(array, action);
-  }
-
-  /** @deprecated Use {@link ViewCollections#run(View, butterknife.Action[])} */
-  @UiThread
-  @Deprecated
-  @SafeVarargs public static <T extends View> void apply(@NonNull T view,
-      @NonNull Action<? super T>... actions) {
-    ViewCollections.run(view, actions);
-  }
-
-  /** @deprecated {@link ViewCollections#run(View, butterknife.Action)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View> void apply(@NonNull T view, @NonNull Action<? super T> action) {
-    ViewCollections.run(view, action);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(List, butterknife.Setter, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull List<T> list,
-      @NonNull Setter<? super T, V> setter, V value) {
-    ViewCollections.set(list, setter, value);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(View[], butterknife.Setter, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull T[] array,
-      @NonNull Setter<? super T, V> setter, V value) {
-    ViewCollections.set(array, setter, value);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(View, butterknife.Setter, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull T view,
-      @NonNull Setter<? super T, V> setter, V value) {
-    ViewCollections.set(view, setter, value);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(List, Property, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull List<T> list,
-      @NonNull Property<? super T, V> setter, V value) {
-    ViewCollections.set(list, setter, value);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(View[], Property, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull T[] array,
-      @NonNull Property<? super T, V> setter, V value) {
-    ViewCollections.set(array, setter, value);
-  }
-
-  /** @deprecated Use {@link ViewCollections#set(View, Property, Object)} */
-  @UiThread
-  @Deprecated
-  public static <T extends View, V> void apply(@NonNull T view,
-      @NonNull Property<? super T, V> setter, V value) {
-    ViewCollections.set(view, setter, value);
-  }
-
-  /** @deprecated Use {@link butterknife.Action} */
-  @Deprecated
-  public interface Action<T extends View> extends butterknife.Action<T> {
-  }
-
-  /** @deprecated Use {@link butterknife.Setter} */
-  @Deprecated
-  public interface Setter<T extends View, V> extends butterknife.Setter<T, V> {
-  }
 }