From ed85ab83dfde0be40ff3333e661884a88faee7d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caner=20Tu=CC=88re?= <cnrture@gmail.com>
Date: Sat, 14 Sep 2024 23:22:37 +0300
Subject: [PATCH] fix bugs

---
 .../composearch/ui/EmptyActivity.kt           |  4 ++--
 .../general/EmptyManifestXml.kt               | 21 +++++++++++--------
 .../recipes/ComposeProjectRecipe.kt           |  7 ++++++-
 .../recipes/XMLProjectRecipe.kt               |  7 ++++++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/composearch/ui/EmptyActivity.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/composearch/ui/EmptyActivity.kt
index e2cd7c7..42c5725 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/composearch/ui/EmptyActivity.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/composearch/ui/EmptyActivity.kt
@@ -54,7 +54,7 @@ package $packageName.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.navigation.ui.rememberNavController
+import androidx.navigation.compose.rememberNavController
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -92,7 +92,7 @@ package $packageName.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.navigation.ui.rememberNavController
+import androidx.navigation.compose.rememberNavController
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/EmptyManifestXml.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/EmptyManifestXml.kt
index c614e07..3b9d5fd 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/EmptyManifestXml.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/general/EmptyManifestXml.kt
@@ -1,23 +1,26 @@
 package com.github.cnrture.quickprojectwizard.general
 
-fun emptyManifestXml(styleName: String, isHiltEnable: Boolean, dataDiDomainPresentationUiPackages: Boolean): String {
-    return when {
-        isHiltEnable && dataDiDomainPresentationUiPackages -> hilt(
-            styleName
-        )
-
-        else -> withoutHilt(styleName)
+fun emptyManifestXml(
+    styleName: String,
+    isHiltEnable: Boolean,
+    dataDiDomainPresentationUiPackages: Boolean,
+    projectName: String
+): String {
+    return if (isHiltEnable && dataDiDomainPresentationUiPackages) {
+        hilt(styleName, projectName)
+    } else {
+        withoutHilt(styleName)
     }
 }
 
-fun hilt(styleName: String) = """
+fun hilt(styleName: String, projectName: String) = """
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".MainApplication"
+        android:name=".${projectName}Application"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/ComposeProjectRecipe.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/ComposeProjectRecipe.kt
index 2f821a4..120ffda 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/ComposeProjectRecipe.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/ComposeProjectRecipe.kt
@@ -81,7 +81,12 @@ fun RecipeExecutor.composeProjectRecipe(
     val (_, _, _, manifestOut) = moduleData
 
     mergeXml(
-        emptyManifestXml("@style/${moduleData.themesData.main.name}", isHiltEnable, dataDiDomainPresentationUiPackages),
+        emptyManifestXml(
+            "@style/${moduleData.themesData.main.name}",
+            isHiltEnable,
+            dataDiDomainPresentationUiPackages,
+            projectName
+        ),
         manifestOut.resolve("AndroidManifest.xml")
     )
 
diff --git a/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/XMLProjectRecipe.kt b/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/XMLProjectRecipe.kt
index 1444237..1866e92 100644
--- a/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/XMLProjectRecipe.kt
+++ b/src/main/kotlin/com/github/cnrture/quickprojectwizard/recipes/XMLProjectRecipe.kt
@@ -65,7 +65,12 @@ fun RecipeExecutor.xmlProjectRecipe(
     val (_, _, _, manifestOut) = moduleData
 
     mergeXml(
-        emptyManifestXml("@style/${moduleData.themesData.main.name}", isHiltEnable, dataDiDomainPresentationUiPackages),
+        emptyManifestXml(
+            "@style/${moduleData.themesData.main.name}",
+            isHiltEnable,
+            dataDiDomainPresentationUiPackages,
+            projectName
+        ),
         manifestOut.resolve("AndroidManifest.xml")
     )