diff --git a/lib/model/bottom_navigation/bottom_navigation_tab.dart b/lib/model/bottom_navigation/bottom_navigation_tab.dart index 4a75ecc2..e1436a87 100644 --- a/lib/model/bottom_navigation/bottom_navigation_tab.dart +++ b/lib/model/bottom_navigation/bottom_navigation_tab.dart @@ -1,23 +1,23 @@ import 'package:flutter/material.dart'; import 'package:flutter_template/screen/debug/debug_screen.dart'; import 'package:flutter_template/screen/todo/todo_list/todo_list_screen.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/util/locale/localization_keys.dart'; +import 'package:icapps_icons/icapps_icons.dart'; enum BottomNavigationTab { todo( - iconActive: ThemeAssets.todoIconActive, - iconInactive: ThemeAssets.todoIconInactive, + iconActive: IcappsIcons.alarmFilled, + iconInactive: IcappsIcons.alarm, labelKey: LocalizationKeys.todoTitle, ), settings( - iconActive: ThemeAssets.settingsIconActive, - iconInactive: ThemeAssets.settingsIconInactive, + iconActive: IcappsIcons.cogwheel1Filled, + iconInactive: IcappsIcons.cogwheel1, labelKey: LocalizationKeys.settingsTitle, ); - final String iconActive; - final String iconInactive; + final IconData iconActive; + final IconData iconInactive; final String labelKey; const BottomNavigationTab({ diff --git a/lib/screen/debug/debug_screen.dart b/lib/screen/debug/debug_screen.dart index ca876ea5..a4f621d6 100644 --- a/lib/screen/debug/debug_screen.dart +++ b/lib/screen/debug/debug_screen.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart'; import 'package:flutter_template/di/injectable.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/util/keys.dart'; import 'package:flutter_template/viewmodel/debug/debug_viewmodel.dart'; import 'package:flutter_template/viewmodel/global/global_viewmodel.dart'; @@ -10,6 +9,7 @@ import 'package:flutter_template/widget/debug/debug_section.dart'; import 'package:flutter_template/widget/debug/debug_switch_row_item.dart'; import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; +import 'package:icapps_icons/icapps_icons.dart'; import 'package:provider/provider.dart'; @flutterRoute @@ -33,7 +33,7 @@ class DebugScreenState extends State { children: [ DebugSection( title: localization.debugAnimationsTitle, - icon: ThemeAssets.animationIcon, + icon: IcappsIcons.spark1, children: [ DebugRowSwitchItem( key: Keys.debugSlowAnimations, @@ -46,7 +46,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: localization.debugThemeTitle, - icon: ThemeAssets.themeIcon, + icon: IcappsIcons.swatches, children: [ DebugRowItem( key: Keys.debugTargetPlatform, @@ -65,7 +65,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: localization.debugLocaleTitle, - icon: ThemeAssets.translationsIcon, + icon: IcappsIcons.globe1, children: [ DebugRowItem( key: Keys.debugSelectLanguage, @@ -84,7 +84,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: localization.debugLicensesTitle, - icon: ThemeAssets.licenseIcon, + icon: IcappsIcons.rosette1, children: [ DebugRowItem( key: Keys.debugLicense, @@ -96,7 +96,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: localization.debugDatabase, - icon: ThemeAssets.boxIcon, + icon: IcappsIcons.boxWithLid, children: [ DebugRowItem( key: Keys.debugDatabase, @@ -108,7 +108,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: localization.debugPermissionsTitle, - icon: ThemeAssets.lockOpenIcon, + icon: IcappsIcons.lockOpen1, children: [ DebugRowItem( key: Keys.debugPermissionAnalytics, @@ -125,7 +125,7 @@ class DebugScreenState extends State { const SizedBox(height: 24), DebugSection( title: 'logs', - icon: ThemeAssets.listIcon, + icon: IcappsIcons.listBullets, children: [ DebugRowItem( key: Keys.debugPermissionAnalyticsReset, diff --git a/lib/screen/logs/logs_screen.dart b/lib/screen/logs/logs_screen.dart index 8cdb8f33..12ebe254 100644 --- a/lib/screen/logs/logs_screen.dart +++ b/lib/screen/logs/logs_screen.dart @@ -1,15 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart'; import 'package:flutter_template/di/injectable.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/util/extension/date_time_extension.dart'; import 'package:flutter_template/viewmodel/logs/logs_viewmodel.dart'; import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_button.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; +import 'package:icapps_icons/icapps_icons.dart'; @flutterRoute class LogsScreen extends StatefulWidget { @@ -50,8 +49,8 @@ class LogsScreenState extends State { style: theme.text.bodyBig, ), ), - SvgIcon( - svgAsset: ThemeAssets.chevronRightIcon, + Icon( + IcappsIcons.chevronRight, color: theme.icon, ) ], diff --git a/lib/screen/todo/todo_list/todo_list_screen.dart b/lib/screen/todo/todo_list/todo_list_screen.dart index 6ec6a974..d261490a 100644 --- a/lib/screen/todo/todo_list/todo_list_screen.dart +++ b/lib/screen/todo/todo_list/todo_list_screen.dart @@ -1,16 +1,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_template/di/injectable.dart'; import 'package:flutter_template/model/webservice/todo/todo.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/util/keys.dart'; import 'package:flutter_template/viewmodel/todo/todo_list/todo_list_viewmodel.dart'; import 'package:flutter_template/widget/general/action/action_item.dart'; import 'package:flutter_template/widget/general/base_screen/base_screen.dart'; import 'package:flutter_template/widget/general/styled/flutter_template_progress_indicator.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/provider_widget.dart'; import 'package:flutter_template/widget/todo/todo_row_item.dart'; +import 'package:icapps_icons/icapps_icons.dart'; class TodoListScreen extends StatefulWidget { const TodoListScreen({super.key}); @@ -33,13 +32,13 @@ class TodoListScreenState extends State { actions: [ ActionItem( key: Keys.downloadAction, - svgAsset: ThemeAssets.downloadIcon, + icon: IcappsIcons.arrowDownToLine, onClick: viewModel.onDownloadClicked, color: theme.appBarAction, ), ActionItem( key: Keys.addAction, - svgAsset: ThemeAssets.addIcon, + icon: IcappsIcons.plus, onClick: viewModel.onAddClicked, color: theme.appBarAction, ), @@ -75,8 +74,8 @@ class TodoListScreenState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ - SvgIcon( - svgAsset: ThemeAssets.fileIcon, + Icon( + IcappsIcons.fileData, color: theme.accent, ), const SizedBox(height: 8), diff --git a/lib/widget/debug/debug_row_item.dart b/lib/widget/debug/debug_row_item.dart index 5c72de95..8403f88f 100644 --- a/lib/widget/debug/debug_row_item.dart +++ b/lib/widget/debug/debug_row_item.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/styles/theme_data.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; +import 'package:icapps_icons/icapps_icons.dart'; class DebugRowItem extends StatelessWidget { final String title; @@ -21,37 +20,37 @@ class DebugRowItem extends StatelessWidget { Widget build(BuildContext context) { return DataProviderWidget( childBuilderTheme: (context, theme) => TouchFeedBack( - onTapped: onClick, - child: Padding( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + onTapped: onClick, + child: Padding( + padding: const EdgeInsets.all(16), + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: theme.text.bodyBig, + ), + if (subTitle != null) ...[ + Container(height: 8), Text( - title, - style: theme.text.bodyBig, + subTitle!, + style: theme.text.bodySmall, ), - if (subTitle != null) ...[ - Container(height: 8), - Text( - subTitle!, - style: theme.text.bodySmall, - ), - ], ], - ), + ], ), - SvgIcon( - svgAsset: ThemeAssets.chevronRightIcon, - color: theme.icon, - ), - ], - ), + ), + Icon( + IcappsIcons.chevronRight, + color: theme.icon, + ) + ], ), ), + ), ); } } diff --git a/lib/widget/debug/debug_row_title.dart b/lib/widget/debug/debug_row_title.dart index 3f7e30d3..5f233349 100644 --- a/lib/widget/debug/debug_row_title.dart +++ b/lib/widget/debug/debug_row_title.dart @@ -1,12 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/styles/theme_dimens.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; class DebugRowTitle extends StatelessWidget { final String title; - final String icon; + final IconData icon; const DebugRowTitle({ required this.title, @@ -19,8 +18,8 @@ class DebugRowTitle extends StatelessWidget { return DataProviderWidget( childBuilderTheme: (context, theme) => Row( children: [ - SvgIcon( - svgAsset: icon, + Icon( + icon, color: theme.fadedText, size: ThemeDimens.smallIconSize, ), diff --git a/lib/widget/debug/debug_section.dart b/lib/widget/debug/debug_section.dart index 604e7259..1be81731 100644 --- a/lib/widget/debug/debug_section.dart +++ b/lib/widget/debug/debug_section.dart @@ -5,7 +5,7 @@ import 'package:icapps_architecture/icapps_architecture.dart'; class DebugSection extends StatelessWidget { final String title; - final String icon; + final IconData icon; final List children; const DebugSection({ diff --git a/lib/widget/debug/selector_item.dart b/lib/widget/debug/selector_item.dart index 7e8e9cf2..8e11757b 100644 --- a/lib/widget/debug/selector_item.dart +++ b/lib/widget/debug/selector_item.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/styles/theme_data.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; +import 'package:icapps_icons/icapps_icons.dart'; class SelectorItem extends StatelessWidget { final VoidCallback onClick; @@ -44,8 +43,8 @@ class SelectorItem extends StatelessWidget { ), Opacity( opacity: selected ? 1 : 0, - child: SvgIcon( - svgAsset: ThemeAssets.checkIcon, + child: Icon( + IcappsIcons.checkmark, color: theme.accent, ), ), diff --git a/lib/widget/general/action/action_item.dart b/lib/widget/general/action/action_item.dart index 6c97122a..aae2534e 100644 --- a/lib/widget/general/action/action_item.dart +++ b/lib/widget/general/action/action_item.dart @@ -1,15 +1,14 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; class ActionItem extends StatelessWidget { - final String svgAsset; + final IconData icon; final VoidCallback? onClick; final Color? color; - const ActionItem({ - required this.svgAsset, + const ActionItem( { + required this.icon, required this.onClick, this.color, super.key, @@ -29,8 +28,8 @@ class ActionItem extends StatelessWidget { borderRadius: BorderRadius.circular(48), onTapped: onClick, child: Center( - child: SvgIcon( - svgAsset: svgAsset, + child: Icon( + icon, size: 24, color: color ?? theme.icon, ), diff --git a/lib/widget/general/bottom_navigation/bottom_navigation_item.dart b/lib/widget/general/bottom_navigation/bottom_navigation_item.dart index 91369469..6bcf097c 100644 --- a/lib/widget/general/bottom_navigation/bottom_navigation_item.dart +++ b/lib/widget/general/bottom_navigation/bottom_navigation_item.dart @@ -3,15 +3,14 @@ import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/styles/theme_dimens.dart'; import 'package:flutter_template/styles/theme_durations.dart'; import 'package:flutter_template/util/extension/text_scaler_extensions.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; class BottomNavigationItem extends StatelessWidget { final bool isSelected; final String labelKey; - final String iconActive; - final String iconInactive; + final IconData iconActive; + final IconData iconInactive; final VoidCallback onTap; static const _itemHeight = 56.0; @@ -35,13 +34,13 @@ class BottomNavigationItem extends StatelessWidget { children: [ AnimatedCrossFade( duration: ThemeDurations.shortAnimationDuration, - firstChild: SvgIcon( - svgAsset: iconActive, + firstChild: Icon( + iconActive, color: theme.bottomNavbarItemActive, size: hasSpaceForLabel ? ThemeDimens.iconSize : ThemeDimens.largeIcon, ), - secondChild: SvgIcon( - svgAsset: iconInactive, + secondChild: Icon( + iconInactive, color: theme.bottomNavbarItemInactive, size: hasSpaceForLabel ? ThemeDimens.iconSize : ThemeDimens.largeIcon, ), diff --git a/lib/widget/general/styled/flutter_template_back_button.dart b/lib/widget/general/styled/flutter_template_back_button.dart index 55e575b2..a6015cb9 100644 --- a/lib/widget/general/styled/flutter_template_back_button.dart +++ b/lib/widget/general/styled/flutter_template_back_button.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_assets.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'; +import 'package:icapps_icons/icapps_icons.dart'; class FlutterTemplateBackButton extends StatelessWidget { final VoidCallback? onClick; @@ -27,17 +27,17 @@ class FlutterTemplateBackButton extends StatelessWidget { return DataProviderWidget( childBuilderTheme: (context, theme) => ActionItem( key: Keys.backButton, - svgAsset: getCorrectIcon(context), + icon: getCorrectIcon(context), color: isLight ? ThemeColors.white : theme.appBarAction, onClick: onClick, ), ); } - String getCorrectIcon(BuildContext context) { + IconData getCorrectIcon(BuildContext context) { if (fullScreen) { - return ThemeAssets.arrowLeftIcon; + return IcappsIcons.arrowLeft; } - return ThemeAssets.arrowLeftIcon; + return IcappsIcons.arrowLeft; } } diff --git a/lib/widget/general/styled/flutter_template_checkbox.dart b/lib/widget/general/styled/flutter_template_checkbox.dart index a1af0c06..c1b44f50 100644 --- a/lib/widget/general/styled/flutter_template_checkbox.dart +++ b/lib/widget/general/styled/flutter_template_checkbox.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; -import 'package:flutter_template/widget/general/svg_icon.dart'; import 'package:flutter_template/widget/provider/data_provider_widget.dart'; import 'package:icapps_architecture/icapps_architecture.dart'; +import 'package:icapps_icons/icapps_icons.dart'; class FlutterTemplateCheckBox extends StatelessWidget { final bool value; @@ -26,8 +25,8 @@ class FlutterTemplateCheckBox extends StatelessWidget { width: 48, child: value ? Center( - child: SvgIcon( - svgAsset: ThemeAssets.checkIcon, + child: Icon( + IcappsIcons.checkmark, color: theme.accent, size: 24, ), diff --git a/pubspec.lock b/pubspec.lock index 60cbff4d..6152b27e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -685,6 +685,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.3" + icapps_icons: + dependency: "direct main" + description: + name: icapps_icons + sha256: "3f78156e4dd9aedbd6b627e288d5a6a3e22700022556c25c1f8c15f156d42b8d" + url: "https://pub.dev" + source: hosted + version: "1.0.0" icapps_translations: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 8c225a79..78f23f1e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,6 +37,7 @@ dependencies: sdk: flutter get_it: ^7.2.0 icapps_architecture: ^2.1.0 + icapps_icons: ^1.0.0 injectable: ^2.1.0 intl: ^0.19.0 json_annotation: ^4.7.0 @@ -89,6 +90,9 @@ flutter: - family: OpenSans fonts: - asset: assets/fonts/open_sans/OpenSans-Regular.ttf + - family: icappsIcons + fonts: + - asset: packages/icapps_icons/fonts/icappsIcons.ttf icapps_translations: api_key: '16daba4a2cb331e92eeb0aa2fd219608ff7c8f0488ab4aa887411040a951392f9a8cce488463a1f38eeebf96cb06658aa02d43e53cfc7a7be2d652e8' #TODO Update this to the correct api key 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 83fb66bd..68b0e005 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 2ede885a..3b4f7e5b 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 cb05c778..037b2479 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 a0df3692..1d65a29d 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 cb05c778..037b2479 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 a0df3692..1d65a29d 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 cb05c778..037b2479 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 a0df3692..1d65a29d 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 cb05c778..037b2479 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 a0df3692..1d65a29d 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 90a52528..a4f06086 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 64408fd8..06a8cc70 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 90a52528..a4f06086 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 64408fd8..06a8cc70 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 342e2448..a9e4f68c 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 8ade57fc..d586b912 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 90a52528..a4f06086 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 64408fd8..06a8cc70 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 447775c7..318f0cb2 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 dd03d5d5..7a6bcf4a 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 3bb0e917..097e20d6 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 e01a3468..30ea90e3 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 3bb0e917..097e20d6 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 e01a3468..30ea90e3 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 f6195eb0..2d04bec2 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 f9511091..efe99947 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 f6195eb0..2d04bec2 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 f9511091..efe99947 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 0ce65696..ac19207a 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 eb81a13c..9390279c 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 1d7195b6..c64cb8fa 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 049369bb..d81882e3 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/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 05ba8625..6fd02c47 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 c23a0ebb..9a7ace94 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 368f2001..faef996c 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 b5dd1472..d432be0e 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 8d87ab74..4360970f 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 e3b7e87a..1ddbcb82 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 90f4c588..41c74368 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 f2fa661a..eb3dd6b2 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 e4b976e0..9058ad10 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 1d1b4854..b5633f46 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 474b7bab..f866ee7f 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 4b6a0a55..cf285e6a 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 df3a6fd8..9272bc13 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 abb6e020..2e2df8ba 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 4a96eba7..e85fcac8 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 9cdb18ac..24f3d13f 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/widget/debug/debug_row_title_test.dart b/test/widget/debug/debug_row_title_test.dart index 9b9c2223..76794aa8 100644 --- a/test/widget/debug/debug_row_title_test.dart +++ b/test/widget/debug/debug_row_title_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/widget/debug/debug_row_title.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:icapps_icons/icapps_icons.dart'; import '../../util/test_util.dart'; @@ -8,7 +8,7 @@ void main() { testWidgets('DebugRowTitle default', (tester) async { final widget = DebugRowTitle( title: TestUtil.getVariableString(), - icon: ThemeAssets.fileIcon, + icon: IcappsIcons.fileData, ); await TestUtil.loadWidgetWithText(tester, widget); 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 b493754c..7f50dced 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 c5d2f136..bab73f09 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 98b8bf9b..43a1d633 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/select_language_dialog_en_selected.png b/test/widget/debug/img/select_language_dialog_en_selected.png index 880a9a8c..61515bdb 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 880a9a8c..61515bdb 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 44effaa4..c15fc2de 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 f7c5f306..92add1e1 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_selected_state.png b/test/widget/debug/img/selector_item_selected_state.png index ac575c43..19437db4 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/action_item_test.dart b/test/widget/general/action/action_item_test.dart index 028c279d..6e0e2f0f 100644 --- a/test/widget/general/action/action_item_test.dart +++ b/test/widget/general/action/action_item_test.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_template/styles/theme_assets.dart'; import 'package:flutter_template/styles/theme_data.dart'; import 'package:flutter_template/widget/general/action/action_item.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:icapps_icons/icapps_icons.dart'; import '../../../util/test_util.dart'; @@ -12,7 +12,7 @@ void main() { data: FlutterTemplateThemeData.lightTheme(TargetPlatform.android), child: LayoutBuilder( builder: (context, constraint) => ActionItem( - svgAsset: ThemeAssets.addIcon, + icon: IcappsIcons.plus, onClick: () {}, ), ), @@ -27,7 +27,7 @@ void main() { data: FlutterTemplateThemeData.lightTheme(TargetPlatform.android), child: LayoutBuilder( builder: (context, constraint) => ActionItem( - svgAsset: ThemeAssets.addIcon, + icon: IcappsIcons.plus, color: Colors.black, onClick: () {}, ), @@ -45,7 +45,7 @@ void main() { data: FlutterTemplateThemeData.lightTheme(TargetPlatform.android), child: LayoutBuilder( builder: (context, constraint) => ActionItem( - svgAsset: ThemeAssets.addIcon, + icon: IcappsIcons.plus, onClick: () { clicked = true; }, 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 9b25170e..ac20ba8f 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 9b25170e..ac20ba8f 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_custom_color.png b/test/widget/general/action/img/action_item_custom_color.png index f90aec44..e32bc7d8 100644 Binary files a/test/widget/general/action/img/action_item_custom_color.png and b/test/widget/general/action/img/action_item_custom_color.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 9b25170e..ac20ba8f 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/styled/img/flutter_template_back_button_dark.png b/test/widget/general/styled/img/flutter_template_back_button_dark.png index 4e9ba818..ac20ba8f 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 4e9ba818..ac20ba8f 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_back_button_full_screen_light.png b/test/widget/general/styled/img/flutter_template_back_button_full_screen_light.png index 1a602b68..749a943b 100644 Binary files a/test/widget/general/styled/img/flutter_template_back_button_full_screen_light.png and b/test/widget/general/styled/img/flutter_template_back_button_full_screen_light.png differ diff --git a/test/widget/general/styled/img/flutter_template_back_button_light.png b/test/widget/general/styled/img/flutter_template_back_button_light.png index 1a602b68..749a943b 100644 Binary files a/test/widget/general/styled/img/flutter_template_back_button_light.png and b/test/widget/general/styled/img/flutter_template_back_button_light.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 5eba9941..2bd2c1b7 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