Use property's name for key of view's tag

wada811 · Aug 24, 2023 · e352567 · e352567
1 parent 333d7dd
commit e352567
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/ViewBinding-ktx/src/main/java/com/wada811/viewbinding/FragmentViewBinding.kt b/ViewBinding-ktx/src/main/java/com/wada811/viewbinding/FragmentViewBinding.kt
@@ -7,10 +7,14 @@ import com.wada811.viewbindingktx.viewBinding
 import com.wada811.viewbindingktx.withBinding
 import kotlin.properties.ReadOnlyProperty
 
+@Deprecated("Import com.wada811.viewbindingktx", ReplaceWith("viewBinding()", "com.wada811.viewbindingktx.viewBinding"))
 inline fun <reified T : ViewBinding> Fragment.viewBinding(): ReadOnlyProperty<Fragment, T> = this.viewBinding()
 
+@Deprecated("Import com.wada811.viewbindingktx", ReplaceWith("viewBinding(bind)", "com.wada811.viewbindingktx.viewBinding"))
 fun <T : ViewBinding> Fragment.viewBinding(bind: (View) -> T): ReadOnlyProperty<Fragment, T> = this.viewBinding(bind)
 
-inline fun <reified T : ViewBinding> Fragment.withBinding(noinline withBinding: (binding: T) -> Unit) = this.withBinding(withBinding)
+@Deprecated("Import com.wada811.viewbindingktx", ReplaceWith("viewBinding(block)", "com.wada811.viewbindingktx.viewBinding"))
+inline fun <reified T : ViewBinding> Fragment.withBinding(noinline block: (binding: T) -> Unit) = this.withBinding(block)
 
-fun <T : ViewBinding> Fragment.withBinding(bind: (View) -> T, withBinding: (binding: T) -> Unit) = this.withBinding(bind, withBinding)
+@Deprecated("Import com.wada811.viewbindingktx", ReplaceWith("viewBinding(bind, block)", "com.wada811.viewbindingktx.viewBinding"))
+fun <T : ViewBinding> Fragment.withBinding(bind: (View) -> T, block: (binding: T) -> Unit) = this.withBinding(bind, block)
diff --git a/ViewBinding-ktx/src/main/java/com/wada811/viewbindingktx/FragmentViewBinding.kt b/ViewBinding-ktx/src/main/java/com/wada811/viewbindingktx/FragmentViewBinding.kt
@@ -16,14 +16,18 @@ fun <T : ViewBinding> Fragment.viewBinding(bind: (View) -> T): ReadOnlyProperty<
     return object : ReadOnlyProperty<Fragment, T> {
         @Suppress("UNCHECKED_CAST")
         override fun getValue(thisRef: Fragment, property: KProperty<*>): T {
-            (requireView().getTag(R.id.view_binding_tag) as? T)?.let { return it }
+            (requireView().getTag(property.key) as? T)?.let { return it }
             return bind(requireView()).also {
-                requireView().setTag(R.id.view_binding_tag, it)
+                requireView().setTag(property.key, it)
             }
         }
     }
 }
 
+private val KProperty<*>.key: Int
+    get() = name.hashCode()
+
+
 inline fun <reified T : ViewBinding> Fragment.withBinding(noinline withBinding: (binding: T) -> Unit) {
     withBinding({
         T::class.java.getMethod("bind", View::class.java).invoke(null, it) as T

diff --git a/ViewBinding-ktx/src/main/res/values/ids.xml b/ViewBinding-ktx/src/main/res/values/ids.xml
diff --git a/gradle.properties b/gradle.properties
@@ -27,8 +27,3 @@ android.databinding.incremental=true
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-#android.enableJetifier=true
-# Cacheable unit tests
-# https://developer.android.com/studio/releases/gradle-plugin#cacheable_tests
-android.testConfig.useRelativePath=true