Skip to content

update icons #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorre127 merged 1 commit into from
Jan 27, 2025
Merged

update icons #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/model/bottom_navigation/bottom_navigation_tab.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
16 changes: 8 additions & 8 deletions lib/screen/debug/debug_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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
Expand All @@ -33,7 +33,7 @@ class DebugScreenState extends State<DebugScreen> {
children: [
DebugSection(
title: localization.debugAnimationsTitle,
icon: ThemeAssets.animationIcon,
icon: IcappsIcons.spark1,
children: [
DebugRowSwitchItem(
key: Keys.debugSlowAnimations,
Expand All @@ -46,7 +46,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: localization.debugThemeTitle,
icon: ThemeAssets.themeIcon,
icon: IcappsIcons.swatches,
children: [
DebugRowItem(
key: Keys.debugTargetPlatform,
Expand All @@ -65,7 +65,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: localization.debugLocaleTitle,
icon: ThemeAssets.translationsIcon,
icon: IcappsIcons.globe1,
children: [
DebugRowItem(
key: Keys.debugSelectLanguage,
Expand All @@ -84,7 +84,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: localization.debugLicensesTitle,
icon: ThemeAssets.licenseIcon,
icon: IcappsIcons.rosette1,
children: [
DebugRowItem(
key: Keys.debugLicense,
Expand All @@ -96,7 +96,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: localization.debugDatabase,
icon: ThemeAssets.boxIcon,
icon: IcappsIcons.boxWithLid,
children: [
DebugRowItem(
key: Keys.debugDatabase,
Expand All @@ -108,7 +108,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: localization.debugPermissionsTitle,
icon: ThemeAssets.lockOpenIcon,
icon: IcappsIcons.lockOpen1,
children: [
DebugRowItem(
key: Keys.debugPermissionAnalytics,
Expand All @@ -125,7 +125,7 @@ class DebugScreenState extends State<DebugScreen> {
const SizedBox(height: 24),
DebugSection(
title: 'logs',
icon: ThemeAssets.listIcon,
icon: IcappsIcons.listBullets,
children: [
DebugRowItem(
key: Keys.debugPermissionAnalyticsReset,
Expand Down
7 changes: 3 additions & 4 deletions lib/screen/logs/logs_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -50,8 +49,8 @@ class LogsScreenState extends State<LogsScreen> {
style: theme.text.bodyBig,
),
),
SvgIcon(
svgAsset: ThemeAssets.chevronRightIcon,
Icon(
IcappsIcons.chevronRight,
color: theme.icon,
)
],
Expand Down
11 changes: 5 additions & 6 deletions lib/screen/todo/todo_list/todo_list_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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});
Expand All @@ -33,13 +32,13 @@ class TodoListScreenState extends State<TodoListScreen> {
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,
),
Expand Down Expand Up @@ -75,8 +74,8 @@ class TodoListScreenState extends State<TodoListScreen> {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SvgIcon(
svgAsset: ThemeAssets.fileIcon,
Icon(
IcappsIcons.fileData,
color: theme.accent,
),
const SizedBox(height: 8),
Expand Down
53 changes: 26 additions & 27 deletions lib/widget/debug/debug_row_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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,
)
],
),
),
),
);
}
}
7 changes: 3 additions & 4 deletions lib/widget/debug/debug_row_title.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/widget/debug/debug_section.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Widget> children;

const DebugSection({
Expand Down
7 changes: 3 additions & 4 deletions lib/widget/debug/selector_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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,
),
),
Expand Down
11 changes: 5 additions & 6 deletions lib/widget/general/action/action_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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( {
Copy link

@luca-vz luca-vz Jan 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove spacing

required this.icon,
required this.onClick,
this.color,
super.key,
Expand All @@ -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,
),
Expand Down
13 changes: 6 additions & 7 deletions lib/widget/general/bottom_navigation/bottom_navigation_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
),
Expand Down
Loading
Loading