Use GoogleFonts.RobotoCondensed (#23)

* Use GoogleFonts.robotoCondensed * Fix padding Former-commit-id: d984abb
flutter · Mar 25, 2020 · 138ebd3 · AndraQA · Feb 15, 2021 · 138ebd3
1 parent 2dfa713
commit 138ebd3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/fonts/google_fonts/RobotoCondensed-Bold.ttf b/fonts/google_fonts/RobotoCondensed-Bold.ttf
diff --git a/fonts/google_fonts/RobotoCondensed-Regular.ttf b/fonts/google_fonts/RobotoCondensed-Regular.ttf
diff --git a/lib/studies/fortnightly/shared.dart b/lib/studies/fortnightly/shared.dart
@@ -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,
       ),

diff --git a/lib/studies/rally/app.dart b/lib/studies/rally/app.dart
@@ -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(

diff --git a/lib/studies/rally/tabs/overview.dart b/lib/studies/rally/tabs/overview.dart
@@ -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(