Skip to content
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

Jump to bottom

Add SWM icon pack support. #3114

Merged
merged 10 commits into from
Sep 20, 2024
Merged

Add SWM icon pack support. #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4f29c0a
initial icon replacement
latekvo Sep 17, 2024
3554800
fix typing violations by adding type definitions file
latekvo Sep 18, 2024
69c6e6b
declare type definition locations in tsconfig, fix typedefs
latekvo Sep 18, 2024
758a1d7
replace react swm icons with native swm icon library
latekvo Sep 19, 2024
9958c4d
fix swm icons for android and ios by adding custom font support to expo
latekvo Sep 19, 2024
e46b78e
remove unnecessary react package
latekvo Sep 19, 2024
9dd7148
remove unnecessary tsconfig type definitions
latekvo Sep 19, 2024
1f0205d
revert unrelated yarn lock update
latekvo Sep 19, 2024
f224361
fix whitespaces breaking yarn lock
latekvo Sep 19, 2024
a7c21d6
Merge branch 'main' into @latekvo/change-entypo-to-swm-icon-pack
latekvo Sep 19, 2024
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
5 changes: 3 additions & 2 deletions example/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
StackScreenProps,
} from '@react-navigation/stack';
import { NavigationContainer, ParamListBase } from '@react-navigation/native';
import Entypo from '@expo/vector-icons/Entypo';
import {
GestureHandlerRootView,
RectButton,
Expand Down Expand Up @@ -77,6 +76,8 @@
import RectButtonBorders from './src/release_tests/rectButton';
import { ListWithHeader } from './src/ListWithHeader';

import { Icon } from '@swmansion/icons';

interface Example {
name: string;
component: React.ComponentType;
Expand Down Expand Up @@ -276,7 +277,7 @@
renderSectionHeader={({ section: { sectionTitle } }) => (
<Text style={styles.sectionTitle}>{sectionTitle}</Text>
)}
ItemSeparatorComponent={() => <View style={styles.separator} />}

Check warning on line 280 in example/App.tsx

View workflow job for this annotation

GitHub Actions / check (example) 

Do not define components during render. React will see a new component type on every render and destroy the entire subtree’s DOM nodes and state (https://reactjs.org/docs/reconciliation.html#elements-of-different-types). Instead, move this component definition out of the parent component “MainScreen” and pass data as props. If you want to allow component creation in props, set allowAsProps option to true
/>
</SafeAreaView>
);
Expand Down Expand Up @@ -326,7 +327,7 @@
return (
<RectButton style={[styles.button]} onPress={() => onPressItem(name)}>
<Text>{name}</Text>
<Entypo name="chevron-right" size={24} color="#bbb" />
<Icon name="chevron-small-right" size={24} color="#bbb" />
</RectButton>
);
}
Expand Down
14 changes: 13 additions & 1 deletion example/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@
},
"web": {
"favicon": "./assets/favicon.png"
}
},
"plugins": [
[
"expo-font",
{
"fonts": [
"./node_modules/@swmansion/icons/fonts/broken/swm-icons-broken.ttf",
"./node_modules/@swmansion/icons/fonts/outline/swm-icons-outline.ttf",
"./node_modules/@swmansion/icons/fonts/curved/swm-icons-curved.ttf"
]
}
]
]
}
}
2 changes: 2 additions & 0 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
"@react-navigation/elements": "^1.3.7",
"@react-navigation/native": "^6.1.17",
"@react-navigation/stack": "^6.3.29",
"@swmansion/icons": "^0.0.1",
"expo": "^51.0.0",
"expo-font": "~12.0.10",
"hoist-non-react-statics": "^3.3.2",
"invariant": "^2.2.4",
"patch-package": "^6.5.1",
Expand Down
12 changes: 12 additions & 0 deletions example/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,6 +2024,11 @@
dependencies:
"@sinonjs/commons" "^3.0.0"

"@swmansion/icons@^0.0.1":
version "0.0.1"
resolved "https://registry.yarnpkg.com/@swmansion/icons/-/icons-0.0.1.tgz#8171b857be9885e1565138bf358b073f6585ca43"
integrity sha512-MjqBDtxzMRa++iPT0RkBPPOV+wIGvzVMGKQTw9thk8GKt+UAhT9NKkfK4BhiKKvKnKkCHfYCvdidNlN+jpHLrQ==

"@tsconfig/react-native@^3.0.5":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@tsconfig/react-native/-/react-native-3.0.5.tgz#c4971b1eca2e8cdf7b0d25f40193a782039c1abd"
Expand Down Expand Up @@ -4039,6 +4044,13 @@ expo-file-system@~17.0.1:
resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-17.0.1.tgz#b9f8af8c1c06ec71d96fd7a0d2567fa9e1c88f15"
integrity sha512-dYpnZJqTGj6HCYJyXAgpFkQWsiCH3HY1ek2cFZVHFoEc5tLz9gmdEgTF6nFHurvmvfmXqxi7a5CXyVm0aFYJBw==

expo-font@~12.0.10:
version "12.0.10"
resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-12.0.10.tgz#62deaf1f46159d7839f01305f44079268781b1db"
integrity sha512-Q1i2NuYri3jy32zdnBaHHCya1wH1yMAsI+3CCmj9zlQzlhsS9Bdwcj2W3c5eU5FvH2hsNQy4O+O1NnM6o/pDaQ==
dependencies:
fontfaceobserver "^2.1.0"

expo-font@~12.0.4:
version "12.0.4"
resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-12.0.4.tgz#c3d9b7fc152286c1e2beae80f97b94ca4622db34"
Expand Down
Loading