diff --git a/assets/fonts/aeonik_pro/AeonikPro-Bold.otf b/assets/fonts/aeonik_pro/AeonikPro-Bold.otf new file mode 100644 index 00000000..87d733ab Binary files /dev/null and b/assets/fonts/aeonik_pro/AeonikPro-Bold.otf differ diff --git a/assets/fonts/aeonik_pro/AeonikPro-Light.otf b/assets/fonts/aeonik_pro/AeonikPro-Light.otf new file mode 100644 index 00000000..3d34d5e7 Binary files /dev/null and b/assets/fonts/aeonik_pro/AeonikPro-Light.otf differ diff --git a/assets/fonts/aeonik_pro/AeonikPro-Medium.otf b/assets/fonts/aeonik_pro/AeonikPro-Medium.otf new file mode 100644 index 00000000..94b8aabe Binary files /dev/null and b/assets/fonts/aeonik_pro/AeonikPro-Medium.otf differ diff --git a/assets/fonts/aeonik_pro/AeonikPro-Regular.otf b/assets/fonts/aeonik_pro/AeonikPro-Regular.otf new file mode 100644 index 00000000..a72b8d6e Binary files /dev/null and b/assets/fonts/aeonik_pro/AeonikPro-Regular.otf differ diff --git a/assets/fonts/open_sans/OpenSans-Regular.ttf b/assets/fonts/open_sans/OpenSans-Regular.ttf deleted file mode 100644 index 29bfd35a..00000000 Binary files a/assets/fonts/open_sans/OpenSans-Regular.ttf and /dev/null differ diff --git a/lib/screen/license/license_screen.dart b/lib/screen/license/license_screen.dart index 3ea8b6fa..58ee4fc2 100644 --- a/lib/screen/license/license_screen.dart +++ b/lib/screen/license/license_screen.dart @@ -26,7 +26,7 @@ class LicenseScreenState extends State { itemBuilder: (context, index) { final item = viewModel.licenses[index]; return Card( - color: theme.background, + color: theme.level1, child: Padding( padding: const EdgeInsets.all(16), child: Column( @@ -34,12 +34,12 @@ class LicenseScreenState extends State { children: [ Text( item.name, - style: theme.text.titleNormal, + style: theme.bodyNeutralDefault.headingS, ), Container(height: 8), Text( item.license, - style: theme.text.bodySmall, + style: theme.bodyNeutralDefault.paragraphS, ), ], ), diff --git a/lib/screen/log_detail/log_detail_screen.dart b/lib/screen/log_detail/log_detail_screen.dart index fea3b981..6385a010 100644 --- a/lib/screen/log_detail/log_detail_screen.dart +++ b/lib/screen/log_detail/log_detail_screen.dart @@ -35,7 +35,7 @@ class LogDetailScreenState extends State { final log = viewModel.logs.reversed.toList()[index]; return Text( log, - style: theme.text.bodySmall, + style: theme.bodyNeutralDefault.paragraphS, ); }, ), diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart index 696284d9..dd7397ac 100644 --- a/lib/screen/login/login_screen.dart +++ b/lib/screen/login/login_screen.dart @@ -33,13 +33,13 @@ class LoginScreenState extends State { Container(height: 16), Text( 'Login', - style: theme.text.titleNormal, + style: theme.bodyNeutralDefault.headingS, textAlign: TextAlign.center, ), Container(height: 32), Text( 'Just fill in some text. There is no validator for the login', - style: theme.text.labelButtonSmall, + style: theme.bodyNeutralDefault.labelS, ), Container(height: 32), FlutterTemplateInputField( diff --git a/lib/screen/logs/logs_screen.dart b/lib/screen/logs/logs_screen.dart index 12ebe254..c4b71d8a 100644 --- a/lib/screen/logs/logs_screen.dart +++ b/lib/screen/logs/logs_screen.dart @@ -37,7 +37,7 @@ class LogsScreenState extends State { final item = viewModel.availableDates[index]; return TouchFeedBack( onTapped: () => viewModel.onLogTapped(item), - color: theme.cardBackground, + color: theme.canvas, borderRadius: BorderRadius.circular(12), child: Padding( padding: const EdgeInsets.all(16), @@ -46,12 +46,12 @@ class LogsScreenState extends State { Expanded( child: Text( item.shortDateWeekdayFormat, - style: theme.text.bodyBig, + style: theme.bodyNeutralDefault.paragraphM, ), ), Icon( IcappsIcons.chevronRight, - color: theme.icon, + color: theme.bodyNeutralFaded, ) ], ), diff --git a/lib/screen/permission/analytics_permission_screen.dart b/lib/screen/permission/analytics_permission_screen.dart index e6bd6e53..a0cd41dd 100644 --- a/lib/screen/permission/analytics_permission_screen.dart +++ b/lib/screen/permission/analytics_permission_screen.dart @@ -38,13 +38,13 @@ class AnalyticsPermissionScreen extends StatelessWidget { const SizedBox(height: 32), Text( localization.permissionAnalyticsTitle, - style: theme.text.titleNormal, + style: theme.bodyNeutralDefault.headingS, ), const SizedBox(height: 16), Text( localization.permissionAnalyticsDescription, textAlign: TextAlign.center, - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, ), const Spacer(), ], diff --git a/lib/screen/splash/splash_screen.dart b/lib/screen/splash/splash_screen.dart index 757b63bd..40d3017e 100644 --- a/lib/screen/splash/splash_screen.dart +++ b/lib/screen/splash/splash_screen.dart @@ -25,7 +25,7 @@ class SplashScreenState extends State { consumerWithThemeAndLocalization: (context, viewModel, child, theme, localization) => StatusBar.animated( isDarkStyle: theme.isDarkTheme, child: Scaffold( - backgroundColor: theme.primary, + backgroundColor: theme.main, body: const Center( child: FlutterTemplateProgressIndicator.light(), ), diff --git a/lib/screen/todo/todo_add/todo_add_screen.dart b/lib/screen/todo/todo_add/todo_add_screen.dart index 532ded82..d19bac1b 100644 --- a/lib/screen/todo/todo_add/todo_add_screen.dart +++ b/lib/screen/todo/todo_add/todo_add_screen.dart @@ -24,14 +24,14 @@ class TodoAddScreenState extends State { return ProviderWidget( create: getIt.call, childBuilderWithViewModel: (context, viewModel, theme, localization) => Scaffold( - backgroundColor: theme.background, + backgroundColor: theme.level2, appBar: AppBar( systemOverlayStyle: SystemUiOverlayStyle.light, leading: FlutterTemplateBackButton.light( onClick: viewModel.onBackClicked, ), title: Text(localization.todoAddTitle), - backgroundColor: theme.primary, + backgroundColor: theme.main, ), body: ScrollConfiguration( behavior: ScrollWhenNeededBehavior(), diff --git a/lib/screen/todo/todo_list/todo_list_screen.dart b/lib/screen/todo/todo_list/todo_list_screen.dart index d261490a..5e5f5cdd 100644 --- a/lib/screen/todo/todo_list/todo_list_screen.dart +++ b/lib/screen/todo/todo_list/todo_list_screen.dart @@ -34,13 +34,13 @@ class TodoListScreenState extends State { key: Keys.downloadAction, icon: IcappsIcons.arrowDownToLine, onClick: viewModel.onDownloadClicked, - color: theme.appBarAction, + color: theme.main, ), ActionItem( key: Keys.addAction, icon: IcappsIcons.plus, onClick: viewModel.onAddClicked, - color: theme.appBarAction, + color: theme.main, ), ], child: Builder( @@ -50,7 +50,7 @@ class TodoListScreenState extends State { return Center( child: Text( localization.getTranslation(errorKey), - style: theme.errorText.bodyNormal, + style: theme.bodySystemNegative.paragraphM, ), ); } @@ -68,7 +68,7 @@ class TodoListScreenState extends State { child: Container( padding: const EdgeInsets.all(16), decoration: BoxDecoration( - color: theme.fillInformative, + color: theme.systemInformative, borderRadius: BorderRadius.circular(8), ), child: Column( @@ -76,13 +76,13 @@ class TodoListScreenState extends State { children: [ Icon( IcappsIcons.fileData, - color: theme.accent, + color: theme.accentThink, ), const SizedBox(height: 8), Text( localization.todoEmptyState, textAlign: TextAlign.center, - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, ), ], ), @@ -104,7 +104,7 @@ class TodoListScreenState extends State { padding: const EdgeInsets.symmetric(horizontal: 16), child: Container( height: 1, - color: theme.primary.withOpacity(0.1), + color: theme.main.withOpacity(0.1), ), ), ); diff --git a/lib/styles/theme_colors.dart b/lib/styles/theme_colors.dart index e8cb3d4a..10c3ebe4 100644 --- a/lib/styles/theme_colors.dart +++ b/lib/styles/theme_colors.dart @@ -3,23 +3,265 @@ import 'package:flutter/material.dart'; class ThemeColors { ThemeColors._(); - static const primary = Color(0xFF002548); - static const primaryDark = Color(0xFF001223); - static const accent = Color(0xFF009AC7); - static const lightAccent = Color(0xFFECF5FE); - static const darkAccent = Color(0xFF005780); - static const darkBackground = Color(0xFF1B4162); - static const white = Color(0xFFFFFFFF); - static const white20 = Color(0x33FFFFFF); - static const white50 = Color(0x80FFFFFF); - static const black = Color(0xFF000000); - static const grey = Color(0xB3000000); //black 70% - static const fadedGrey = Color(0xFF6C7B89); - static const mediumGrey = Color(0x80000000); //black 50% - static const lightGrey = Color(0xFFDDE1E4); - static const backgroundGrey = Color(0xFFF9FAFC); - static const disabledGrey = Color(0xFFE6E6E6); - static const shadow = Color.fromARGB(255, 0, 0, 0); //black 12% - static const error = Color(0xFFE30000); - static const success = Color(0xFF3E9103); -} \ No newline at end of file + // Main + static const main4 = Color(0xFF000B14); + static const main8 = Color(0xFF001529); + static const main12 = Color(0xFF002547); + static const main16 = Color(0xFF002B51); + static const main20 = Color(0xFF013565); + static const main24 = Color(0xFF014079); + static const main28 = Color(0xFF014A8D); + static const main32 = Color(0xFF0255A1); + static const main36 = Color(0xFF0360B5); + static const main40 = Color(0xFF046AC8); + static const main44 = Color(0xFF0475DC); + static const main48 = Color(0xFF067FEF); + static const main52 = Color(0xFF108AF9); + static const main56 = Color(0xFF2593F9); + static const main60 = Color(0xFF399DF9); + static const main64 = Color(0xFF4DA7F9); + static const main68 = Color(0xFF62B1F9); + static const main72 = Color(0xFF76BAFA); + static const main76 = Color(0xFF89C4FA); + static const main80 = Color(0xFF9DCEFB); + static const main84 = Color(0xFFB1D8FB); + static const main88 = Color(0xFFC5E2FC); + static const main92 = Color(0xFFD8EBFD); + static const main96 = Color(0xFFECF5FE); + + // Think colors + static const accentThink4 = Color(0xFF001014); + static const accentThink8 = Color(0xFF001F29); + static const accentThink12 = Color(0xFF002F3D); + static const accentThink16 = Color(0xFF003E52); + static const accentThink20 = Color(0xFF004E66); + static const accentThink24 = Color(0xFF005D7A); + static const accentThink28 = Color(0xFF006D8F); + static const accentThink32 = Color(0xFF007DA3); + static const accentThink36 = Color(0xFF008CB8); + static const accentThink40 = Color(0xFF0098C7); + static const accentThink44 = Color(0xFF01ABE0); + static const accentThink48 = Color(0xFF01BAF4); + static const accentThink52 = Color(0xFF0CC4FD); + static const accentThink56 = Color(0xFF21C9FD); + static const accentThink60 = Color(0xFF36CDFC); + static const accentThink64 = Color(0xFF4AD2FC); + static const accentThink68 = Color(0xFF5FD7FC); + static const accentThink72 = Color(0xFF73DCFC); + static const accentThink76 = Color(0xFF87E1FC); + static const accentThink80 = Color(0xFF9CE6FC); + static const accentThink84 = Color(0xFFB0EBFD); + static const accentThink88 = Color(0xFFC4F0FD); + static const accentThink92 = Color(0xFFD8F5FE); + static const accentThink96 = Color(0xFFEBFAFE); + + // Build colors + static const accentBuild4 = Color(0xFF05100D); + static const accentBuild8 = Color(0xFF0A1F1A); + static const accentBuild12 = Color(0xFF0F2E27); + static const accentBuild16 = Color(0xFF143D34); + static const accentBuild20 = Color(0xFF194D41); + static const accentBuild24 = Color(0xFF1F5C4E); + static const accentBuild28 = Color(0xFF246A5B); + static const accentBuild32 = Color(0xFF2A7968); + static const accentBuild36 = Color(0xFF308875); + static const accentBuild40 = Color(0xFF359781); + static const accentBuild44 = Color(0xFF3BA58E); + static const accentBuild48 = Color(0xFF41B39B); + static const accentBuild52 = Color(0xFF4CBDA4); + static const accentBuild56 = Color(0xFF5CC2AC); + static const accentBuild60 = Color(0xFF6BC7B3); + static const accentBuild64 = Color(0xFF7ACCB9); + static const accentBuild68 = Color(0xFF89D1C2); + static const accentBuild72 = Color(0xFF98D7C9); + static const accentBuild76 = Color(0xFFA7DCD1); + static const accentBuild80 = Color(0xFFB6E2D8); + static const accentBuild84 = Color(0xFFC5E7E0); + static const accentBuild88 = Color(0xFFD4EDE8); + static const accentBuild92 = Color(0xFFE2F3EF); + static const accentBuild96 = Color(0xFFF1F9F7); + + // Maintain colors + static const accentMaintain4 = Color(0xFF09070E); + static const accentMaintain8 = Color(0xFF120D1C); + static const accentMaintain12 = Color(0xFF1B1429); + static const accentMaintain16 = Color(0xFF231B37); + static const accentMaintain20 = Color(0xFF2C2244); + static const accentMaintain24 = Color(0xFF352952); + static const accentMaintain28 = Color(0xFF3E305F); + static const accentMaintain32 = Color(0xFF48376C); + static const accentMaintain36 = Color(0xFF513E79); + static const accentMaintain40 = Color(0xFF5A4686); + static const accentMaintain44 = Color(0xFF634D93); + static const accentMaintain48 = Color(0xFF6C55A0); + static const accentMaintain52 = Color(0xFF7159A6); + static const accentMaintain56 = Color(0xFF826DB0); + static const accentMaintain60 = Color(0xFF8E7BB7); + static const accentMaintain64 = Color(0xFF9898BE); + static const accentMaintain68 = Color(0xFFA596C4); + static const accentMaintain72 = Color(0xFFB0A4CB); + static const accentMaintain76 = Color(0xFFBCB1D2); + static const accentMaintain80 = Color(0xFFC7BEDA); + static const accentMaintain84 = Color(0xFFD2CCE1); + static const accentMaintain88 = Color(0xFFDDD9E8); + static const accentMaintain92 = Color(0xFFE9E5F0); + static const accentMaintain96 = Color(0xFFF4F2F7); + + // Celebrate colors + static const accentCelebrate4 = Color(0xFF0F0C05); + static const accentCelebrate8 = Color(0xFF1E180B); + static const accentCelebrate12 = Color(0xFF2D2410); + static const accentCelebrate16 = Color(0xFF3C3116); + static const accentCelebrate20 = Color(0xFF4B3D1B); + static const accentCelebrate24 = Color(0xFF594921); + static const accentCelebrate28 = Color(0xFF685527); + static const accentCelebrate32 = Color(0xFF76602D); + static const accentCelebrate36 = Color(0xFF856C33); + static const accentCelebrate40 = Color(0xFF937839); + static const accentCelebrate44 = Color(0xFFA1843F); + static const accentCelebrate48 = Color(0xFFAF9046); + static const accentCelebrate52 = Color(0xFFB99A50); + static const accentCelebrate56 = Color(0xFFBEA260); + static const accentCelebrate60 = Color(0xFFC2A86B); + static const accentCelebrate64 = Color(0xFFC9B27D); + static const accentCelebrate68 = Color(0xFFCFB88C); + static const accentCelebrate72 = Color(0xFFD4C39B); + static const accentCelebrate76 = Color(0xFFDACCAA); + static const accentCelebrate80 = Color(0xFFE0D4B8); + static const accentCelebrate84 = Color(0xFFE6DDC6); + static const accentCelebrate88 = Color(0xFFECE5D5); + static const accentCelebrate92 = Color(0xFFF2EEE3); + static const accentCelebrate96 = Color(0xFFF9F6F1); + + // Neutral colors + static const neutral0 = Color(0xFF000000); + static const neutral4 = Color(0xFF090A0B); + static const neutral8 = Color(0xFF121517); + static const neutral12 = Color(0xFF1F2428); + static const neutral16 = Color(0xFF24292E); + static const neutral20 = Color(0xFF2D3339); + static const neutral24 = Color(0xFF363E45); + static const neutral28 = Color(0xFF3F4850); + static const neutral32 = Color(0xFF48525B); + static const neutral36 = Color(0xFF515C67); + static const neutral40 = Color(0xFF5A6772); + static const neutral44 = Color(0xFF63717E); + static const neutral48 = Color(0xFF6C7B89); + static const neutral52 = Color(0xFF768593); + static const neutral56 = Color(0xFF818F9C); + static const neutral60 = Color(0xFF8D9AA5); + static const neutral64 = Color(0xFF98A4AE); + static const neutral68 = Color(0xFFA4AEB7); + static const neutral72 = Color(0xFFAFB8C0); + static const neutral76 = Color(0xFFBAC2C9); + static const neutral80 = Color(0xFFC6CCD2); + static const neutral84 = Color(0xFFD1D6DB); + static const neutral88 = Color(0xFFDDE1E4); + static const neutral92 = Color(0xFFE8EBED); + static const neutral96 = Color(0xFFF4F5F6); + static const neutral100 = Color(0xFFFFFFFF); + + // System Info colors + static const systemInfo4 = Color(0xFF000B14); + static const systemInfo8 = Color(0xFF001529); + static const systemInfo12 = Color(0xFF002547); + static const systemInfo16 = Color(0xFF002B51); + static const systemInfo20 = Color(0xFF013565); + static const systemInfo24 = Color(0xFF014079); + static const systemInfo28 = Color(0xFF014A8D); + static const systemInfo32 = Color(0xFF0255A1); + static const systemInfo36 = Color(0xFF0360B5); + static const systemInfo40 = Color(0xFF046AC8); + static const systemInfo44 = Color(0xFF0475DC); + static const systemInfo48 = Color(0xFF067FEF); + static const systemInfo52 = Color(0xFF108AF9); + static const systemInfo56 = Color(0xFF2593F9); + static const systemInfo60 = Color(0xFF399DF9); + static const systemInfo64 = Color(0xFF4DA7F9); + static const systemInfo68 = Color(0xFF62B1F9); + static const systemInfo72 = Color(0xFF76BAFA); + static const systemInfo76 = Color(0xFF89C4FA); + static const systemInfo80 = Color(0xFF9DCEFB); + static const systemInfo84 = Color(0xFFB1D8FB); + static const systemInfo88 = Color(0xFFC5E2FC); + static const systemInfo92 = Color(0xFFD8EBFD); + static const systemInfo96 = Color(0xFFECF5FE); + + // System Positive colors + static const systemPositive4 = Color(0xFF01130D); + static const systemPositive8 = Color(0xFF03261A); + static const systemPositive12 = Color(0xFF053827); + static const systemPositive16 = Color(0xFF074B34); + static const systemPositive20 = Color(0xFF085E41); + static const systemPositive24 = Color(0xFF0A704E); + static const systemPositive28 = Color(0xFF0D825B); + static const systemPositive32 = Color(0xFF0F9468); + static const systemPositive36 = Color(0xFF11A675); + static const systemPositive40 = Color(0xFF14B881); + static const systemPositive44 = Color(0xFF16CA8E); + static const systemPositive48 = Color(0xFF19DC9B); + static const systemPositive52 = Color(0xFF23E6A5); + static const systemPositive56 = Color(0xFF36E7AC); + static const systemPositive60 = Color(0xFF49E9B4); + static const systemPositive64 = Color(0xFF5CEBBB); + static const systemPositive68 = Color(0xFF6EEDC2); + static const systemPositive72 = Color(0xFF81EECA); + static const systemPositive76 = Color(0xFF93F1D1); + static const systemPositive80 = Color(0xFFA5F3D9); + static const systemPositive84 = Color(0xFFB7F5E0); + static const systemPositive88 = Color(0xFFC9F7E8); + static const systemPositive92 = Color(0xFFDBFAF0); + static const systemPositive96 = Color(0xFFEDFCF7); + + // System Attention colors + static const systemAttention4 = Color(0xFF140E00); + static const systemAttention8 = Color(0xFF281B01); + static const systemAttention12 = Color(0xFF3C2801); + static const systemAttention16 = Color(0xFF503601); + static const systemAttention20 = Color(0xFF644302); + static const systemAttention24 = Color(0xFF785103); + static const systemAttention28 = Color(0xFF8B5E04); + static const systemAttention32 = Color(0xFF9F6B05); + static const systemAttention36 = Color(0xFFB27906); + static const systemAttention40 = Color(0xFFC58607); + static const systemAttention44 = Color(0xFFD89308); + static const systemAttention48 = Color(0xFFEBA009); + static const systemAttention52 = Color(0xFFF5AA14); + static const systemAttention56 = Color(0xFFF5B128); + static const systemAttention60 = Color(0xFFF6B83C); + static const systemAttention64 = Color(0xFFF6BF50); + static const systemAttention68 = Color(0xFFF7C664); + static const systemAttention72 = Color(0xFFF7CD78); + static const systemAttention76 = Color(0xFFF8D48B); + static const systemAttention80 = Color(0xFFF9DB9F); + static const systemAttention84 = Color(0xFFFAE2B2); + static const systemAttention88 = Color(0xFFFBE9C6); + static const systemAttention92 = Color(0xFFFCF1D9); + static const systemAttention96 = Color(0xFFFEF8EC); + + // System Negative colors + static const systemNegative4 = Color(0xFF120202); + static const systemNegative8 = Color(0xFF240505); + static const systemNegative12 = Color(0xFF360707); + static const systemNegative16 = Color(0xFF480A0A); + static const systemNegative20 = Color(0xFF5A0C0C); + static const systemNegative24 = Color(0xFF6B0F0F); + static const systemNegative28 = Color(0xFF7D1212); + static const systemNegative32 = Color(0xFF8E1515); + static const systemNegative36 = Color(0xFF9F1818); + static const systemNegative40 = Color(0xFFB11B1B); + static const systemNegative44 = Color(0xFFC21F1F); + static const systemNegative48 = Color(0xFFD32222); + static const systemNegative52 = Color(0xFFDC2D2D); + static const systemNegative56 = Color(0xFFDF3F3F); + static const systemNegative60 = Color(0xFFE15151); + static const systemNegative64 = Color(0xFFE46363); + static const systemNegative68 = Color(0xFFE67474); + static const systemNegative72 = Color(0xFFE98686); + static const systemNegative76 = Color(0xFFEC9898); + static const systemNegative80 = Color(0xFFEFA9A9); + static const systemNegative84 = Color(0xFFF2BBBB); + static const systemNegative88 = Color(0xFFF5CCCC); + static const systemNegative92 = Color(0xFFF8DDDD); + static const systemNegative96 = Color(0xFFFCFEEE); +} diff --git a/lib/styles/theme_data.dart b/lib/styles/theme_data.dart index 7c3ec552..260f380e 100644 --- a/lib/styles/theme_data.dart +++ b/lib/styles/theme_data.dart @@ -10,24 +10,24 @@ class FlutterTemplateThemeData { static final _darkThemeData = ThemeData( fontFamily: ThemeFonts.body, - primaryColor: ThemeColors.primary, + primaryColor: ThemeColors.main16, colorScheme: const ColorScheme( - primary: ThemeColors.primary, - primaryContainer: ThemeColors.primaryDark, - onPrimary: ThemeColors.white, - secondary: ThemeColors.accent, - secondaryContainer: ThemeColors.accent, - onSecondary: ThemeColors.white, - surface: ThemeColors.backgroundGrey, - onSurface: ThemeColors.primary, - onError: ThemeColors.primaryDark, + primary: ThemeColors.main16, + primaryContainer: ThemeColors.main16, + onPrimary: ThemeColors.neutral100, + secondary: ThemeColors.accentThink40, + secondaryContainer: ThemeColors.accentThink40, + onSecondary: ThemeColors.neutral100, + surface: ThemeColors.neutral96, + onSurface: ThemeColors.main16, + onError: ThemeColors.main16, + error: ThemeColors.systemNegative52, brightness: Brightness.light, - error: ThemeColors.error, ), textSelectionTheme: TextSelectionThemeData( - cursorColor: ThemeColors.accent, - selectionHandleColor: ThemeColors.accent, - selectionColor: ThemeColors.accent.withOpacity(0.4), + cursorColor: ThemeColors.accentThink40, + selectionHandleColor: ThemeColors.accentThink40, + selectionColor: ThemeColors.accentThink40.withOpacity(0.4), ), pageTransitionsTheme: PageTransitionsTheme( builders: { @@ -48,206 +48,331 @@ class FlutterTemplateThemeData { } } -class FlutterTemplateTextTheme { - final TextStyle titleHuge; - final TextStyle titleBig; - final TextStyle titleNormal; - final TextStyle titleSmall; - - final TextStyle titleListItem; - - final TextStyle labelButtonBig; - final TextStyle labelButtonSmall; - - final TextStyle bodyNormal; - final TextStyle bodySmall; - final TextStyle bodyUltraSmall; - final TextStyle infoBodySubHeader; - final TextStyle bodyBig; - - const FlutterTemplateTextTheme({ - required this.titleHuge, - required this.titleBig, - required this.titleNormal, - required this.titleSmall, - required this.titleListItem, - required this.labelButtonBig, - required this.labelButtonSmall, - required this.bodyNormal, - required this.bodySmall, - required this.bodyUltraSmall, - required this.infoBodySubHeader, - required this.bodyBig, - }); -} - enum FlutterTemplateThemeStyle { dark, light, } +class FlutterTemplateThemeEffects { + final Color elevationDefault1; + final Color elevationDefault2; + final Color elevationDefault3; + + FlutterTemplateThemeEffects({ + required this.elevationDefault1, + required this.elevationDefault2, + required this.elevationDefault3, + }); + + List get elevation1 => [ + BoxShadow( + offset: const Offset(0, 4), + spreadRadius: 0, + blurRadius: 8, + color: elevationDefault2, + ), + BoxShadow( + offset: const Offset(0, 2), + spreadRadius: 0, + blurRadius: 4, + color: elevationDefault1, + ), + ]; + + List get elevation2 => [ + BoxShadow( + offset: const Offset(0, 8), + spreadRadius: 0, + blurRadius: 16, + color: elevationDefault2, + ), + BoxShadow( + offset: const Offset(0, 4), + spreadRadius: 0, + blurRadius: 8, + color: elevationDefault1, + ), + ]; + + List get elevation3 => [ + BoxShadow( + offset: const Offset(0, 12), + spreadRadius: 0, + blurRadius: 24, + color: elevationDefault2, + ), + BoxShadow( + offset: const Offset(0, 8), + spreadRadius: 0, + blurRadius: 16, + color: elevationDefault1, + ), + ]; + + List get elevation4 => [ + BoxShadow( + offset: const Offset(0, 16), + spreadRadius: 0, + blurRadius: 32, + color: elevationDefault3, + ), + BoxShadow( + offset: const Offset(0, 12), + spreadRadius: 0, + blurRadius: 24, + color: elevationDefault1, + ), + ]; + + List get elevation5 => [ + BoxShadow( + offset: const Offset(0, 24), + spreadRadius: 0, + blurRadius: 48, + color: elevationDefault3, + ), + BoxShadow( + offset: const Offset(0, 16), + spreadRadius: 0, + blurRadius: 32, + color: elevationDefault2, + ), + ]; +} + class FlutterTemplateTheme { + // Brand base + final Color main; + final Color pureWhite; + final Color pureBlack; + + // Brand Accent + final Color accentThink; + final Color accentBuild; + final Color accentMaintain; + final Color accentCelebrate; + + // Fill system + final Color systemPositive; + final Color systemAttention; + final Color systemNegative; + final Color systemInformative; + + // Fill neutral + final Color canvas; + final Color level1; + final Color level2; + final Color level3; + final Color level4; + + // Stroke neutral + final Color strokeDefault; + final Color strokeSubtle; + + // Text heading brand + final Color headingBrandDefault; + final Color headingBrandThink; + final Color headingBrandBuild; + final Color headingBrandMaintain; + final Color headingBrandCelebrate; + + // Text heading system + final Color headingSystemPositive; + final Color headingSystemPositiveDark; + final Color headingSystemNegative; + final Color headingSystemNegativeDark; + final Color headingSystemAttention; + final Color headingSystemAttentionDark; + final Color headingSystemInformative; + final Color headingSystemInformativeDark; + + // Text body brand + final Color bodyBrandDefault; + final Color bodyBrandSubtle; + final Color bodyBrandFaded; + + // Text body system + final Color bodySystemPositive; + final Color bodySystemPositiveDark; + final Color bodySystemNegative; + final Color bodySystemNegativeDark; + final Color bodySystemAttention; + final Color bodySystemAttentionDark; + final Color bodySystemInformative; + final Color bodySystemInformativeDark; + + // Text body neutral + final Color bodyNeutralDefault; + final Color bodyNeutralSubtle; + final Color bodyNeutralFaded; + + // Text action + final Color actionDefault; + final bool isDarkTheme; - final Color text; - final Color lightText; - final Color fadedText; - final Color inverseText; - final Color errorText; - final Color buttonTextDisabled; - final Color primary; - final Color secondary; - final Color accent; - final Color background; - final Color permissionScreenBackground; - final Color inverseBackground; - final Color disabled; - final Color icon; - final Color appBarAction; - final Color inverseIcon; - final Color inverseProgressIndicator; - final Color shadow; - final Color progressIndicator; - final Color buttonColor; - final Color buttonText; - final Color inverseButtonText; - final Color textButtonText; - final Color fillInformative; - final Color cardBackground; - final Color switchBackground; - - final Color bottomNavbarBackground; - final Color bottomNavbarItemActive; - final Color bottomNavbarItemInactive; - - final Color inputFieldFill; - final Color inputFieldHint; - final Color inputFieldBorderEnabled; - final Color inputFieldBorderFocused; - final Color inputFieldBorderIdle; - final Color inputFieldCursor; - - final Color debugTitleBackground; + final FlutterTemplateThemeEffects effects; bool get isLightTheme => !isDarkTheme; static final _instanceDark = FlutterTemplateTheme._( isDarkTheme: true, - text: ThemeColors.white, - fadedText: ThemeColors.lightGrey, - inverseText: ThemeColors.black, - errorText: ThemeColors.error, - primary: ThemeColors.primary, - accent: ThemeColors.accent, - secondary: ThemeColors.white, - background: ThemeColors.primary, - permissionScreenBackground: ThemeColors.primary, - inverseBackground: ThemeColors.white, - disabled: ThemeColors.disabledGrey, - icon: ThemeColors.white, - appBarAction: ThemeColors.white, - inverseIcon: ThemeColors.black, - progressIndicator: ThemeColors.primary, - inverseProgressIndicator: ThemeColors.white, - shadow: ThemeColors.shadow, - buttonText: ThemeColors.primary, - inverseButtonText: ThemeColors.white, - buttonTextDisabled: ThemeColors.lightGrey, - buttonColor: ThemeColors.accent, - textButtonText: ThemeColors.white, - bottomNavbarBackground: ThemeColors.darkBackground, - bottomNavbarItemActive: ThemeColors.white, - bottomNavbarItemInactive: ThemeColors.white50, - inputFieldFill: ThemeColors.black, - inputFieldHint: ThemeColors.white50, - inputFieldBorderEnabled: ThemeColors.white50, - inputFieldBorderFocused: ThemeColors.white, - inputFieldBorderIdle: ThemeColors.white50, - inputFieldCursor: ThemeColors.accent, - debugTitleBackground: ThemeColors.white20, - fillInformative: ThemeColors.darkAccent, - cardBackground: ThemeColors.darkBackground, - lightText: ThemeColors.white, - switchBackground: ThemeColors.fadedGrey, + main: ThemeColors.main16, + pureWhite: ThemeColors.neutral100, + pureBlack: ThemeColors.neutral0, + accentThink: ThemeColors.accentThink40, + accentBuild: ThemeColors.accentBuild60, + accentMaintain: ThemeColors.accentMaintain52, + accentCelebrate: ThemeColors.accentCelebrate60, + systemPositive: ThemeColors.systemPositive96, + systemAttention: ThemeColors.systemAttention96, + systemNegative: ThemeColors.systemNegative96, + systemInformative: ThemeColors.systemInfo96, + canvas: ThemeColors.neutral100, + level1: ThemeColors.neutral96, + level2: ThemeColors.neutral92, + level3: ThemeColors.neutral88, + level4: ThemeColors.neutral84, + strokeDefault: ThemeColors.neutral76, + strokeSubtle: ThemeColors.neutral88, + headingBrandDefault: ThemeColors.main16, + headingBrandThink: ThemeColors.accentThink32, + headingBrandBuild: ThemeColors.accentBuild32, + headingBrandMaintain: ThemeColors.accentMaintain52, + headingBrandCelebrate: ThemeColors.accentCelebrate36, + headingSystemPositive: ThemeColors.systemPositive28, + headingSystemPositiveDark: ThemeColors.systemPositive16, + headingSystemNegative: ThemeColors.systemNegative52, + headingSystemNegativeDark: ThemeColors.systemNegative24, + headingSystemAttention: ThemeColors.systemAttention36, + headingSystemAttentionDark: ThemeColors.systemAttention24, + headingSystemInformative: ThemeColors.systemInfo36, + headingSystemInformativeDark: ThemeColors.systemInfo24, + bodyBrandDefault: ThemeColors.main16, + bodyBrandSubtle: ThemeColors.main32, + bodyBrandFaded: ThemeColors.main44, + bodySystemPositive: ThemeColors.systemPositive28, + bodySystemPositiveDark: ThemeColors.systemPositive16, + bodySystemNegative: ThemeColors.systemNegative52, + bodySystemNegativeDark: ThemeColors.systemNegative24, + bodySystemAttention: ThemeColors.systemAttention36, + bodySystemAttentionDark: ThemeColors.systemAttention24, + bodySystemInformative: ThemeColors.systemInfo36, + bodySystemInformativeDark: ThemeColors.systemInfo24, + bodyNeutralDefault: ThemeColors.neutral20, + bodyNeutralSubtle: ThemeColors.neutral36, + bodyNeutralFaded: ThemeColors.neutral48, + actionDefault: ThemeColors.accentThink32, + effects: FlutterTemplateThemeEffects( + elevationDefault1: ThemeColors.main16.withOpacity(0.04), + elevationDefault2: ThemeColors.main16.withOpacity(0.08), + elevationDefault3: ThemeColors.main16.withOpacity(0.12), + ), ); static final _instanceLight = FlutterTemplateTheme._( isDarkTheme: false, - text: ThemeColors.primary, - fadedText: ThemeColors.fadedGrey, - inverseText: ThemeColors.white, - errorText: ThemeColors.error, - primary: ThemeColors.primary, - accent: ThemeColors.accent, - secondary: ThemeColors.black, - background: ThemeColors.backgroundGrey, - permissionScreenBackground: ThemeColors.white, - inverseBackground: ThemeColors.white, - inputFieldFill: ThemeColors.white, - inputFieldHint: ThemeColors.mediumGrey, - disabled: ThemeColors.disabledGrey, - icon: ThemeColors.primary, - appBarAction: ThemeColors.primary, - inverseIcon: ThemeColors.black, - progressIndicator: ThemeColors.primary, - inverseProgressIndicator: ThemeColors.white, - shadow: ThemeColors.shadow, - buttonText: ThemeColors.white, - inverseButtonText: ThemeColors.primary, - buttonTextDisabled: ThemeColors.lightGrey, - buttonColor: ThemeColors.primary, - textButtonText: ThemeColors.primary, - bottomNavbarBackground: ThemeColors.white, - bottomNavbarItemActive: ThemeColors.primary, - bottomNavbarItemInactive: ThemeColors.mediumGrey, - inputFieldBorderEnabled: ThemeColors.mediumGrey, - inputFieldBorderFocused: ThemeColors.primary, - inputFieldBorderIdle: ThemeColors.mediumGrey, - inputFieldCursor: ThemeColors.accent, - debugTitleBackground: ThemeColors.lightGrey, - fillInformative: ThemeColors.lightAccent, - cardBackground: ThemeColors.white, - lightText: ThemeColors.white, - switchBackground: ThemeColors.disabledGrey, + main: ThemeColors.main16, + pureWhite: ThemeColors.neutral100, + pureBlack: ThemeColors.neutral0, + accentThink: ThemeColors.accentThink40, + accentBuild: ThemeColors.accentBuild60, + accentMaintain: ThemeColors.accentMaintain52, + accentCelebrate: ThemeColors.accentCelebrate60, + systemPositive: ThemeColors.systemPositive96, + systemAttention: ThemeColors.systemAttention96, + systemNegative: ThemeColors.systemNegative96, + systemInformative: ThemeColors.systemInfo96, + canvas: ThemeColors.neutral100, + level1: ThemeColors.neutral96, + level2: ThemeColors.neutral92, + level3: ThemeColors.neutral88, + level4: ThemeColors.neutral84, + strokeDefault: ThemeColors.neutral76, + strokeSubtle: ThemeColors.neutral88, + headingBrandDefault: ThemeColors.main16, + headingBrandThink: ThemeColors.accentThink32, + headingBrandBuild: ThemeColors.accentBuild32, + headingBrandMaintain: ThemeColors.accentMaintain52, + headingBrandCelebrate: ThemeColors.accentCelebrate36, + headingSystemPositive: ThemeColors.systemPositive28, + headingSystemPositiveDark: ThemeColors.systemPositive16, + headingSystemNegative: ThemeColors.systemNegative52, + headingSystemNegativeDark: ThemeColors.systemNegative24, + headingSystemAttention: ThemeColors.systemAttention36, + headingSystemAttentionDark: ThemeColors.systemAttention24, + headingSystemInformative: ThemeColors.systemInfo36, + headingSystemInformativeDark: ThemeColors.systemInfo24, + bodyBrandDefault: ThemeColors.main16, + bodyBrandSubtle: ThemeColors.main32, + bodyBrandFaded: ThemeColors.main44, + bodySystemPositive: ThemeColors.systemPositive28, + bodySystemPositiveDark: ThemeColors.systemPositive16, + bodySystemNegative: ThemeColors.systemNegative52, + bodySystemNegativeDark: ThemeColors.systemNegative24, + bodySystemAttention: ThemeColors.systemAttention36, + bodySystemAttentionDark: ThemeColors.systemAttention24, + bodySystemInformative: ThemeColors.systemInfo36, + bodySystemInformativeDark: ThemeColors.systemInfo24, + bodyNeutralDefault: ThemeColors.neutral20, + bodyNeutralSubtle: ThemeColors.neutral36, + bodyNeutralFaded: ThemeColors.neutral48, + actionDefault: ThemeColors.accentThink32, + effects: FlutterTemplateThemeEffects( + elevationDefault1: ThemeColors.main16.withOpacity(0.04), + elevationDefault2: ThemeColors.main16.withOpacity(0.08), + elevationDefault3: ThemeColors.main16.withOpacity(0.12), + ), ); FlutterTemplateTheme._({ required this.isDarkTheme, - required this.text, - required this.fadedText, - required this.inverseText, - required this.errorText, - required this.buttonTextDisabled, - required this.primary, - required this.secondary, - required this.accent, - required this.background, - required this.permissionScreenBackground, - required this.inverseBackground, - required this.disabled, - required this.icon, - required this.appBarAction, - required this.inverseIcon, - required this.inverseProgressIndicator, - required this.shadow, - required this.progressIndicator, - required this.buttonColor, - required this.buttonText, - required this.inverseButtonText, - required this.textButtonText, - required this.bottomNavbarBackground, - required this.bottomNavbarItemActive, - required this.bottomNavbarItemInactive, - required this.inputFieldFill, - required this.inputFieldHint, - required this.inputFieldBorderEnabled, - required this.inputFieldBorderFocused, - required this.inputFieldBorderIdle, - required this.inputFieldCursor, - required this.debugTitleBackground, - required this.fillInformative, - required this.cardBackground, - required this.lightText, - required this.switchBackground, + required this.main, + required this.pureWhite, + required this.pureBlack, + required this.accentThink, + required this.accentBuild, + required this.accentMaintain, + required this.accentCelebrate, + required this.systemPositive, + required this.systemAttention, + required this.systemNegative, + required this.systemInformative, + required this.canvas, + required this.level1, + required this.level2, + required this.level3, + required this.level4, + required this.strokeDefault, + required this.strokeSubtle, + required this.headingBrandDefault, + required this.headingBrandThink, + required this.headingBrandBuild, + required this.headingBrandMaintain, + required this.headingBrandCelebrate, + required this.headingSystemPositive, + required this.headingSystemPositiveDark, + required this.headingSystemNegative, + required this.headingSystemNegativeDark, + required this.headingSystemAttention, + required this.headingSystemAttentionDark, + required this.headingSystemInformative, + required this.headingSystemInformativeDark, + required this.bodyBrandDefault, + required this.bodyBrandSubtle, + required this.bodyBrandFaded, + required this.bodySystemPositive, + required this.bodySystemPositiveDark, + required this.bodySystemNegative, + required this.bodySystemNegativeDark, + required this.bodySystemAttention, + required this.bodySystemAttentionDark, + required this.bodySystemInformative, + required this.bodySystemInformativeDark, + required this.bodyNeutralDefault, + required this.bodyNeutralSubtle, + required this.bodyNeutralFaded, + required this.actionDefault, + required this.effects, }); static FlutterTemplateTheme of(BuildContext context, {bool forceDark = false, bool forceLight = false}) { @@ -270,62 +395,74 @@ class FlutterTemplateTheme { } extension TextThemeExtension on Color { - TextStyle get titleHuge => TextStyle(fontSize: 40, color: this, fontFamily: ThemeFonts.title, height: 1.2); + // Heading + TextStyle get headingXl => TextStyle(fontSize: 32, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); + + TextStyle get headingL => TextStyle(fontSize: 28, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); - TextStyle get titleBig => TextStyle(fontSize: 30, color: this, fontFamily: ThemeFonts.title, height: 1.2); + TextStyle get headingM => TextStyle(fontSize: 26, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); - TextStyle get titleNormal => TextStyle(fontSize: 24, color: this, fontFamily: ThemeFonts.title); + TextStyle get headingS => TextStyle(fontSize: 24, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); - TextStyle get titleSmall => TextStyle(fontSize: 18, color: this, fontFamily: ThemeFonts.title); + TextStyle get headingXs => TextStyle(fontSize: 20, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); - TextStyle get titleListItem => TextStyle(fontSize: 18, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.bold); + TextStyle get headingXXS => TextStyle(fontSize: 18, color: this, fontFamily: ThemeFonts.title, fontWeight: FontWeight.w700, height: 1); - TextStyle get labelButtonBig => TextStyle(fontSize: 16, color: this, fontFamily: ThemeFonts.button, fontWeight: FontWeight.bold); + // Paragraph + TextStyle get paragraphM => TextStyle(fontSize: 16, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1.5); - TextStyle get labelButtonSmall => TextStyle(fontSize: 14, color: this, fontFamily: ThemeFonts.button, fontWeight: FontWeight.bold); + TextStyle get paragraphS => TextStyle(fontSize: 13, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1.5); - TextStyle get bodyBig => TextStyle(fontSize: 18, color: this, fontFamily: ThemeFonts.body); + TextStyle get paragraphXs => TextStyle(fontSize: 11, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1.5); - TextStyle get bodyNormal => TextStyle(fontSize: 16, color: this, fontFamily: ThemeFonts.body); + // Label - TextStyle get bodySmall => TextStyle(fontSize: 14, color: this, fontFamily: ThemeFonts.body); + TextStyle get labelM => TextStyle(fontSize: 16, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); - TextStyle get bodyUltraSmall => TextStyle(fontSize: 12, color: this, fontFamily: ThemeFonts.body); + TextStyle get labelS => TextStyle(fontSize: 13, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); - TextStyle get infoBodySubHeader => TextStyle(fontSize: 14, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w600); + TextStyle get labelXs => TextStyle(fontSize: 11, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); + + // Data + TextStyle get dataM => TextStyle(fontSize: 16, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); + + TextStyle get dataS => TextStyle(fontSize: 13, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); + + TextStyle get dataXs => TextStyle(fontSize: 11, color: this, fontFamily: ThemeFonts.body, fontWeight: FontWeight.w400, height: 1); } extension TextStyleExtension on TextStyle { - TextStyle get medium => copyWith(fontWeight: FontWeight.w400); + // Font weights + TextStyle get thin => copyWith(fontWeight: FontWeight.w100); + + TextStyle get extraLight => copyWith(fontWeight: FontWeight.w200); + + TextStyle get light => copyWith(fontWeight: FontWeight.w300); + + TextStyle get regular => copyWith(fontWeight: FontWeight.w400); + + TextStyle get medium => copyWith(fontWeight: FontWeight.w500); + + TextStyle get semiBold => copyWith(fontWeight: FontWeight.w600); - TextStyle get strong => copyWith(fontWeight: FontWeight.w600); + TextStyle get bold => copyWith(fontWeight: FontWeight.w700); + + TextStyle get extraBold => copyWith(fontWeight: FontWeight.w800); TextStyle get black => copyWith(fontWeight: FontWeight.w900); + // Font styles TextStyle get underLine => copyWith(decoration: TextDecoration.underline); TextStyle get italic => copyWith(fontStyle: FontStyle.italic); } extension ShadowsExtension on Color { - List get bottomNavShadow => [ - BoxShadow( - offset: const Offset(0, -29), - spreadRadius: 0, - blurRadius: 29, - color: withOpacity(0.02), - ), - BoxShadow( - offset: const Offset(0, -65), - spreadRadius: 0, - blurRadius: 39, - color: withOpacity(0.01), - ), - BoxShadow( - offset: const Offset(0, -115), + List get elevation1 => [ + const BoxShadow( + offset: Offset(0, 4), spreadRadius: 0, - blurRadius: 46, - color: withOpacity(0.01), + blurRadius: 8, ), ]; } diff --git a/lib/styles/theme_fonts.dart b/lib/styles/theme_fonts.dart index aa5db0a3..7f2d5503 100644 --- a/lib/styles/theme_fonts.dart +++ b/lib/styles/theme_fonts.dart @@ -1,9 +1,9 @@ class ThemeFonts { ThemeFonts._(); - static const _openSans = 'OpenSans'; + static const _aeonikPro = 'AeonikPro'; - static const title = _openSans; - static const body = _openSans; - static const button = _openSans; + static const title = _aeonikPro; + static const body = _aeonikPro; + static const button = _aeonikPro; } diff --git a/lib/util/snackbar/snackbar_util.dart b/lib/util/snackbar/snackbar_util.dart index 1be286c7..7d9fb6dc 100644 --- a/lib/util/snackbar/snackbar_util.dart +++ b/lib/util/snackbar/snackbar_util.dart @@ -1,7 +1,9 @@ import 'package:another_flushbar/flushbar.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_template/di/injectable.dart'; import 'package:flutter_template/model/snackbar/snackbar_data.dart'; -import 'package:flutter_template/styles/theme_colors.dart'; +import 'package:flutter_template/navigator/main_navigator.dart'; +import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/styles/theme_durations.dart'; class SnackBarUtil { @@ -26,21 +28,23 @@ class SnackBarUtil { } static SnackBarStyleData _getSnackBarStyle(SnackBarStyle style) { + final context = getIt().context; + final theme = FlutterTemplateTheme.of(context); switch (style) { case SnackBarStyle.neutral: - return const SnackBarStyleData( - textColor: ThemeColors.white, - backgroundColor: ThemeColors.primary, + return SnackBarStyleData( + textColor: theme.pureWhite, + backgroundColor: theme.main, ); case SnackBarStyle.success: - return const SnackBarStyleData( - textColor: ThemeColors.white, - backgroundColor: ThemeColors.success, + return SnackBarStyleData( + textColor: theme.pureWhite, + backgroundColor: theme.systemPositive, ); case SnackBarStyle.error: - return const SnackBarStyleData( - textColor: ThemeColors.white, - backgroundColor: ThemeColors.error, + return SnackBarStyleData( + textColor: theme.pureWhite, + backgroundColor: theme.systemNegative, ); } } diff --git a/lib/widget/debug/debug_row_item.dart b/lib/widget/debug/debug_row_item.dart index 8403f88f..405610ee 100644 --- a/lib/widget/debug/debug_row_item.dart +++ b/lib/widget/debug/debug_row_item.dart @@ -31,13 +31,13 @@ class DebugRowItem extends StatelessWidget { children: [ Text( title, - style: theme.text.bodyBig, + style: theme.bodyNeutralDefault.paragraphM, ), if (subTitle != null) ...[ Container(height: 8), Text( subTitle!, - style: theme.text.bodySmall, + style: theme.bodyNeutralDefault.paragraphS, ), ], ], @@ -45,7 +45,7 @@ class DebugRowItem extends StatelessWidget { ), Icon( IcappsIcons.chevronRight, - color: theme.icon, + color: theme.bodyNeutralFaded, ) ], ), diff --git a/lib/widget/debug/debug_row_title.dart b/lib/widget/debug/debug_row_title.dart index 5f233349..5d02419c 100644 --- a/lib/widget/debug/debug_row_title.dart +++ b/lib/widget/debug/debug_row_title.dart @@ -20,13 +20,13 @@ class DebugRowTitle extends StatelessWidget { children: [ Icon( icon, - color: theme.fadedText, + color: theme.bodyNeutralFaded, size: ThemeDimens.smallIconSize, ), const SizedBox(width: 4), Text( title, - style: theme.fadedText.bodySmall, + style: theme.bodyNeutralFaded.paragraphS, ), ], ), diff --git a/lib/widget/debug/debug_section.dart b/lib/widget/debug/debug_section.dart index 1be81731..823b66bb 100644 --- a/lib/widget/debug/debug_section.dart +++ b/lib/widget/debug/debug_section.dart @@ -28,7 +28,7 @@ class DebugSection extends StatelessWidget { const SizedBox(height: 8), Container( decoration: BoxDecoration( - color: theme.cardBackground, + color: theme.canvas, borderRadius: BorderRadius.circular(12), ), child: Column( @@ -42,7 +42,7 @@ class DebugSection extends StatelessWidget { Container( margin: const EdgeInsets.symmetric(horizontal: 8), height: 1, - color: theme.debugTitleBackground, + color: theme.level3, ), ], ]; diff --git a/lib/widget/debug/debug_switch_row_item.dart b/lib/widget/debug/debug_switch_row_item.dart index 72d976c0..8e466717 100644 --- a/lib/widget/debug/debug_switch_row_item.dart +++ b/lib/widget/debug/debug_switch_row_item.dart @@ -33,12 +33,12 @@ class DebugRowSwitchItem extends StatelessWidget { children: [ Text( title, - style: theme.text.bodyBig, + style: theme.bodyNeutralDefault.paragraphM, ), if (subTitle != null) Text( subTitle!, - style: theme.text.bodySmall, + style: theme.bodyNeutralDefault.paragraphS, ), ], ), diff --git a/lib/widget/debug/select_language_dialog.dart b/lib/widget/debug/select_language_dialog.dart index 420b82f7..08621111 100644 --- a/lib/widget/debug/select_language_dialog.dart +++ b/lib/widget/debug/select_language_dialog.dart @@ -17,7 +17,7 @@ class SelectLanguageDialog extends StatelessWidget { final globalViewModel = Provider.of(context); return DataProviderWidget( childBuilder: (context, theme, localization) => AlertDialog( - backgroundColor: theme.background, + backgroundColor: theme.level1, title: Text(localization.debugLocaleSelector), content: SizedBox( height: 150, diff --git a/lib/widget/debug/selector_item.dart b/lib/widget/debug/selector_item.dart index 8e11757b..6b5d8086 100644 --- a/lib/widget/debug/selector_item.dart +++ b/lib/widget/debug/selector_item.dart @@ -25,9 +25,9 @@ class SelectorItem extends StatelessWidget { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: selected ? theme.fillInformative : theme.cardBackground, + color: selected ? theme.systemInformative : theme.canvas, border: Border.all( - color: selected ? theme.accent : theme.cardBackground, + color: selected ? theme.accentThink : theme.canvas, width: 1, ), ), @@ -38,14 +38,14 @@ class SelectorItem extends StatelessWidget { Expanded( child: Text( title, - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, ), ), Opacity( opacity: selected ? 1 : 0, child: Icon( IcappsIcons.checkmark, - color: theme.accent, + color: theme.accentThink, ), ), ], diff --git a/lib/widget/general/action/action_item.dart b/lib/widget/general/action/action_item.dart index aae2534e..253c5609 100644 --- a/lib/widget/general/action/action_item.dart +++ b/lib/widget/general/action/action_item.dart @@ -31,7 +31,7 @@ class ActionItem extends StatelessWidget { child: Icon( icon, size: 24, - color: color ?? theme.icon, + color: color ?? theme.bodyNeutralFaded, ), ), ), diff --git a/lib/widget/general/action/text_action_item.dart b/lib/widget/general/action/text_action_item.dart index ed28e821..bdf33d42 100644 --- a/lib/widget/general/action/text_action_item.dart +++ b/lib/widget/general/action/text_action_item.dart @@ -28,7 +28,7 @@ class TextActionItem extends StatelessWidget { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), child: AnimatedDefaultTextStyle( - style: style ?? theme.inverseText.labelButtonSmall, + style: style ?? theme.pureWhite.labelS, duration: ThemeDurations.shortAnimationDuration, child: Text(text), ), diff --git a/lib/widget/general/base_screen/base_screen.dart b/lib/widget/general/base_screen/base_screen.dart index 5ab21461..e09408e7 100644 --- a/lib/widget/general/base_screen/base_screen.dart +++ b/lib/widget/general/base_screen/base_screen.dart @@ -105,7 +105,7 @@ class BaseScreen extends StatelessWidget { return DataProviderWidget( childBuilder: (context, theme, localization) => StatusBar.dark( child: Scaffold( - backgroundColor: background ?? theme.background, + backgroundColor: background ?? theme.level1, body: GestureDetector( onTap: FocusManager.instance.primaryFocus?.unfocus, child: SafeArea( diff --git a/lib/widget/general/base_screen/base_screen_header.dart b/lib/widget/general/base_screen/base_screen_header.dart index cf07fc5d..b7b400e1 100644 --- a/lib/widget/general/base_screen/base_screen_header.dart +++ b/lib/widget/general/base_screen/base_screen_header.dart @@ -34,7 +34,7 @@ class BaseScreenHeader extends StatelessWidget { ? null : Text( title!.toUpperCase(), - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, textAlign: isTitleCentered ? TextAlign.center : TextAlign.start, ); diff --git a/lib/widget/general/bottom_navigation/bottom_navigation.dart b/lib/widget/general/bottom_navigation/bottom_navigation.dart index dfecdeaf..c6afec86 100644 --- a/lib/widget/general/bottom_navigation/bottom_navigation.dart +++ b/lib/widget/general/bottom_navigation/bottom_navigation.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_template/model/bottom_navigation/bottom_navigation_tab.dart'; -import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/widget/general/bottom_navigation/bottom_navigation_item.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; @@ -20,8 +19,8 @@ class BottomNavigation extends StatelessWidget { childBuilder: (context, theme, localization) => Container( padding: const EdgeInsets.symmetric(horizontal: 8), decoration: BoxDecoration( - color: theme.bottomNavbarBackground, - boxShadow: theme.shadow.bottomNavShadow, + color: theme.pureWhite, + boxShadow: theme.effects.elevation5, ), child: ClipRect( child: Column( diff --git a/lib/widget/general/bottom_navigation/bottom_navigation_item.dart b/lib/widget/general/bottom_navigation/bottom_navigation_item.dart index 6bcf097c..be3aaf8d 100644 --- a/lib/widget/general/bottom_navigation/bottom_navigation_item.dart +++ b/lib/widget/general/bottom_navigation/bottom_navigation_item.dart @@ -36,12 +36,12 @@ class BottomNavigationItem extends StatelessWidget { duration: ThemeDurations.shortAnimationDuration, firstChild: Icon( iconActive, - color: theme.bottomNavbarItemActive, + color: theme.main, size: hasSpaceForLabel ? ThemeDimens.iconSize : ThemeDimens.largeIcon, ), secondChild: Icon( iconInactive, - color: theme.bottomNavbarItemInactive, + color: theme.bodyNeutralFaded, size: hasSpaceForLabel ? ThemeDimens.iconSize : ThemeDimens.largeIcon, ), crossFadeState: isSelected ? CrossFadeState.showFirst : CrossFadeState.showSecond, @@ -50,7 +50,7 @@ class BottomNavigationItem extends StatelessWidget { const SizedBox(height: 2), AnimatedDefaultTextStyle( duration: ThemeDurations.shortAnimationDuration, - style: isSelected ? theme.bottomNavbarItemActive.bodySmall.strong : theme.bottomNavbarItemInactive.bodySmall, + style: isSelected ? theme.main.paragraphS.bold : theme.bodyNeutralFaded.paragraphS, child: Text( localization.getTranslation(labelKey), maxLines: 1, diff --git a/lib/widget/general/styled/flutter_template_back_button.dart b/lib/widget/general/styled/flutter_template_back_button.dart index a6015cb9..fffaeb7e 100644 --- a/lib/widget/general/styled/flutter_template_back_button.dart +++ b/lib/widget/general/styled/flutter_template_back_button.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_colors.dart'; import 'package:flutter_template/util/keys.dart'; import 'package:flutter_template/widget/general/action/action_item.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; @@ -28,7 +27,7 @@ class FlutterTemplateBackButton extends StatelessWidget { childBuilderTheme: (context, theme) => ActionItem( key: Keys.backButton, icon: getCorrectIcon(context), - color: isLight ? ThemeColors.white : theme.appBarAction, + color: isLight ? theme.pureWhite : theme.main, onClick: onClick, ), ); diff --git a/lib/widget/general/styled/flutter_template_button.dart b/lib/widget/general/styled/flutter_template_button.dart index a75b8991..6539abd3 100644 --- a/lib/widget/general/styled/flutter_template_button.dart +++ b/lib/widget/general/styled/flutter_template_button.dart @@ -37,25 +37,25 @@ class FlutterTemplateButton extends StatelessWidget { TextStyle _enabledTextStyle(FlutterTemplateTheme theme) { switch (buttonType) { case ButtonType.regular: - return theme.lightText.labelButtonSmall; + return theme.pureWhite.labelS; case ButtonType.text: - return theme.accent.labelButtonSmall; + return theme.accentThink.labelS; } } TextStyle _disabledTextStyle(FlutterTemplateTheme theme) { switch (buttonType) { case ButtonType.regular: - return theme.inverseText.labelButtonSmall; + return theme.pureWhite.labelS; case ButtonType.text: - return theme.disabled.labelButtonSmall; + return theme.level2.labelS; } } Color? _enabledButtonColor(FlutterTemplateTheme theme) { switch (buttonType) { case ButtonType.regular: - return theme.buttonColor; + return theme.main; case ButtonType.text: return null; } @@ -64,7 +64,7 @@ class FlutterTemplateButton extends StatelessWidget { Color? _disabledButtonColor(FlutterTemplateTheme theme) { switch (buttonType) { case ButtonType.regular: - return theme.disabled; + return theme.level2; case ButtonType.text: return null; } diff --git a/lib/widget/general/styled/flutter_template_checkbox.dart b/lib/widget/general/styled/flutter_template_checkbox.dart index c1b44f50..7bc20af6 100644 --- a/lib/widget/general/styled/flutter_template_checkbox.dart +++ b/lib/widget/general/styled/flutter_template_checkbox.dart @@ -27,7 +27,7 @@ class FlutterTemplateCheckBox extends StatelessWidget { ? Center( child: Icon( IcappsIcons.checkmark, - color: theme.accent, + color: theme.accentThink, size: 24, ), ) @@ -40,7 +40,7 @@ class FlutterTemplateCheckBox extends StatelessWidget { childBuilderTheme: (context, theme) => Checkbox( value: value, onChanged: (value) => onChanged(value ?? false), - activeColor: theme.accent, + activeColor: theme.accentThink, ), ); } diff --git a/lib/widget/general/styled/flutter_template_input_field.dart b/lib/widget/general/styled/flutter_template_input_field.dart index 346a5909..2d6e3886 100644 --- a/lib/widget/general/styled/flutter_template_input_field.dart +++ b/lib/widget/general/styled/flutter_template_input_field.dart @@ -9,7 +9,6 @@ class FlutterTemplateInputField extends StatelessWidget { final ValueChanged onChanged; final TextEditingController? controller; - const FlutterTemplateInputField({ required this.hint, required this.onChanged, @@ -23,7 +22,7 @@ class FlutterTemplateInputField extends StatelessWidget { Widget build(BuildContext context) { return DataProviderWidget( childBuilderTheme: (context, theme) => TextField( - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, controller: controller, enabled: enabled, onChanged: onChanged, @@ -31,16 +30,16 @@ class FlutterTemplateInputField extends StatelessWidget { decoration: InputDecoration( filled: true, hintText: hint, - hintStyle: theme.inputFieldHint.bodyNormal, - fillColor: theme.inputFieldFill, + hintStyle: theme.bodyNeutralDefault.paragraphM, + fillColor: theme.pureWhite, enabledBorder: UnderlineInputBorder( - borderSide: BorderSide(color: theme.inputFieldBorderEnabled), + borderSide: BorderSide(color: theme.bodyNeutralDefault), ), focusedBorder: UnderlineInputBorder( - borderSide: BorderSide(color: theme.inputFieldBorderFocused), + borderSide: BorderSide(color: theme.main), ), border: UnderlineInputBorder( - borderSide: BorderSide(color: theme.bottomNavbarItemInactive), + borderSide: BorderSide(color: theme.bodyNeutralFaded), ), ), ), diff --git a/lib/widget/general/styled/flutter_template_progress_indicator.dart b/lib/widget/general/styled/flutter_template_progress_indicator.dart index db1564e3..9c094c58 100644 --- a/lib/widget/general/styled/flutter_template_progress_indicator.dart +++ b/lib/widget/general/styled/flutter_template_progress_indicator.dart @@ -20,7 +20,7 @@ class FlutterTemplateProgressIndicator extends StatelessWidget { childBuilderTheme: (context, theme) { if (FlavorConfig.isInTest()) { return Container( - color: theme.accent, + color: theme.accentThink, height: 50, width: 50, child: const Text( @@ -30,7 +30,7 @@ class FlutterTemplateProgressIndicator extends StatelessWidget { ); } return CircularProgressIndicator( - valueColor: AlwaysStoppedAnimation(dark ? theme.progressIndicator : theme.inverseProgressIndicator), + valueColor: AlwaysStoppedAnimation(dark ? theme.main : theme.pureWhite), ); }, ); diff --git a/lib/widget/general/styled/flutter_template_switch.dart b/lib/widget/general/styled/flutter_template_switch.dart index 4bd4523f..75d08f24 100644 --- a/lib/widget/general/styled/flutter_template_switch.dart +++ b/lib/widget/general/styled/flutter_template_switch.dart @@ -23,7 +23,7 @@ class FlutterTemplateSwitch extends StatelessWidget { height: 24, width: 42, decoration: BoxDecoration( - color: value ? theme.accent : theme.switchBackground, + color: value ? theme.accentThink : theme.level2, borderRadius: ThemeDimens.circularBorderRadius, ), child: AnimatedAlign( @@ -34,7 +34,7 @@ class FlutterTemplateSwitch extends StatelessWidget { height: 20, width: 20, decoration: BoxDecoration( - color: theme.lightText, + color: theme.pureWhite, borderRadius: ThemeDimens.circularBorderRadius, ), ), diff --git a/lib/widget/todo/todo_row_item.dart b/lib/widget/todo/todo_row_item.dart index f599f351..32151646 100644 --- a/lib/widget/todo/todo_row_item.dart +++ b/lib/widget/todo/todo_row_item.dart @@ -31,7 +31,7 @@ class TodoRowItem extends StatelessWidget { Expanded( child: Text( title, - style: theme.text.bodyNormal, + style: theme.bodyNeutralDefault.paragraphM, ), ), FlutterTemplateCheckBox( diff --git a/pubspec.yaml b/pubspec.yaml index 78f23f1e..3203c114 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -82,14 +82,20 @@ flutter: assets: - assets/api/ - assets/fonts/ - - assets/fonts/open_sans/ + - assets/fonts/aeonik_pro/ - assets/locale/ - assets/images/ - assets/images/icons/ fonts: - - family: OpenSans + - family: AeonikPro fonts: - - asset: assets/fonts/open_sans/OpenSans-Regular.ttf + - asset: assets/fonts/aeonik_pro/AeonikPro-Regular.otf + - asset: assets/fonts/aeonik_pro/AeonikPro-Light.otf + weight: 300 + - asset: assets/fonts/aeonik_pro/AeonikPro-Medium.otf + weight: 500 + - asset: assets/fonts/aeonik_pro/AeonikPro-Bold.otf + weight: 700 - family: icappsIcons fonts: - asset: packages/icapps_icons/fonts/icappsIcons.ttf diff --git a/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_ipad_pro.png b/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_ipad_pro.png index 68b0e005..bfcdbb98 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_ipad_pro.png and b/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_iphone_11.png b/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_iphone_11.png index 3b4f7e5b..27d7ed1d 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_iphone_11.png and b/test/screen/debug/img/debug_platform_selector_screen_inital_state_darkmode_iphone_11.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_ipad_pro.png b/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_ipad_pro.png index 037b2479..bfcdbb98 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_ipad_pro.png and b/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_iphone_11.png b/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_iphone_11.png index 1d65a29d..27d7ed1d 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_iphone_11.png and b/test/screen/debug/img/debug_platform_selector_screen_inital_state_lightmode_iphone_11.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_android_ipad_pro.png b/test/screen/debug/img/debug_platform_selector_screen_selected_android_ipad_pro.png index 037b2479..bfcdbb98 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_android_ipad_pro.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_android_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_android_iphone_11.png b/test/screen/debug/img/debug_platform_selector_screen_selected_android_iphone_11.png index 1d65a29d..27d7ed1d 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_android_iphone_11.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_android_iphone_11.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_ios_ipad_pro.png b/test/screen/debug/img/debug_platform_selector_screen_selected_ios_ipad_pro.png index 037b2479..bfcdbb98 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_ios_ipad_pro.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_ios_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_ios_iphone_11.png b/test/screen/debug/img/debug_platform_selector_screen_selected_ios_iphone_11.png index 1d65a29d..27d7ed1d 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_ios_iphone_11.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_ios_iphone_11.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_system_ipad_pro.png b/test/screen/debug/img/debug_platform_selector_screen_selected_system_ipad_pro.png index 037b2479..bfcdbb98 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_system_ipad_pro.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_system_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_platform_selector_screen_selected_system_iphone_11.png b/test/screen/debug/img/debug_platform_selector_screen_selected_system_iphone_11.png index 1d65a29d..27d7ed1d 100644 Binary files a/test/screen/debug/img/debug_platform_selector_screen_selected_system_iphone_11.png and b/test/screen/debug/img/debug_platform_selector_screen_selected_system_iphone_11.png differ diff --git a/test/screen/debug/img/debug_screen_inital_state_ipad_pro.png b/test/screen/debug/img/debug_screen_inital_state_ipad_pro.png index a4f06086..da44f920 100644 Binary files a/test/screen/debug/img/debug_screen_inital_state_ipad_pro.png and b/test/screen/debug/img/debug_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_screen_inital_state_iphone_11.png b/test/screen/debug/img/debug_screen_inital_state_iphone_11.png index 06a8cc70..256d8a82 100644 Binary files a/test/screen/debug/img/debug_screen_inital_state_iphone_11.png and b/test/screen/debug/img/debug_screen_inital_state_iphone_11.png differ diff --git a/test/screen/debug/img/debug_screen_show_locale_key_disabled_ipad_pro.png b/test/screen/debug/img/debug_screen_show_locale_key_disabled_ipad_pro.png index a4f06086..da44f920 100644 Binary files a/test/screen/debug/img/debug_screen_show_locale_key_disabled_ipad_pro.png and b/test/screen/debug/img/debug_screen_show_locale_key_disabled_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_screen_show_locale_key_disabled_iphone_11.png b/test/screen/debug/img/debug_screen_show_locale_key_disabled_iphone_11.png index 06a8cc70..256d8a82 100644 Binary files a/test/screen/debug/img/debug_screen_show_locale_key_disabled_iphone_11.png and b/test/screen/debug/img/debug_screen_show_locale_key_disabled_iphone_11.png differ diff --git a/test/screen/debug/img/debug_screen_show_locale_key_enabled_ipad_pro.png b/test/screen/debug/img/debug_screen_show_locale_key_enabled_ipad_pro.png index a9e4f68c..442f5517 100644 Binary files a/test/screen/debug/img/debug_screen_show_locale_key_enabled_ipad_pro.png and b/test/screen/debug/img/debug_screen_show_locale_key_enabled_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_screen_show_locale_key_enabled_iphone_11.png b/test/screen/debug/img/debug_screen_show_locale_key_enabled_iphone_11.png index d586b912..a08faab9 100644 Binary files a/test/screen/debug/img/debug_screen_show_locale_key_enabled_iphone_11.png and b/test/screen/debug/img/debug_screen_show_locale_key_enabled_iphone_11.png differ diff --git a/test/screen/debug/img/debug_screen_slow_animations_disabled_ipad_pro.png b/test/screen/debug/img/debug_screen_slow_animations_disabled_ipad_pro.png index a4f06086..da44f920 100644 Binary files a/test/screen/debug/img/debug_screen_slow_animations_disabled_ipad_pro.png and b/test/screen/debug/img/debug_screen_slow_animations_disabled_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_screen_slow_animations_disabled_iphone_11.png b/test/screen/debug/img/debug_screen_slow_animations_disabled_iphone_11.png index 06a8cc70..256d8a82 100644 Binary files a/test/screen/debug/img/debug_screen_slow_animations_disabled_iphone_11.png and b/test/screen/debug/img/debug_screen_slow_animations_disabled_iphone_11.png differ diff --git a/test/screen/debug/img/debug_screen_slow_animations_enabled_ipad_pro.png b/test/screen/debug/img/debug_screen_slow_animations_enabled_ipad_pro.png index 318f0cb2..4ac374cc 100644 Binary files a/test/screen/debug/img/debug_screen_slow_animations_enabled_ipad_pro.png and b/test/screen/debug/img/debug_screen_slow_animations_enabled_ipad_pro.png differ diff --git a/test/screen/debug/img/debug_screen_slow_animations_enabled_iphone_11.png b/test/screen/debug/img/debug_screen_slow_animations_enabled_iphone_11.png index 7a6bcf4a..4f5a5455 100644 Binary files a/test/screen/debug/img/debug_screen_slow_animations_enabled_iphone_11.png and b/test/screen/debug/img/debug_screen_slow_animations_enabled_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_darkmode_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_darkmode_ipad_pro.png index 097e20d6..8e679b79 100644 Binary files a/test/screen/home/img/home_screen_initial_state_darkmode_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_darkmode_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_darkmode_iphone_11.png b/test/screen/home/img/home_screen_initial_state_darkmode_iphone_11.png index 30ea90e3..dfaa6dd5 100644 Binary files a/test/screen/home/img/home_screen_initial_state_darkmode_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_darkmode_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_ipad_pro.png index 097e20d6..8e679b79 100644 Binary files a/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_iphone_11.png b/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_iphone_11.png index 30ea90e3..dfaa6dd5 100644 Binary files a/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_first_tab_darkmode_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_first_tab_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_first_tab_ipad_pro.png index 2d04bec2..8e679b79 100644 Binary files a/test/screen/home/img/home_screen_initial_state_first_tab_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_first_tab_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_first_tab_iphone_11.png b/test/screen/home/img/home_screen_initial_state_first_tab_iphone_11.png index efe99947..dfaa6dd5 100644 Binary files a/test/screen/home/img/home_screen_initial_state_first_tab_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_first_tab_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_ipad_pro.png index 2d04bec2..8e679b79 100644 Binary files a/test/screen/home/img/home_screen_initial_state_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_iphone_11.png b/test/screen/home/img/home_screen_initial_state_iphone_11.png index efe99947..dfaa6dd5 100644 Binary files a/test/screen/home/img/home_screen_initial_state_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_ipad_pro.png index ac19207a..0f516531 100644 Binary files a/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_iphone_11.png b/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_iphone_11.png index 9390279c..96cdbf57 100644 Binary files a/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_second_tab_darkmode_iphone_11.png differ diff --git a/test/screen/home/img/home_screen_initial_state_second_tab_ipad_pro.png b/test/screen/home/img/home_screen_initial_state_second_tab_ipad_pro.png index c64cb8fa..0f516531 100644 Binary files a/test/screen/home/img/home_screen_initial_state_second_tab_ipad_pro.png and b/test/screen/home/img/home_screen_initial_state_second_tab_ipad_pro.png differ diff --git a/test/screen/home/img/home_screen_initial_state_second_tab_iphone_11.png b/test/screen/home/img/home_screen_initial_state_second_tab_iphone_11.png index d81882e3..96cdbf57 100644 Binary files a/test/screen/home/img/home_screen_initial_state_second_tab_iphone_11.png and b/test/screen/home/img/home_screen_initial_state_second_tab_iphone_11.png differ diff --git a/test/screen/license/img/license_screen_empty_list_ipad_pro.png b/test/screen/license/img/license_screen_empty_list_ipad_pro.png index 20fbbdc9..2b70995b 100644 Binary files a/test/screen/license/img/license_screen_empty_list_ipad_pro.png and b/test/screen/license/img/license_screen_empty_list_ipad_pro.png differ diff --git a/test/screen/license/img/license_screen_empty_list_iphone_11.png b/test/screen/license/img/license_screen_empty_list_iphone_11.png index 03415aa7..9f8e4800 100644 Binary files a/test/screen/license/img/license_screen_empty_list_iphone_11.png and b/test/screen/license/img/license_screen_empty_list_iphone_11.png differ diff --git a/test/screen/license/img/license_screen_inital_state_dark_mode_ipad_pro.png b/test/screen/license/img/license_screen_inital_state_dark_mode_ipad_pro.png index c1a764c9..5c0ef181 100644 Binary files a/test/screen/license/img/license_screen_inital_state_dark_mode_ipad_pro.png and b/test/screen/license/img/license_screen_inital_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/license/img/license_screen_inital_state_dark_mode_iphone_11.png b/test/screen/license/img/license_screen_inital_state_dark_mode_iphone_11.png index 110cdebf..421f3fa9 100644 Binary files a/test/screen/license/img/license_screen_inital_state_dark_mode_iphone_11.png and b/test/screen/license/img/license_screen_inital_state_dark_mode_iphone_11.png differ diff --git a/test/screen/license/img/license_screen_inital_state_ipad_pro.png b/test/screen/license/img/license_screen_inital_state_ipad_pro.png index 5850646d..5c0ef181 100644 Binary files a/test/screen/license/img/license_screen_inital_state_ipad_pro.png and b/test/screen/license/img/license_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/license/img/license_screen_inital_state_iphone_11.png b/test/screen/license/img/license_screen_inital_state_iphone_11.png index 5f38a0b3..421f3fa9 100644 Binary files a/test/screen/license/img/license_screen_inital_state_iphone_11.png and b/test/screen/license/img/license_screen_inital_state_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png b/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png index 31aeab45..40478aed 100644 Binary files a/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png and b/test/screen/login/img/login_screen_initial_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png b/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png index 3a0be798..9fea6442 100644 Binary files a/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png and b/test/screen/login/img/login_screen_initial_state_dark_mode_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_initial_state_ipad_pro.png b/test/screen/login/img/login_screen_initial_state_ipad_pro.png index f785ecda..40478aed 100644 Binary files a/test/screen/login/img/login_screen_initial_state_ipad_pro.png and b/test/screen/login/img/login_screen_initial_state_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_initial_state_iphone_11.png b/test/screen/login/img/login_screen_initial_state_iphone_11.png index b500ea42..9fea6442 100644 Binary files a/test/screen/login/img/login_screen_initial_state_iphone_11.png and b/test/screen/login/img/login_screen_initial_state_iphone_11.png differ diff --git a/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png b/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png index 2be31ce0..c873f226 100644 Binary files a/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png and b/test/screen/login/img/login_screen_login_button_disabled_ipad_pro.png differ diff --git a/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png b/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png index 6e029465..e5c2de5c 100644 Binary files a/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png and b/test/screen/login/img/login_screen_login_button_disabled_iphone_11.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png index 049ac764..28adf616 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png index d4e67bb4..9c19b21d 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_dark_mode_iphone_11.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png index 049ac764..28adf616 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_ipad_pro.png differ diff --git a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png index d4e67bb4..9c19b21d 100644 Binary files a/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png and b/test/screen/permission/img/analytics_permission_screen_initial_state_light_mode_iphone_11.png differ diff --git a/test/screen/splash/img/splash_screen_inital_state_ipad_pro.png b/test/screen/splash/img/splash_screen_inital_state_ipad_pro.png index 5c2a589e..37bc00f3 100644 Binary files a/test/screen/splash/img/splash_screen_inital_state_ipad_pro.png and b/test/screen/splash/img/splash_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/splash/img/splash_screen_inital_state_iphone_11.png b/test/screen/splash/img/splash_screen_inital_state_iphone_11.png index 59cf1e9f..4612e2c3 100644 Binary files a/test/screen/splash/img/splash_screen_inital_state_iphone_11.png and b/test/screen/splash/img/splash_screen_inital_state_iphone_11.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_enabled_ipad_pro.png b/test/screen/todo/todo_add/img/todo_add_screen_enabled_ipad_pro.png index 6fd02c47..eb40a4cd 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_enabled_ipad_pro.png and b/test/screen/todo/todo_add/img/todo_add_screen_enabled_ipad_pro.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_enabled_iphone_11.png b/test/screen/todo/todo_add/img/todo_add_screen_enabled_iphone_11.png index 9a7ace94..80a3d720 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_enabled_iphone_11.png and b/test/screen/todo/todo_add/img/todo_add_screen_enabled_iphone_11.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_ipad_pro.png b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_ipad_pro.png index faef996c..b3b8c647 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_ipad_pro.png and b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_ipad_pro.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_iphone_11.png b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_iphone_11.png index d432be0e..c8ef8900 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_iphone_11.png and b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_darkmode_iphone_11.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_ipad_pro.png b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_ipad_pro.png index 4360970f..b3b8c647 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_ipad_pro.png and b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_iphone_11.png b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_iphone_11.png index 1ddbcb82..c8ef8900 100644 Binary files a/test/screen/todo/todo_add/img/todo_add_screen_inital_state_iphone_11.png and b/test/screen/todo/todo_add/img/todo_add_screen_inital_state_iphone_11.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_empty_state_ipad_pro.png b/test/screen/todo/todo_list/img/todo_list_screen_empty_state_ipad_pro.png index 41c74368..bb1e34d4 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_empty_state_ipad_pro.png and b/test/screen/todo/todo_list/img/todo_list_screen_empty_state_ipad_pro.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_empty_state_iphone_11.png b/test/screen/todo/todo_list/img/todo_list_screen_empty_state_iphone_11.png index eb3dd6b2..34de5cd6 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_empty_state_iphone_11.png and b/test/screen/todo/todo_list/img/todo_list_screen_empty_state_iphone_11.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_error_state_ipad_pro.png b/test/screen/todo/todo_list/img/todo_list_screen_error_state_ipad_pro.png index 9058ad10..4cad663f 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_error_state_ipad_pro.png and b/test/screen/todo/todo_list/img/todo_list_screen_error_state_ipad_pro.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_error_state_iphone_11.png b/test/screen/todo/todo_list/img/todo_list_screen_error_state_iphone_11.png index b5633f46..fc72e434 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_error_state_iphone_11.png and b/test/screen/todo/todo_list/img/todo_list_screen_error_state_iphone_11.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_ipad_pro.png b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_ipad_pro.png index f866ee7f..b579b11b 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_ipad_pro.png and b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_ipad_pro.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_iphone_11.png b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_iphone_11.png index cf285e6a..08d2d34b 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_iphone_11.png and b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_dark_mode_iphone_11.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_ipad_pro.png b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_ipad_pro.png index 9272bc13..b579b11b 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_ipad_pro.png and b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_ipad_pro.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_iphone_11.png b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_iphone_11.png index 2e2df8ba..08d2d34b 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_inital_state_iphone_11.png and b/test/screen/todo/todo_list/img/todo_list_screen_inital_state_iphone_11.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_loading_state_ipad_pro.png b/test/screen/todo/todo_list/img/todo_list_screen_loading_state_ipad_pro.png index e85fcac8..ae790736 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_loading_state_ipad_pro.png and b/test/screen/todo/todo_list/img/todo_list_screen_loading_state_ipad_pro.png differ diff --git a/test/screen/todo/todo_list/img/todo_list_screen_loading_state_iphone_11.png b/test/screen/todo/todo_list/img/todo_list_screen_loading_state_iphone_11.png index 24f3d13f..c6bcb649 100644 Binary files a/test/screen/todo/todo_list/img/todo_list_screen_loading_state_iphone_11.png and b/test/screen/todo/todo_list/img/todo_list_screen_loading_state_iphone_11.png differ diff --git a/test/util/test_util.dart b/test/util/test_util.dart index e2b46179..e7a28d46 100644 --- a/test/util/test_util.dart +++ b/test/util/test_util.dart @@ -136,7 +136,10 @@ class TestUtil { } static Future _loadFonts() async { - await _loadFont('assets/fonts/open_sans/OpenSans-Regular.ttf', ThemeFonts.body); + await _loadFont('assets/fonts/aeonik_pro/AeonikPro-Bold.otf', ThemeFonts.body); + await _loadFont('assets/fonts/aeonik_pro/AeonikPro-Light.otf', ThemeFonts.body); + await _loadFont('assets/fonts/aeonik_pro/AeonikPro-Medium.otf', ThemeFonts.body); + await _loadFont('assets/fonts/aeonik_pro/AeonikPro-Regular.otf', ThemeFonts.body); } static Future _loadFont(String fontPath, String fontName) async { diff --git a/test/widget/debug/img/debug_row_item_with_subtitle.png b/test/widget/debug/img/debug_row_item_with_subtitle.png index 7f50dced..6175deb8 100644 Binary files a/test/widget/debug/img/debug_row_item_with_subtitle.png and b/test/widget/debug/img/debug_row_item_with_subtitle.png differ diff --git a/test/widget/debug/img/debug_row_item_with_title.png b/test/widget/debug/img/debug_row_item_with_title.png index bab73f09..84c4f509 100644 Binary files a/test/widget/debug/img/debug_row_item_with_title.png and b/test/widget/debug/img/debug_row_item_with_title.png differ diff --git a/test/widget/debug/img/debug_row_title_default_state.png b/test/widget/debug/img/debug_row_title_default_state.png index 43a1d633..cdbf90f9 100644 Binary files a/test/widget/debug/img/debug_row_title_default_state.png and b/test/widget/debug/img/debug_row_title_default_state.png differ diff --git a/test/widget/debug/img/debug_switch_row_item_selected_state.png b/test/widget/debug/img/debug_switch_row_item_selected_state.png index 39986ddc..45dea45a 100644 Binary files a/test/widget/debug/img/debug_switch_row_item_selected_state.png and b/test/widget/debug/img/debug_switch_row_item_selected_state.png differ diff --git a/test/widget/debug/img/debug_switch_row_item_selected_state_subtitle.png b/test/widget/debug/img/debug_switch_row_item_selected_state_subtitle.png index def71278..f7ba79b3 100644 Binary files a/test/widget/debug/img/debug_switch_row_item_selected_state_subtitle.png and b/test/widget/debug/img/debug_switch_row_item_selected_state_subtitle.png differ diff --git a/test/widget/debug/img/debug_switch_row_item_unselected_state.png b/test/widget/debug/img/debug_switch_row_item_unselected_state.png index efcb5ff7..08bc76c3 100644 Binary files a/test/widget/debug/img/debug_switch_row_item_unselected_state.png and b/test/widget/debug/img/debug_switch_row_item_unselected_state.png differ diff --git a/test/widget/debug/img/debug_switch_row_item_unselected_state_subtitle.png b/test/widget/debug/img/debug_switch_row_item_unselected_state_subtitle.png index 938ea9a0..bd147b8d 100644 Binary files a/test/widget/debug/img/debug_switch_row_item_unselected_state_subtitle.png and b/test/widget/debug/img/debug_switch_row_item_unselected_state_subtitle.png differ diff --git a/test/widget/debug/img/select_language_dialog_en_selected.png b/test/widget/debug/img/select_language_dialog_en_selected.png index 61515bdb..74bdcbf2 100644 Binary files a/test/widget/debug/img/select_language_dialog_en_selected.png and b/test/widget/debug/img/select_language_dialog_en_selected.png differ diff --git a/test/widget/debug/img/select_language_dialog_initial_state.png b/test/widget/debug/img/select_language_dialog_initial_state.png index 61515bdb..74bdcbf2 100644 Binary files a/test/widget/debug/img/select_language_dialog_initial_state.png and b/test/widget/debug/img/select_language_dialog_initial_state.png differ diff --git a/test/widget/debug/img/select_language_dialog_nl_selected.png b/test/widget/debug/img/select_language_dialog_nl_selected.png index c15fc2de..eb31686b 100644 Binary files a/test/widget/debug/img/select_language_dialog_nl_selected.png and b/test/widget/debug/img/select_language_dialog_nl_selected.png differ diff --git a/test/widget/debug/img/select_language_dialog_system_defaults_selected.png b/test/widget/debug/img/select_language_dialog_system_defaults_selected.png index 92add1e1..6a08c330 100644 Binary files a/test/widget/debug/img/select_language_dialog_system_defaults_selected.png and b/test/widget/debug/img/select_language_dialog_system_defaults_selected.png differ diff --git a/test/widget/debug/img/selector_item_initial_state.png b/test/widget/debug/img/selector_item_initial_state.png index aefd97d2..6b9a53ca 100644 Binary files a/test/widget/debug/img/selector_item_initial_state.png and b/test/widget/debug/img/selector_item_initial_state.png differ diff --git a/test/widget/debug/img/selector_item_selected_state.png b/test/widget/debug/img/selector_item_selected_state.png index 19437db4..df484ad3 100644 Binary files a/test/widget/debug/img/selector_item_selected_state.png and b/test/widget/debug/img/selector_item_selected_state.png differ diff --git a/test/widget/general/action/img/action_item_after_click.png b/test/widget/general/action/img/action_item_after_click.png index ac20ba8f..df0631bf 100644 Binary files a/test/widget/general/action/img/action_item_after_click.png and b/test/widget/general/action/img/action_item_after_click.png differ diff --git a/test/widget/general/action/img/action_item_before_click.png b/test/widget/general/action/img/action_item_before_click.png index ac20ba8f..df0631bf 100644 Binary files a/test/widget/general/action/img/action_item_before_click.png and b/test/widget/general/action/img/action_item_before_click.png differ diff --git a/test/widget/general/action/img/action_item_default_state.png b/test/widget/general/action/img/action_item_default_state.png index ac20ba8f..df0631bf 100644 Binary files a/test/widget/general/action/img/action_item_default_state.png and b/test/widget/general/action/img/action_item_default_state.png differ diff --git a/test/widget/general/action/img/text_action_item_default_state.png b/test/widget/general/action/img/text_action_item_default_state.png index 3f9cc491..78e717af 100644 Binary files a/test/widget/general/action/img/text_action_item_default_state.png and b/test/widget/general/action/img/text_action_item_default_state.png differ diff --git a/test/widget/general/action/img/text_action_item_disabled_state.png b/test/widget/general/action/img/text_action_item_disabled_state.png index 3f9cc491..78e717af 100644 Binary files a/test/widget/general/action/img/text_action_item_disabled_state.png and b/test/widget/general/action/img/text_action_item_disabled_state.png differ diff --git a/test/widget/general/styled/img/flutter_template_back_button_dark.png b/test/widget/general/styled/img/flutter_template_back_button_dark.png index ac20ba8f..24cbee09 100644 Binary files a/test/widget/general/styled/img/flutter_template_back_button_dark.png and b/test/widget/general/styled/img/flutter_template_back_button_dark.png differ diff --git a/test/widget/general/styled/img/flutter_template_back_button_full_screen_dark.png b/test/widget/general/styled/img/flutter_template_back_button_full_screen_dark.png index ac20ba8f..24cbee09 100644 Binary files a/test/widget/general/styled/img/flutter_template_back_button_full_screen_dark.png and b/test/widget/general/styled/img/flutter_template_back_button_full_screen_dark.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_default_state_android.png b/test/widget/general/styled/img/flutter_template_button_default_state_android.png index 499d033a..ee57151e 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_default_state_android.png and b/test/widget/general/styled/img/flutter_template_button_default_state_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_default_state_ios.png b/test/widget/general/styled/img/flutter_template_button_default_state_ios.png index 499d033a..ee57151e 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_default_state_ios.png and b/test/widget/general/styled/img/flutter_template_button_default_state_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_not_enabled_android.png b/test/widget/general/styled/img/flutter_template_button_not_enabled_android.png index 95422802..51e5d173 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_not_enabled_android.png and b/test/widget/general/styled/img/flutter_template_button_not_enabled_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_not_enabled_ios.png b/test/widget/general/styled/img/flutter_template_button_not_enabled_ios.png index 95422802..51e5d173 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_not_enabled_ios.png and b/test/widget/general/styled/img/flutter_template_button_not_enabled_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_not_expanded_android.png b/test/widget/general/styled/img/flutter_template_button_not_expanded_android.png index b3fbe285..2738d821 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_not_expanded_android.png and b/test/widget/general/styled/img/flutter_template_button_not_expanded_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_not_expanded_ios.png b/test/widget/general/styled/img/flutter_template_button_not_expanded_ios.png index b3fbe285..2738d821 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_not_expanded_ios.png and b/test/widget/general/styled/img/flutter_template_button_not_expanded_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_with_key_android.png b/test/widget/general/styled/img/flutter_template_button_with_key_android.png index 499d033a..ee57151e 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_with_key_android.png and b/test/widget/general/styled/img/flutter_template_button_with_key_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_button_with_key_ios.png b/test/widget/general/styled/img/flutter_template_button_with_key_ios.png index 499d033a..ee57151e 100644 Binary files a/test/widget/general/styled/img/flutter_template_button_with_key_ios.png and b/test/widget/general/styled/img/flutter_template_button_with_key_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_checkbox_true_android.png b/test/widget/general/styled/img/flutter_template_checkbox_true_android.png index 9ebc16a6..730a8745 100644 Binary files a/test/widget/general/styled/img/flutter_template_checkbox_true_android.png and b/test/widget/general/styled/img/flutter_template_checkbox_true_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_checkbox_true_ios.png b/test/widget/general/styled/img/flutter_template_checkbox_true_ios.png index 2bd2c1b7..66ae2c96 100644 Binary files a/test/widget/general/styled/img/flutter_template_checkbox_true_ios.png and b/test/widget/general/styled/img/flutter_template_checkbox_true_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_input_field_type_text_after.png b/test/widget/general/styled/img/flutter_template_input_field_type_text_after.png index 725339e9..e45a91a8 100644 Binary files a/test/widget/general/styled/img/flutter_template_input_field_type_text_after.png and b/test/widget/general/styled/img/flutter_template_input_field_type_text_after.png differ diff --git a/test/widget/general/styled/img/flutter_template_input_field_type_text_before.png b/test/widget/general/styled/img/flutter_template_input_field_type_text_before.png index 68d9364e..f6c755f7 100644 Binary files a/test/widget/general/styled/img/flutter_template_input_field_type_text_before.png and b/test/widget/general/styled/img/flutter_template_input_field_type_text_before.png differ diff --git a/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_disabled.png b/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_disabled.png index 523ed673..e905f139 100644 Binary files a/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_disabled.png and b/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_disabled.png differ diff --git a/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_enabled.png b/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_enabled.png index 68d9364e..f6c755f7 100644 Binary files a/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_enabled.png and b/test/widget/general/styled/img/flutter_template_input_field_with_hint_and_enabled.png differ diff --git a/test/widget/general/styled/img/flutter_template_progress_indicator_dark.png b/test/widget/general/styled/img/flutter_template_progress_indicator_dark.png index 36624398..fba78ef1 100644 Binary files a/test/widget/general/styled/img/flutter_template_progress_indicator_dark.png and b/test/widget/general/styled/img/flutter_template_progress_indicator_dark.png differ diff --git a/test/widget/general/styled/img/flutter_template_progress_indicator_light.png b/test/widget/general/styled/img/flutter_template_progress_indicator_light.png index 36624398..fba78ef1 100644 Binary files a/test/widget/general/styled/img/flutter_template_progress_indicator_light.png and b/test/widget/general/styled/img/flutter_template_progress_indicator_light.png differ diff --git a/test/widget/general/styled/img/flutter_template_switch_false_android.png b/test/widget/general/styled/img/flutter_template_switch_false_android.png index 79370c94..136d4b7c 100644 Binary files a/test/widget/general/styled/img/flutter_template_switch_false_android.png and b/test/widget/general/styled/img/flutter_template_switch_false_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_switch_false_ios.png b/test/widget/general/styled/img/flutter_template_switch_false_ios.png index 79370c94..136d4b7c 100644 Binary files a/test/widget/general/styled/img/flutter_template_switch_false_ios.png and b/test/widget/general/styled/img/flutter_template_switch_false_ios.png differ diff --git a/test/widget/general/styled/img/flutter_template_switch_true_android.png b/test/widget/general/styled/img/flutter_template_switch_true_android.png index 7a0e1599..d00ce46e 100644 Binary files a/test/widget/general/styled/img/flutter_template_switch_true_android.png and b/test/widget/general/styled/img/flutter_template_switch_true_android.png differ diff --git a/test/widget/general/styled/img/flutter_template_switch_true_ios.png b/test/widget/general/styled/img/flutter_template_switch_true_ios.png index 7a0e1599..d00ce46e 100644 Binary files a/test/widget/general/styled/img/flutter_template_switch_true_ios.png and b/test/widget/general/styled/img/flutter_template_switch_true_ios.png differ diff --git a/test/widget/provider/img/data_provider_widget_localization.png b/test/widget/provider/img/data_provider_widget_localization.png index dc6675cd..5993b3fb 100644 Binary files a/test/widget/provider/img/data_provider_widget_localization.png and b/test/widget/provider/img/data_provider_widget_localization.png differ diff --git a/test/widget/provider/img/data_provider_widget_theme.png b/test/widget/provider/img/data_provider_widget_theme.png index dc6675cd..5993b3fb 100644 Binary files a/test/widget/provider/img/data_provider_widget_theme.png and b/test/widget/provider/img/data_provider_widget_theme.png differ diff --git a/test/widget/provider/img/data_provider_widget_theme_and_localization.png b/test/widget/provider/img/data_provider_widget_theme_and_localization.png index dc6675cd..5993b3fb 100644 Binary files a/test/widget/provider/img/data_provider_widget_theme_and_localization.png and b/test/widget/provider/img/data_provider_widget_theme_and_localization.png differ diff --git a/test/widget/provider/img/provider_widget_child.png b/test/widget/provider/img/provider_widget_child.png index d39ae51e..bf46640e 100644 Binary files a/test/widget/provider/img/provider_widget_child.png and b/test/widget/provider/img/provider_widget_child.png differ diff --git a/test/widget/provider/img/provider_widget_child_builder.png b/test/widget/provider/img/provider_widget_child_builder.png index dc6675cd..5993b3fb 100644 Binary files a/test/widget/provider/img/provider_widget_child_builder.png and b/test/widget/provider/img/provider_widget_child_builder.png differ diff --git a/test/widget/provider/img/provider_widget_consumer.png b/test/widget/provider/img/provider_widget_consumer.png index a4b0eafd..542af140 100644 Binary files a/test/widget/provider/img/provider_widget_consumer.png and b/test/widget/provider/img/provider_widget_consumer.png differ diff --git a/test/widget/provider/img/provider_widget_consumer_and_consumer_child.png b/test/widget/provider/img/provider_widget_consumer_and_consumer_child.png index ca6746e5..ea1184f2 100644 Binary files a/test/widget/provider/img/provider_widget_consumer_and_consumer_child.png and b/test/widget/provider/img/provider_widget_consumer_and_consumer_child.png differ diff --git a/test/widget/todo/img/todo_row_item_selected_state.png b/test/widget/todo/img/todo_row_item_selected_state.png index 5b980662..2962d2ac 100644 Binary files a/test/widget/todo/img/todo_row_item_selected_state.png and b/test/widget/todo/img/todo_row_item_selected_state.png differ diff --git a/test/widget/todo/img/todo_row_item_unselected_state.png b/test/widget/todo/img/todo_row_item_unselected_state.png index c39de2d3..93df069d 100644 Binary files a/test/widget/todo/img/todo_row_item_unselected_state.png and b/test/widget/todo/img/todo_row_item_unselected_state.png differ