diff --git a/docs/store/feature_graphic.png b/docs/store/feature_graphic.png index f769c84..b8902a1 100644 Binary files a/docs/store/feature_graphic.png and b/docs/store/feature_graphic.png differ diff --git a/lib/ui/branding/feature_graphic_painter.dart b/lib/ui/branding/feature_graphic_painter.dart index 630d33f..f90cc22 100644 --- a/lib/ui/branding/feature_graphic_painter.dart +++ b/lib/ui/branding/feature_graphic_painter.dart @@ -17,20 +17,26 @@ class FeatureGraphic { AppIconMark.paintBlocks(canvas, blockArea, groupFraction: 0.92); canvas.restore(); - void text(String s, double dy, double fontSize, FontWeight w, Color c) { + // Text column begins just right of the blocks; kept within the 1024 width. + final textLeft = size.height * 0.94; + void text(String s, double dy, double fontSize, Color c) { final tp = TextPainter( text: TextSpan( text: s, style: TextStyle( - color: c, fontSize: fontSize, fontWeight: w, letterSpacing: 0.5), + color: c, + fontSize: fontSize, + fontFamily: 'TitanOne', + letterSpacing: 0.5, + ), ), textDirection: TextDirection.ltr, - )..layout(); - tp.paint(canvas, Offset(size.height * 1.02, dy)); + )..layout(maxWidth: size.width - textLeft - size.height * 0.06); + tp.paint(canvas, Offset(textLeft, dy)); } - text('Block Seasons', size.height * 0.34, 76, FontWeight.w900, Colors.white); - text('A new season of blocks every few weeks.', size.height * 0.50, 30, - FontWeight.w500, const Color(0xFFB9C4E6)); + text('Block Seasons', size.height * 0.33, 56, Colors.white); + text('A new season of blocks,\nevery few weeks.', size.height * 0.56, 22, + const Color(0xFFB9C4E6)); } } diff --git a/test/tool/generate_brand_assets_test.dart b/test/tool/generate_brand_assets_test.dart index 45d7fba..75cf07b 100644 --- a/test/tool/generate_brand_assets_test.dart +++ b/test/tool/generate_brand_assets_test.dart @@ -4,6 +4,7 @@ import 'dart:ui'; import 'package:block_seasons/ui/branding/app_icon_painter.dart'; import 'package:block_seasons/ui/branding/feature_graphic_painter.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; Future _writePng(String path, int size, void Function(Canvas) draw) async { @@ -45,6 +46,14 @@ void main() { testWidgets('generate feature graphic', (tester) async { await tester.runAsync(() async { + // Load the real display font (OFL Titan One) so the wordmark renders as + // glyphs — the flutter_test default font draws every char as a box. + final fontBytes = + File('tool/fonts/TitanOne-Regular.ttf').readAsBytesSync(); + final loader = FontLoader('TitanOne') + ..addFont(Future.value(ByteData.view(fontBytes.buffer))); + await loader.load(); + const w = 1024, h = 500; final recorder = PictureRecorder(); final canvas = Canvas(recorder); diff --git a/tool/fonts/OFL.txt b/tool/fonts/OFL.txt new file mode 100644 index 0000000..4885975 --- /dev/null +++ b/tool/fonts/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), +with Reserved Font Name Titan. + +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/tool/fonts/TitanOne-Regular.ttf b/tool/fonts/TitanOne-Regular.ttf new file mode 100644 index 0000000..aabd6ed Binary files /dev/null and b/tool/fonts/TitanOne-Regular.ttf differ