azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate synthetic packages even for layouts without @+id/ attributes declared

Browse Source
This commit is contained in:
Yan Zhulanow
2015-03-23 14:52:42 +03:00
parent 0a96c2c148
commit cbf68e8c6f
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt
+11 -12
View File
@@ -92,20 +92,19 @@ public abstract class AndroidUIXmlProcessor(protected val project: Project) {
return resourceManager.getLayoutXmlFiles().flatMap { entry ->
val files = entry.getValue()
val widgets = parseLayout(files)
if (widgets.isNotEmpty()) {
val layoutPackage = files[0].genSyntheticPackageName()
val mainLayoutFile = renderLayoutFile(layoutPackage, widgets) {
writeSyntheticProperty("Activity", it, "findViewById(0)")
writeSyntheticProperty("Fragment", it, "getView().findViewById(0)")
}
val layoutPackage = files[0].genSyntheticPackageName()
val viewLayoutFile = renderLayoutFile("$layoutPackage.view", widgets) {
writeSyntheticProperty("View", it, "findViewById(0)")
}
val mainLayoutFile = renderLayoutFile(layoutPackage, widgets) {
writeSyntheticProperty("Activity", it, "findViewById(0)")
writeSyntheticProperty("Fragment", it, "getView().findViewById(0)")
}
listOf(mainLayoutFile, viewLayoutFile)
} else listOf()
val viewLayoutFile = renderLayoutFile("$layoutPackage.view", widgets) {
writeSyntheticProperty("View", it, "findViewById(0)")
}
listOf(mainLayoutFile, viewLayoutFile)
}.filterNotNull() + commonFiles
}
@@ -156,7 +155,7 @@ public abstract class AndroidUIXmlProcessor(protected val project: Project) {
for (widget in widgets) {
if (widgetMap.contains(widget.id)) {
val existingElement = widgetMap.get(widget.id)
if (existingElement.className != widget.className) {
if (existingElement.className != widget.className && existingElement.className != "View") {
// Widgets with the same id but different types exist.
widgetMap.put(widget.id, widget.copy(className = "View"))
}