From 81413466b3755c0e2fcbc572d98dabb6276368ed Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Sat, 7 Jan 2023 17:16:55 +0530 Subject: [PATCH] fix: attribute name not shown in delete attribute dialog --- .../androidide/uidesigner/adapters/ViewAttrListAdapter.kt | 2 +- .../com/itsaky/androidide/uidesigner/models/UiAttribute.kt | 4 ++-- .../main/java/com/itsaky/androidide/inflater/IAttribute.kt | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt index 275e2070a..e9d317b9b 100644 --- a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt +++ b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/adapters/ViewAttrListAdapter.kt @@ -90,7 +90,7 @@ internal class ViewAttrListAdapter( DialogUtils.newYesNoDialog( context = context, title = context.getString(R.string.title_confirm_delete), - message = context.getString(R.string.msg_confirm_delete), + message = context.getString(R.string.msg_confirm_delete, attribute.qualifiedName), positiveClickListener = { dialog, _ -> dialog.dismiss() if (onDeleteAttr(attribute)) { diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt index 9a34f830c..4e91a3070 100644 --- a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt +++ b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/models/UiAttribute.kt @@ -19,6 +19,7 @@ package com.itsaky.androidide.uidesigner.models import android.os.Parcelable import com.itsaky.androidide.inflater.IAttribute +import com.itsaky.androidide.inflater.INamespace import com.itsaky.androidide.inflater.IView import com.itsaky.androidide.inflater.internal.AttributeImpl import com.itsaky.androidide.inflater.internal.NamespaceImpl @@ -34,8 +35,7 @@ import kotlinx.parcelize.Parcelize open class UiAttribute @JvmOverloads constructor( - override val namespace: NamespaceImpl = - com.itsaky.androidide.inflater.INamespace.ANDROID as NamespaceImpl, + override val namespace: NamespaceImpl = INamespace.ANDROID as NamespaceImpl, override val name: String, override var value: String, internal var isRequired: Boolean = false diff --git a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt index 4e4745154..44dcc70f1 100644 --- a/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt +++ b/xml-inflater/src/main/java/com/itsaky/androidide/inflater/IAttribute.kt @@ -32,4 +32,10 @@ interface IAttribute { /** The value of the attribute. */ var value: String + + /** + * The name of this attribute the form `:`. + */ + val qualifiedName : String + get() = "${namespace.prefix}:${name}" }