diff options
Diffstat (limited to 'compiler/src/main/kotlin/com')
4 files changed, 12 insertions, 10 deletions
diff --git a/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt b/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt index b7abeb7e..11804ff9 100644 --- a/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt +++ b/compiler/src/main/kotlin/com/android/databinding/ext/ext.kt @@ -77,4 +77,4 @@ public fun String.toCamelCaseAsVar() : String { } public fun String.br() : String = - "android.binding.BR.${if (this == "") "_all" else this}" + "BR.${if (this == "") "_all" else this}" diff --git a/compiler/src/main/kotlin/com/android/databinding/util/XmlEditor.kt b/compiler/src/main/kotlin/com/android/databinding/util/XmlEditor.kt index b1531fc4..ad79405f 100644 --- a/compiler/src/main/kotlin/com/android/databinding/util/XmlEditor.kt +++ b/compiler/src/main/kotlin/com/android/databinding/util/XmlEditor.kt @@ -131,7 +131,8 @@ object XmlEditor { Preconditions.checkNotNull(rootNodeContext, "Cannot find root node for ${f.getName()}") Preconditions.checkState(rootNodeHasTag == false, """You cannot set a tag in the layout root if you are using binding. Invalid file: ${f}""") - val rootNodeBounds = Pair(rootNodeContext!!.getStart().toPosition(), rootNodeContext!!.getStop().toEndPosition()) + val rootNodeBounds = Pair(rootNodeContext!!.getStart().toPosition(), + rootNodeContext!!.getStop().toEndPosition()) log { "root node bounds: ${rootNodeBounds}" } val out = StringBuilder() diff --git a/compiler/src/main/kotlin/com/android/databinding/writer/DataBinderWriter.kt b/compiler/src/main/kotlin/com/android/databinding/writer/DataBinderWriter.kt index d52a6122..7b3638e3 100644 --- a/compiler/src/main/kotlin/com/android/databinding/writer/DataBinderWriter.kt +++ b/compiler/src/main/kotlin/com/android/databinding/writer/DataBinderWriter.kt @@ -19,13 +19,13 @@ class DataBinderWriter(val pkg: String, val projectPackage: String, val classNam fun write() = kcode("") { nl("package $pkg;") - nl("import $projectPackage.R;") + nl("import $projectPackage.BR;") nl("public class $className implements com.android.databinding.library.DataBinderMapper {") { tab("@Override") tab("public com.android.databinding.library.ViewDataBinding getDataBinder(android.view.View view, int layoutId) {") { tab("switch(layoutId) {") { layoutBinders.groupBy{it.getLayoutname()}.forEach { - tab("case R.layout.${it.value.first!!.getLayoutname()}:") { + tab("case ${it.value.first!!.getModulePackage()}.R.layout.${it.value.first!!.getLayoutname()}:") { if (it.value.size() == 1) { tab("return new ${it.value.first!!.getPackage()}.${it.value.first!!.getClassName()}(view);") } else { @@ -51,7 +51,7 @@ class DataBinderWriter(val pkg: String, val projectPackage: String, val classNam tab("}") tab("public int getId(String key) {") { - tab("return android.binding.BR.getId(key);") + tab("return BR.getId(key);") } tab("}") } nl("}") diff --git a/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt b/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt index fec3b460..e82de91d 100644 --- a/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/com/android/databinding/writer/LayoutBinderWriter.kt @@ -331,7 +331,8 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) { public fun write() : String { layoutBinder.resolveWhichExpressionsAreUsed() return kcode("package ${layoutBinder.getPackage()};") { - nl("import ${layoutBinder.getProjectPackage()}.R;") + nl("import ${layoutBinder.getModulePackage()}.R;") + nl("import ${layoutBinder.getModulePackage()}.BR;") nl("import android.view.View;") nl("public class ${className} extends ${baseClassName} {") { tab(declareIncludeViews()) @@ -401,7 +402,7 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) { if (originalTag != null) { tagValue = "\"${originalTag}\"" if (originalTag.startsWith("@")) { - var packageName = layoutBinder.getProjectPackage() + var packageName = layoutBinder.getModulePackage() if (originalTag.startsWith("@android:")) { packageName = "android" } @@ -749,15 +750,15 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) { } nl("") tab("public static ${baseClassName} inflate(android.view.ViewGroup root) {") { - tab("return DataBindingUtil.<${baseClassName}>inflate(root.getContext(), ${layoutBinder.getProjectPackage()}.R.layout.${layoutBinder.getLayoutname()}, root, true);") + tab("return DataBindingUtil.<${baseClassName}>inflate(root.getContext(), ${layoutBinder.getModulePackage()}.R.layout.${layoutBinder.getLayoutname()}, root, true);") } tab("}") tab("public static ${baseClassName} inflate(android.content.Context context) {") { - tab("return DataBindingUtil.<${baseClassName}>inflate(context, ${layoutBinder.getProjectPackage()}.R.layout.${layoutBinder.getLayoutname()}, null, false);") + tab("return DataBindingUtil.<${baseClassName}>inflate(context, ${layoutBinder.getModulePackage()}.R.layout.${layoutBinder.getLayoutname()}, null, false);") } tab("}") tab("public static ${baseClassName} bind(android.view.View view) {") { - tab("return (${baseClassName})DataBindingUtil.bindTo(view, ${layoutBinder.getProjectPackage()}.R.layout.${layoutBinder.getLayoutname()});") + tab("return (${baseClassName})DataBindingUtil.bindTo(view, ${layoutBinder.getModulePackage()}.R.layout.${layoutBinder.getLayoutname()});") } tab("}") nl("}") |