Skip to content

Commit

Permalink
chore: Updates themes and assets from natds-commons
Browse files Browse the repository at this point in the history
  • Loading branch information
hayna-foursys committed May 19, 2023
1 parent e149467 commit 3948957
Show file tree
Hide file tree
Showing 38 changed files with 1,112 additions and 34 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions designsystem/src/main/res/drawable/avon_v2_a_custom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="56dp"
android:viewportWidth="256"
android:viewportHeight="56.76">
<path
android:fillColor="#000"
android:pathData="M88.19 55.36L62.22 1.08h7.06a8.3 8.3 0 0 1 7.52 4.79l14.27 30.4l14.17-30.4a8.3 8.3 0 0 1 7.52-4.79h7.12L93.91 55.36zm-63.8-24.72a50.8 50.8 0 0 1 12.25 4l-7.07-14.9zm34.79 24.72H46.69c-7.95-10.7-16.78-14.39-26.73-15.62l-5.6 10.83a9.01 9.01 0 0 1-7.9 4.77H0L26.64 1.08h5.84zM250.8 1.08a5.71 5.71 0 0 0-5.71 5.72l0.03 28.63l-28.35-34.35h-8.4v54.28h5.2a5.71 5.71 0 0 0 5.72-5.72l-0.03-28.57l23.21 28.25s4.55 6.04 11.2 6.04H256V1.08zm-62.23 27.28a27.6 27.6 0 0 1-8.54 20.12a28.9 28.9 0 0 1-20.36 8.28A28.45 28.45 0 0 1 139.26 8.1a29.73 29.73 0 0 1 40.83 0.02a28.07 28.07 0 0 1 8.49 20.23zm-11.07 0a17.85 17.85 0 1 0-5.24 12.58a17.82 17.82 0 0 0 5.24-12.58z"/>
</vector>
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 8 additions & 1 deletion designsystem/src/main/res/values/colors_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down Expand Up @@ -75,6 +75,13 @@
<color name="ssotb35cd13c8e8a5828bc4a16b9f383629d">#D683B2</color>
<color name="ssot34bf1fdc42f48eeee970f648bf8c7953">#A33C77</color>
<color name="ssot418d56a57829993b5a0738013f447a00">#843161</color>
<color name="ssot237676100691ca84982bf1d88644283c">#E5004B</color>
<color name="ssot936e30b9277dff22beb4673044f69aff">#B3003B</color>
<color name="ssot39137ab8e1e241e736689eae9f0b8bbc">#80002A</color>
<color name="ssotd426646a8ea50fc9c765d0bc691369ed">#FF4482</color>
<color name="ssot7b470948de8dbf389fa35a22a01623ca">#FFA1C1</color>
<color name="ssot1e8ee62e3567170b6516dc5494fd1180">#080800</color>
<color name="ssotcd822a8eddf5ac0e2bc1d5b3352f4415">#080808</color>
<color name="ssotb5e37fe8d8a82c396fe83ad972a307df">#F3EADE</color>
<color name="ssot9227134e2fe50a84a9c99804b11d516d">#CBFFD2</color>
<color name="ssotef72b74b8552f03259b8cb138db04995">#C0B8AC</color>
Expand Down
2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/dimens_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/theme_aesop_dark_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/theme_attributes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/theme_avon_dark_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/theme_avon_light_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
531 changes: 531 additions & 0 deletions designsystem/src/main/res/values/theme_avon_v2_dark_ssot.xml

Large diffs are not rendered by default.

531 changes: 531 additions & 0 deletions designsystem/src/main/res/values/theme_avon_v2_light_ssot.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion designsystem/src/main/res/values/theme_biome_dark_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
14 changes: 7 additions & 7 deletions designsystem/src/main/res/values/theme_natura_dark_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down Expand Up @@ -446,10 +446,10 @@
<item name="assetBrandNeutralBFile">@drawable/natura_b_official_dark</item>
<item name="assetBrandCustomAFile">@drawable/natura_a_custom</item>
<item name="assetBrandCustomBFile">@drawable/natura_b_custom</item>
<item name="assetFontFileDisplay">@font/roboto_regular</item>
<item name="assetFontFileHeadline">@font/roboto_regular</item>
<item name="assetFontFileBodyRegular">@font/roboto_regular</item>
<item name="assetFontFileBodyBold">@font/roboto_medium</item>
<item name="assetFontFileDisplay">@font/helvetica_now_display_bd</item>
<item name="assetFontFileHeadline">@font/helvetica_now_display_md</item>
<item name="assetFontFileBodyRegular">@font/helvetica_now_display_regular</item>
<item name="assetFontFileBodyBold">@font/helvetica_now_display_bd</item>
<item name="alertTitlePrimaryFontWeight">sans-serif-medium</item>
<item name="alertTitleFallbackFontWeight">sans-serif</item>
<item name="alertContentPrimaryFontWeight">sans-serif</item>
Expand Down Expand Up @@ -518,8 +518,8 @@
<item name="overlineFontWeight">sans-serif-medium</item>
<item name="typographyFontWeightRegular">sans-serif</item>
<item name="typographyFontWeightMedium">sans-serif-medium</item>
<item name="typographyDisplayFontWeight">sans-serif-bold</item>
<item name="typographyHeadlineFontWeight">sans-serif-medium</item>
<item name="typographyDisplayFontWeight">sans-serif-black</item>
<item name="typographyHeadlineFontWeight">sans-serif-bold</item>
<item name="typographyBodyRegularFontWeight">sans-serif</item>
<item name="typographyBodyBoldFontWeight">sans-serif-bold</item>
<item name="typographyFallbackFontWeight">sans-serif</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
14 changes: 7 additions & 7 deletions designsystem/src/main/res/values/theme_natura_v2_dark_ssot.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down Expand Up @@ -450,10 +450,10 @@
<item name="assetBrandNeutralBFile">@drawable/natura_b_official_dark</item>
<item name="assetBrandCustomAFile">@drawable/natura_a_custom</item>
<item name="assetBrandCustomBFile">@drawable/natura_b_custom</item>
<item name="assetFontFileDisplay">@font/roboto_regular</item>
<item name="assetFontFileHeadline">@font/roboto_regular</item>
<item name="assetFontFileBodyRegular">@font/roboto_regular</item>
<item name="assetFontFileBodyBold">@font/roboto_medium</item>
<item name="assetFontFileDisplay">@font/helvetica_now_display_bd</item>
<item name="assetFontFileHeadline">@font/helvetica_now_display_md</item>
<item name="assetFontFileBodyRegular">@font/helvetica_now_display_regular</item>
<item name="assetFontFileBodyBold">@font/helvetica_now_display_bd</item>
<item name="alertTitlePrimaryFontWeight">sans-serif-medium</item>
<item name="alertTitleFallbackFontWeight">sans-serif</item>
<item name="alertContentPrimaryFontWeight">sans-serif</item>
Expand Down Expand Up @@ -522,8 +522,8 @@
<item name="overlineFontWeight">sans-serif-medium</item>
<item name="typographyFontWeightRegular">sans-serif</item>
<item name="typographyFontWeightMedium">sans-serif-medium</item>
<item name="typographyDisplayFontWeight">sans-serif-bold</item>
<item name="typographyHeadlineFontWeight">sans-serif-medium</item>
<item name="typographyDisplayFontWeight">sans-serif-black</item>
<item name="typographyHeadlineFontWeight">sans-serif-bold</item>
<item name="typographyBodyRegularFontWeight">sans-serif</item>
<item name="typographyBodyBoldFontWeight">sans-serif-bold</item>
<item name="typographyFallbackFontWeight">sans-serif</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.53.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* https://github.com/natura-cosmeticos/natds-commons/tree/main/packages/natds-themes
*
* Generated by @naturacosmeticos/natds-themes
* v0.49.0
* v0.52.0
* Do not edit this file.
*
* If you have any trouble or a feature request, open an issue:
Expand Down
2 changes: 1 addition & 1 deletion version-theme.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
natds-themes@0.50.0
natds-themes@0.54.0

0 comments on commit 3948957

Please sign in to comment.