From b0edf1fe75e69d886c6b0aaff3baa4c6a53fbbcb Mon Sep 17 00:00:00 2001
From: David Adegoke <64401859+Blazebrain@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:15:36 +0100
Subject: [PATCH] fix(desktop-icon): Desktop Icons Fix (#2303)
This change:
- Adds svg icons for history and notification
- Updates the sidebar and services widget to use new images
- Fixes services widget icon looking very tiny on desktop
---
assets/images/history.svg | 10 +++++++++
assets/images/notif.svg | 3 +++
.../desktop_sidebar/side_menu_item.dart | 5 +++--
.../desktop_sidebar_wrapper.dart | 7 +------
lib/src/widgets/services_updates_widget.dart | 21 ++++++++++---------
5 files changed, 28 insertions(+), 18 deletions(-)
create mode 100644 assets/images/history.svg
create mode 100644 assets/images/notif.svg
diff --git a/assets/images/history.svg b/assets/images/history.svg
new file mode 100644
index 000000000..f308ab7e3
--- /dev/null
+++ b/assets/images/history.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/images/notif.svg b/assets/images/notif.svg
new file mode 100644
index 000000000..b1ff5b4fa
--- /dev/null
+++ b/assets/images/notif.svg
@@ -0,0 +1,3 @@
+
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
index e8ad78a3d..1f169d202 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
import 'package:flutter/material.dart';
class SideMenuItem extends StatelessWidget {
@@ -46,8 +47,8 @@ class SideMenuItem extends StatelessWidget {
color: _setColor(context),
size: 30,
)
- : Image.asset(
- imagePath ?? '',
+ : CakeImageWidget(
+ imageUrl: imagePath ?? '',
fit: BoxFit.cover,
height: 30,
width: 30,
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
index a1de585bd..a26f48928 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
@@ -63,9 +63,6 @@ class DesktopSidebarWrapper extends BasePage {
final pageController = PageController();
- final selectedIconPath = 'assets/images/desktop_transactions_solid_icon.png';
- final unselectedIconPath = 'assets/images/desktop_transactions_outline_icon.png';
-
double get sideMenuWidth => 76.0;
@override
@@ -103,9 +100,7 @@ class DesktopSidebarWrapper extends BasePage {
}
},
isSelected: desktopSidebarViewModel.currentPage == SidebarItem.transactions,
- imagePath: desktopSidebarViewModel.currentPage == SidebarItem.transactions
- ? selectedIconPath
- : unselectedIconPath,
+ imagePath: 'assets/images/history.svg',
),
SideMenuItem(
widget: ServicesUpdatesWidget(
diff --git a/lib/src/widgets/services_updates_widget.dart b/lib/src/widgets/services_updates_widget.dart
index d669dba37..eaa50867c 100644
--- a/lib/src/widgets/services_updates_widget.dart
+++ b/lib/src/widgets/services_updates_widget.dart
@@ -3,11 +3,12 @@ import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/entities/service_status.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/widgets/service_status_tile.dart';
+import 'package:cake_wallet/utils/device_info.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -40,16 +41,17 @@ class _ServicesUpdatesWidgetState extends State {
);
});
},
- child: SvgPicture.asset(
- "assets/images/notification_icon.svg",
+ child: CakeImageWidget(
+ imageUrl: "assets/images/notif.svg",
color: Theme.of(context).colorScheme.onSurface,
- width: 20,
- placeholderBuilder: (_) => Icon(Icons.error),
+ width: DeviceInfo.instance.isDesktop ? 30 : 20,
),
);
}
return Padding(
- padding: const EdgeInsets.only(left: 16, top: 12, right: 8, bottom: 8),
+ padding: DeviceInfo.instance.isDesktop
+ ? EdgeInsets.zero
+ : EdgeInsets.only(left: 16, top: 12, right: 8, bottom: 8),
child: FutureBuilder(
future: widget.servicesResponse,
builder: (context, state) {
@@ -135,11 +137,10 @@ class _ServicesUpdatesWidgetState extends State {
: null,
child: Stack(
children: [
- SvgPicture.asset(
- "assets/images/notification_icon.svg",
+ CakeImageWidget(
+ imageUrl: "assets/images/notif.svg",
color: Theme.of(context).colorScheme.onSurface,
- width: 20,
- placeholderBuilder: (_) => Icon(Icons.error),
+ width: DeviceInfo.instance.isDesktop ? 30 : 20,
),
if (state.hasData && state.data!.hasUpdates && !wasOpened)
Container(