Support several res/ directories

This commit is contained in:
Yan Zhulanow
2015-04-14 19:07:35 +03:00
parent 7a685b8c56
commit 3645dfc5af
22 changed files with 183 additions and 50 deletions
@@ -46,7 +46,7 @@ public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, Simpl
val module = projectFileIndex.getModuleForFile(file.getVirtualFile())
if (module != null) {
val resourceManager = AndroidResourceManager.getInstance(module)
val mainResDirectory = resourceManager.getMainResDirectory()
val mainResDirectory = resourceManager.getResDirectories()
val baseDirectory = file.getParent()?.getParent()?.getVirtualFile()
//File from res/ directory was modified
@@ -54,10 +54,10 @@ public class IDEAndroidResourceManager(val module: Module) : AndroidResourceMana
private fun AndroidFacet.toAndroidModuleInfo(): AndroidModuleInfo? {
val applicationPackage = getManifest()?.getPackage()?.toString()
val mainResDirectory = getAllResourceDirectories().firstOrNull()?.getPath()
val mainResDirectories = getAllResourceDirectories().map { it.getPath() }
return if (applicationPackage != null) {
AndroidModuleInfo(applicationPackage, mainResDirectory)
AndroidModuleInfo(applicationPackage, mainResDirectories)
}
else null
}