layout 디렉토리 버그 수정

Author: kimdohun0104

src/main/kotlin/kr/co/finda/androidtemplate/feature/createFindaTemplate/dialog/CreateFindaTemplateDialogPresenter.kt

@@ -26,10 +26,9 @@ class CreateFindaTemplateDialogPresenter(
         }
 
         val packageName = fileHelper.getPackageNameByPath(selectedDirectory.path)
-//        val appModule = fileHelper.getModulePathByPath(selectedDirectory.path)
         createUiCodeFile(name, packageName, screenType, selectedDirectory)
         createViewModelFile(name, packageName, selectedDirectory)
-        createLayoutFile(project, name, packageName, screenType)
+        createLayoutFile(project, name, packageName, screenType, selectedDirectory)
     }
 
     private fun getConflictedFileName(
@@ -95,15 +94,21 @@ class CreateFindaTemplateDialogPresenter(
         project: Project,
         name: String,
         packageName: String,
-        screenType: ScreenType
+        screenType: ScreenType,
+        selectedDirectory: VirtualFile
     ) {
-        val layoutDirectory = fileHelper.getLayoutDirectory(project.basePath!!)
+        val layoutName = getLayoutName(screenType, name)
+        val layoutDirectory = fileHelper.getLayoutDirectory(selectedDirectory.path)
+        if (layoutDirectory == null) {
+            view.showErrorDialog(project, PluginError.FT104)
+            return
+        }
 
         val templateName = "LayoutTemplate"
 
         fileHelper.createFileWithTemplate(
-            layoutDirectory!!,
-            getLayoutName(screenType, name),
+            layoutDirectory,
+            layoutName,
             FileExtension.XML,
             templateName,
             Replacements(

src/main/kotlin/kr/co/finda/androidtemplate/model/FileHelper.kt

@@ -6,6 +6,10 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.util.ResourceUtil
 import kr.co.finda.androidtemplate.ext.replaceAll
 import kr.co.finda.androidtemplate.type.FileExtension
+import java.io.File
+import java.net.URI
+import java.nio.file.Files
+import java.nio.file.Paths
 
 interface FileHelper {
 
@@ -21,7 +25,7 @@ interface FileHelper {
 
     fun getPackageNameByPath(path: String): String
 
-    fun getLayoutDirectory(projectBasePath: String): VirtualFile?
+    fun getLayoutDirectory(selectedDirectoryPath: String): VirtualFile?
 }
 
 class FileHelperImpl(
@@ -61,9 +65,11 @@ class FileHelperImpl(
         }
     }
 
-    override fun getLayoutDirectory(projectBasePath: String): VirtualFile? {
+    override fun getLayoutDirectory(selectedDirectoryPath: String): VirtualFile? {
+        val mainPath = selectedDirectoryPath.split("src/main")[0]
+        val layoutPath = "${mainPath}/src/main/res/layout"
         return VirtualFileManager.getInstance()
-            .findFileByUrl("file://${projectBasePath}/src/main/res/layout")
+            .findFileByUrl("file://${layoutPath}")
     }
 
     private fun getTemplateContentByName(templateName: String): String {

src/main/kotlin/kr/co/finda/androidtemplate/type/PluginError.kt

@@ -10,5 +10,6 @@ enum class PluginError(
      */
     FT101("선택된 위치를 찾을 수 없습니다", "FT101"),
     FT102("유효하지 않은 경로입니다", "FT102-'src/main/(java|kotlin)'경로에 해당하지 않습니다"),
-    FT103("중복된 이름이 존재합니다", "FT103-이미 생성된 Activity 혹은 ViewModel을 확인해주세요")
+    FT103("중복된 이름이 존재합니다", "FT103-이미 생성된 Activity 혹은 ViewModel을 확인해주세요"),
+    FT104("레이아웃 폴더를 찾을 수 없습니다", "FT104-레이아웃 파일이 생성되지 못했습니다")
 }