Improved code to get namespace using ksp when possible.

vsnappy1 · Nov 8, 2024 · e358164 · e358164
1 parent a7870f7
commit e358164
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # ResourceManager
 ResourceManager is an Android plugin that simplifies accessing Android resources (strings, colors, drawables, etc.) in both Android and non-Android components (e.g., ViewModel) using generated code. It supports both Kotlin and Java projects.
 
-[![Maven Central](https://img.shields.io/maven-central/v/dev.randos/resourcemanager-runtime.svg)](https://central.sonatype.com/artifact/dev.randos/resourcemanager-runtime)
+[![Maven Central](https://img.shields.io/maven-central/v/dev.randos/resourcemanager-compiler.svg)](https://central.sonatype.com/artifact/dev.randos/resourcemanager-compiler)
 ![Platform Support](https://img.shields.io/badge/platform-Android-brightgreen.svg)
 
 ## Setup
@@ -57,14 +57,6 @@ class MyApplication: Application() {
     }
 }
 ```
-__Note:__ 
-If your `Application` class is located in the root package (e.g., `com.example.yourapp`), you don’t need to specify a namespace. However, if your Application class is in a sub-package (e.g., `com.example.yourapp.app`), you must specify the namespace in the annotation to correctly reference the resources.
-```kotlin
-@InstallResourceManager(namespace = "com.example.yourapp")  // Specify the namespace if Application is in a sub-package
-    class MyApplication: Application() {
-        ...
-}
-```
 
 ## Usage
 Here’s an example of how to use ResourceManager in a ViewModel
@@ -88,4 +80,12 @@ To ensure that ResourceManager works correctly with __*ProGuard*__ or __*R8*__,
     public void initialize(android.app.Application);
 }
 ```
+__Note:__
+If your namespace (i.e., `com.example.yourapp`) is different than module package structure (e.g., `com/example/yourapp2/app`), then you must specify the namespace in the annotation to correctly reference the resources. (i.e., `com.example.yourapp.R`)
+```kotlin
+@InstallResourceManager(namespace = "com.example.yourapp")
+    class MyApplication: Application() {
+        ...
+}
+```
 
diff --git a/resourcemanager-compiler/build.gradle.kts b/resourcemanager-compiler/build.gradle.kts
@@ -129,10 +129,7 @@ publishing {
             from(components["java"])
             groupId = "dev.randos"
             artifactId = "resourcemanager-compiler"
-            version = "0.0.2"
-
-            val bundle = file("${publishBundleRepo.absolutePath}/$artifactId-$version.zip")
-            artifact(bundle)
+            version = "0.0.3"
 
             pom {
                 name = "${groupId}:${artifactId}"

diff --git a/...r/src/main/java/dev/randos/resourcemanager/compiler/ResourceManagerAnnotationProcessor.kt b/...r/src/main/java/dev/randos/resourcemanager/compiler/ResourceManagerAnnotationProcessor.kt
@@ -29,6 +29,9 @@ internal class ResourceManagerAnnotationProcessor(
 
         val unprocessedSymbols = mutableListOf<KSAnnotated>()
 
+        // Get the namespace
+        val namespace = resolver.getAllFiles().firstOrNull()?.packageName?.asString()
+
         for (symbol in symbols) {
             val containingFile = symbol.containingFile ?: continue
             val annotatedFile = File(containingFile.filePath)
@@ -63,8 +66,7 @@ internal class ResourceManagerAnnotationProcessor(
 
                     if (classFile == null) {
                         classFile = ClassFileGenerator.generateClassFile(
-                            packageName = packageName,
-                            namespace = getNameSpace(symbol) ?: packageName,
+                            namespace = getNamespace(symbol) ?: namespace ?: packageName,
                             files = resources
                         )
                     }
@@ -86,7 +88,7 @@ internal class ResourceManagerAnnotationProcessor(
         return unprocessedSymbols
     }
 
-    private fun getNameSpace(it: KSClassDeclaration): String? {
+    private fun getNamespace(it: KSClassDeclaration): String? {
         val namespaceAnnotation =
             it.annotations.firstOrNull { annotation -> annotation.annotationType.resolve().declaration.qualifiedName?.asString() == InstallResourceManager::class.java.name }
         val namespace = namespaceAnnotation?.arguments?.firstOrNull()?.value as? String

diff --git a/...r/src/main/java/dev/randos/resourcemanager/compiler/file/generation/ClassFileGenerator.kt b/...r/src/main/java/dev/randos/resourcemanager/compiler/file/generation/ClassFileGenerator.kt
@@ -12,12 +12,11 @@ internal class ClassFileGenerator {
 
     companion object {
         fun generateClassFile(
-            packageName: String,
             namespace: String,
             files: List<Resource>
         ): String {
             return StringBuilder().apply {
-                appendLine("package $packageName\n")
+                appendLine("package $namespace\n")
                 appendLine("import android.app.Application")
                 appendLine("import android.graphics.drawable.Drawable")
                 appendLine("import android.content.res.Resources.Theme")

diff --git a/resourcemanager-runtime/build.gradle.kts b/resourcemanager-runtime/build.gradle.kts
@@ -107,10 +107,7 @@ publishing {
         register<MavenPublication>("java") {
             groupId = "dev.randos"
             artifactId = "resourcemanager-runtime"
-            version = "0.0.2"
-
-            val bundle = file("${publishBundleRepo.absolutePath}/$artifactId-$version.zip")
-            artifact(bundle)
+            version = "0.0.3"
 
             pom {
                 name = "${groupId}:${artifactId}"