change layout file name

Author: longforus

src/main/kotlin/com/longforus/mvpautocodeplus/TemplateCons.java

@@ -27,12 +27,14 @@ public interface TemplateCons {
             "    interface View : ${VN}${VG}{}\n" + "    interface ${P_OR_M} : ${PN}${PG}{}\n" + "}\n";
 
     String COMMON_IMPL_TP_CONTENT_JAVA =
-        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${CONTRACT};\n" + "#if (${IMPL} != \"\")import ${IMPL};#end\n" + "\n" + "\n" + "/**\n" +
+        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME};#end\n" + "\n" + "import ${CONTRACT};\n" + "import ${PACKAGE_NAME}.R;\n" + "#if (${IMPL} != \"\")import ${IMPL};#end\n" + "\n" + "\n" + "/**\n" +
             " * @describe \n" + " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" +
             "public class ${NAME}${IMPL_TYPE} #if(${IMPL}!=\"\") extends ${IMPL}${VG}#end implements I${NAME}Contract.${TYPE} {\n" + "\n" + "}\n" + "\n";
 
+    //todo R文件的报名应该是清单里面的报名
+
     String COMMON_IMPL_TP_CONTENT_KOTLIN =
-        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${CONTRACT}\n" + "#if (${IMPL} != \"\")import ${IMPL}#end\n" + "\n" + "/**\n" +
+        "#if (${PACKAGE_NAME} != \"\")package ${PACKAGE_NAME}#end\n" + "\n" + "import ${CONTRACT}\n" + "import ${PACKAGE_NAME}.R\n" + "#if (${IMPL} != \"\")import ${IMPL}#end\n" + "\n" + "/**\n" +
             " * @describe \n" + " * @author  ${USER}\n" + " * @date ${DATE}  ${TIME}\n" + " * \t\t\t\t\t\t\t\t - generate by MvpAutoCodePlus plugin.\n" + " */\n" + "\n" +
             "class ${NAME}${IMPL_TYPE} :#if (${IMPL_NP} != \"\") ${IMPL_NP}${VG}(),#end ${CONTRACT_NP}.${TYPE} {\n" + "\n" + "}\n" + "\n";
 }

src/main/kotlin/com/longforus/mvpautocodeplus/maker/LayoutCreator.kt

@@ -1,6 +1,7 @@
 package com.longforus.mvpautocodeplus.maker
 
 import com.android.resources.ResourceFolderType
+import com.android.tools.idea.util.dependsOnAndroidx
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.project.Project
@@ -16,6 +17,7 @@ import org.jetbrains.android.facet.AndroidRootUtil
 import org.jetbrains.android.util.AndroidResourceUtil
 import org.jetbrains.android.util.AndroidUtils
 import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
+import org.jetbrains.kotlin.psi.psiUtil.findFunctionByName
 
 /**
  * @describe
@@ -52,18 +54,29 @@ fun createLayoutFileForActivityOrFragment(ic: ItemConfigBean,facet: AndroidFacet
         if (className != null) {
 //            val layoutFile = CreateResourceFileAction.createFileResource(facet, ResourceFolderType.LAYOUT, "activity_auto", null, null, true, "Create Layout For '$className'",
 //                resDirectory, null, false)
+                val nameSb  = StringBuilder()
+                 ic.name.forEach {
+                     if (it >= "A"[0] && it <= "Z"[0]) {
+                         nameSb.append("_")
+                     }
+                     nameSb.append(it)
+                 }
+
+            val layoutFileOriginName = if (isActivity) "activity${nameSb.toString().toLowerCase()}" else "frag${nameSb.toString().toLowerCase()}"
+
+            val rootLayoutName = if (facet.module.dependsOnAndroidx()) "androidx.constraintlayout.widget.ConstraintLayout" else "android.support.constraint.ConstraintLayout"
 
             val layoutFile = AndroidResourceUtil.createFileResource(
-                if (isActivity) "activity_${ic.name.toLowerCase()}" else "frag_${ic.name.toLowerCase()}", resDirectory.findSubdirectory("layout")!!,
-                "android.support.constraint.ConstraintLayout",
+                layoutFileOriginName, resDirectory.findSubdirectory("layout")!!,
+                rootLayoutName,
                 ResourceFolderType.LAYOUT.getName(), false)
             val layoutFileName = layoutFile?.name
             val onCreateMethods = activityClass.findMethodsByName("getLayoutId", false)//todo 生成viewBinding
             if (onCreateMethods.size != 1) {
                 return
             }
             if (activityClass is KtUltraLightClass){
-//                activityClass.kotlinOrigin.findFunctionByName("getLayoutId")
+                activityClass.kotlinOrigin.findFunctionByName("getLayoutId")
                 activityClass.ownMethods.find {
                     it.name=="getLayoutId"
                 }?.let {