Skip to content

Commit 5ce3922

Browse files
committed
refactor: update text styles to use Google Fonts for improved typography consistency
1 parent a94497f commit 5ce3922

3 files changed

Lines changed: 254 additions & 253 deletions

File tree

mobile/lib/features/auth/presentation/auth_shell_screen.dart

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import 'package:flutter/services.dart';
33
import 'package:flutter_riverpod/flutter_riverpod.dart';
44
import 'package:go_router/go_router.dart';
55

6+
import 'package:google_fonts/google_fonts.dart';
7+
68
import '../../../app/router.dart';
79
import '../../../app/theme/app_theme.dart';
810
import '../../../shared/providers/core_providers.dart';
@@ -268,9 +270,9 @@ class _EntryViewMockup extends StatelessWidget {
268270
child: Column(
269271
crossAxisAlignment: CrossAxisAlignment.start,
270272
children: [
271-
const Text(
273+
Text(
272274
'Your business,\nsimplified.',
273-
style: TextStyle(
275+
style: GoogleFonts.plusJakartaSans(
274276
color: AppColors.ink,
275277
fontWeight: FontWeight.w800,
276278
fontSize: 32,
@@ -279,9 +281,9 @@ class _EntryViewMockup extends StatelessWidget {
279281
),
280282
),
281283
const SizedBox(height: 14),
282-
const Text(
284+
Text(
283285
'Track sales, stock, customers and debts — all in one calm, trustworthy workspace built for Ghanaian shops.',
284-
style: TextStyle(
286+
style: GoogleFonts.plusJakartaSans(
285287
color: AuthMockup.ink2,
286288
fontSize: 15,
287289
fontWeight: FontWeight.w400,
@@ -314,10 +316,10 @@ class _EntryViewMockup extends StatelessWidget {
314316
const SizedBox(width: 7),
315317
Text(
316318
'Secure workspace · v2.4'.toUpperCase(),
317-
style: const TextStyle(
319+
style: GoogleFonts.plusJakartaSans(
318320
color: AuthMockup.ink3,
319321
fontWeight: FontWeight.w700,
320-
fontSize: 11.5,
322+
fontSize: 12,
321323
letterSpacing: 0.92,
322324
),
323325
),
@@ -386,24 +388,17 @@ class _PinSignInViewState extends State<_PinSignInView> {
386388
children: [
387389
AuthLoginHero(onBack: widget.onBack),
388390
Expanded(
389-
child: Transform.translate(
390-
offset: const Offset(0, -AuthMockup.sheetOverlap),
391-
child: DecoratedBox(
392-
decoration: const BoxDecoration(
393-
color: AuthMockup.bg,
394-
borderRadius: BorderRadius.vertical(
395-
top: Radius.circular(AuthMockup.loginSheetRadius),
391+
child: ColoredBox(
392+
color: AuthMockup.bg,
393+
child: SafeArea(
394+
top: false,
395+
child: ListView(
396+
padding: const EdgeInsets.fromLTRB(
397+
AuthMockup.gutter,
398+
16,
399+
AuthMockup.gutter,
400+
24,
396401
),
397-
),
398-
child: SafeArea(
399-
top: false,
400-
child: ListView(
401-
padding: const EdgeInsets.fromLTRB(
402-
AuthMockup.gutter,
403-
28,
404-
AuthMockup.gutter,
405-
24,
406-
),
407402
children: [
408403
const AuthSecLabel('Phone Number'),
409404
const SizedBox(height: 9),
@@ -438,12 +433,12 @@ class _PinSignInViewState extends State<_PinSignInView> {
438433
const Expanded(child: AuthSecLabel('Security PIN')),
439434
GestureDetector(
440435
onTap: widget.onForgotPin,
441-
child: const Text(
436+
child: Text(
442437
'Forgot PIN?',
443-
style: TextStyle(
438+
style: GoogleFonts.plusJakartaSans(
444439
color: AuthMockup.green700,
445440
fontWeight: FontWeight.w600,
446-
fontSize: 13.5,
441+
fontSize: 14,
447442
),
448443
),
449444
),
@@ -492,32 +487,25 @@ class _PinSignInViewState extends State<_PinSignInView> {
492487
loading: widget.loading,
493488
),
494489
const SizedBox(height: 22),
495-
const Row(
490+
Row(
496491
children: [
497-
Expanded(
498-
child: Divider(
499-
height: 1,
500-
color: AuthMockup.line,
501-
),
492+
const Expanded(
493+
child: Divider(height: 1, color: AuthMockup.line),
502494
),
503495
Padding(
504-
padding:
505-
EdgeInsets.symmetric(horizontal: 12),
496+
padding: const EdgeInsets.symmetric(horizontal: 12),
506497
child: Text(
507498
'NEW TO SIKABOAFO?',
508-
style: TextStyle(
499+
style: GoogleFonts.plusJakartaSans(
509500
color: AuthMockup.ink3,
510501
fontWeight: FontWeight.w700,
511-
fontSize: 11,
502+
fontSize: 12,
512503
letterSpacing: 0.88,
513504
),
514505
),
515506
),
516-
Expanded(
517-
child: Divider(
518-
height: 1,
519-
color: AuthMockup.line,
520-
),
507+
const Expanded(
508+
child: Divider(height: 1, color: AuthMockup.line),
521509
),
522510
],
523511
),
@@ -557,7 +545,6 @@ class _PinSignInViewState extends State<_PinSignInView> {
557545
),
558546
),
559547
),
560-
),
561548
],
562549
),
563550
);

0 commit comments

Comments
 (0)