diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/ComposeTemplate.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/ComposeTemplate.kt index 0e3bddc..9cdc577 100644 --- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/ComposeTemplate.kt +++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/ComposeTemplate.kt @@ -6,7 +6,7 @@ import com.github.cnrture.quickprojectwizard.general.ImageLibrary import com.github.cnrture.quickprojectwizard.general.NetworkLibrary import com.github.cnrture.quickprojectwizard.gradle.network.getVersions import com.github.cnrture.quickprojectwizard.recipes.composeProjectRecipe -import kotlinx.coroutines.* +import kotlinx.coroutines.runBlocking import java.net.URL import java.util.* diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Dependencies.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Dependencies.kt index 42bc76e..9a9cca5 100644 --- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Dependencies.kt +++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/Dependencies.kt @@ -1,6 +1,8 @@ package com.github.cnrture.quickprojectwizard.gradle -import com.github.cnrture.quickprojectwizard.* +import com.github.cnrture.quickprojectwizard.addLibsDependency +import com.github.cnrture.quickprojectwizard.addLibsPlugin +import com.github.cnrture.quickprojectwizard.addLibsVersion import com.github.cnrture.quickprojectwizard.general.ImageLibrary import com.github.cnrture.quickprojectwizard.general.NetworkLibrary diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/GradleKts.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/GradleKts.kt index 0266e7f..0c27d7e 100644 --- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/GradleKts.kt +++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/gradle/GradleKts.kt @@ -95,21 +95,25 @@ fun getGradleKts( append(" // Coil\n") addGradleImplementation(Library.CoilCompose) } + isCompose && selectedImageLibrary == ImageLibrary.Glide -> { append("\n") append(" // Glide\n") addGradleImplementation(Library.GlideCompose) } + !isCompose && selectedImageLibrary == ImageLibrary.Coil -> { append("\n") append(" // Coil\n") addGradleImplementation(Library.Coil) } + !isCompose && selectedImageLibrary == ImageLibrary.Glide -> { append("\n") append(" // Glide\n") addGradleImplementation(Library.Glide) } + else -> Unit } diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/xmlarch/ui/EmptyActivityLayout.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/xmlarch/ui/EmptyActivityLayout.kt index 234754b..60631bc 100644 --- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/xmlarch/ui/EmptyActivityLayout.kt +++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/xmlarch/ui/EmptyActivityLayout.kt @@ -1,6 +1,6 @@ package com.github.cnrture.quickprojectwizard.xmlarch.ui -fun emptyActivityLayout(isNavigationEnable: Boolean,): String { +fun emptyActivityLayout(isNavigationEnable: Boolean): String { return if (isNavigationEnable) withNavigation() else empty() }