Merge pull request #34 from icerockdev/develop

Release 0.7.0

Author: Alex009

.github/workflows/ui-tests-android-sample.yml

@@ -0,0 +1,21 @@
+name: Unit tests of Android Sample
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  test:
+    runs-on: macOS-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build and publish local
+        run: ./gradlew -PlibraryPublish :gradle-plugin:publishPluginPublicationToMavenLocal :resources:publishToMavenLocal
+      - name: Sample unit-tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          script: ./gradlew connectedAndroidTest

README.md

@@ -36,6 +36,7 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
   - 0.6.0
   - 0.6.1
   - 0.6.2
+  - 0.7.0
 
 ## Installation
 root build.gradle  
@@ -46,7 +47,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.6.2"
+        classpath "dev.icerock.moko:resources-generator:0.7.0"
     }
 }
 
@@ -63,7 +64,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.6.2")
+    commonMainApi("dev.icerock.moko:resources:0.7.0")
 }
 
 multiplatformResources {
@@ -251,6 +252,23 @@ We got autogenerated `MR.images.home_black_18` `ImageResource` in code, that we
 - Android: `imageView.setImageResource(image.drawableResId)`
 - iOS: `imageView.image = image.toUIImage()`
 
+### Example 7 - pass font
+Fonts resources directory is `commonMain/resources/MR/fonts`.  
+Font name should be this pattern: `<fontFamily>-<fontStyle>` like:
+- `Raleway-Bold.ttf`
+- `Raleway-Regular.ttf`
+- `Raleway-Italic.ttf`
+Supported only `ttf` resources for now.
+
+If we add to `commonMain/resources/MR/images` files:
+- `Raleway-Bold.ttf`
+- `Raleway-Regular.ttf`
+- `Raleway-Italic.ttf`
+
+We got autogenerated `MR.fonts.Raleway.italic`, `MR.fonts.Raleway.regular`, `MR.fonts.Raleway.bold` `FontResource` in code, that we can use:
+- Android: `textView.typeface = font.getTypeface(context = this)`
+- iOS: `textView.font = font.uiFont(withSize: 14.0)`
+
 ## Samples
 Please see more examples in the [sample directory](sample).
 

buildSrc/src/main/kotlin/Deps.kt

@@ -20,6 +20,21 @@ object Deps {
             val appCompat = AndroidLibrary(
                 name = "androidx.appcompat:appcompat:${Versions.Libs.Android.appCompat}"
             )
+
+            object AndroidTest {
+                val espressoCore = AndroidLibrary(
+                    name = "androidx.test.espresso:espresso-core:${Versions.Libs.Android.AndroidTest.espressoCore}"
+                )
+                val testRunner = AndroidLibrary(
+                    name = "androidx.test:runner:${Versions.Libs.Android.AndroidTest.testRunner}"
+                )
+                val testRules = AndroidLibrary(
+                    name = "androidx.test:rules:${Versions.Libs.Android.AndroidTest.testRunner}"
+                )
+                val testExtJunit = AndroidLibrary(
+                    name = "androidx.test.ext:junit:${Versions.Libs.Android.AndroidTest.testExtJunit}"
+                )
+            }
         }
 
         object MultiPlatform {

buildSrc/src/main/kotlin/Versions.kt

@@ -11,7 +11,7 @@ object Versions {
 
     const val kotlin = "1.3.61"
 
-    private const val mokoResources = "0.6.2"
+    private const val mokoResources = "0.7.0"
 
     object Plugins {
         const val android = "3.5.2"
@@ -23,6 +23,12 @@ object Versions {
     object Libs {
         object Android {
             const val appCompat = "1.1.0"
+
+            object AndroidTest {
+                const val espressoCore = "3.2.0"
+                const val testRunner = "1.2.0"
+                const val testExtJunit = "1.1.1"
+            }
         }
 
         object MultiPlatform {

gradle-plugin/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPlugin.kt

@@ -5,19 +5,11 @@
 package dev.icerock.gradle
 
 import com.android.build.gradle.LibraryExtension
-import dev.icerock.gradle.generator.AndroidMRGenerator
-import dev.icerock.gradle.generator.CommonMRGenerator
-import dev.icerock.gradle.generator.IosMRGenerator
-import dev.icerock.gradle.generator.MRGenerator
-import dev.icerock.gradle.generator.image.AndroidImagesGenerator
-import dev.icerock.gradle.generator.image.CommonImagesGenerator
-import dev.icerock.gradle.generator.image.IosImagesGenerator
-import dev.icerock.gradle.generator.plurals.AndroidPluralsGenerator
-import dev.icerock.gradle.generator.plurals.CommonPluralsGenerator
-import dev.icerock.gradle.generator.plurals.IosPluralsGenerator
-import dev.icerock.gradle.generator.strings.AndroidStringsGenerator
-import dev.icerock.gradle.generator.strings.CommonStringsGenerator
-import dev.icerock.gradle.generator.strings.IosStringsGenerator
+import dev.icerock.gradle.generator.*
+import dev.icerock.gradle.generator.fonts.FontsGeneratorFeature
+import dev.icerock.gradle.generator.image.ImagesGeneratorFeature
+import dev.icerock.gradle.generator.plurals.PluralsGeneratorFeature
+import dev.icerock.gradle.generator.strings.StringsGeneratorFeature
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.file.FileTree
@@ -57,16 +49,6 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
                 sourceSets.getByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME)
             val commonResources = commonSourceSet.resources
 
-            val strings = commonResources.matching {
-                include("MR/**/strings.xml")
-            }
-            val plurals = commonResources.matching {
-                include("MR/**/plurals.xml")
-            }
-            val images = commonResources.matching {
-                include("MR/images/**/*.png", "MR/images/**/*.jpg")
-            }
-
             val androidExtension = target.extensions.getByType(LibraryExtension::class)
             val mainAndroidSet = androidExtension.sourceSets.getByName("main")
             val manifestFile = mainAndroidSet.manifest.srcFile
@@ -75,9 +57,7 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
 
             generateMultiplatformResources(
                 project = target,
-                stringsFileTree = strings,
-                pluralsFileTree = plurals,
-                imagesFileTree = images,
+                commonResources = commonResources,
                 sourceSets = sourceSets.filter { it.name.endsWith("Main") },
                 extension = mrExtension,
                 multiplatformExtension = multiplatformExtension,
@@ -99,9 +79,7 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
 
     private fun generateMultiplatformResources(
         project: Project,
-        stringsFileTree: FileTree,
-        pluralsFileTree: FileTree,
-        imagesFileTree: FileTree,
+        commonResources: FileTree,
         sourceSets: List<KotlinSourceSet>,
         extension: MultiplatformResourcesPluginExtension,
         multiplatformExtension: KotlinMultiplatformExtension,
@@ -110,15 +88,23 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
         val generatedDir = File(project.buildDir, "generated/moko")
 
         sourceSets.forEach { sourceSet ->
+            val sourceInfo = SourceInfo(
+                generatedDir,
+                sourceSet,
+                commonResources,
+                extension.multiplatformResourcesPackage!!,
+                androidPackage
+            )
+            val features = listOf(
+                StringsGeneratorFeature(sourceInfo),
+                PluralsGeneratorFeature(sourceInfo),
+                ImagesGeneratorFeature(sourceInfo),
+                FontsGeneratorFeature(sourceInfo)
+            )
             val generator = createGenerator(
                 multiplatformExtension = multiplatformExtension,
-                generatedDir = generatedDir,
-                sourceSet = sourceSet,
-                stringsFileTree = stringsFileTree,
-                pluralsFileTree = pluralsFileTree,
-                imagesFileTree = imagesFileTree,
-                mrClassPackage = extension.multiplatformResourcesPackage!!,
-                androidRClassPackage = androidPackage
+                info = sourceInfo,
+                features = features
             ) ?: return@forEach
 
             generator.apply(project = project)
@@ -127,52 +113,40 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
 
     private fun createGenerator(
         multiplatformExtension: KotlinMultiplatformExtension,
-        generatedDir: File,
-        sourceSet: KotlinSourceSet,
-        stringsFileTree: FileTree,
-        pluralsFileTree: FileTree,
-        imagesFileTree: FileTree,
-        mrClassPackage: String,
-        androidRClassPackage: String
+        info: SourceInfo,
+        features: List<ResourceGeneratorFeature>
     ): MRGenerator? {
-        if (sourceSet.name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) {
-            return createCommonGenerator(
-                generatedDir = generatedDir,
-                sourceSet = sourceSet,
-                stringsFileTree = stringsFileTree,
-                pluralsFileTree = pluralsFileTree,
-                imagesFileTree = imagesFileTree,
-                mrClassPackage = mrClassPackage
+        if (info.sourceSet.name == KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME) {
+            return CommonMRGenerator(
+                info.generatedDir,
+                info.sourceSet,
+                info.mrClassPackage,
+                generators = features.map { it.createCommonGenerator() }
             )
         }
 
         val target = multiplatformExtension.targets.firstOrNull { target ->
             val sourceSets = target.compilations.flatMap { it.kotlinSourceSets }
-            sourceSets.any { it == sourceSet }
+            sourceSets.any { it == info.sourceSet }
         } ?: return null
 
         return when (target) {
             is KotlinAndroidTarget -> {
-                createAndroidGenerator(
-                    generatedDir = generatedDir,
-                    sourceSet = sourceSet,
-                    stringsFileTree = stringsFileTree,
-                    pluralsFileTree = pluralsFileTree,
-                    imagesFileTree = imagesFileTree,
-                    mrClassPackage = mrClassPackage,
-                    androidRClassPackage = androidRClassPackage
+                AndroidMRGenerator(
+                    info.generatedDir,
+                    info.sourceSet,
+                    info.mrClassPackage,
+                    generators = features.map{ it.createAndroidGenerator() }
                 )
             }
             is KotlinNativeTarget -> {
                 val family = target.konanTarget.family
                 if (family == Family.IOS) {
-                    createIosGenerator(
-                        generatedDir = generatedDir,
-                        sourceSet = sourceSet,
-                        stringsFileTree = stringsFileTree,
-                        pluralsFileTree = pluralsFileTree,
-                        imagesFileTree = imagesFileTree,
-                        mrClassPackage = mrClassPackage
+                    IosMRGenerator(
+                        info.generatedDir,
+                        info.sourceSet,
+                        info.mrClassPackage,
+                        generators = features.map{ it.createiOSGenerator() }
                     )
                 } else {
                     println("unsupported native family $family")
@@ -185,95 +159,5 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
             }
         }
     }
-
-    private fun createCommonGenerator(
-        generatedDir: File,
-        sourceSet: KotlinSourceSet,
-        stringsFileTree: FileTree,
-        imagesFileTree: FileTree,
-        pluralsFileTree: FileTree,
-        mrClassPackage: String
-    ): MRGenerator {
-        return CommonMRGenerator(
-            generatedDir = generatedDir,
-            sourceSet = sourceSet,
-            mrClassPackage = mrClassPackage,
-            generators = listOf(
-                CommonStringsGenerator(
-                    sourceSet = sourceSet,
-                    stringsFileTree = stringsFileTree
-                ),
-                CommonPluralsGenerator(
-                    sourceSet = sourceSet,
-                    pluralsFileTree = pluralsFileTree
-                ),
-                CommonImagesGenerator(
-                    sourceSet = sourceSet,
-                    inputFileTree = imagesFileTree
-                )
-            )
-        )
-    }
-
-    private fun createAndroidGenerator(
-        generatedDir: File,
-        sourceSet: KotlinSourceSet,
-        stringsFileTree: FileTree,
-        pluralsFileTree: FileTree,
-        imagesFileTree: FileTree,
-        mrClassPackage: String,
-        androidRClassPackage: String
-    ): MRGenerator {
-        return AndroidMRGenerator(
-            generatedDir = generatedDir,
-            sourceSet = sourceSet,
-            mrClassPackage = mrClassPackage,
-            generators = listOf(
-                AndroidStringsGenerator(
-                    sourceSet = sourceSet,
-                    stringsFileTree = stringsFileTree,
-                    androidRClassPackage = androidRClassPackage
-                ),
-                AndroidPluralsGenerator(
-                    sourceSet = sourceSet,
-                    pluralsFileTree = pluralsFileTree,
-                    androidRClassPackage = androidRClassPackage
-                ),
-                AndroidImagesGenerator(
-                    sourceSet = sourceSet,
-                    inputFileTree = imagesFileTree,
-                    androidRClassPackage = androidRClassPackage
-                )
-            )
-        )
-    }
-
-    private fun createIosGenerator(
-        generatedDir: File,
-        sourceSet: KotlinSourceSet,
-        stringsFileTree: FileTree,
-        pluralsFileTree: FileTree,
-        imagesFileTree: FileTree,
-        mrClassPackage: String
-    ): MRGenerator {
-        return IosMRGenerator(
-            generatedDir = generatedDir,
-            sourceSet = sourceSet,
-            mrClassPackage = mrClassPackage,
-            generators = listOf(
-                IosStringsGenerator(
-                    sourceSet = sourceSet,
-                    stringsFileTree = stringsFileTree
-                ),
-                IosPluralsGenerator(
-                    sourceSet = sourceSet,
-                    pluralsFileTree = pluralsFileTree
-                ),
-                IosImagesGenerator(
-                    sourceSet = sourceSet,
-                    inputFileTree = imagesFileTree
-                )
-            )
-        )
-    }
 }
+