Skip to content

Commit f7aaf06

Browse files
committed
Remove unused Text imports and simplify function parameters in project recipe files
1 parent 973c674 commit f7aaf06

13 files changed

Lines changed: 6 additions & 18 deletions

File tree

src/main/kotlin/com/github/cnrture/quickprojectwizard/general/EmptyManifestXml.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ fun emptyManifestXml(
44
styleName: String,
55
isHiltEnable: Boolean,
66
dataDiDomainPresentationUiPackages: Boolean,
7-
projectName: String,
87
): String {
98
return if (isHiltEnable && dataDiDomainPresentationUiPackages) {
10-
hilt(styleName, projectName)
9+
hilt(styleName)
1110
} else {
1211
withoutHilt(styleName)
1312
}
1413
}
1514

16-
fun hilt(styleName: String, projectName: String) = """
15+
fun hilt(styleName: String) = """
1716
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1817
xmlns:tools="http://schemas.android.com/tools">
1918

src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/ComposeProjectRecipe.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ fun RecipeExecutor.composeProjectRecipe(
9797
"@style/${moduleData.themesData.main.name}",
9898
isHiltEnable,
9999
dataDiDomainPresentationUiPackages,
100-
projectName
101100
),
102101
manifestOut.resolve("AndroidManifest.xml")
103102
)

src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/XMLProjectRecipe.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ fun RecipeExecutor.xmlProjectRecipe(
8080
"@style/${moduleData.themesData.main.name}",
8181
isHiltEnable,
8282
dataDiDomainPresentationUiPackages,
83-
projectName
8483
),
8584
manifestOut.resolve("AndroidManifest.xml")
8685
)

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/components/QPWTextField.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.github.cnrture.quickprojectwizard.toolwindow.components
22

33
import androidx.compose.material.OutlinedTextField
4-
import androidx.compose.material.Text
54
import androidx.compose.material.TextFieldDefaults
65
import androidx.compose.runtime.Composable
76
import androidx.compose.ui.Modifier

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/file/LibraryDependencyFinder.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class LibraryDependencyFinder {
4949
val librariesContent = librariesSection[1].split("[").first()
5050

5151
val modulePattern =
52-
"""(\w+(?:-\w+)*)\s*=\s*\{\s*module\s*=\s*["']([^:"']+):([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*\}""".toRegex()
52+
"""(\w+(?:-\w+)*)\s*=\s*\{\s*module\s*=\s*["']([^:"']+):([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*}""".toRegex()
5353

5454
val groupNamePattern =
55-
"""(\w+(?:-\w+)*)\s*=\s*\{\s*group\s*=\s*["']([^"']+)["']\s*,\s*name\s*=\s*["']([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*\}""".toRegex()
55+
"""(\w+(?:-\w+)*)\s*=\s*\{\s*group\s*=\s*["']([^"']+)["']\s*,\s*name\s*=\s*["']([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*}""".toRegex()
5656

5757
val moduleMatches = modulePattern.findAll(librariesContent)
5858
moduleMatches.forEach { match ->
@@ -126,7 +126,7 @@ class LibraryDependencyFinder {
126126
// kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
127127
// compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
128128
val pluginPattern =
129-
"""(\w+(?:-\w+)*)\s*=\s*\{\s*id\s*=\s*["']([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*\}""".toRegex()
129+
"""(\w+(?:-\w+)*)\s*=\s*\{\s*id\s*=\s*["']([^"']+)["']\s*(?:,\s*version\.ref\s*=\s*["']([^"']+)["'])?\s*(?:,\s*version\s*=\s*["']([^"']+)["'])?\s*}""".toRegex()
130130

131131
val pluginMatches = pluginPattern.findAll(pluginsContent)
132132
pluginMatches.forEach { match ->
@@ -154,7 +154,7 @@ class LibraryDependencyFinder {
154154
}
155155

156156
val usedLibraries = mutableSetOf<String>()
157-
val importRegex = """import\s+([\w.]+(?:\*)?)\s*""".toRegex()
157+
val importRegex = """import\s+([\w.]+\*?)\s*""".toRegex()
158158

159159
println("LibraryDependencyFinder: Scanning for imports in ${sourceDir.absolutePath}")
160160

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/featuremaker/components/RootSelectionContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.github.cnrture.quickprojectwizard.toolwindow.manager.featuremaker.co
33
import androidx.compose.foundation.border
44
import androidx.compose.foundation.layout.*
55
import androidx.compose.foundation.shape.RoundedCornerShape
6-
import androidx.compose.material.Text
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Modifier
98
import androidx.compose.ui.draw.clip

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/modulemaker/components/DetectModulesContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.*
66
import androidx.compose.foundation.shape.RoundedCornerShape
77
import androidx.compose.material.CircularProgressIndicator
88
import androidx.compose.material.Icon
9-
import androidx.compose.material.Text
109
import androidx.compose.material.icons.Icons
1110
import androidx.compose.material.icons.rounded.PlayArrow
1211
import androidx.compose.runtime.Composable

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/modulemaker/components/ExistingModulesContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.compose.foundation.border
44
import androidx.compose.foundation.layout.*
55
import androidx.compose.foundation.shape.RoundedCornerShape
66
import androidx.compose.material.Divider
7-
import androidx.compose.material.Text
87
import androidx.compose.runtime.Composable
98
import androidx.compose.ui.Modifier
109
import androidx.compose.ui.draw.clip

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/modulemaker/components/LibrarySelectionContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.*
66
import androidx.compose.foundation.shape.RoundedCornerShape
77
import androidx.compose.material.Divider
88
import androidx.compose.material.Icon
9-
import androidx.compose.material.Text
109
import androidx.compose.material.icons.Icons
1110
import androidx.compose.material.icons.rounded.ExpandMore
1211
import androidx.compose.runtime.Composable

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/modulemaker/components/MoveFilesContent.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.github.cnrture.quickprojectwizard.toolwindow.manager.modulemaker.com
33
import androidx.compose.foundation.border
44
import androidx.compose.foundation.layout.*
55
import androidx.compose.foundation.shape.RoundedCornerShape
6-
import androidx.compose.material.Text
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Modifier
98
import androidx.compose.ui.draw.clip

0 commit comments

Comments
 (0)