diff --git a/LICENSE-3RD-PARTY b/LICENSE-3RD-PARTY new file mode 100644 index 0000000..14d187c --- /dev/null +++ b/LICENSE-3RD-PARTY @@ -0,0 +1,104 @@ +# THIRD PARTY LICENSES + +--- + +## IBM Plex Sans + +Applies to: + +- ibm_plex_sans_light.otf +- ibm_plex_sans_medium.otf +- ibm_plex_sans_regular.otf + +Copyright © Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +--- + +## SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1. Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + +2. Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3. No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + +4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5. The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/components/src/main/res/font/ibm_plex_sans.xml b/components/src/main/res/font/ibm_plex_sans.xml new file mode 100644 index 0000000..7f24c32 --- /dev/null +++ b/components/src/main/res/font/ibm_plex_sans.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/components/src/main/res/font/ibm_plex_sans_light.otf b/components/src/main/res/font/ibm_plex_sans_light.otf new file mode 100644 index 0000000..f1e7fab Binary files /dev/null and b/components/src/main/res/font/ibm_plex_sans_light.otf differ diff --git a/components/src/main/res/font/ibm_plex_sans_medium.otf b/components/src/main/res/font/ibm_plex_sans_medium.otf new file mode 100644 index 0000000..8407613 Binary files /dev/null and b/components/src/main/res/font/ibm_plex_sans_medium.otf differ diff --git a/components/src/main/res/font/ibm_plex_sans_regular.otf b/components/src/main/res/font/ibm_plex_sans_regular.otf new file mode 100644 index 0000000..def9ade Binary files /dev/null and b/components/src/main/res/font/ibm_plex_sans_regular.otf differ diff --git a/components/src/main/res/layout/banner.xml b/components/src/main/res/layout/banner.xml index 9a711e0..97a69f3 100644 --- a/components/src/main/res/layout/banner.xml +++ b/components/src/main/res/layout/banner.xml @@ -40,13 +40,12 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + style="@style/TextAppearance.Zds.LabelLarge" android:textColor="?android:attr/textColorPrimaryInverse" - tools:text="Banner Title" - android:textStyle="bold" - android:textSize="16sp" app:layout_constraintEnd_toStartOf="@id/close" app:layout_constraintStart_toEndOf="@id/image" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + tools:text="Banner Title" /> \ No newline at end of file diff --git a/components/src/main/res/layout/dialog_title.xml b/components/src/main/res/layout/dialog_title.xml index 9954805..8e100fa 100644 --- a/components/src/main/res/layout/dialog_title.xml +++ b/components/src/main/res/layout/dialog_title.xml @@ -25,6 +25,6 @@ android:textColor="?android:attr/textColorPrimaryInverse" android:layout_gravity="center" android:layout_marginTop="8dp" - android:textSize="24sp" + style="@style/TextAppearance.Zds.HeadingSmall" tools:text="Dialog title"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item.xml b/components/src/main/res/layout/dropdown_item.xml index 43263cd..d6519f3 100644 --- a/components/src/main/res/layout/dropdown_item.xml +++ b/components/src/main/res/layout/dropdown_item.xml @@ -12,6 +12,7 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:paddingStart="12dp" + style="@style/TextAppearance.Zds.BodyMedium" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item_checkbox.xml b/components/src/main/res/layout/dropdown_item_checkbox.xml index 2a8e82a..e3aa27d 100644 --- a/components/src/main/res/layout/dropdown_item_checkbox.xml +++ b/components/src/main/res/layout/dropdown_item_checkbox.xml @@ -24,5 +24,6 @@ android:gravity="center_vertical" android:paddingStart="6dp" android:textAppearance="@style/Zds.Dropdown" + style="@style/TextAppearance.Zds.BodyMedium" tools:text="Menu Item"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item_checkbox_condensed.xml b/components/src/main/res/layout/dropdown_item_checkbox_condensed.xml index 08c212e..a299836 100644 --- a/components/src/main/res/layout/dropdown_item_checkbox_condensed.xml +++ b/components/src/main/res/layout/dropdown_item_checkbox_condensed.xml @@ -23,6 +23,7 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:paddingStart="6dp" + style="@style/TextAppearance.Zds.BodyMedium" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item_condensed.xml b/components/src/main/res/layout/dropdown_item_condensed.xml index 68abf03..bd3f7a8 100644 --- a/components/src/main/res/layout/dropdown_item_condensed.xml +++ b/components/src/main/res/layout/dropdown_item_condensed.xml @@ -11,6 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" + style="@style/TextAppearance.Zds.BodyMedium" android:paddingStart="12dp" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> diff --git a/components/src/main/res/layout/dropdown_item_icon.xml b/components/src/main/res/layout/dropdown_item_icon.xml index 64cb453..40dba9f 100644 --- a/components/src/main/res/layout/dropdown_item_icon.xml +++ b/components/src/main/res/layout/dropdown_item_icon.xml @@ -21,6 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" + style="@style/TextAppearance.Zds.BodyMedium" android:paddingStart="6dp" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> diff --git a/components/src/main/res/layout/dropdown_item_icon_condensed.xml b/components/src/main/res/layout/dropdown_item_icon_condensed.xml index 79ea218..068b6d2 100644 --- a/components/src/main/res/layout/dropdown_item_icon_condensed.xml +++ b/components/src/main/res/layout/dropdown_item_icon_condensed.xml @@ -22,6 +22,7 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:paddingStart="6dp" + style="@style/TextAppearance.Zds.BodyMedium" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item_radio.xml b/components/src/main/res/layout/dropdown_item_radio.xml index 2fcb0b7..2a82e37 100644 --- a/components/src/main/res/layout/dropdown_item_radio.xml +++ b/components/src/main/res/layout/dropdown_item_radio.xml @@ -22,6 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" + style="@style/TextAppearance.Zds.BodyMedium" android:textAppearance="@style/Zds.Dropdown" tools:text="Menu Item"/> \ No newline at end of file diff --git a/components/src/main/res/layout/dropdown_item_radio_condensed.xml b/components/src/main/res/layout/dropdown_item_radio_condensed.xml index 0cc3396..636e113 100644 --- a/components/src/main/res/layout/dropdown_item_radio_condensed.xml +++ b/components/src/main/res/layout/dropdown_item_radio_condensed.xml @@ -19,6 +19,7 @@ diff --git a/components/src/main/res/layout/list_item.xml b/components/src/main/res/layout/list_item.xml index bd92985..32fa94d 100644 --- a/components/src/main/res/layout/list_item.xml +++ b/components/src/main/res/layout/list_item.xml @@ -29,21 +29,23 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@id/iconRight"> - + + + \ No newline at end of file + android:textAppearance="@style/TextAppearance.Zds.LabelSmall" /> \ No newline at end of file diff --git a/components/src/main/res/layout/navigation_header.xml b/components/src/main/res/layout/navigation_header.xml index b80e84b..abccedc 100644 --- a/components/src/main/res/layout/navigation_header.xml +++ b/components/src/main/res/layout/navigation_header.xml @@ -1,65 +1,65 @@ + android:paddingStart="16dp" + android:paddingEnd="16dp"> + tools:srcCompat="@drawable/ic_round_warning" + tools:tint="@color/zebra_control_inverse" /> + tools:icon="@drawable/ic_round_warning" + tools:iconTint="@color/zebra_control_inverse" /> + app:layout_constraintTop_toTopOf="@id/image" + tools:text="Title" /> + app:layout_constraintTop_toBottomOf="@id/title" + tools:text="Subitle" /> \ No newline at end of file diff --git a/components/src/main/res/layout/select_input.xml b/components/src/main/res/layout/select_input.xml index 61b7f53..b425a2a 100644 --- a/components/src/main/res/layout/select_input.xml +++ b/components/src/main/res/layout/select_input.xml @@ -17,6 +17,7 @@ app:layout_constraintBottom_toTopOf="@id/error_layout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> \ No newline at end of file diff --git a/components/src/main/res/layout/system_banner.xml b/components/src/main/res/layout/system_banner.xml index b4fcce3..ae842f3 100644 --- a/components/src/main/res/layout/system_banner.xml +++ b/components/src/main/res/layout/system_banner.xml @@ -28,8 +28,7 @@ android:layout_marginStart="8dp" android:gravity="center_vertical" android:textColor="?android:attr/textColorPrimaryInverse" - android:textSize="16sp" - android:textStyle="bold" + style="@style/TextAppearance.Zds.LabelLarge" tools:text="Banner Title" /> @@ -42,6 +41,7 @@ android:theme="@style/Zds.IconButton.Basic" app:icon="@drawable/ic_arrow_forward" app:iconPadding="0dp" + app:iconTint="@color/textPrimaryVariant" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/components/src/main/res/layout/text_input.xml b/components/src/main/res/layout/text_input.xml index bbfde61..4d7cb13 100644 --- a/components/src/main/res/layout/text_input.xml +++ b/components/src/main/res/layout/text_input.xml @@ -1,47 +1,47 @@ - + android:layout_height="wrap_content"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/textLabel"> + android:layout_height="wrap_content" + style="@style/TextAppearance.Zds.BodyMedium" + android:textColorHint="@color/zebra_hint" /> @@ -49,12 +49,12 @@ android:id="@+id/error_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@id/connectLeftLayout" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" android:layout_marginTop="4dp" - android:orientation="horizontal"> + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/connectLeftLayout"> \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-buttons.xml b/components/src/main/res/values-night/styles-buttons.xml index 2996214..9f4f6de 100644 --- a/components/src/main/res/values-night/styles-buttons.xml +++ b/components/src/main/res/values-night/styles-buttons.xml @@ -1,5 +1,6 @@ + @@ -75,6 +84,8 @@ 4dp false 16sp + 24sp + @font/ibm_plex_sans_medium 18dp diff --git a/components/src/main/res/values-night/themes.xml b/components/src/main/res/values-night/themes.xml index 93e0801..703c8b2 100644 --- a/components/src/main/res/values-night/themes.xml +++ b/components/src/main/res/values-night/themes.xml @@ -24,5 +24,23 @@ false @style/Zds.Snackbar @style/Zds.Snackbar.SnackbarButton + @style/TextAppearance.Zds.BodyMedium + @font/ibm_plex_sans + @font/ibm_plex_sans + @style/TextAppearance.Zds.DisplayLarge + @style/TextAppearance.Zds.DisplayMedium + @style/TextAppearance.Zds.DisplaySmall + @style/TextAppearance.Zds.HeadingLarge + @style/TextAppearance.Zds.HeadingMedium + @style/TextAppearance.Zds.HeadingSmall + @style/TextAppearance.Zds.TitleLarge + @style/TextAppearance.Zds.TitleMedium + @style/TextAppearance.Zds.TitleSmall + @style/TextAppearance.Zds.BodyLarge + @style/TextAppearance.Zds.BodyMedium + @style/TextAppearance.Zds.BodySmall + @style/TextAppearance.Zds.LabelLarge + @style/TextAppearance.Zds.LabelMedium + @style/TextAppearance.Zds.LabelSmall \ No newline at end of file diff --git a/components/src/main/res/values/dimens.xml b/components/src/main/res/values/dimens.xml index 51d98af..eeda2fc 100644 --- a/components/src/main/res/values/dimens.xml +++ b/components/src/main/res/values/dimens.xml @@ -3,7 +3,43 @@ 50% 30% 64dp - 24dp 4dp + + + 52sp + 44sp + 36sp + 32sp + 28sp + 24sp + 20sp + 16sp + 12sp + 20sp + 16sp + 14sp + 12sp + 16sp + 14sp + 12sp + 12sp + + 60sp + 52sp + 40sp + 36sp + 28sp + 24sp + 20sp + 20sp + 16sp + 24sp + 24sp + 18sp + 16sp + 24sp + 20sp + 16sp + 14sp \ No newline at end of file diff --git a/components/src/main/res/values/styles-buttons.xml b/components/src/main/res/values/styles-buttons.xml index c7f564a..cc42b21 100644 --- a/components/src/main/res/values/styles-buttons.xml +++ b/components/src/main/res/values/styles-buttons.xml @@ -9,8 +9,10 @@ @color/textPrimary 4dp false - 16sp 18dp + 16sp + 24sp + @font/ibm_plex_sans_medium @@ -72,6 +80,8 @@ 4dp false 16sp + 24sp + @font/ibm_plex_sans_medium 18dp diff --git a/components/src/main/res/values/styles-checkbox.xml b/components/src/main/res/values/styles-checkbox.xml index 5e79b71..2f9b76d 100644 --- a/components/src/main/res/values/styles-checkbox.xml +++ b/components/src/main/res/values/styles-checkbox.xml @@ -8,6 +8,7 @@ @color/zebra_grey_track_disabled @color/zebra_hint 14sp + @font/ibm_plex_sans_regular \ No newline at end of file diff --git a/components/src/main/res/values/styles-toolbar.xml b/components/src/main/res/values/styles-toolbar.xml index 3488c24..58b7ed6 100644 --- a/components/src/main/res/values/styles-toolbar.xml +++ b/components/src/main/res/values/styles-toolbar.xml @@ -1,5 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/components/src/main/res/values/themes.xml b/components/src/main/res/values/themes.xml index 6f6f979..6bb73f4 100644 --- a/components/src/main/res/values/themes.xml +++ b/components/src/main/res/values/themes.xml @@ -1,5 +1,6 @@ + \ No newline at end of file