diff --git a/CHANGELOG.md b/CHANGELOG.md index 009f0f62..2ad29045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 2.12.2 +- Fix: Display proper size recommendation text + ### 2.12.1 - Fix: Memory leak with Virtusize composables - Fix: Shadow is clipped in compose version of VirtusizeInPageStandard diff --git a/README-COMPOSE.md b/README-COMPOSE.md index 1ce85cde..31ba53a4 100644 --- a/README-COMPOSE.md +++ b/README-COMPOSE.md @@ -74,7 +74,7 @@ In your app `build.gradle` file, add the following dependencies: ```groovy dependencies { - implementation 'com.virtusize.android:virtusize:2.12.1' + implementation 'com.virtusize.android:virtusize:2.12.2' } ``` @@ -82,7 +82,7 @@ In your app `build.gradle` file, add the following dependencies: ```kotlin dependencies { - implementation("com.virtusize.android:virtusize:2.12.1") + implementation("com.virtusize.android:virtusize:2.12.2") } ``` diff --git a/README-JP.md b/README-JP.md index d92bb3e0..c1d1fe0f 100644 --- a/README-JP.md +++ b/README-JP.md @@ -75,7 +75,7 @@ appの`build.gradle`ファイルに下記のdependencyを追加 ```groovy dependencies { - implementation 'com.virtusize.android:virtusize:2.12.1' + implementation 'com.virtusize.android:virtusize:2.12.2' } ``` @@ -83,7 +83,7 @@ appの`build.gradle`ファイルに下記のdependencyを追加 ```kotlin dependencies { - implementation("com.virtusize.android:virtusize:2.12.1") + implementation("com.virtusize.android:virtusize:2.12.2") } ``` diff --git a/README.md b/README.md index b90ee545..804bf669 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ In your app `build.gradle` file, add the following dependencies: ```groovy dependencies { - implementation 'com.virtusize.android:virtusize:2.12.1' + implementation 'com.virtusize.android:virtusize:2.12.2' } ``` @@ -90,7 +90,7 @@ In your app `build.gradle` file, add the following dependencies: ```kotlin dependencies { - implementation("com.virtusize.android:virtusize:2.12.1") + implementation("com.virtusize.android:virtusize:2.12.2") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 6e8abd33..c36fd961 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,8 +22,8 @@ nexusPublishing { repositories { sonatype { // only for users registered in Sonatype after 24 Feb 2021 - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) username = getProperties("OSSRH_USERNAME") password = getProperties("OSSRH_PASSWORD") } diff --git a/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt b/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt index bd6411ed..db2d2432 100644 --- a/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt +++ b/buildSrc/src/main/java/com/virtusize/android/constants/Constants.kt @@ -6,6 +6,6 @@ object Constants { const val TARGET_SDK = 34 // Update versionName when publishing a new release - const val VERSION_NAME = "2.12.1" + const val VERSION_NAME = "2.12.2" const val GROUP_ID = "com.virtusize.android" } diff --git a/buildSrc/src/main/java/com/virtusize/android/extensions/Publications.kt b/buildSrc/src/main/java/com/virtusize/android/extensions/Publications.kt index 3ff88556..eb8f2e13 100644 --- a/buildSrc/src/main/java/com/virtusize/android/extensions/Publications.kt +++ b/buildSrc/src/main/java/com/virtusize/android/extensions/Publications.kt @@ -17,10 +17,11 @@ private fun Project.configureRepositories() { publications { repositories { maven { + name = "ossrh-staging-api" val releasesRepoUrl = - "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/" val snapshotsRepoUrl = - "https://s01.oss.sonatype.org/content/repositories/snapshots/" + "https://central.sonatype.com/repository/maven-snapshots/" url = uri(if (isSnapshot) snapshotsRepoUrl else releasesRepoUrl) credentials { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 31a143d6..e3706749 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ material = "1.12.0" nextPublish = "1.1.0" robolectric = "4.13" truth = "1.4.4" -virtusize = "2.12.1" +virtusize = "2.12.2" virtusizeAuth = "1.1.1" browser = "1.8.0" diff --git a/virtusize-core/src/main/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParams.kt b/virtusize-core/src/main/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParams.kt index 0ee6dbe5..2c1d22d2 100644 --- a/virtusize-core/src/main/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParams.kt +++ b/virtusize-core/src/main/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParams.kt @@ -39,6 +39,9 @@ internal data class BodyProfileRecommendedSizeParams( userBodyProfile.weight.toFloatOrNull()?.let { mapOf(PARAM_USER_WEIGHT to it) } .orEmpty(), ) + .plus( + mapOf(PARAM_USER_AGE to userBodyProfile.age), + ) .plus( mapOf(PARAM_ITEMS to arrayOf(createItemsParams())), ) @@ -98,6 +101,11 @@ internal data class BodyProfileRecommendedSizeParams( .plus( mapOf(PARAM_GENDER to userBodyProfile.gender), ) + .plus( + mapOf( + PARAM_STYLE to (storeProduct.storeProductMeta?.additionalInfo?.style ?: "regular"), + ), + ) } /** @@ -155,6 +163,7 @@ internal data class BodyProfileRecommendedSizeParams( const val PARAM_USER_GENDER = "userGender" const val PARAM_USER_HEIGHT = "userHeight" const val PARAM_USER_WEIGHT = "userWeight" + const val PARAM_USER_AGE = "userAge" const val PARAM_EXTERNAL_PRODUCT_ID = "extProductId" const val PARAM_BRAND = "brand" @@ -162,6 +171,7 @@ internal data class BodyProfileRecommendedSizeParams( const val PARAM_SIZES = "sizes" const val PARAM_MODEL_INFO = "modelInfo" const val PARAM_GENDER = "gender" + const val PARAM_STYLE = "style" const val PARAM_BODY_MEASUREMENT_VALUE = "value" const val PARAM_BODY_MEASUREMENT_PREDICTED = "predicted" diff --git a/virtusize-core/src/test/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParamsTests.kt b/virtusize-core/src/test/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParamsTests.kt index 503bde78..91671efa 100644 --- a/virtusize-core/src/test/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParamsTests.kt +++ b/virtusize-core/src/test/java/com/virtusize/android/data/local/BodyProfileRecommendedSizeParamsTests.kt @@ -30,6 +30,7 @@ internal class BodyProfileRecommendedSizeParamsTests { """ { "fit": "regular", + "style": "fashionable", "sizes": { "38": { "bust": 660, @@ -75,6 +76,7 @@ internal class BodyProfileRecommendedSizeParamsTests { """ { "fit": "regular", + "style": "fashionable", "sizes": {}, "modelInfo": null, "gender": "female", @@ -390,6 +392,7 @@ internal class BodyProfileRecommendedSizeParamsTests { "hip" to 85, "height" to 165, ), + "style" to "fashionable", ), ) } diff --git a/virtusize-core/src/test/java/com/virtusize/android/network/VirtusizeApiTest.kt b/virtusize-core/src/test/java/com/virtusize/android/network/VirtusizeApiTest.kt index 9fa80fea..f06cb2a4 100644 --- a/virtusize-core/src/test/java/com/virtusize/android/network/VirtusizeApiTest.kt +++ b/virtusize-core/src/test/java/com/virtusize/android/network/VirtusizeApiTest.kt @@ -466,6 +466,7 @@ internal class VirtusizeApiTest { "hip" to 85, "height" to 165, ), + "style" to "fashionable", ), ) } diff --git a/virtusize/src/main/res/font/subset_noto_sans_jp_bold.ttf b/virtusize/src/main/res/font/subset_noto_sans_jp_bold.ttf index 04b44ac3..a3fa63f3 100644 Binary files a/virtusize/src/main/res/font/subset_noto_sans_jp_bold.ttf and b/virtusize/src/main/res/font/subset_noto_sans_jp_bold.ttf differ diff --git a/virtusize/src/main/res/font/subset_noto_sans_jp_regular.ttf b/virtusize/src/main/res/font/subset_noto_sans_jp_regular.ttf index edffec93..c4926c27 100644 Binary files a/virtusize/src/main/res/font/subset_noto_sans_jp_regular.ttf and b/virtusize/src/main/res/font/subset_noto_sans_jp_regular.ttf differ diff --git a/virtusize/src/main/res/font/subset_noto_sans_kr_bold.ttf b/virtusize/src/main/res/font/subset_noto_sans_kr_bold.ttf index acb63c6b..b546e80d 100644 Binary files a/virtusize/src/main/res/font/subset_noto_sans_kr_bold.ttf and b/virtusize/src/main/res/font/subset_noto_sans_kr_bold.ttf differ diff --git a/virtusize/src/main/res/font/subset_noto_sans_kr_regular.ttf b/virtusize/src/main/res/font/subset_noto_sans_kr_regular.ttf index e44f1802..8dcc037e 100644 Binary files a/virtusize/src/main/res/font/subset_noto_sans_kr_regular.ttf and b/virtusize/src/main/res/font/subset_noto_sans_kr_regular.ttf differ