-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #212 from dherediat97/feature/redesign-views
feature: change app colors to the standard on flutter
- Loading branch information
Showing
31 changed files
with
375 additions
and
728 deletions.
There are no files selected for viewing
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,81 @@ | ||
import 'package:film_flu/gen/fonts.gen.dart'; | ||
import 'package:flutter/material.dart'; | ||
import 'package:google_fonts/google_fonts.dart'; | ||
|
||
class AppFonts { | ||
static String primaryFont = FontFamily.ysabeauInfant; | ||
static String secondaryFont = FontFamily.lilitaOne; | ||
static String tertiaryFont = FontFamily.shadowsIntoLight; | ||
static String primaryFont = 'Ysabeau'; | ||
static String secondaryFont = 'LilitaOne'; | ||
static String tertiaryFont = 'Shadows Into Light'; | ||
|
||
const AppFonts( | ||
primaryFont, | ||
secondaryFont, | ||
tertiaryFont, | ||
); | ||
} | ||
|
||
TextTheme createTextTheme( | ||
BuildContext context, String bodyFontString, String displayFontString) { | ||
TextTheme baseTextTheme = Theme.of(context).textTheme; | ||
|
||
TextTheme titleTextTheme = | ||
GoogleFonts.getTextTheme(bodyFontString, baseTextTheme); | ||
|
||
TextTheme bodyTextTheme = | ||
GoogleFonts.getTextTheme(bodyFontString, baseTextTheme); | ||
|
||
TextTheme displayTextTheme = | ||
GoogleFonts.getTextTheme(displayFontString, baseTextTheme); | ||
|
||
TextTheme textTheme = displayTextTheme.copyWith( | ||
displayLarge: displayTextTheme.displayLarge?.copyWith( | ||
fontSize: 22, | ||
fontWeight: FontWeight.bold, | ||
color: Theme.of(context).colorScheme.primary, | ||
), | ||
displayMedium: displayTextTheme.displayMedium?.copyWith( | ||
fontSize: 15, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
displaySmall: displayTextTheme.displaySmall?.copyWith( | ||
fontSize: 12, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
bodyLarge: bodyTextTheme.bodyLarge?.copyWith( | ||
fontSize: 24, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
bodyMedium: bodyTextTheme.bodyMedium?.copyWith( | ||
fontSize: 15, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
bodySmall: bodyTextTheme.bodySmall?.copyWith( | ||
fontSize: 15, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
labelLarge: bodyTextTheme.labelLarge?.copyWith( | ||
fontSize: 12, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
labelMedium: bodyTextTheme.labelMedium?.copyWith( | ||
fontSize: 14, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
labelSmall: bodyTextTheme.labelSmall?.copyWith( | ||
fontSize: 14, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
titleLarge: titleTextTheme.titleLarge?.copyWith( | ||
fontSize: 40, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
titleMedium: titleTextTheme.titleMedium?.copyWith( | ||
fontSize: 14, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
titleSmall: titleTextTheme.titleSmall?.copyWith( | ||
fontSize: 16, | ||
color: Theme.of(context).colorScheme.secondary, | ||
), | ||
); | ||
return textTheme; | ||
} |
Oops, something went wrong.