diff --git a/apps/common-app/package.json b/apps/common-app/package.json index 1837a0f0a83..b319fcb2d2a 100644 --- a/apps/common-app/package.json +++ b/apps/common-app/package.json @@ -8,9 +8,6 @@ "format": "prettier --write --list-different ." }, "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "*", - "@fortawesome/free-solid-svg-icons": "*", - "@fortawesome/react-native-fontawesome": "*", "@react-native-async-storage/async-storage": "*", "@react-native-community/slider": "*", "@react-native-masked-view/masked-view": "*", @@ -34,9 +31,6 @@ "react-strict-dom": "*" }, "devDependencies": { - "@fortawesome/fontawesome-svg-core": "^6.4.0", - "@fortawesome/free-solid-svg-icons": "^6.4.0", - "@fortawesome/react-native-fontawesome": "^0.3.0", "@react-native-async-storage/async-storage": "^1.22.3", "@react-native-community/slider": "^4.5.0", "@react-native-masked-view/masked-view": "^0.3.1", diff --git a/apps/common-app/src/examples/AnimatedTabBarExample.tsx b/apps/common-app/src/examples/AnimatedTabBarExample.tsx index 0b2ee0d74fb..905c718db91 100644 --- a/apps/common-app/src/examples/AnimatedTabBarExample.tsx +++ b/apps/common-app/src/examples/AnimatedTabBarExample.tsx @@ -9,45 +9,37 @@ import Animated, { withTiming, } from 'react-native-reanimated'; import { + Text, View, Dimensions, StyleSheet, TouchableWithoutFeedback, } from 'react-native'; -import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome'; -import { - faCoffee, - faTrash, - faUser, - faList, - faReply, -} from '@fortawesome/free-solid-svg-icons'; import Svg, { Path } from 'react-native-svg'; import * as shape from 'd3-shape'; -import type { IconProp } from '@fortawesome/fontawesome-svg-core'; const { width, height } = Dimensions.get('window'); const tabs = [ { name: 'coffee', - item: faCoffee, + item: '☕️', }, { name: 'list', - item: faList, + item: '📝', }, { name: 'reply', - item: faReply, + item: '🔁', }, { name: 'trash', - item: faTrash, + item: '🗑', }, { name: 'user', - item: faUser, + item: '👤', }, ]; @@ -101,10 +93,13 @@ const styles = StyleSheet.create({ alignItems: 'center', zIndex: 5, }, + emoji: { + fontSize: 25, + }, }); type ButtonProps = { - item: IconProp; + item: string; index: number; activeIndex: Animated.SharedValue; width: number; @@ -141,7 +136,7 @@ function Button({ (activeIndex.value = index)}> - + {item} @@ -149,7 +144,7 @@ function Button({ } type ActiveIconProps = { - item: IconProp; + item: string; index: number; activeIndex: Animated.SharedValue; width: number; @@ -170,7 +165,7 @@ function ActiveIcon({ item, index, activeIndex }: ActiveIconProps) { return ( - + {item} ); diff --git a/apps/common-app/src/examples/LayoutAnimations/HabitsExample.tsx b/apps/common-app/src/examples/LayoutAnimations/HabitsExample.tsx index 5ffd72e2a58..c24463fdeba 100644 --- a/apps/common-app/src/examples/LayoutAnimations/HabitsExample.tsx +++ b/apps/common-app/src/examples/LayoutAnimations/HabitsExample.tsx @@ -9,8 +9,6 @@ import Animated, { BounceIn, FadeOut, } from 'react-native-reanimated'; -import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome'; -import { faCheck, faClose } from '@fortawesome/free-solid-svg-icons'; const data = [ { label: 'Water plants', icon: '🌿', isDone: true }, @@ -81,7 +79,7 @@ function Summary({ onPress }: SummaryProps) { Great job! - + {'✅'} {data.filter((item) => item.isDone).length} out of {data.length} habits @@ -115,11 +113,7 @@ function ListItem({ label, icon, isDone, index }: ListItemProps) { {label} - + {isDone ? '✅' : '❌'} ); @@ -220,4 +214,7 @@ const styles = StyleSheet.create({ color: 'white', fontWeight: 'bold', }, + summaryIcon: { + fontSize: 64, + }, }); diff --git a/yarn.lock b/yarn.lock index 6a82a08cf11..3cd0728fee7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4204,45 +4204,6 @@ __metadata: languageName: node linkType: hard -"@fortawesome/fontawesome-common-types@npm:6.5.2": - version: 6.5.2 - resolution: "@fortawesome/fontawesome-common-types@npm:6.5.2" - checksum: 10/a918b2dd6566db6878999e1c4523fa8d0fcc3c79f00086b48a36c365e543ac16a2950618f47893a8369d4ee13e454baf1f5108f7238bdf6ec2bea459b6c517ca - languageName: node - linkType: hard - -"@fortawesome/fontawesome-svg-core@npm:^6.4.0": - version: 6.5.2 - resolution: "@fortawesome/fontawesome-svg-core@npm:6.5.2" - dependencies: - "@fortawesome/fontawesome-common-types": "npm:6.5.2" - checksum: 10/03cc6d9662f2014e2fbbf47e9678a6a21108edeb78ff551207eeb12404daa8bfa5c6dd30a474d3fca897e856ff4b45d35261bb445fc30994c46d91783722684d - languageName: node - linkType: hard - -"@fortawesome/free-solid-svg-icons@npm:^6.4.0": - version: 6.5.2 - resolution: "@fortawesome/free-solid-svg-icons@npm:6.5.2" - dependencies: - "@fortawesome/fontawesome-common-types": "npm:6.5.2" - checksum: 10/2f6dde7eddc8ab9ed09d220c2dad6cb53922842d3f764ea9d393162ba50971b5be8f16e0c9a225ec808d6a2e92769a0d194e7e1ae8f98ccdd53f7a59aee2e31b - languageName: node - linkType: hard - -"@fortawesome/react-native-fontawesome@npm:^0.3.0": - version: 0.3.0 - resolution: "@fortawesome/react-native-fontawesome@npm:0.3.0" - dependencies: - humps: "npm:^2.0.1" - prop-types: "npm:^15.7.2" - peerDependencies: - "@fortawesome/fontawesome-svg-core": ~1 || ~6 - react-native: ">= 0.67" - react-native-svg: ">= 11.x" - checksum: 10/c538b9f36b1fa5c079be3aa597984c9c36833b513d70b0364b4c7abf30edba0952baafee25db78e35f8af51fbb39573fa2f0792ff9cf959fb3245e49babb752f - languageName: node - linkType: hard - "@gar/promisify@npm:^1.0.1": version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" @@ -8870,9 +8831,6 @@ __metadata: version: 0.0.0-use.local resolution: "common-app@workspace:apps/common-app" dependencies: - "@fortawesome/fontawesome-svg-core": "npm:^6.4.0" - "@fortawesome/free-solid-svg-icons": "npm:^6.4.0" - "@fortawesome/react-native-fontawesome": "npm:^0.3.0" "@react-native-async-storage/async-storage": "npm:^1.22.3" "@react-native-community/slider": "npm:^4.5.0" "@react-native-masked-view/masked-view": "npm:^0.3.1" @@ -8900,9 +8858,6 @@ __metadata: react-strict-dom: "npm:^0.0.17" typescript: "npm:~5.3.0" peerDependencies: - "@fortawesome/fontawesome-svg-core": "*" - "@fortawesome/free-solid-svg-icons": "*" - "@fortawesome/react-native-fontawesome": "*" "@react-native-async-storage/async-storage": "*" "@react-native-community/slider": "*" "@react-native-masked-view/masked-view": "*" @@ -12597,13 +12552,6 @@ __metadata: languageName: node linkType: hard -"humps@npm:^2.0.1": - version: 2.0.1 - resolution: "humps@npm:2.0.1" - checksum: 10/16e63cba9659c54cdc5d55bc5f50033939e959cfb6a65d2e9aa36a7ac882e70c66fdb5b0cb28fb81a204681a28cc1051eecbed7b70d4ede2435ab13ebaa8ac2d - languageName: node - linkType: hard - "husky@npm:^9.0.11": version: 9.0.11 resolution: "husky@npm:9.0.11"