Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Use GoogleFonts.RobotoCondensed #23

Merged
merged 2 commits into from
Mar 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added fonts/google_fonts/RobotoCondensed-Bold.ttf
Binary file not shown.
Binary file added fonts/google_fonts/RobotoCondensed-Regular.ttf
Binary file not shown.
4 changes: 1 addition & 3 deletions lib/studies/fortnightly/shared.dart
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,8 @@ ThemeData buildTheme(BuildContext context) {
fontSize: 16,
textStyle: textTheme.headline5,
),
// TODO: Use GoogleFonts.robotoCondensed when available
// (caption 2), preview category, stock ticker
subtitle1: textTheme.subtitle1.copyWith(
fontFamily: 'Roboto Condensed',
subtitle1: GoogleFonts.robotoCondensed(
fontWeight: FontWeight.w700,
fontSize: 16,
),
Expand Down
11 changes: 3 additions & 8 deletions lib/studies/rally/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,24 @@ class RallyApp extends StatelessWidget {
TextTheme _buildRallyTextTheme(TextTheme base) {
return base
.copyWith(
// TODO: Use GoogleFonts.robotoCondensed when available
bodyText2: base.bodyText2.copyWith(
fontFamily: 'Roboto Condensed',
bodyText2: GoogleFonts.robotoCondensed(
fontSize: 14,
fontWeight: FontWeight.w400,
letterSpacing: letterSpacingOrNone(0.5),
),
bodyText1: GoogleFonts.eczar(
fontSize: 40,
fontWeight: FontWeight.w400,
letterSpacing: letterSpacingOrNone(1.4),
textStyle: base.bodyText1,
),
// TODO: Use GoogleFonts.robotoCondensed when available
button: base.button.copyWith(
fontFamily: 'Roboto Condensed',
button: GoogleFonts.robotoCondensed(
fontWeight: FontWeight.w700,
letterSpacing: letterSpacingOrNone(2.8),
),
headline5: GoogleFonts.eczar(
fontSize: 40,
fontWeight: FontWeight.w600,
letterSpacing: letterSpacingOrNone(1.4),
textStyle: base.bodyText1,
),
)
.apply(
Expand Down
6 changes: 5 additions & 1 deletion lib/studies/rally/tabs/overview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,11 @@ class _FinancialView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Padding(
padding: const EdgeInsets.all(16),
padding: const EdgeInsets.only(
top: 16,
left: 16,
right: 16,
),
child: Text(title),
),
Padding(
Expand Down