Skip to content

Commit ff10eea

Browse files
authored
fix(widgets): fix widget icons (#2517)
1 parent 27e15f7 commit ff10eea

File tree

4 files changed

+13
-56
lines changed

4 files changed

+13
-56
lines changed

src/components/SvgImage.tsx

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/components/widgets/BaseWidget.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import { useNavigation } from '@react-navigation/native';
12
import React, { memo, ReactElement, ReactNode, useState } from 'react';
23
import { useTranslation } from 'react-i18next';
34
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
5+
import { SvgXml } from 'react-native-svg';
46

5-
import { useNavigation } from '@react-navigation/native';
67
import { widgets } from '../../constants/widgets';
78
import { useAppDispatch, useAppSelector } from '../../hooks/redux';
89
import { RootNavigationProp } from '../../navigation/types';
@@ -15,7 +16,6 @@ import { BodyMSB } from '../../styles/text';
1516
import { truncate } from '../../utils/helpers';
1617
import Dialog from '../Dialog';
1718
// import LoadingView from '../LoadingView';
18-
import SvgImage from '../SvgImage';
1919

2020
const BaseWidget = ({
2121
id,
@@ -70,10 +70,12 @@ const BaseWidget = ({
7070
{(showTitle || isEditing) && (
7171
<View style={styles.header}>
7272
<View style={styles.title}>
73-
<View style={styles.icon}>
74-
<SvgImage image={widget.icon} size={32} />
75-
</View>
76-
73+
<SvgXml
74+
style={styles.icon}
75+
xml={widget.icon}
76+
width={32}
77+
height={32}
78+
/>
7779
<BodyMSB style={styles.name} numberOfLines={1}>
7880
{truncate(widget.name, 18)}
7981
</BodyMSB>

src/screens/Widgets/Widget.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { isEqual } from 'lodash';
12
import React, { ReactElement } from 'react';
23
import { useTranslation } from 'react-i18next';
34
import { StyleSheet, View } from 'react-native';
5+
import { SvgXml } from 'react-native-svg';
46

5-
import { isEqual } from 'lodash';
67
import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
78
import NavigationHeader from '../../components/NavigationHeader';
89
import SafeAreaInset from '../../components/SafeAreaInset';
9-
import SvgImage from '../../components/SvgImage';
1010
import Button from '../../components/buttons/Button';
1111
import BlocksWidget from '../../components/widgets/BlocksWidget';
1212
import CalculatorWidget from '../../components/widgets/CalculatorWidget';
@@ -115,9 +115,7 @@ const Widget = ({
115115
{widget.name.split(' ').join('\n')}
116116
</Headline>
117117
</View>
118-
<View style={styles.headerImage}>
119-
<SvgImage image={widget.icon} size={64} />
120-
</View>
118+
<SvgXml style={styles.headerImage} xml={widget.icon} />
121119
</View>
122120

123121
<BodyM style={styles.description} color="secondary">

src/screens/Widgets/WidgetListItem.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { ReactElement } from 'react';
22
import { StyleSheet } from 'react-native';
3+
import { SvgXml } from 'react-native-svg';
34

45
import { useNavigation } from '@react-navigation/native';
56
import { useTranslation } from 'react-i18next';
67
import Divider from '../../components/Divider';
7-
import SvgImage from '../../components/SvgImage';
88
import { widgets } from '../../constants/widgets';
99
import { useCurrency } from '../../hooks/displayValues';
1010
import { RootNavigationProp } from '../../navigation/types';
@@ -31,9 +31,7 @@ const WidgetListItem = ({ id }: { id: TWidgetId }): ReactElement => {
3131
return (
3232
<TouchableOpacity testID={`WidgetListItem-${id}`} onPress={onPress}>
3333
<View style={styles.feed}>
34-
<View style={styles.icon}>
35-
<SvgImage image={widget.icon} size={48} />
36-
</View>
34+
<SvgXml style={styles.icon} xml={widget.icon} />
3735
<View style={styles.text}>
3836
<BodyMSB numberOfLines={1}>{widget.name}</BodyMSB>
3937
<CaptionB color="secondary" numberOfLines={1}>

0 commit comments

Comments
 (0)