From 03568c33bc479694cfa35980b596a12d5668d5ff Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 2 Jun 2022 22:31:08 -0400
Subject: [PATCH] multisrc: copy generator READMEs first before overrides

---
 .../java/generator/ThemeSourceGenerator.kt    | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
index e45b13c98..f232eeecd 100644
--- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
+++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
@@ -136,25 +136,29 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString
 
                 writeSourceClasses(projectSrcPath, srcOverridePath, source, themePkg, themeClass)
                 copyThemeClasses(userDir, themePkg, projectRootPath)
-                copyThemeReadmes(overridesPath, projectRootPath)
+                copyThemeReadmes(userDir, themePkg, overridesPath, projectRootPath)
                 copyResFiles(resOverridePath, defaultResPath, source, projectRootPath)
             }
         }
 
-        private fun copyThemeReadmes(overridesPath: String, projectRootPath: String) {
+        private fun copyThemeReadmes(userDir: String, themePkg: String, overridesPath: String, projectRootPath: String) {
+            val sourcePath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}"
+
             val destinationPath = "$projectRootPath"
             File(destinationPath).mkdirs()
 
-            File(overridesPath)
-                ?.list()
-                ?.filter { it.endsWith("README.md") || it.endsWith("CHANGELOG.md") }
-                ?.forEach {
-                    Files.copy(
-                        File("$overridesPath/$it").toPath(),
-                        File("$destinationPath/$it").toPath(),
-                        StandardCopyOption.REPLACE_EXISTING
-                    )
-                }
+            listOf(sourcePath, overridesPath).forEach { path ->
+                File(path)
+                    ?.list()
+                    ?.filter { it.endsWith("README.md") || it.endsWith("CHANGELOG.md") }
+                    ?.forEach {
+                        Files.copy(
+                            File("$path/$it").toPath(),
+                            File("$destinationPath/$it").toPath(),
+                            StandardCopyOption.REPLACE_EXISTING
+                        )
+                    }
+            }
         }
 
         private fun copyThemeClasses(userDir: String, themePkg: String, projectRootPath: String) {