-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #306 from natura-cosmeticos/feature/remove-font-he…
…lvetica Feature/remove font helvetica
- Loading branch information
Showing
50 changed files
with
3,117 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+2.51 KB
designsystem/src/main/res/drawable-xhdpi/avon_v2_a_official_dark.webp
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+3.85 KB
designsystem/src/main/res/drawable-xxhdpi/avon_v2_a_official_dark.webp
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+5.36 KB
designsystem/src/main/res/drawable-xxxhdpi/avon_v2_a_official_dark.webp
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
185 changes: 185 additions & 0 deletions
185
designsystem/src/main/res/values-v23/theme_avon_v2_dark.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,185 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
|
||
<resources> | ||
|
||
<style name="Theme.Avon_v2.Dark" parent="Theme.Avon_v2.Dark.SSOT"> | ||
|
||
<!-- { @deprecated Attributes }--> | ||
<item name="buttonDefaultFontSize">@dimen/ssotc2495f0d9de767b82b3bf958745bf316</item> | ||
<item name="buttonDefaultLetterSpacing">@dimen/ssotcbbe59f3826d96d11375dfb0c3469776</item> | ||
<item name="buttonDefaultLineHeight">@dimen/ssot6008647277c4454cecd97d33c069f0ca</item> | ||
<item name="buttonDefaultFontWeight">sans-serif-medium</item> | ||
<item name="badgeLabelPrimaryFontFamily">Roboto</item> | ||
<item name="badgeLabelFallbackFontFamily">Roboto</item> | ||
|
||
<!-- | ||
/*** | ||
* LOCAL ATTRIBUTES (INFOS THAT ARE NOT IN NATDS COMMONS) | ||
* YOU CAN EDIT THOSE FIELDS IF NECESSARY | ||
*/ | ||
--> | ||
|
||
<!-- Definitions based on appcompat colors --> | ||
<item name="colorPrimaryVariant">?colorPrimaryDark</item> | ||
<item name="colorSecondaryVariant">?colorSecondaryDark</item> | ||
<item name="colorAccent">?colorPrimary</item> | ||
<item name="colorControlHighlight">#1F000000</item> | ||
<item name="colorControlNormal">?colorOnBackground</item> | ||
<item name="android:colorBackground">?colorBackground</item> | ||
<item name="colorError">?colorAlert</item> | ||
<item name="colorOnError">?colorOnAlert</item> | ||
|
||
<item name="android:textColorPrimary">?colorOnSurface</item> | ||
<item name="android:textColorPrimaryDisableOnly">@color/lowGrey</item> | ||
<item name="android:textColorSecondary">@color/lowerGrey</item> | ||
<item name="android:textColorHighlight">@color/white</item> | ||
<item name="android:textColorLink">@color/link</item> | ||
|
||
<item name="colorHighEmphasisOpacity06">#51FAFAFA</item> | ||
<item name="colorMediumEmphasisOpacity06">#51BBBBBB</item> | ||
<item name="colorHighlightOpacity05">#3DFFFFFF</item> | ||
<item name="colorHighlightOpacityMediumHigh">#8FFFFFFF</item> | ||
<item name="colorTranparent">#00FFFFFF</item> | ||
|
||
<item name="chipSemiXBorderRadius">@dimen/ssotdee911e3860cd0a0c290215546ecdc43</item> | ||
|
||
<!-- { @deprecated Tokens }--> | ||
<item name="opacity01">@dimen/ds_opacity01</item> | ||
<item name="opacity02">@dimen/ds_opacity02</item> | ||
<item name="opacity03">@dimen/ds_opacity03</item> | ||
<item name="opacity04">@dimen/ds_opacity04</item> | ||
<item name="opacity05">@dimen/ds_opacity05</item> | ||
<item name="opacity06">@dimen/ds_opacity06</item> | ||
<item name="opacity07">@dimen/ds_opacity07</item> | ||
<item name="opacity08">@dimen/ds_opacity08</item> | ||
<item name="opacity09">@dimen/ds_opacity09</item> | ||
<item name="opacity10">@dimen/ds_opacity10</item> | ||
<item name="opacityFull">@dimen/ds_opacity_full</item> | ||
|
||
<item name="elevation00">@dimen/ds_elevation00</item> | ||
<item name="elevation01">@dimen/ds_elevation01</item> | ||
<item name="elevation02">@dimen/ds_elevation02</item> | ||
<item name="elevation03">@dimen/ds_elevation03</item> | ||
<item name="elevation04">@dimen/ds_elevation04</item> | ||
<item name="elevation05">@dimen/ds_elevation05</item> | ||
<item name="elevation06">@dimen/ds_elevation06</item> | ||
<item name="elevation07">@dimen/ds_elevation07</item> | ||
<item name="elevation08">@dimen/ds_elevation08</item> | ||
<item name="elevation09">@dimen/ds_elevation09</item> | ||
<item name="elevation10">@dimen/ds_elevation10</item> | ||
|
||
<!--Component styles--> | ||
<item name="textAppearanceHeadline1">@style/Heading1</item> | ||
<item name="textAppearanceHeadline2">@style/Heading2</item> | ||
<item name="textAppearanceHeadline3">@style/Heading3</item> | ||
<item name="textAppearanceHeadline4">@style/Heading4</item> | ||
<item name="textAppearanceHeadline5">@style/Heading5</item> | ||
<item name="textAppearanceHeadline6">@style/Heading6</item> | ||
<item name="textAppearanceSubtitle1">@style/Subtitle1</item> | ||
<item name="textAppearanceSubtitle2">@style/Subtitle2</item> | ||
<item name="textAppearanceBody1">@style/Body1</item> | ||
<item name="textAppearanceBody2">@style/Body2</item> | ||
<item name="textAppearanceButton">@style/Button</item> | ||
<item name="textAppearanceCaption">@style/Caption</item> | ||
<item name="textAppearanceOverline">@style/Overline</item> | ||
|
||
<item name="navigationViewStyle">@style/Widget.Natura.NavigationView</item> | ||
<item name="searchViewStyle">@style/Widget.Natura.SearchView</item> | ||
<item name="android:windowLightStatusBar">true</item> | ||
<item name="android:statusBarColor">?colorSurface</item> | ||
|
||
<item name="checkboxStyle">@style/Widget.DS.CheckBox.V23</item> | ||
<item name="checkboxStyleSecondary">@style/Widget.DS.CheckBox.Secondary.V23</item> | ||
<item name="radioButtonStyle">@style/Widget.DS.RadioButton.V23</item> | ||
<item name="radioButtonStyleSecondary">@style/Widget.DS.RadioButton.Secondary.V23</item> | ||
|
||
<item name="buttonStyle">@style/Widget.DS.Button.V23</item> | ||
<item name="materialButtonStyle">@style/Widget.DS.Button.V23</item> | ||
<item name="outlinedButton">@style/Widget.DS.Button.Outlined.V23</item> | ||
<item name="textButton">@style/Widget.DS.Button.TextButton.V23</item> | ||
|
||
<item name="buttonStyleSmall">@style/Widget.DS.ButtonSmall.V23</item> | ||
<item name="materialButtonStyleSmall">@style/Widget.DS.ButtonSmall.V23</item> | ||
<item name="outlinedButtonSmall">@style/Widget.DS.ButtonSmall.Outlined.V23</item> | ||
<item name="textButtonSmall">@style/Widget.DS.ButtonSmall.TextButton.V23</item> | ||
|
||
<item name="buttonStyleMedium">@style/Widget.DS.Button.V23</item> | ||
<item name="materialButtonStyleMedium">@style/Widget.DS.Button.V23</item> | ||
<item name="outlinedButtonMedium">@style/Widget.DS.Button.Outlined.V23</item> | ||
<item name="textButtonMedium">@style/Widget.DS.Button.TextButton.V23</item> | ||
|
||
<item name="buttonStyleLarge">@style/Widget.DS.ButtonLarge.V23</item> | ||
<item name="materialButtonStyleLarge">@style/Widget.DS.ButtonLarge.V23</item> | ||
<item name="outlinedButtonLarge">@style/Widget.DS.ButtonLarge.Outlined.V23</item> | ||
<item name="textButtonLarge">@style/Widget.DS.ButtonLarge.TextButton.V23</item> | ||
|
||
<item name="dialogStandardTheme">@style/Theme.DS.Dialog.Standard</item> | ||
<item name="dialogAlertTheme">@style/Theme.DS.Dialog.Alert</item> | ||
<item name="dialogWithContainedButtons">@style/Theme.DS.Dialog.ContainedButtons</item> | ||
<item name="dialogWithTextButtons">@style/Theme.DS.Dialog.TextButtons</item> | ||
<item name="dialogWithOutlinedButtons">@style/Theme.DS.Dialog.OutlinedButtons</item> | ||
<item name="dialogTitleAppearance">@style/Theme.DS.Dialog.Title</item> | ||
<item name="dialogBodyAppearance">@style/Theme.DS.Dialog.Body</item> | ||
|
||
<item name="iconButtonPrimary">@style/Widget.DS.IconButton.Primary</item> | ||
<item name="iconButtonDefault">@style/Widget.DS.IconButton.Default</item> | ||
<item name="iconButtonLight">@style/Widget.DS.IconButton.Light</item> | ||
|
||
<item name="iconButtonSizeSemi">@style/Widget.DS.IconButton.Semi</item> | ||
<item name="iconButtonSizeSemiX">@style/Widget.DS.IconButton.SemiX</item> | ||
<item name="iconButtonSizeMedium">@style/Widget.DS.IconButton.Medium</item> | ||
|
||
<item name="iconButtonFloatingEnabled">@style/Widget.DS.IconButton.Floating.Enabled</item> | ||
<item name="iconButtonOverlayEnabled">@style/Widget.DS.IconButton.Overlay.Enabled</item> | ||
|
||
<item name="iconButtonFloatingDisabled">@style/Widget.DS.IconButton.Floating.Disabled</item> | ||
<item name="iconButtonOverlayDisabled">@style/Widget.DS.IconButton.Overlay.Disabled</item> | ||
|
||
<item name="toolbarStyle">@style/Widget.DS.AppBarTop</item> | ||
<item name="toolbarHeight">@dimen/ds_toolbar_height</item> | ||
<item name="toolbarDefaultTheme">@style/Theme.DS.Toolbar</item> | ||
|
||
<item name="shortcutOutlinedPrimary">@style/Widget.DS.Shortcut.Outlined.Primary</item> | ||
<item name="shortcutOutlinedNeutral">@style/Widget.DS.Shortcut.Outlined.Neutral</item> | ||
<item name="shortcutOutlinedDisabled">@style/Widget.DS.Shortcut.Outlined.Disabled</item> | ||
<item name="shortcutContainedPrimary">@style/Widget.DS.Shortcut.Contained.Primary</item> | ||
<item name="shortcutContainedNeutral">@style/Widget.DS.Shortcut.Contained.Neutral</item> | ||
<item name="shortcutContainedDisabled">@style/Widget.DS.Shortcut.Contained.Disabled</item> | ||
|
||
<item name="tagPrimary">@style/Widget.DS.Tag.Primary</item> | ||
<item name="tagAlert">@style/Widget.DS.Tag.Alert</item> | ||
<item name="tagSecondary">@style/Widget.DS.Tag.Secondary</item> | ||
<item name="tagSuccess">@style/Widget.DS.Tag.Success</item> | ||
<item name="tagWarning">@style/Widget.DS.Tag.Warning</item> | ||
<item name="tagLink">@style/Widget.DS.Tag.Link</item> | ||
<item name="tagSizeSmall">@style/Widget.DS.Tag.Small</item> | ||
<item name="tagSizeStandard">@style/Widget.DS.Tag.Standard</item> | ||
|
||
<item name="logoVertical">@drawable/default_icon_outlined_action_cancel</item> | ||
<item name="logoHorizontal">@drawable/avon_horizontal_dark</item> | ||
|
||
<item name="card">@style/Widget.DS.Card</item> | ||
|
||
<item name="dividerFullbleed">@style/Widget.DS.Divider.Fullbleed</item> | ||
<item name="dividerInset">@style/Widget.DS.Divider.Inset</item> | ||
<item name="dividerMiddle">@style/Widget.DS.Divider.Middle</item> | ||
|
||
<item name="progressIndicatorStandard">@style/Widget.DS.ProgressIndicator.Standard</item> | ||
<item name="progressIndicatorSemi">@style/Widget.DS.ProgressIndicator.Semi</item> | ||
<item name="progressIndicatorMedium">@style/Widget.DS.ProgressIndicator.Medium</item> | ||
<item name="progressIndicatorLarge">@style/Widget.DS.ProgressIndicator.Large</item> | ||
|
||
<item name="avatarStandard">@style/Widget.DS.Avatar.Standard</item> | ||
<item name="avatarSemi">@style/Widget.DS.Avatar.Semi</item> | ||
<item name="avatarSemix">@style/Widget.DS.Avatar.Semix</item> | ||
<item name="avatarMedium">@style/Widget.DS.Avatar.Medium</item> | ||
<item name="avatarLargexxx">@style/Widget.DS.Avatar.Largexxx</item> | ||
|
||
<item name="checkboxPrimary">@style/Widget.DS.CheckBox.Primary.V23</item> | ||
</style> | ||
|
||
<style name="Theme.Avon_v2.Dark.NoActionBar" parent="Theme.Avon_v2.Dark.SSOT"> | ||
<item name="windowActionBar">false</item> | ||
<item name="windowNoTitle">true</item> | ||
</style> | ||
</resources> |
Oops, something went wrong.