From 7825db36b9a8e70d1c9420326fb089ee999158e1 Mon Sep 17 00:00:00 2001 From: Mark Philips Date: Wed, 6 Aug 2025 13:22:55 -0600 Subject: [PATCH 1/2] Refactored `cleanup.gradle.kts` to include replacement for postSplashScreenTheme property contained in `splash.xml` --- buildSrc/src/main/kotlin/cleanup.gradle.kts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/cleanup.gradle.kts b/buildSrc/src/main/kotlin/cleanup.gradle.kts index 8305e86..ecc8e29 100644 --- a/buildSrc/src/main/kotlin/cleanup.gradle.kts +++ b/buildSrc/src/main/kotlin/cleanup.gradle.kts @@ -220,7 +220,12 @@ fun changeResourceFiles(name: String) { .filter { it.name == "themes.xml" } .forEach { themesFile -> themesFile.replace( - oldValue = "Theme.ComposeAndroidTemplate", newValue = "Theme.$name" + oldValue = "Theme.ComposeAndroidTemplate", + newValue = "Theme.$name" + ) + themesFile.replace( + oldValue = "@style/Theme.ComposeAndroidTemplate", + newValue = "@style/Theme.$name" ) } @@ -230,7 +235,8 @@ fun changeResourceFiles(name: String) { .filter { it.name == "strings.xml" } .forEach { stringsFile -> stringsFile.replace( - oldValue = "Compose Android Template", newValue = name + oldValue = "Compose Android Template", + newValue = name ) } From a1a5bffd48af9dbf944ee7fc5d24d74f5a294736 Mon Sep 17 00:00:00 2001 From: Mark Philips Date: Wed, 6 Aug 2025 14:10:29 -0600 Subject: [PATCH 2/2] Corrected logic in `cleanup.gradle.kts` for postSplashScreenTheme property replacement for in `splash.xml` --- buildSrc/src/main/kotlin/cleanup.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/cleanup.gradle.kts b/buildSrc/src/main/kotlin/cleanup.gradle.kts index ecc8e29..babbcba 100644 --- a/buildSrc/src/main/kotlin/cleanup.gradle.kts +++ b/buildSrc/src/main/kotlin/cleanup.gradle.kts @@ -223,10 +223,6 @@ fun changeResourceFiles(name: String) { oldValue = "Theme.ComposeAndroidTemplate", newValue = "Theme.$name" ) - themesFile.replace( - oldValue = "@style/Theme.ComposeAndroidTemplate", - newValue = "@style/Theme.$name" - ) } // Update strings.xml file @@ -247,7 +243,11 @@ fun changeResourceFiles(name: String) { .forEach { splashFile -> splashFile.replace( oldValue = "Theme.ComposeAndroidTemplate.Starting", - newValue = "Theme.${name}.Starting" + newValue = "Theme.$name.Starting" + ) + splashFile.replace( + oldValue = "Theme.ComposeAndroidTemplate", + newValue = "Theme.$name" ) } } \ No newline at end of file