Merge pull request #725 from icerockdev/#723-support-android-format-f…

…or-strings-generator

#723 support android format for strings generator

gradle/moko.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.24.0-beta-5"
+resourcesVersion = "0.24.0-beta-6"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/resources/plural/PluralResourceGenerator.kt

@@ -11,6 +11,7 @@ import dev.icerock.gradle.generator.generateKey
 import dev.icerock.gradle.generator.localization.LanguageType
 import dev.icerock.gradle.metadata.resource.PluralMetadata
 import dev.icerock.gradle.utils.processXmlTextContent
+import dev.icerock.gradle.utils.removeAndroidMirroringFormat
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.Node
@@ -79,7 +80,7 @@ internal class PluralResourceGenerator(
                 val item: Node = itemNodes.item(j)
 
                 val quantity: String = item.attributes.getNamedItem("quantity").textContent.trim()
-                val value: String = item.textContent
+                val value: String = item.textContent.removeAndroidMirroringFormat()
 
                 pluralMap[quantity] = value.processXmlTextContent(strictLineBreaks)
             }

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/resources/string/StringResourceGenerator.kt

@@ -11,6 +11,7 @@ import dev.icerock.gradle.generator.generateKey
 import dev.icerock.gradle.generator.localization.LanguageType
 import dev.icerock.gradle.metadata.resource.StringMetadata
 import dev.icerock.gradle.utils.processXmlTextContent
+import dev.icerock.gradle.utils.removeAndroidMirroringFormat
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
@@ -29,7 +30,7 @@ internal class StringResourceGenerator(
             val language: LanguageType = LanguageType.fromFileName(file.parentFile.name)
             val strings: Map<KeyType, String> = loadLanguageStrings(file)
             strings.map { (key: KeyType, text: String) ->
-                key to (language to text)
+                key to (language to text.removeAndroidMirroringFormat())
             }
         }.groupBy(
             keySelector = { it.first },

resources-generator/src/main/kotlin/dev/icerock/gradle/utils/StringExt.kt

@@ -49,13 +49,26 @@ internal fun String.remove(char: String): String {
 internal val String.flatName: String
     get() = this.remove('.')
 
+internal fun String.removeAndroidMirroringFormat(): String {
+    //  Remove android format from string
+    return replace("""\'""", "'")
+        .replace("""\"""", "\"")
+}
+
 internal fun String.convertXmlStringToAndroidLocalization(): String {
     //  Android resources should comply with requirements:
-    //  https://developer.android.com/guide/topics/resources/string-resource
+    //  https://developer.android.com/guide/topics/resources/string-resource#escaping_quotes
     return StringEscapeUtils
         .unescapeXml(this)
         .replace("\n", "\\n")
         .let { StringEscapeUtils.escapeXml11(it) }
+        .let {
+            if (it[0] == '@') {
+                replaceFirst("@", """\@""")
+            } else {
+                it
+            }
+        }
         .replace(""", "\\"")
         .replace("'", "\\'")
 }

resources-generator/src/test/kotlin/dev/icerock/gradle/generator/pluralsGenerator/XmlPluralsToPlatformTest.kt

@@ -23,7 +23,7 @@ class XmlPluralsToPlatformTest {
     fun simplePluralsAndroidTest(){
         assertEquals(
             expected = """%d count of \"%s\"""",
-            actual ="%d count of \"%s\"".convertXmlStringToAndroidLocalization(),
+            actual ="""%d count of "%s"""".convertXmlStringToAndroidLocalization(),
         )
     }
 

resources-generator/src/test/kotlin/dev/icerock/gradle/generator/stringsGenerator/XmlStringsAndroidFormatTest.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle.generator.stringsGenerator
+
+import dev.icerock.gradle.utils.convertXmlStringToAndroidLocalization
+import dev.icerock.gradle.utils.removeAndroidMirroringFormat
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class XmlStringsAndroidFormatTest {
+    @Test
+    fun quotesAndroidFormat() {
+        assertEquals(
+            expected = """Same text with symbol's @ ? somet'ing "word"""",
+            actual = TEXT_WITH_QUOTES.removeAndroidMirroringFormat()
+        )
+    }
+
+    @Test
+    fun quotesAndroidInOutFormat() {
+        assertEquals(
+            expected = """Same text with symbol\'s @ ? somet\'ing \"word\"""",
+            actual = TEXT_WITH_QUOTES
+                .removeAndroidMirroringFormat()
+                .convertXmlStringToAndroidLocalization()
+        )
+    }
+
+    private companion object {
+        private const val TEXT_WITH_QUOTES = """Same text with symbol's @ ? somet\'ing \"word""""
+
+    }
+}

resources-generator/src/test/kotlin/dev/icerock/gradle/generator/stringsGenerator/XmlStringsToPlatformTest.kt

@@ -122,4 +122,12 @@ class XmlStringsToPlatformTest {
             actual = "\uD83D\uDE08".convertXmlStringToLocalization()
         )
     }
+
+    @Test
+    fun stringLikeAndroidLinkOnStringAndroidTest() {
+        assertEquals(
+            expected = """\@same text""",
+            actual = """@same text""".convertXmlStringToAndroidLocalization()
+        )
+    }
 }

samples/compose-resources-gallery/shared/src/commonMain/moko-resources/base/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
     <string name="hello_world">Hello moko-resources World</string>
-    <string name="new_line_test">Text with
+    <string name="new_line_test">@Text with
         newline w/o new line</string>
-    <string name="symbols_text">Text \n with " ' % @ * &amp; {} "same"  inch's</string>
+    <string name="symbols_text">Text \n with " ' % @ * &amp; {} "same\"  inch\'s</string>
     <string name="font_style_text">Text with &lt;b&gt;bold&lt;/b&gt;, &lt;i&gt;italic&lt;/i&gt;, &lt;u&gt;underline&lt;/u&gt;</string>
 </resources>

samples/compose-resources-gallery/shared/src/commonMain/moko-resources/ru/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
     <string name="hello_world">Привет Мир moko-resources</string>
-    <string name="symbols_text">Текст \n с " ' % @ * &amp; {} "сколько-то" дюйм'ов</string>
+    <string name="symbols_text">Текст \n с " ' % @ * &amp; {} "сколько-то\" дюйм\'ов</string>
     <string name="font_style_text">Текст с &lt;b&gt;жирный&lt;/b&gt;, &lt;i&gt;курсив&lt;/i&gt;, &lt;u&gt;подчеркивание&lt;/u&gt;</string>
 </resources>