diff --git a/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java b/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java index 2ab1abc61..06634f61a 100644 --- a/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java +++ b/butterknife/src/androidTest/java/butterknife/ButterKnifeTest.java @@ -1,35 +1,15 @@ 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 PROPERTY_ENABLED = - new Property(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 SETTER_ENABLED = - (view, value, index) -> view.setEnabled(value); - private static final ButterKnife.Action ACTION_DISABLE = - (view, index) -> view.setEnabled(false); - private static final ButterKnife.Action 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. @@ -37,182 +17,6 @@ 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 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 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 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 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 index 0dbf2070e..84606c9ad 100644 --- 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 findBindingConstructorForClass(Cl BINDINGS.put(cls, bindingCtor); return bindingCtor; } - - /** @deprecated Use {@link ViewCollections#run(List, butterknife.Action[])} */ - @UiThread - @Deprecated - @SafeVarargs public static void apply(@NonNull List list, - @NonNull Action... actions) { - ViewCollections.run(list, actions); - } - - /** @deprecated Use {@link ViewCollections#run(View[], butterknife.Action[])} */ - @UiThread - @Deprecated - @SafeVarargs public static void apply(@NonNull T[] array, - @NonNull Action... actions) { - ViewCollections.run(array, actions); - } - - /** @deprecated Use {@link ViewCollections#run(List, butterknife.Action)} */ - @UiThread - @Deprecated - public static void apply(@NonNull List list, - @NonNull Action action) { - ViewCollections.run(list, action); - } - - /** @deprecated Use {@link ViewCollections#run(View[], butterknife.Action)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T[] array, @NonNull Action action) { - ViewCollections.run(array, action); - } - - /** @deprecated Use {@link ViewCollections#run(View, butterknife.Action[])} */ - @UiThread - @Deprecated - @SafeVarargs public static void apply(@NonNull T view, - @NonNull Action... actions) { - ViewCollections.run(view, actions); - } - - /** @deprecated {@link ViewCollections#run(View, butterknife.Action)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T view, @NonNull Action action) { - ViewCollections.run(view, action); - } - - /** @deprecated Use {@link ViewCollections#set(List, butterknife.Setter, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull List list, - @NonNull Setter setter, V value) { - ViewCollections.set(list, setter, value); - } - - /** @deprecated Use {@link ViewCollections#set(View[], butterknife.Setter, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T[] array, - @NonNull Setter setter, V value) { - ViewCollections.set(array, setter, value); - } - - /** @deprecated Use {@link ViewCollections#set(View, butterknife.Setter, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T view, - @NonNull Setter setter, V value) { - ViewCollections.set(view, setter, value); - } - - /** @deprecated Use {@link ViewCollections#set(List, Property, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull List list, - @NonNull Property setter, V value) { - ViewCollections.set(list, setter, value); - } - - /** @deprecated Use {@link ViewCollections#set(View[], Property, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T[] array, - @NonNull Property setter, V value) { - ViewCollections.set(array, setter, value); - } - - /** @deprecated Use {@link ViewCollections#set(View, Property, Object)} */ - @UiThread - @Deprecated - public static void apply(@NonNull T view, - @NonNull Property setter, V value) { - ViewCollections.set(view, setter, value); - } - - /** @deprecated Use {@link butterknife.Action} */ - @Deprecated - public interface Action extends butterknife.Action { - } - - /** @deprecated Use {@link butterknife.Setter} */ - @Deprecated - public interface Setter extends butterknife.Setter { - } }