diff --git a/NOTICE b/NOTICE index 992e335..c74df87 100644 --- a/NOTICE +++ b/NOTICE @@ -34,6 +34,10 @@ licenses, including but not limited to: separate process, not linked * Firebase SDKs — Apache-2.0 (Google LLC) * OpenTelemetry / dartastic — Apache-2.0 + * IBM Plex Sans (font) — SIL OFL 1.1 (IBM Corp.), bundled in + packages/pinbench_ui/fonts/ + * Outfit (font) — SIL OFL 1.1 (The Outfit Project + Authors), bundled likewise "Arduino" is a trademark of Arduino SA. This project is not affiliated with, endorsed by, or sponsored by Arduino SA. Run `flutter pub deps` or diff --git a/packages/pinbench_ui/fonts/IBMPlexSans-Bold.ttf b/packages/pinbench_ui/fonts/IBMPlexSans-Bold.ttf new file mode 100644 index 0000000..1d66b1a Binary files /dev/null and b/packages/pinbench_ui/fonts/IBMPlexSans-Bold.ttf differ diff --git a/packages/pinbench_ui/fonts/IBMPlexSans-Medium.ttf b/packages/pinbench_ui/fonts/IBMPlexSans-Medium.ttf new file mode 100644 index 0000000..a3826c4 Binary files /dev/null and b/packages/pinbench_ui/fonts/IBMPlexSans-Medium.ttf differ diff --git a/packages/pinbench_ui/fonts/IBMPlexSans-OFL.txt b/packages/pinbench_ui/fonts/IBMPlexSans-OFL.txt new file mode 100644 index 0000000..c35c4c6 --- /dev/null +++ b/packages/pinbench_ui/fonts/IBMPlexSans-OFL.txt @@ -0,0 +1,93 @@ +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/packages/pinbench_ui/fonts/IBMPlexSans-Regular.ttf b/packages/pinbench_ui/fonts/IBMPlexSans-Regular.ttf new file mode 100644 index 0000000..bd6817d Binary files /dev/null and b/packages/pinbench_ui/fonts/IBMPlexSans-Regular.ttf differ diff --git a/packages/pinbench_ui/fonts/IBMPlexSans-SemiBold.ttf b/packages/pinbench_ui/fonts/IBMPlexSans-SemiBold.ttf new file mode 100644 index 0000000..09ec8cd Binary files /dev/null and b/packages/pinbench_ui/fonts/IBMPlexSans-SemiBold.ttf differ diff --git a/packages/pinbench_ui/fonts/Outfit-Bold.ttf b/packages/pinbench_ui/fonts/Outfit-Bold.ttf new file mode 100644 index 0000000..0306824 Binary files /dev/null and b/packages/pinbench_ui/fonts/Outfit-Bold.ttf differ diff --git a/packages/pinbench_ui/fonts/Outfit-Medium.ttf b/packages/pinbench_ui/fonts/Outfit-Medium.ttf new file mode 100644 index 0000000..76a2ae3 Binary files /dev/null and b/packages/pinbench_ui/fonts/Outfit-Medium.ttf differ diff --git a/packages/pinbench_ui/fonts/Outfit-OFL.txt b/packages/pinbench_ui/fonts/Outfit-OFL.txt new file mode 100644 index 0000000..723cd44 --- /dev/null +++ b/packages/pinbench_ui/fonts/Outfit-OFL.txt @@ -0,0 +1,93 @@ +Copyright 2021 The Outfit Project Authors (https://github.com/Outfitio/Outfit-Fonts) + +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: +https://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/packages/pinbench_ui/fonts/Outfit-SemiBold.ttf b/packages/pinbench_ui/fonts/Outfit-SemiBold.ttf new file mode 100644 index 0000000..049908c Binary files /dev/null and b/packages/pinbench_ui/fonts/Outfit-SemiBold.ttf differ diff --git a/packages/pinbench_ui/lib/theme/forui_theme.dart b/packages/pinbench_ui/lib/theme/forui_theme.dart index 0d84327..ee45a72 100644 --- a/packages/pinbench_ui/lib/theme/forui_theme.dart +++ b/packages/pinbench_ui/lib/theme/forui_theme.dart @@ -6,10 +6,11 @@ /// `shared/widgets` should construct or name it. /// /// The base is forui's own Neutral scheme rather than a port of `AppPalette` — -/// the point of adopting the library was its look, so its greys, typography -/// and component shapes are left alone. Only [primary] is overridden, because -/// the teal is the product's identity and not something a library should -/// decide. +/// the point of adopting the library was its look, so its greys, type scale +/// and component shapes are left alone. Two things are the product's identity +/// and not something a library should decide, so they are overridden: the +/// teal ([primary]), and the typefaces, the brand kit's IBM Plex Sans and +/// Outfit (see [fTheme]) in place of forui's Inter. library; import 'package:flutter/widgets.dart'; @@ -89,4 +90,20 @@ FColors _colors(Brightness brightness) => brightness == Brightness.light /// /// `touch: false` because this is a desktop IDE — forui sizes its controls for /// fingers by default, which would make every toolbar in the app taller. -FThemeData fTheme(Brightness brightness) => FThemeData(touch: false, colors: _colors(brightness)); +FThemeData fTheme(Brightness brightness) { + final colors = _colors(brightness); + return FThemeData( + touch: false, + colors: colors, + typography: FTypography( + display: FTypeface.inherit(colors: colors, touch: false, fontFamily: _displayFont), + body: FTypeface.inherit(colors: colors, touch: false, fontFamily: _bodyFont), + ), + ); +} + +/// The brand kit's type, bundled by this package (see its pubspec): IBM Plex +/// Sans for body and UI text, Outfit for display. forui's sizes, weights and +/// line heights are kept; only the faces change. +const _bodyFont = 'packages/pinbench_ui/IBMPlexSans'; +const _displayFont = 'packages/pinbench_ui/Outfit'; diff --git a/packages/pinbench_ui/pubspec.yaml b/packages/pinbench_ui/pubspec.yaml index bf623fe..c9500e9 100644 --- a/packages/pinbench_ui/pubspec.yaml +++ b/packages/pinbench_ui/pubspec.yaml @@ -36,3 +36,28 @@ dev_dependencies: all_lints: ^0.1.2 flutter_test: sdk: flutter + +flutter: + # The brand kit's type: IBM Plex Sans for body and UI text, Outfit for + # display (handbook/brand/README.md). Bundled rather than fetched, so the + # desktop app renders them offline. Both are OFL; the licences sit beside + # the files. Full glyph sets, not Latin-only cuts: the app shows Ω and µ. + fonts: + - family: IBMPlexSans + fonts: + - asset: fonts/IBMPlexSans-Regular.ttf + weight: 400 + - asset: fonts/IBMPlexSans-Medium.ttf + weight: 500 + - asset: fonts/IBMPlexSans-SemiBold.ttf + weight: 600 + - asset: fonts/IBMPlexSans-Bold.ttf + weight: 700 + - family: Outfit + fonts: + - asset: fonts/Outfit-Medium.ttf + weight: 500 + - asset: fonts/Outfit-SemiBold.ttf + weight: 600 + - asset: fonts/Outfit-Bold.ttf + weight: 700