Skip to content

Commit 8035e5a

Browse files
committed
Add bundled Plus Jakarta Sans font and update test configuration
- Introduced Plus Jakarta Sans font files to the project, ensuring they are loaded from assets for offline use. - Updated README.md to document the font usage and regeneration instructions. - Configured the test setup to prevent network fetching of fonts during tests, ensuring deterministic test results.
1 parent 70d0ebb commit 8035e5a

18 files changed

Lines changed: 184 additions & 18 deletions

mobile/assets/google_fonts/OFL.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2020 The Plus Jakarta Sans Project Authors (https://github.com/tokotype/PlusJakartaSans)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.
94.2 KB
Binary file not shown.
94.2 KB
Binary file not shown.
94.2 KB
Binary file not shown.
94.3 KB
Binary file not shown.
94.3 KB
Binary file not shown.
94.3 KB
Binary file not shown.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Bundled Plus Jakarta Sans (✅ in place)
2+
3+
The app uses **Plus Jakarta Sans** as its base typeface via `google_fonts`. The
4+
static weights are bundled here so the font loads from assets — **never over the
5+
network** — which matters for an offline-first app and keeps tests deterministic.
6+
7+
`lib/main.dart` sets `GoogleFonts.config.allowRuntimeFetching = false`, and
8+
`test/flutter_test_config.dart` does the same for tests, so a missing weight
9+
fails loudly instead of silently downloading.
10+
11+
## Files present
12+
13+
Generated from the official open-source variable font
14+
(`google/fonts``ofl/plusjakartasans`) via `fonttools` instancer, named to
15+
match what `google_fonts` looks up by filename:
16+
17+
- `PlusJakartaSans-Regular.ttf` (w400)
18+
- `PlusJakartaSans-Medium.ttf` (w500)
19+
- `PlusJakartaSans-SemiBold.ttf` (w600)
20+
- `PlusJakartaSans-Bold.ttf` (w700)
21+
- `PlusJakartaSans-ExtraBold.ttf` (w800)
22+
- `PlusJakartaSans-Black.ttf` (w900 → pinned to 800, the family's max)
23+
- `OFL.txt` (SIL Open Font License — required)
24+
25+
## Regenerating (if ever needed)
26+
27+
```bash
28+
curl -sSL -o VF.ttf "https://raw.githubusercontent.com/google/fonts/main/ofl/plusjakartasans/PlusJakartaSans%5Bwght%5D.ttf"
29+
python -m pip install fonttools
30+
# then instance wght=400/500/600/700/800 with fontTools.varLib.instancer
31+
```

mobile/lib/features/sales/presentation/sales_screen.dart

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ class _SalesScreenState extends ConsumerState<SalesScreen> {
6969
@override
7070
Widget build(BuildContext context) {
7171
final cart = ref.watch(salesCartProvider);
72+
// Size the hero to its content (status-bar inset + title + top-seller banner)
73+
// plus a small gap, instead of a fixed height. This keeps the space between
74+
// the top-seller card and the bottom of the green header tight and
75+
// consistent across devices, instead of a large variable gap.
76+
final topPad = MediaQuery.paddingOf(context).top;
7277
final merchantAsync = ref.watch(merchantContextProvider);
7378
final inventoryAsync = ref.watch(inventoryControllerProvider);
7479
final salesAsync = ref.watch(salesControllerProvider);
@@ -169,7 +174,7 @@ class _SalesScreenState extends ConsumerState<SalesScreen> {
169174
NestedScrollView(
170175
headerSliverBuilder: (context, innerBoxIsScrolled) => [
171176
SliverAppBar(
172-
expandedHeight: 218,
177+
expandedHeight: topPad + 170,
173178
pinned: true,
174179
backgroundColor: const Color(0xFF041509),
175180
elevation: 0,

mobile/lib/features/settings/presentation/connect_paystack_screen.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,7 @@ class _DisconnectDialogState extends State<_DisconnectDialog> {
997997
color: DashboardMockup.ink)),
998998
const SizedBox(height: 8),
999999
TextField(
1000+
key: const Key('disconnect_confirm_input'),
10001001
controller: _ctrl,
10011002
autofocus: true,
10021003
textCapitalization: TextCapitalization.characters,

0 commit comments

Comments
 (0)