feat: add option to create kotlin file

Author: teixeira0x

core/app/src/main/java/com/itsaky/androidide/actions/filetree/NewFileAction.kt

@@ -24,7 +24,7 @@ import com.blankj.utilcode.util.FileIOUtils
 import com.itsaky.androidide.actions.ActionData
 import com.itsaky.androidide.actions.requireFile
 import com.itsaky.androidide.adapters.viewholders.FileTreeViewHolder
-import com.itsaky.androidide.databinding.LayoutCreateFileJavaBinding
+import com.itsaky.androidide.databinding.LayoutCreateFileClassBinding
 import com.itsaky.androidide.eventbus.events.file.FileCreationEvent
 import com.itsaky.androidide.preferences.databinding.LayoutDialogTextInputBinding
 import com.itsaky.androidide.projects.IProjectManager
@@ -36,12 +36,12 @@ import com.itsaky.androidide.utils.SingleTextWatcher
 import com.itsaky.androidide.utils.flashError
 import com.itsaky.androidide.utils.flashSuccess
 import com.unnamed.b.atv.model.TreeNode
-import jdkx.lang.model.SourceVersion
-import org.greenrobot.eventbus.EventBus
-import org.slf4j.LoggerFactory
 import java.io.File
 import java.util.Objects
 import java.util.regex.Pattern
+import jdkx.lang.model.SourceVersion
+import org.greenrobot.eventbus.EventBus
+import org.slf4j.LoggerFactory
 
 /**
  * File tree action to create a new file.
@@ -52,7 +52,7 @@ class NewFileAction(context: Context, override val order: Int) :
   BaseDirNodeAction(
     context = context,
     labelRes = R.string.new_file,
-    iconRes = R.drawable.ic_new_file
+    iconRes = R.drawable.ic_new_file,
   ) {
 
   override val id: String = "ide.editor.fileTree.newFile"
@@ -63,7 +63,7 @@ class NewFileAction(context: Context, override val order: Int) :
     const val LAYOUT_RES_PATH_REGEX = "/.*/src/.*/res/layout"
     const val MENU_RES_PATH_REGEX = "/.*/src/.*/res/menu"
     const val DRAWABLE_RES_PATH_REGEX = "/.*/src/.*/res/drawable"
-    const val JAVA_PATH_REGEX = "/.*/src/.*/java"
+    const val JAVA_OR_KOTLIN_PATH_REGEX = "/.*/src/.*/(java|kotlin)"
 
     private val log = LoggerFactory.getLogger(NewFileAction::class.java)
   }
@@ -84,7 +84,7 @@ class NewFileAction(context: Context, override val order: Int) :
     context: Context,
     node: TreeNode?,
     file: File,
-    forceUnknownType: Boolean
+    forceUnknownType: Boolean,
   ) {
     if (forceUnknownType) {
       createNewEmptyFile(context, node, file)
@@ -93,10 +93,14 @@ class NewFileAction(context: Context, override val order: Int) :
 
     val projectDir = IProjectManager.getInstance().projectDirPath
     Objects.requireNonNull(projectDir)
-    val isJava =
-      Pattern.compile(Pattern.quote(projectDir) + JAVA_PATH_REGEX).matcher(file.absolutePath).find()
+    val isJavaOrKotlin =
+      Pattern.compile(Pattern.quote(projectDir) + JAVA_OR_KOTLIN_PATH_REGEX)
+        .matcher(file.absolutePath)
+        .find()
     val isRes =
-      Pattern.compile(Pattern.quote(projectDir) + RES_PATH_REGEX).matcher(file.absolutePath).find()
+      Pattern.compile(Pattern.quote(projectDir) + RES_PATH_REGEX)
+        .matcher(file.absolutePath)
+        .find()
     val isLayoutRes =
       Pattern.compile(Pattern.quote(projectDir) + LAYOUT_RES_PATH_REGEX)
         .matcher(file.absolutePath)
@@ -110,8 +114,8 @@ class NewFileAction(context: Context, override val order: Int) :
         .matcher(file.absolutePath)
         .find()
 
-    if (isJava) {
-      createJavaClass(context, node, file)
+    if (isJavaOrKotlin) {
+      createClass(context, node, file)
       return
     }
 
@@ -138,16 +142,22 @@ class NewFileAction(context: Context, override val order: Int) :
     createNewEmptyFile(context, node, file)
   }
 
-  private fun createJavaClass(context: Context, node: TreeNode?, file: File) {
+  private fun createClass(context: Context, node: TreeNode?, file: File) {
     val builder = DialogUtils.newMaterialDialogBuilder(context)
-    val binding: LayoutCreateFileJavaBinding =
-      LayoutCreateFileJavaBinding.inflate(LayoutInflater.from(context))
-    binding.typeGroup.addOnButtonCheckedListener { _, _, _ ->
-      binding.createLayout.isVisible = binding.typeGroup.checkedButtonId == binding.typeActivity.id
+    val binding: LayoutCreateFileClassBinding =
+      LayoutCreateFileClassBinding.inflate(LayoutInflater.from(context))
+    binding.classTypeGroup.addOnButtonCheckedListener { _, _, _ ->
+      binding.createLayout.isVisible =
+        binding.classTypeGroup.checkedButtonId == binding.typeActivity.id
     }
     binding.name.editText?.addTextChangedListener(
       object : SingleTextWatcher() {
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+        override fun onTextChanged(
+          s: CharSequence?,
+          start: Int,
+          before: Int,
+          count: Int,
+        ) {
           if (isValidJavaName(s)) {
             binding.name.isErrorEnabled = true
             binding.name.error = context.getString(R.string.msg_invalid_name)
@@ -158,7 +168,7 @@ class NewFileAction(context: Context, override val order: Int) :
       }
     )
     builder.setView(binding.root)
-    builder.setTitle(R.string.new_java_class)
+    builder.setTitle(R.string.new_class)
     builder.setPositiveButton(R.string.text_create) { dialogInterface, _ ->
       dialogInterface.dismiss()
       try {
@@ -173,11 +183,11 @@ class NewFileAction(context: Context, override val order: Int) :
     builder.create().show()
   }
 
-  private fun doCreateJavaFile(
-    binding: LayoutCreateFileJavaBinding,
+  private fun doCreateClassFile(
+    binding: LayoutCreateFileClassBinding,
     file: File,
     context: Context,
-    node: TreeNode?
+    node: TreeNode?,
   ) {
     if (binding.name.isErrorEnabled) {
       flashError(R.string.msg_invalid_name)
@@ -191,64 +201,89 @@ class NewFileAction(context: Context, override val order: Int) :
     }
 
     val autoLayout =
-      binding.typeGroup.checkedButtonId == binding.typeActivity.id &&
-          binding.createLayout.isChecked
+      binding.classTypeGroup.checkedButtonId == binding.typeActivity.id &&
+        binding.createLayout.isChecked
     val pkgName = ProjectWriter.getPackageName(file)
     if (pkgName == null || pkgName.trim { it <= ' ' }.isEmpty()) {
       flashError(R.string.msg_get_package_failed)
       return
     }
 
-    val id: Int = binding.typeGroup.checkedButtonId
-    val javaName = if (name.endsWith(".java")) name else "$name.java"
-    val className = if (!name.contains(".")) name else name.substring(0, name.lastIndexOf("."))
+    val fileTypeId: Int = binding.fileTypeGroup.checkedButtonId
+    val classTypeId: Int = binding.classTypeGroup.checkedButtonId
+
     val created =
-      when (id) {
-        binding.typeClass.id ->
-          createFile(
-            context,
-            node,
-            file,
-            javaName,
-            ProjectWriter.createJavaClass(pkgName, className)
-          )
-
-        binding.typeInterface.id ->
-          createFile(
-            context,
-            node,
-            file,
-            javaName,
-            ProjectWriter.createJavaInterface(pkgName, className)
-          )
-
-        binding.typeEnum.id ->
-          createFile(
-            context,
-            node,
-            file,
-            javaName,
-            ProjectWriter.createJavaEnum(pkgName, className)
-          )
-
-        binding.typeActivity.id ->
-          createFile(
-            context,
-            node,
-            file,
-            javaName,
-            ProjectWriter.createActivity(pkgName, className)
-          )
-
-        else -> createFile(context, node, file, name, "")
-      }
+      doCreateClassFile(
+        fileTypeId == binding.typeKotlin.id,
+        classTypeId,
+        name,
+        pkgName,
+        node,
+      )
 
     if (created && autoLayout) {
       val packagePath = pkgName.toString().replace(".", "/")
       createAutoLayout(context, file, name, packagePath)
     }
   }
 
+  private fun doCreateClassFile(
+    isKotlin: Boolean,
+    classTypeId: Int,
+    name: String,
+    pkgName: String,
+    node: TreeNode?,
+  ): Boolean {
+    val fileName =
+      when {
+        isKotlin -> if (name.endsWith(".kt")) name else "$name.kt"
+        else -> if (name.endsWith(".java")) name else "$name.java"
+      }
+    val className =
+      if (!name.contains(".")) name
+      else name.substring(0, name.lastIndexOf("."))
+
+    return when (classTypeId) {
+      binding.typeClass.id ->
+        createFile(
+          context,
+          node,
+          file,
+          fileName,
+          ProjectWriter.createClass(isKotlin, pkgName, className),
+        )
+
+      binding.typeInterface.id ->
+        createFile(
+          context,
+          node,
+          file,
+          fileName,
+          ProjectWriter.createInterface(isKotlin, pkgName, className),
+        )
+
+      binding.typeEnum.id ->
+        createFile(
+          context,
+          node,
+          file,
+          fileName,
+          ProjectWriter.createEnum(isKotlin, pkgName, className),
+        )
+
+      binding.typeActivity.id ->
+        createFile(
+          context,
+          node,
+          file,
+          fileName,
+          ProjectWriter.createActivity(isKotlin, pkgName, className),
+        )
+
+      else -> createFile(context, node, file, name, "")
+    }
+  }
+
   private fun isValidJavaName(s: CharSequence?) =
     s == null || !SourceVersion.isName(s) || SourceVersion.isKeyword(s)
 
@@ -258,25 +293,31 @@ class NewFileAction(context: Context, override val order: Int) :
       node,
       Environment.mkdirIfNotExits(file),
       ProjectWriter.createLayout(),
-      ".xml"
+      ".xml",
     )
   }
 
   private fun createAutoLayout(
     context: Context,
     directory: File,
     fileName: String,
-    packagePath: String
+    packagePath: String,
   ) {
     val dir = directory.toString().replace("java/$packagePath", "res/layout/")
-    val layoutName = ProjectWriter.createLayoutName(fileName.replace(".java", ".xml"))
+    val layoutName =
+      ProjectWriter.createLayoutName(fileName.replace(".java", ".xml"))
     val newFileLayout = File(dir, layoutName)
     if (newFileLayout.exists()) {
       flashError(R.string.msg_layout_file_exists)
       return
     }
 
-    if (!FileIOUtils.writeFileFromString(newFileLayout, ProjectWriter.createLayout())) {
+    if (
+      !FileIOUtils.writeFileFromString(
+        newFileLayout,
+        ProjectWriter.createLayout(),
+      )
+    ) {
       flashError(R.string.msg_layout_file_creation_failed)
       return
     }
@@ -290,7 +331,7 @@ class NewFileAction(context: Context, override val order: Int) :
       node,
       Environment.mkdirIfNotExits(file),
       ProjectWriter.createMenu(),
-      ".xml"
+      ".xml",
     )
   }
 
@@ -300,7 +341,7 @@ class NewFileAction(context: Context, override val order: Int) :
       node,
       Environment.mkdirIfNotExits(file),
       ProjectWriter.createDrawable(),
-      ".xml"
+      ".xml",
     )
   }
 
@@ -310,7 +351,7 @@ class NewFileAction(context: Context, override val order: Int) :
         context.getString(R.string.restype_drawable),
         context.getString(R.string.restype_layout),
         context.getString(R.string.restype_menu),
-        context.getString(R.string.restype_other)
+        context.getString(R.string.restype_other),
       )
     val builder = DialogUtils.newMaterialDialogBuilder(context)
     builder.setTitle(R.string.new_xml_resource)
@@ -325,15 +366,19 @@ class NewFileAction(context: Context, override val order: Int) :
     builder.create().show()
   }
 
-  private fun createNewEmptyFile(context: Context, node: TreeNode?, file: File) {
+  private fun createNewEmptyFile(
+    context: Context,
+    node: TreeNode?,
+    file: File,
+  ) {
     createNewFileWithContent(context, node, file, "")
   }
 
   private fun createNewFileWithContent(
     context: Context,
     node: TreeNode?,
     file: File,
-    content: String
+    content: String,
   ) {
     createNewFileWithContent(context, node, file, content, null)
   }
@@ -345,14 +390,15 @@ class NewFileAction(context: Context, override val order: Int) :
     content: String,
     extension: String?,
   ) {
-    val binding = LayoutDialogTextInputBinding.inflate(LayoutInflater.from(context))
+    val binding =
+      LayoutDialogTextInputBinding.inflate(LayoutInflater.from(context))
     val builder = DialogUtils.newMaterialDialogBuilder(context)
     binding.name.editText!!.setHint(R.string.file_name)
     builder.setTitle(R.string.new_file)
     builder.setMessage(
       context.getString(R.string.msg_can_contain_slashes) +
-          "\n\n" +
-          context.getString(R.string.msg_newfile_dest, folder.absolutePath)
+        "\n\n" +
+        context.getString(R.string.msg_newfile_dest, folder.absolutePath)
     )
     builder.setView(binding.root)
     builder.setCancelable(false)
@@ -384,7 +430,7 @@ class NewFileAction(context: Context, override val order: Int) :
     node: TreeNode?,
     directory: File,
     name: String,
-    content: String
+    content: String,
   ): Boolean {
     if (name.length !in 1..40 || name.startsWith("/")) {
       flashError(R.string.msg_invalid_name)