diff --git a/android/app/build.gradle b/android/app/build.gradle index 8d78483b8..0493829b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -96,7 +96,12 @@ apply from: "../../node_modules/react-native/react.gradle" // add vector icons to project project.ext.vectoricons = [ - iconFontNames: [ 'MaterialCommunityIcons.ttf', 'MaterialIcons.ttf' ] + iconFontsDir: "../../assets/fonts/", + iconFontNames: [ + 'MaterialCommunityIcons.ttf', + 'MaterialIcons.ttf', + 'inaturalisticons.ttf' + ] ] apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" diff --git a/android/app/src/main/assets/fonts/inaturalisticons.ttf b/android/app/src/main/assets/fonts/inaturalisticons.ttf deleted file mode 100644 index ca608f2ca..000000000 Binary files a/android/app/src/main/assets/fonts/inaturalisticons.ttf and /dev/null differ diff --git a/assets/fonts/MaterialCommunityIcons.ttf b/assets/fonts/MaterialCommunityIcons.ttf new file mode 100644 index 000000000..ba8735957 Binary files /dev/null and b/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/assets/fonts/MaterialIcons.ttf b/assets/fonts/MaterialIcons.ttf new file mode 100644 index 000000000..e50801b3b Binary files /dev/null and b/assets/fonts/MaterialIcons.ttf differ diff --git a/src/components/INatIcon.js b/src/components/INatIcon.js index 9716a6088..793ea81de 100644 --- a/src/components/INatIcon.js +++ b/src/components/INatIcon.js @@ -3,20 +3,21 @@ * Usage: */ -import createIconSet from 'react-native-vector-icons/lib/create-icon-set'; +import createIconSet from "react-native-vector-icons/lib/create-icon-set"; + export const glyphMap = { "notifications-bell": 57344, "hamburger-menu": 57345, "plus-sign": 57346, "compass-rose": 57347, "pen-and-paper": 57348, - "microphone": 57350, - "camera": 57355, + microphone: 57350, + camera: 57355, "triple-dots": 57352, "close-button-x": 57351, "comments-filled-in": 57353, - "checkmark": 57354, - "pencil": 57356, + checkmark: 57354, + pencil: 57356, "ios-people-updated-2": 57357, "cv-sparklylabel": 57358, "close-button-circle": 57349, @@ -30,11 +31,11 @@ export const glyphMap = { "identification-solid": 57366 }; -const iconSet = createIconSet(glyphMap, 'inaturalisticons', 'inaturalisticons.ttf'); +const iconSet = createIconSet( glyphMap, "inaturalisticons", "inaturalisticons.ttf" ); export default iconSet; export const { Button, getImageSource, - getImageSourceSync, + getImageSourceSync } = iconSet;