mirror/iNaturalistReactNative
1
0
Fork 0
mirror of https://github.com/inaturalist/iNaturalistReactNative.git synced 2025-12-23 22:18:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 439-activityheader-component

Browse Source
This commit is contained in:
Angie Ta
2023-02-13 20:02:44 -08:00
parent 46af16fb0f 829cc77958
commit 9478467728
9 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
View File

Binary file not shown.

BIN
android/app/src/main/assets/fonts/MaterialIcons.ttf
View File

Binary file not shown.

BIN
android/app/src/main/assets/fonts/inaturalisticons.ttf
View File

Binary file not shown.

2
android/link-assets-manifest.json
View File

@@ -15,7 +15,7 @@
},
{
"path": "assets/fonts/inaturalisticons.ttf",
"sha1": "0830dfea4d6996a890dfe05a1e1a67ae3eaf0ad4"
"sha1": "cca5dfffa09eb30b9077879a9bbb887074c4f1dd"
}
]
}

BIN
assets/fonts/inaturalisticons.ttf
View File

Binary file not shown.

14
ios/iNaturalistReactNative.xcodeproj/project.pbxproj
View File

@@ -14,12 +14,9 @@
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */; };
7EBBE0515B6D88FD724A5C47 /* libPods-iNaturalistReactNative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7DD42FAECED8C66268DDB37F /* libPods-iNaturalistReactNative.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
896925E9AF0F4FA497FD25E1 /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E889D9DF17243EC828D2A57 /* inaturalisticons.ttf */; };
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */; };
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */; };
930E85993B074F9785F7944C /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEC5CA9028A544DB8E47E273 /* MaterialCommunityIcons.ttf */; };
43B44700430B405FA1A54390 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DE2E26ADBABC48C2BCFB836F /* MaterialIcons.ttf */; };
6AB5F072CE7142BBAE142049 /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E1D7643E098741EE83EE859A /* inaturalisticons.ttf */; };
B7FCCE0B8DB2469EB11C349A /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D380594CA89C44E790F81C83 /* inaturalisticons.ttf */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -47,14 +44,11 @@
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney-BookItalic-Pro.otf"; path = "../assets/fonts/Whitney-BookItalic-Pro.otf"; sourceTree = "<group>"; };
7DD42FAECED8C66268DDB37F /* libPods-iNaturalistReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = iNaturalistReactNative/LaunchScreen.storyboard; sourceTree = "<group>"; };
9E889D9DF17243EC828D2A57 /* inaturalisticons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = inaturalisticons.ttf; path = ../assets/fonts/inaturalisticons.ttf; sourceTree = "<group>"; };
BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Light-Pro.otf"; path = "../assets/fonts/Whitney-Light-Pro.otf"; sourceTree = "<group>"; };
C544256CF572EB52B9E2B9CB /* Pods-iNaturalistReactNative.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative.release.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative/Pods-iNaturalistReactNative.release.xcconfig"; sourceTree = "<group>"; };
D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Medium-Pro.otf"; path = "../assets/fonts/Whitney-Medium-Pro.otf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
BEC5CA9028A544DB8E47E273 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../assets/fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
DE2E26ADBABC48C2BCFB836F /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../assets/fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
E1D7643E098741EE83EE859A /* inaturalisticons.ttf */ = {isa = PBXFileReference; name = "inaturalisticons.ttf"; path = "../assets/fonts/inaturalisticons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
D380594CA89C44E790F81C83 /* inaturalisticons.ttf */ = {isa = PBXFileReference; name = "inaturalisticons.ttf"; path = "../assets/fonts/inaturalisticons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -163,7 +157,7 @@
BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */,
D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */,
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */,
9E889D9DF17243EC828D2A57 /* inaturalisticons.ttf */,
D380594CA89C44E790F81C83 /* inaturalisticons.ttf */,
);
name = Resources;
sourceTree = "<group>";
@@ -264,7 +258,7 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */,
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */,
896925E9AF0F4FA497FD25E1 /* inaturalisticons.ttf in Resources */,
B7FCCE0B8DB2469EB11C349A /* inaturalisticons.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
ios/link-assets-manifest.json
View File

@@ -15,7 +15,7 @@
},
{
"path": "assets/fonts/inaturalisticons.ttf",
"sha1": "0830dfea4d6996a890dfe05a1e1a67ae3eaf0ad4"
"sha1": "cca5dfffa09eb30b9077879a9bbb887074c4f1dd"
}
]
}

2
src/components/AddObsModal.js
View File

@@ -82,7 +82,7 @@ const AddObsModal = ( { closeModal }: Props ): React.Node => {
"camera-button"
)}
{renderIconButton(
"icon-gallery",
"gallery",
"mx-5",
navToPhotoGallery,
t( "Navigate-to-photo-importer" ),

53
src/components/INatIcon.js
View File

@@ -29,7 +29,58 @@ const glyphMap = {
"upload-arrow": 57359,
"icn-id2": 57365,
"identification-solid": 57366,
flag: 57367
flag: 57367,
gallery: 57368,
"arrow-down": 57369,
"arrow-left": 57370,
"arrow-right": 57371,
"arrow-up": 57372,
collapse: 57373,
"combined-shape": 57374,
expand: 57375,
"icn-logomark-new-bird": 57376,
"icn-location-private": 57377,
"icn-location-obscured": 57378,
"icn-location-none": 57379,
"icn-leading-id": 57380,
"icn-layers": 57381,
"icn-id-help": 57382,
"icn-dna": 57383,
"icn-captive": 57384,
focus: 57385,
"icn-photo-grid": 57386,
"icn-photo-quilt": 57387,
"icn-species": 57388,
"icn-taxa-amphibians": 57389,
"icn-taxa-animals": 57390,
"icn-taxa-arachnid": 57391,
"icn-taxa-birds": 57392,
"icn-taxa-fish": 57393,
"icn-taxa-fungi": 57394,
"icn-taxa-insects": 57395,
"icn-taxa-kelp": 57396,
"icn-taxa-mammals": 57397,
"icn-taxa-mollusks": 57398,
"icon-comment": 57399,
"icon-cid-finer": 57400,
"icon-cid-coarser": 57401,
"icon-atlas": 57402,
"icon-annotation-obsfields": 57403,
"icn-wild": 57404,
"icn-taxa-something": 57405,
"icn-taxa-reptiles": 57406,
"icn-taxa-protozoa": 57407,
"icn-taxa-plants": 57408,
"icon-dqaqualitygrade-fail": 57409,
"icon-dqaqualitygrade-pass": 57410,
"icon-fave": 57411,
"icon-flag": 57412,
"icon-list": 57413,
"icon-projectchanges": 57414,
treeview: 57416,
"ios-calendar-outline": 57417,
"inat-wordmark": 57418,
"icon-taxonchanges": 57419
};
const iconSet = createIconSet( glyphMap, "inaturalisticons", "inaturalisticons.ttf" );