From 1dc6d553c59f51d9dd5711f5647a4550f9e8d1d0 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 1 Mar 2017 19:20:55 +0300 Subject: [PATCH] Remove the android.widget.TextView.enabled generated property #245 --- anko/library/generated/sdk15/src/Properties.kt | 4 ---- anko/library/generated/sdk19/src/Properties.kt | 4 ---- anko/library/generated/sdk21/src/Properties.kt | 4 ---- anko/library/generated/sdk23/src/Properties.kt | 4 ---- anko/library/generated/sdk25/src/Properties.kt | 4 ---- .../jetbrains/android/anko/generator/PropertyGenerator.kt | 6 +++++- anko/props/excluded_properties.txt | 1 + 7 files changed, 6 insertions(+), 21 deletions(-) diff --git a/anko/library/generated/sdk15/src/Properties.kt b/anko/library/generated/sdk15/src/Properties.kt index 3c38f140..a590be73 100644 --- a/anko/library/generated/sdk15/src/Properties.kt +++ b/anko/library/generated/sdk15/src/Properties.kt @@ -22,10 +22,6 @@ var android.view.View.minimumWidth: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setMinimumWidth(v) -var android.widget.TextView.enabled: Boolean - @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() - set(v) = setEnabled(v) - var android.widget.TextView.textColor: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setTextColor(v) diff --git a/anko/library/generated/sdk19/src/Properties.kt b/anko/library/generated/sdk19/src/Properties.kt index 84fdb037..64491c5e 100644 --- a/anko/library/generated/sdk19/src/Properties.kt +++ b/anko/library/generated/sdk19/src/Properties.kt @@ -14,10 +14,6 @@ var android.view.View.backgroundResource: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setBackgroundResource(v) -var android.widget.TextView.enabled: Boolean - @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() - set(v) = setEnabled(v) - var android.widget.TextView.textColor: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setTextColor(v) diff --git a/anko/library/generated/sdk21/src/Properties.kt b/anko/library/generated/sdk21/src/Properties.kt index 6f22d4ef..10578d5c 100644 --- a/anko/library/generated/sdk21/src/Properties.kt +++ b/anko/library/generated/sdk21/src/Properties.kt @@ -26,10 +26,6 @@ var android.widget.ImageView.imageBitmap: android.graphics.Bitmap? @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setImageBitmap(v) -var android.widget.TextView.enabled: Boolean - @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() - set(v) = setEnabled(v) - var android.widget.TextView.textColor: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setTextColor(v) diff --git a/anko/library/generated/sdk23/src/Properties.kt b/anko/library/generated/sdk23/src/Properties.kt index c8101e1d..ff9c04ff 100644 --- a/anko/library/generated/sdk23/src/Properties.kt +++ b/anko/library/generated/sdk23/src/Properties.kt @@ -14,10 +14,6 @@ var android.view.View.backgroundResource: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setBackgroundResource(v) -var android.widget.TextView.enabled: Boolean - @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() - set(v) = setEnabled(v) - var android.widget.TextView.textColor: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setTextColor(v) diff --git a/anko/library/generated/sdk25/src/Properties.kt b/anko/library/generated/sdk25/src/Properties.kt index 508341ef..ca17254b 100644 --- a/anko/library/generated/sdk25/src/Properties.kt +++ b/anko/library/generated/sdk25/src/Properties.kt @@ -14,10 +14,6 @@ var android.view.View.backgroundResource: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setBackgroundResource(v) -var android.widget.TextView.enabled: Boolean - @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() - set(v) = setEnabled(v) - var android.widget.TextView.textColor: Int @Deprecated(AnkoInternals.NO_GETTER, level = DeprecationLevel.ERROR) get() = AnkoInternals.noGetter() set(v) = setTextColor(v) diff --git a/anko/library/generator/src/org/jetbrains/android/anko/generator/PropertyGenerator.kt b/anko/library/generator/src/org/jetbrains/android/anko/generator/PropertyGenerator.kt index 0c2ec56b..c0b41722 100644 --- a/anko/library/generator/src/org/jetbrains/android/anko/generator/PropertyGenerator.kt +++ b/anko/library/generator/src/org/jetbrains/android/anko/generator/PropertyGenerator.kt @@ -36,7 +36,11 @@ class PropertyGenerator : Generator { .sortedBy { it.identifier } val propertySetters = availableMethods - .filter { it.clazz.isView && it.method.isNonListenerSetter() && !it.method.isOverridden } + .filter { + it.clazz.isView && it.method.isNonListenerSetter() && !it.method.isOverridden && + !config.excludedProperties.contains(it.clazz.fqName + "#" + it.method.name) && + !config.excludedProperties.contains(it.clazz.fqName + "#*") + } .groupBy { it.identifier } genProperties(propertyGetters, propertySetters) diff --git a/anko/props/excluded_properties.txt b/anko/props/excluded_properties.txt index 524df6c6..6ef177b5 100644 --- a/anko/props/excluded_properties.txt +++ b/anko/props/excluded_properties.txt @@ -35,6 +35,7 @@ android.widget.TextView#getTotalPaddingLeft android.widget.TextView#getTotalPaddingRight android.widget.TextView#getTotalPaddingStart android.widget.TextView#getTotalPaddingTop +android.widget.TextView#setEnabled android.widget.AbsSpinner#getAdapter android.view.ViewGroup#getChildCount android.view.ViewGroup#getFocusedChild