Skip to content

Commit

Permalink
feat: Uicons by Flaticon (#234)
Browse files Browse the repository at this point in the history
  • Loading branch information
just-seba authored Oct 15, 2024
1 parent 5341c4b commit dd4534d
Show file tree
Hide file tree
Showing 34 changed files with 7,409 additions and 121 deletions.
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"[dart]": {
// https://dartcode.org/docs/recommended-settings/
"editor.rulers": [80],
"editor.formatOnSave": true,
"editor.formatOnType": true
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
Expand All @@ -19,6 +25,8 @@
"dtos",
"Dtos",
"emma",
"flaticon",
"Flaticon",
"Flurl",
"hcloud",
"keycloak",
Expand All @@ -36,6 +44,8 @@
"Relayout",
"Riok",
"trid",
"uicons",
"Uicons",
"validatable",
"Vogen"
]
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@
## Contributing

See [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md).

---

Attributions:

- Uicons by [Flaticon](https://www.flaticon.com/uicons)
Binary file removed app/fonts/materialdesignicons-webfont.ttf
Binary file not shown.
Binary file added app/fonts/uicons-regular-rounded.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion app/lib/ui/analytics/analytics_range_picker.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:openems/ui/analytics/analytics_period.dart';
import 'package:openems/ui/analytics/analytics_view_model.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:signals/signals_flutter.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/analytics/metrics/analytics_metric_card.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:flutter/material.dart';

class AnalyticsMetricCard extends StatelessWidget {
Expand Down
5 changes: 3 additions & 2 deletions app/lib/ui/analytics/metrics/own_consumption_metric_view.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:openems/ui/analytics/metrics/analytics_circular_percentage_indicator.dart';
import 'package:openems/ui/analytics/metrics/analytics_metric_card.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/shared/unit_text.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -38,7 +39,7 @@ class OwnConsumptionMetricView extends StatelessWidget {
TableRow(
children: [
Icon(
Icons.circle,
AppIcons.circle,
color: Theme.of(context).colorScheme.primary,
),
const Text("Eigenverbrauch:"),
Expand All @@ -51,7 +52,7 @@ class OwnConsumptionMetricView extends StatelessWidget {
TableRow(
children: [
Icon(
Icons.circle,
AppIcons.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
const Text("Einspeisung:"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:openems/ui/analytics/metrics/analytics_metric_card.dart';
import 'package:flutter/material.dart';
import 'package:openems/ui/analytics/metrics/analytics_circular_percentage_indicator.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/shared/unit_text.dart';

class SelfSufficiencyMetricView extends StatelessWidget {
Expand Down Expand Up @@ -35,7 +36,7 @@ class SelfSufficiencyMetricView extends StatelessWidget {
TableRow(
children: [
Icon(
Icons.circle,
AppIcons.circle,
color: Theme.of(context).colorScheme.primary,
),
const Text("Eigenverbrauch:"),
Expand All @@ -48,7 +49,7 @@ class SelfSufficiencyMetricView extends StatelessWidget {
TableRow(
children: [
Icon(
Icons.circle,
AppIcons.circle,
color: Theme.of(context).colorScheme.secondaryContainer,
),
const Text("Zukauf:"),
Expand Down
64 changes: 0 additions & 64 deletions app/lib/ui/app_icons.dart

This file was deleted.

2 changes: 1 addition & 1 deletion app/lib/ui/app_messenger.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/commands/command.dart';
import 'package:flutter/material.dart';
import 'package:signals/signals_flutter.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.enums.swagger.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.models.swagger.dart';
import 'package:openems/domain/integrations/known_integrations.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/add/add_consumer_screen.dart';
import 'package:openems/ui/devices/add/add_electricity_meter_screen.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/add/integrations/shelly_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:async';

import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/domain/integrations/known_integrations.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/add/add_consumer_screen.dart';
import 'package:openems/ui/devices/add/add_electricity_meter_screen.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/add/select_device_category_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.enums.swagger.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/add/widgets/abort_add_button.dart';
import 'package:openems/ui/devices/add/widgets/add_device_step_explanation.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/add/select_integration_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.enums.swagger.dart';
import 'package:openems/domain/integrations/known_integrations.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/add/integrations/development_screen.dart';
import 'package:openems/ui/devices/add/widgets/abort_add_button.dart';
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/add/widgets/abort_add_button.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/shared/app_bar_action_button.dart';
import 'package:flutter/material.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/consumers/edit_switch_consumer_screen.dart';
import 'package:openems/ui/devices/consumers/switch_consumer_view_model.dart';
Expand Down
4 changes: 2 additions & 2 deletions app/lib/ui/devices/devices_screen.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/add/select_device_category_screen.dart';
import 'package:openems/ui/devices/devices_view_model.dart';
Expand Down Expand Up @@ -47,7 +47,7 @@ class _DevicesScreenState extends State<DevicesScreen> {
actions: [
const AppBarActionButton(
onPressed: noop,
icon: Icon(Icons.low_priority),
icon: Icon(AppIcons.priority),
),
AppBarActionButton(
onPressed: _startAddFlow,
Expand Down
6 changes: 3 additions & 3 deletions app/lib/ui/devices/meters/electricity_meter_list_item.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.swagger.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/meters/edit_electricity_meter_screen.dart';
import 'package:openems/ui/devices/meters/electricity_meter_view_model.dart';
Expand Down Expand Up @@ -28,11 +28,11 @@ class ElectricityMeterListItem extends StatelessWidget {
GridPowerDirection.none =>
const OnOffIndicator(status: false),
GridPowerDirection.consume => Icon(
AppIcons.arrow_flow_down_double,
AppIcons.flow_down_double,
color: colorScheme.error,
),
GridPowerDirection.feedin => Icon(
AppIcons.arrow_flow_up_double,
AppIcons.flow_up_double,
color: colorScheme.primary,
)
},
Expand Down
2 changes: 1 addition & 1 deletion app/lib/ui/devices/producers/producer_list_item.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:openems/application/backend_api/value_types.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/devices/producers/edit_producer_screen.dart';
import 'package:openems/ui/devices/producers/producer_view_model.dart';
Expand Down
4 changes: 2 additions & 2 deletions app/lib/ui/home/home_screen.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/home/home_view_model.dart';
import 'package:openems/ui/home/profile/profile_screen.dart';
Expand Down Expand Up @@ -42,7 +42,7 @@ class _HomeScreenState extends State<HomeScreen> {
appBar: AppBar(
actions: [
AppBarActionButton(
icon: const Icon(AppIcons.person_outlined),
icon: const Icon(AppIcons.person),
onPressed: () => AppNavigator.push(const ProfileScreen()),
),
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:openems/infrastructure/window_size_writer.dart';
import 'package:flutter/material.dart';
import 'package:openems/ui/icons/app_icons.dart';

class ScreenSizeSelector extends StatefulWidget {
const ScreenSizeSelector({super.key});
Expand Down Expand Up @@ -27,7 +28,7 @@ class _ScreenSizeSelectorState extends State<ScreenSizeSelector> {
),
IconButton(
onPressed: () => WindowSizeWriter.toggleOrientation(),
icon: const Icon(Icons.rotate_right),
icon: const Icon(AppIcons.rotate_right),
)
],
);
Expand Down
15 changes: 12 additions & 3 deletions app/lib/ui/home/profile/information_screen.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:url_launcher/url_launcher_string.dart';

class AboutScreen extends StatelessWidget {
Expand All @@ -11,13 +12,13 @@ class AboutScreen extends StatelessWidget {
final items = <Widget>[
ListTile(
title: const Text("Impressum"),
trailing: const Icon(Icons.open_in_new),
trailing: const Icon(AppIcons.open_in_new),
onTap: () =>
launchUrlString("https://opencleanenergy.org/legal-notice/"),
),
ListTile(
title: const Text("Datenschutz"),
trailing: const Icon(Icons.open_in_new),
trailing: const Icon(AppIcons.open_in_new),
onTap: () =>
launchUrlString("https://opencleanenergy.org/privacy-policy/"),
),
Expand All @@ -29,8 +30,16 @@ class AboutScreen extends StatelessWidget {
padding: EdgeInsets.only(left: 16.0),
child: Text("IconKitchen"),
),
trailing: const Icon(Icons.open_in_new),
trailing: const Icon(AppIcons.open_in_new),
onTap: () => launchUrlString("https://icon.kitchen"),
),
ListTile(
title: const Padding(
padding: EdgeInsets.only(left: 16.0),
child: Text("Uicons by Flaticon"),
),
trailing: const Icon(AppIcons.open_in_new),
onTap: () => launchUrlString("https://www.flaticon.com/uicons"),
)
],
)
Expand Down
9 changes: 5 additions & 4 deletions app/lib/ui/home/profile/profile_screen.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:openems/infrastructure/window_size_writer.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/app_navigator.dart';
import 'package:openems/ui/home/profile/information_screen.dart';
import 'package:openems/ui/home/profile/version_info.dart';
Expand Down Expand Up @@ -36,7 +36,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
onTap: () => AppNavigator.push(const AboutScreen()),
),
ListTile(
leading: const Icon(Icons.bug_report),
leading: const Icon(AppIcons.logs),
title: const Text(LogsScreen.title),
trailing: const Icon(AppIcons.arrow_next),
onTap: () => AppNavigator.push(const LogsScreen()),
Expand All @@ -54,8 +54,9 @@ class _ProfileScreenState extends State<ProfileScreen> {

if (WindowSizeWriter.isSupported) {
items.add(const ListTile(
leading: Icon(Icons.fit_screen_rounded),
title: ScreenSizeSelector()));
leading: Icon(AppIcons.screen),
title: ScreenSizeSelector(),
));
}

items.add(
Expand Down
7 changes: 2 additions & 5 deletions app/lib/ui/home/status/battery_status_indicator.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/home/home_view_model.dart';
import 'package:openems/ui/home/status/status_indicator.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -27,13 +27,10 @@ class BatteryStatusIndicator extends StatelessWidget {

IconData _getBatteryIcon() {
const icons = [
AppIcons.battery_0_bar,
AppIcons.battery_empty,
AppIcons.battery_1_bar,
AppIcons.battery_2_bar,
AppIcons.battery_3_bar,
AppIcons.battery_4_bar,
AppIcons.battery_5_bar,
AppIcons.battery_6_bar,
AppIcons.battery_full,
];

Expand Down
4 changes: 2 additions & 2 deletions app/lib/ui/home/status/grid_status_indicator.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:openems/application/backend_api/swagger_generated_code/backend_api.enums.swagger.dart';
import 'package:openems/ui/app_icons.dart';
import 'package:openems/ui/icons/app_icons.dart';
import 'package:openems/ui/home/home_view_model.dart';
import 'package:openems/ui/home/status/status_indicator.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -37,7 +37,7 @@ class _GridStatusIndicatorState extends State<GridStatusIndicator> {
@override
Widget build(BuildContext context) {
return StatusIndicator(
icon: signal(AppIcons.transmission_tower),
icon: signal(AppIcons.power_grid),
value: widget.viewModel.currentPower,
maxValue: _maximumPower,
unit: "W",
Expand Down
Loading

0 comments on commit dd4534d

Please sign in to comment.