Merge pull request #41 from icerockdev/develop

Alex009 · web-flow · commit dbbdb13358b2 · 2020-02-08T23:17:17.000+07:00
Release 0.8.0
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
   - 0.6.1
   - 0.6.2
   - 0.7.0
+  - 0.8.0
 
 ## Installation
 root build.gradle  
@@ -47,7 +48,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.7.0"
+        classpath "dev.icerock.moko:resources-generator:0.8.0"
     }
 }
 
@@ -64,7 +65,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.7.0")
+    commonMainApi("dev.icerock.moko:resources:0.8.0")
 }
 
 multiplatformResources {
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -11,7 +11,7 @@ object Versions {
 
     const val kotlin = "1.3.61"
 
-    private const val mokoResources = "0.7.0"
+    private const val mokoResources = "0.8.0"
 
     object Plugins {
         const val android = "3.5.2"
diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts
@@ -5,6 +5,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.multiplatform")
+    id("kotlin-android-extensions")
     id("dev.icerock.mobile.multiplatform")
     id("maven-publish")
 }
diff --git a/resources/src/androidMain/kotlin/dev/icerock/moko/resources/FontResource.kt b/resources/src/androidMain/kotlin/dev/icerock/moko/resources/FontResource.kt
@@ -6,13 +6,17 @@ package dev.icerock.moko.resources
 
 import android.content.Context
 import android.graphics.Typeface
+import android.os.Parcelable
 import androidx.annotation.FontRes
 import androidx.core.content.res.ResourcesCompat
+import kotlinx.android.parcel.Parcelize
 
+@Parcelize
 actual class FontResource(
     @FontRes
     private val fontResourceId: Int
-) {
+) : Parcelable {
+
     fun getTypeface(context: Context): Typeface? {
         return ResourcesCompat.getFont(context, fontResourceId)
     }
diff --git a/resources/src/androidMain/kotlin/dev/icerock/moko/resources/ImageResource.kt b/resources/src/androidMain/kotlin/dev/icerock/moko/resources/ImageResource.kt
@@ -4,6 +4,11 @@
 
 package dev.icerock.moko.resources
 
+import android.os.Parcelable
 import androidx.annotation.DrawableRes
+import kotlinx.android.parcel.Parcelize
 
-actual class ImageResource(@DrawableRes val drawableResId: Int)
+@Parcelize
+actual class ImageResource(
+    @DrawableRes val drawableResId: Int
+) : Parcelable
diff --git a/resources/src/androidMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt b/resources/src/androidMain/kotlin/dev/icerock/moko/resources/PluralsResource.kt
@@ -4,6 +4,11 @@
 
 package dev.icerock.moko.resources
 
+import android.os.Parcelable
 import androidx.annotation.PluralsRes
+import kotlinx.android.parcel.Parcelize
 
-actual class PluralsResource(@PluralsRes val resourceId: Int)
+@Parcelize
+actual class PluralsResource(
+    @PluralsRes val resourceId: Int
+) : Parcelable
diff --git a/resources/src/androidMain/kotlin/dev/icerock/moko/resources/StringResource.kt b/resources/src/androidMain/kotlin/dev/icerock/moko/resources/StringResource.kt
@@ -4,6 +4,11 @@
 
 package dev.icerock.moko.resources
 
+import android.os.Parcelable
 import androidx.annotation.StringRes
+import kotlinx.android.parcel.Parcelize
 
-actual class StringResource(@StringRes val resourceId: Int)
+@Parcelize
+actual class StringResource(
+    @StringRes val resourceId: Int
+) : Parcelable
diff --git a/resources/src/androidMain/kotlin/dev/icerock/moko/resources/desc/StringDesc.kt b/resources/src/androidMain/kotlin/dev/icerock/moko/resources/desc/StringDesc.kt
@@ -5,11 +5,19 @@
 package dev.icerock.moko.resources.desc
 
 import android.content.Context
+import android.os.Parcel
+import android.os.Parcelable
 import dev.icerock.moko.resources.PluralsResource
 import dev.icerock.moko.resources.StringResource
+import kotlinx.android.parcel.Parcelize
 
 actual sealed class StringDesc {
-    actual data class Resource actual constructor(val stringRes: StringResource) : StringDesc() {
+    protected fun processArgs(args: List<Any>, context: Context): Array<out Any> {
+        return args.toList().map { (it as? StringDesc)?.toString(context) ?: it }.toTypedArray()
+    }
+
+    @Parcelize
+    actual data class Resource actual constructor(val stringRes: StringResource) : StringDesc(), Parcelable {
         override fun toString(context: Context): String {
             return context.getString(stringRes.resourceId)
         }
@@ -20,7 +28,9 @@ actual sealed class StringDesc {
         val args: List<Any>
     ) : StringDesc() {
         override fun toString(context: Context): String {
-            return context.getString(stringRes.resourceId, *(args.toTypedArray()))
+            return context.getString(
+                stringRes.resourceId, *processArgs(args, context)
+            )
         }
 
         actual constructor(stringRes: StringResource, vararg args: Any) : this(
@@ -29,8 +39,11 @@ actual sealed class StringDesc {
         )
     }
 
-    actual data class Plural actual constructor(val pluralsRes: PluralsResource, val number: Int) :
-        StringDesc() {
+    @Parcelize
+    actual data class Plural actual constructor(
+        val pluralsRes: PluralsResource,
+        val number: Int
+    ) : StringDesc(), Parcelable {
         override fun toString(context: Context): String {
             return context.resources.getQuantityString(pluralsRes.resourceId, number)
         }
@@ -45,7 +58,7 @@ actual sealed class StringDesc {
             return context.resources.getQuantityString(
                 pluralsRes.resourceId,
                 number,
-                *(args.toTypedArray())
+                *processArgs(args, context)
             )
         }
 
@@ -56,17 +69,21 @@ actual sealed class StringDesc {
         )
     }
 
-    actual data class Raw actual constructor(val string: String) : StringDesc() {
+    @Parcelize
+    actual data class Raw actual constructor(
+        val string: String
+    ) : StringDesc(), Parcelable {
         override fun toString(context: Context): String {
             return string
         }
     }
 
-    actual data class Composition actual constructor(val args: List<StringDesc>, val separator: String?) : StringDesc() {
+    actual data class Composition actual constructor(val args: List<StringDesc>, val separator: String?) :
+        StringDesc() {
         override fun toString(context: Context): String {
             return StringBuilder().apply {
                 args.forEachIndexed { index, stringDesc ->
-                    if(index != 0 && separator != null) {
+                    if (index != 0 && separator != null) {
                         append(separator)
                     }
                     append(stringDesc.toString(context))
diff --git a/resources/src/iosMain/kotlin/dev/icerock/moko/resources/FontResource.kt b/resources/src/iosMain/kotlin/dev/icerock/moko/resources/FontResource.kt
@@ -5,14 +5,9 @@
 package dev.icerock.moko.resources
 
 import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.CValuesRef
-import kotlinx.cinterop.pointed
 import platform.CoreFoundation.CFDataCreate
-import platform.CoreFoundation.CFDataCreateWithBytesNoCopy
-import platform.CoreFoundation.CFDataRef
 import platform.CoreFoundation.kCFAllocatorDefault
 import platform.CoreGraphics.CGDataProviderCreateWithCFData
-import platform.CoreGraphics.CGFloat
 import platform.CoreGraphics.CGFontCreateWithDataProvider
 import platform.CoreGraphics.CGFontRef
 import platform.CoreText.CTFontCreateWithGraphicsFont
@@ -21,22 +16,21 @@ import platform.Foundation.NSBundle
 import platform.Foundation.NSData
 import platform.Foundation.create
 import platform.UIKit.UIFont
-import platform.UIKit.UIFontDescriptor
-import platform.darwin.UInt8
 import platform.darwin.UInt8Var
-import platform.darwin.nil
 import platform.objc.object_getClass
 
 actual class FontResource(fontName: String) {
     private val fontRef: CGFontRef
+
     init {
         val bundle = NSBundle.bundleForClass(object_getClass(this)!!)
         val pathForResourceString = bundle.pathForResource(name = "$fontName.ttf", ofType = null)!!
         val fontData = NSData.create(contentsOfFile = pathForResourceString)!!
         val cfDataRef = CFDataCreate(
             kCFAllocatorDefault,
             fontData.bytes() as CPointer<UInt8Var>,
-            fontData.length.toLong())
+            fontData.length.toLong()
+        )
         val dataProvider = CGDataProviderCreateWithCFData(cfDataRef)
         fontRef = CGFontCreateWithDataProvider(dataProvider)!!
     }
diff --git a/resources/src/iosMain/kotlin/dev/icerock/moko/resources/desc/StringDesc.kt b/resources/src/iosMain/kotlin/dev/icerock/moko/resources/desc/StringDesc.kt
@@ -11,6 +11,10 @@ import platform.Foundation.NSString
 import platform.Foundation.stringWithFormat
 
 actual sealed class StringDesc {
+    protected fun processArgs(args: List<Any>): Array<out Any> {
+        return args.toList().map { (it as? StringDesc)?.localized() ?: it }.toTypedArray()
+    }
+
     actual data class Resource actual constructor(val stringRes: StringResource) : StringDesc() {
         override fun localized(): String {
             return stringRes.bundle.localizedStringForKey(stringRes.resourceId, null, null)
@@ -28,7 +32,7 @@ actual sealed class StringDesc {
 
         override fun localized(): String {
             val string = stringRes.bundle.localizedStringForKey(stringRes.resourceId, null, null)
-            return stringWithFormat(string, args.toTypedArray())
+            return stringWithFormat(string, processArgs(args))
         }
     }
 
@@ -62,7 +66,7 @@ actual sealed class StringDesc {
                 resourceId = pluralsRes.resourceId,
                 number = number
             )!!
-            return stringWithFormat(pluralized, args.toTypedArray())
+            return stringWithFormat(pluralized, processArgs(args))
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ This is a Kotlin MultiPlatform library that provides access to the resources on`
`37`	`37`	`- 0.6.1`
`38`	`38`	`- 0.6.2`
`39`	`39`	`- 0.7.0`
	`40`	`+ - 0.8.0`
`40`	`41`
`41`	`42`	`## Installation`
`42`	`43`	`root build.gradle`
`@@ -47,7 +48,7 @@ buildscript {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`dependencies {`
`50`		`- classpath "dev.icerock.moko:resources-generator:0.7.0"`
	`51`	`+ classpath "dev.icerock.moko:resources-generator:0.8.0"`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`
`@@ -64,7 +65,7 @@ project build.gradle`
`64`	`65`	`apply plugin: "dev.icerock.mobile.multiplatform-resources"`
`65`	`66`
`66`	`67`	`dependencies {`
`67`		`- commonMainApi("dev.icerock.moko:resources:0.7.0")`
	`68`	`+ commonMainApi("dev.icerock.moko:resources:0.8.0")`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`multiplatformResources {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`plugins {`
`6`	`6`	`id("com.android.library")`
`7`	`7`	`id("org.jetbrains.kotlin.multiplatform")`
	`8`	`+ id("kotlin-android-extensions")`
`8`	`9`	`id("dev.icerock.mobile.multiplatform")`
`9`	`10`	`id("maven-publish")`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ import platform.Foundation.NSString`
`11`	`11`	`import platform.Foundation.stringWithFormat`
`12`	`12`
`13`	`13`	`actual sealed class StringDesc {`
	`14`	`+ protected fun processArgs(args: List<Any>): Array<out Any> {`
	`15`	`+ return args.toList().map { (it as? StringDesc)?.localized() ?: it }.toTypedArray()`
	`16`	`+ }`
	`17`	`+`
`14`	`18`	`actual data class Resource actual constructor(val stringRes: StringResource) : StringDesc() {`
`15`	`19`	`override fun localized(): String {`
`16`	`20`	`return stringRes.bundle.localizedStringForKey(stringRes.resourceId, null, null)`
`@@ -28,7 +32,7 @@ actual sealed class StringDesc {`
`28`	`32`
`29`	`33`	`override fun localized(): String {`
`30`	`34`	`val string = stringRes.bundle.localizedStringForKey(stringRes.resourceId, null, null)`
`31`		`- return stringWithFormat(string, args.toTypedArray())`
	`35`	`+ return stringWithFormat(string, processArgs(args))`
`32`	`36`	`}`
`33`	`37`	`}`
`34`	`38`
`@@ -62,7 +66,7 @@ actual sealed class StringDesc {`
`62`	`66`	`resourceId = pluralsRes.resourceId,`
`63`	`67`	`number = number`
`64`	`68`	`)!!`
`65`		`- return stringWithFormat(pluralized, args.toTypedArray())`
	`69`	`+ return stringWithFormat(pluralized, processArgs(args))`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`