Skip to content

fix(widgets): fix widget icons #2517

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
pwltr merged 1 commit into from
Mar 14, 2025
Merged

fix(widgets): fix widget icons #2517

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
41 changes: 0 additions & 41 deletions src/components/SvgImage.tsx
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions src/components/widgets/BaseWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { useNavigation } from '@react-navigation/native';
import React, { memo, ReactElement, ReactNode, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
import { SvgXml } from 'react-native-svg';

import { useNavigation } from '@react-navigation/native';
import { widgets } from '../../constants/widgets';
import { useAppDispatch, useAppSelector } from '../../hooks/redux';
import { RootNavigationProp } from '../../navigation/types';
Expand All @@ -15,7 +16,6 @@ import { BodyMSB } from '../../styles/text';
import { truncate } from '../../utils/helpers';
import Dialog from '../Dialog';
// import LoadingView from '../LoadingView';
import SvgImage from '../SvgImage';

const BaseWidget = ({
id,
Expand Down Expand Up @@ -70,10 +70,12 @@ const BaseWidget = ({
{(showTitle || isEditing) && (
<View style={styles.header}>
<View style={styles.title}>
<View style={styles.icon}>
<SvgImage image={widget.icon} size={32} />
</View>

<SvgXml
style={styles.icon}
xml={widget.icon}
width={32}
height={32}
/>
<BodyMSB style={styles.name} numberOfLines={1}>
{truncate(widget.name, 18)}
</BodyMSB>
Expand Down
8 changes: 3 additions & 5 deletions src/screens/Widgets/Widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isEqual } from 'lodash';
import React, { ReactElement } from 'react';
import { useTranslation } from 'react-i18next';
import { StyleSheet, View } from 'react-native';
import { SvgXml } from 'react-native-svg';

import { isEqual } from 'lodash';
import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
import NavigationHeader from '../../components/NavigationHeader';
import SafeAreaInset from '../../components/SafeAreaInset';
import SvgImage from '../../components/SvgImage';
import Button from '../../components/buttons/Button';
import BlocksWidget from '../../components/widgets/BlocksWidget';
import CalculatorWidget from '../../components/widgets/CalculatorWidget';
Expand Down Expand Up @@ -115,9 +115,7 @@ const Widget = ({
{widget.name.split(' ').join('\n')}
</Headline>
</View>
<View style={styles.headerImage}>
<SvgImage image={widget.icon} size={64} />
</View>
<SvgXml style={styles.headerImage} xml={widget.icon} />
</View>

<BodyM style={styles.description} color="secondary">
Expand Down
6 changes: 2 additions & 4 deletions src/screens/Widgets/WidgetListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { ReactElement } from 'react';
import { StyleSheet } from 'react-native';
import { SvgXml } from 'react-native-svg';

import { useNavigation } from '@react-navigation/native';
import { useTranslation } from 'react-i18next';
import Divider from '../../components/Divider';
import SvgImage from '../../components/SvgImage';
import { widgets } from '../../constants/widgets';
import { useCurrency } from '../../hooks/displayValues';
import { RootNavigationProp } from '../../navigation/types';
Expand All @@ -31,9 +31,7 @@ const WidgetListItem = ({ id }: { id: TWidgetId }): ReactElement => {
return (
<TouchableOpacity testID={`WidgetListItem-${id}`} onPress={onPress}>
<View style={styles.feed}>
<View style={styles.icon}>
<SvgImage image={widget.icon} size={48} />
</View>
<SvgXml style={styles.icon} xml={widget.icon} />
<View style={styles.text}>
<BodyMSB numberOfLines={1}>{widget.name}</BodyMSB>
<CaptionB color="secondary" numberOfLines={1}>
Expand Down
Loading