diff --git a/android/app/src/main/assets/fonts/INatIcon.ttf b/android/app/src/main/assets/fonts/INatIcon.ttf index 582f3a576..4b400e630 100644 Binary files a/android/app/src/main/assets/fonts/INatIcon.ttf and b/android/app/src/main/assets/fonts/INatIcon.ttf differ diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json index 112af09bd..885b32b0d 100644 --- a/android/link-assets-manifest.json +++ b/android/link-assets-manifest.json @@ -3,7 +3,7 @@ "data": [ { "path": "assets/fonts/INatIcon.ttf", - "sha1": "f51ed08f10d74894f6d3eb576cfdc4ad070f84fc" + "sha1": "5d5f17b0bc5f9c93ed4c91ff0dedb22bd9533c8e" }, { "path": "assets/fonts/Lato-Bold.ttf", diff --git a/assets/fonts/INatIcon.ttf b/assets/fonts/INatIcon.ttf index 582f3a576..4b400e630 100644 Binary files a/assets/fonts/INatIcon.ttf and b/assets/fonts/INatIcon.ttf differ diff --git a/ios/iNaturalistReactNative.xcodeproj/project.pbxproj b/ios/iNaturalistReactNative.xcodeproj/project.pbxproj index f73c71281..681bf0781 100644 --- a/ios/iNaturalistReactNative.xcodeproj/project.pbxproj +++ b/ios/iNaturalistReactNative.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 54EB1EFEC1F74152902EED02 /* Lato-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C2D97D72EED451C887998A8 /* Lato-BoldItalic.ttf */; }; 5A8D64AB921678B40E0229C8 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 725BA058C5384A9185E8036A /* Lato-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 00752F4ADC554701A45A848A /* Lato-Bold.ttf */; }; - 7A60305B97C941CFBBA50182 /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 143F005AC7CD49879C8520C3 /* INatIcon.ttf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 8B65ED3129F575C10054CCEF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B65ED2F29F575C10054CCEF /* MainInterface.storyboard */; }; 8B65ED3529F575C10054CCEF /* iNaturalistReactNative-ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 8B65ED2B29F575C10054CCEF /* iNaturalistReactNative-ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -35,6 +34,7 @@ AE4DC81B3A87484CB3FD6750 /* Lato-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4B0AEEF6CA584BCF9880EB35 /* Lato-Regular.ttf */; }; E23E0899594A7C6DF680FFDB /* libPods-iNaturalistReactNative-ShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A336AF0ADEAE537AB1B73F98 /* libPods-iNaturalistReactNative-ShareExtension.a */; }; E5DFC1C6FBFA45739CE91C69 /* Lato-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69DF855D92EA4ADFB73B47F1 /* Lato-MediumItalic.ttf */; }; + A5C00A8934ED4A48A1495179 /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0972395C34134C71A54A2A5D /* INatIcon.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -79,7 +79,6 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = iNaturalistReactNative/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = iNaturalistReactNative/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = iNaturalistReactNative/main.m; sourceTree = ""; }; - 143F005AC7CD49879C8520C3 /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = ""; }; 191A91122CD1916800ECC774 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = ""; }; 1956B4902A7C3C1E00BBBDE4 /* link-inat-model-files.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "link-inat-model-files.sh"; sourceTree = ""; }; 197A169B2A7C2567001A03DC /* cvmodel.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = cvmodel.mlmodel; sourceTree = ""; }; @@ -108,6 +107,7 @@ D7AE5BDBC584A83878A04344 /* Pods-iNaturalistReactNative-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative-ShareExtension/Pods-iNaturalistReactNative-ShareExtension.debug.xcconfig"; sourceTree = ""; }; D8663889EABFBFC3077401E3 /* Pods-iNaturalistReactNative-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative-ShareExtension/Pods-iNaturalistReactNative-ShareExtension.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + 0972395C34134C71A54A2A5D /* INatIcon.ttf */ = {isa = PBXFileReference; name = "INatIcon.ttf"; path = "../assets/fonts/INatIcon.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -261,7 +261,7 @@ 3A9BAF07FCF24F668E2EF5AB /* Lato-Medium.ttf */, 69DF855D92EA4ADFB73B47F1 /* Lato-MediumItalic.ttf */, 4B0AEEF6CA584BCF9880EB35 /* Lato-Regular.ttf */, - 143F005AC7CD49879C8520C3 /* INatIcon.ttf */, + 0972395C34134C71A54A2A5D /* INatIcon.ttf */, ); name = Resources; sourceTree = ""; @@ -398,7 +398,7 @@ 085DD3205807404CAFC32228 /* Lato-Medium.ttf in Resources */, E5DFC1C6FBFA45739CE91C69 /* Lato-MediumItalic.ttf in Resources */, AE4DC81B3A87484CB3FD6750 /* Lato-Regular.ttf in Resources */, - 7A60305B97C941CFBBA50182 /* INatIcon.ttf in Resources */, + A5C00A8934ED4A48A1495179 /* INatIcon.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json index 112af09bd..885b32b0d 100644 --- a/ios/link-assets-manifest.json +++ b/ios/link-assets-manifest.json @@ -3,7 +3,7 @@ "data": [ { "path": "assets/fonts/INatIcon.ttf", - "sha1": "f51ed08f10d74894f6d3eb576cfdc4ad070f84fc" + "sha1": "5d5f17b0bc5f9c93ed4c91ff0dedb22bd9533c8e" }, { "path": "assets/fonts/Lato-Bold.ttf", diff --git a/src/components/SharedComponents/INatIcon/glyphmap.json b/src/components/SharedComponents/INatIcon/glyphmap.json index a21467d14..0a4f1f8ee 100644 --- a/src/components/SharedComponents/INatIcon/glyphmap.json +++ b/src/components/SharedComponents/INatIcon/glyphmap.json @@ -84,39 +84,40 @@ "feedback": 61779, "edit-comment": 61780, "door-exit": 61781, - "currentlocation": 61782, - "crop": 61783, - "creative-commons": 61784, - "copyright": 61785, - "copy": 61786, - "compass-rose-outline": 61787, - "comments": 61788, - "comments-outline": 61789, - "close": 61790, - "close-bold": 61791, - "clock-outline": 61792, - "circle-dots": 61793, - "chevron-right-circle": 61794, - "chevron-left": 61795, - "chevron-left-circle": 61796, - "checkmark-circle": 61797, - "checkmark-circle-outline": 61798, - "check": 61799, - "caret": 61800, - "camera": 61801, - "briefcase": 61802, - "book": 61803, - "binoculars": 61804, - "ban": 61805, - "arrow-up": 61806, - "arrow-up-small": 61807, - "arrow-up-circle-dots": 61808, - "arrow-up-bold-circle": 61809, - "arrow-up-bold-circle-outline": 61810, - "arrow-turn-down-right": 61811, - "arrow-down-bold-circle": 61812, - "arrow-down-bold-circle-outline": 61813, - "apple": 61814, - "aicamera": 61815, - "add-comment-outline": 61816 + "door-enter": 61782, + "currentlocation": 61783, + "crop": 61784, + "creative-commons": 61785, + "copyright": 61786, + "copy": 61787, + "compass-rose-outline": 61788, + "comments": 61789, + "comments-outline": 61790, + "close": 61791, + "close-bold": 61792, + "clock-outline": 61793, + "circle-dots": 61794, + "chevron-right-circle": 61795, + "chevron-left": 61796, + "chevron-left-circle": 61797, + "checkmark-circle": 61798, + "checkmark-circle-outline": 61799, + "check": 61800, + "caret": 61801, + "camera": 61802, + "briefcase": 61803, + "book": 61804, + "binoculars": 61805, + "ban": 61806, + "arrow-up": 61807, + "arrow-up-small": 61808, + "arrow-up-circle-dots": 61809, + "arrow-up-bold-circle": 61810, + "arrow-up-bold-circle-outline": 61811, + "arrow-turn-down-right": 61812, + "arrow-down-bold-circle": 61813, + "arrow-down-bold-circle-outline": 61814, + "apple": 61815, + "aicamera": 61816, + "add-comment-outline": 61817 } \ No newline at end of file diff --git a/src/images/icons/door-enter.svg b/src/images/icons/door-enter.svg new file mode 100644 index 000000000..cb46de51e --- /dev/null +++ b/src/images/icons/door-enter.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/navigation/CustomDrawerContent.tsx b/src/navigation/CustomDrawerContent.tsx index 80cf47597..bfd47ee91 100644 --- a/src/navigation/CustomDrawerContent.tsx +++ b/src/navigation/CustomDrawerContent.tsx @@ -144,6 +144,18 @@ const CustomDrawerContent = ( { state, navigation, descriptors }: Props ) => { }, onPress: ( ) => setShowConfirm( true ) }; + } else { + items.login = { + label: t( "LOG-IN" ), + icon: "door-enter", + color: colors.inatGreen, + style: { + display: "flex" + }, + onPress: ( ) => { + navigation.navigate( "LoginStackNavigator" ); + } + }; } if ( isDebug ) { items.debug = { @@ -154,12 +166,7 @@ const CustomDrawerContent = ( { state, navigation, descriptors }: Props ) => { }; } return items; - }, [ - currentUser, - isConnected, - isDebug, - t - ] ); + }, [currentUser, isConnected, isDebug, navigation, t] ); const onSignOut = async ( ) => { await signOut( { realm, clearRealm: true, queryClient } ); diff --git a/tests/unit/components/SharedComponents/ActivityCount/__snapshots__/ActivityCount.test.js.snap b/tests/unit/components/SharedComponents/ActivityCount/__snapshots__/ActivityCount.test.js.snap index 3dc9e046a..a2d4a5dd1 100644 --- a/tests/unit/components/SharedComponents/ActivityCount/__snapshots__/ActivityCount.test.js.snap +++ b/tests/unit/components/SharedComponents/ActivityCount/__snapshots__/ActivityCount.test.js.snap @@ -36,7 +36,7 @@ exports[`ActivityCount renders reliably 1`] = ` ] } > -  +  -  +  -  +  -  +  -  +  diff --git a/tests/unit/components/SharedComponents/UploadStatus/__snapshots__/UploadStatus.test.js.snap b/tests/unit/components/SharedComponents/UploadStatus/__snapshots__/UploadStatus.test.js.snap index d77f5b5eb..6137b9bf9 100644 --- a/tests/unit/components/SharedComponents/UploadStatus/__snapshots__/UploadStatus.test.js.snap +++ b/tests/unit/components/SharedComponents/UploadStatus/__snapshots__/UploadStatus.test.js.snap @@ -97,7 +97,7 @@ exports[`UploadStatus displays complete icon when progress is 1 1`] = ` ] } > -  +  @@ -191,7 +191,7 @@ exports[`UploadStatus displays progress bar when progress is greater than 5% 1`] ] } > -  +  -  +  -  +  @@ -477,7 +477,7 @@ exports[`UploadStatus displays start icon when upload is unsynced and not queued ] } > -  +  -  +  diff --git a/tests/unit/components/SharedComponents/__snapshots__/Checkbox.test.js.snap b/tests/unit/components/SharedComponents/__snapshots__/Checkbox.test.js.snap index b495d019b..3d914d1ba 100644 --- a/tests/unit/components/SharedComponents/__snapshots__/Checkbox.test.js.snap +++ b/tests/unit/components/SharedComponents/__snapshots__/Checkbox.test.js.snap @@ -278,7 +278,7 @@ exports[`Checkbox renders reliably being checked 1`] = ` ] } > -  +  diff --git a/tests/unit/components/SharedComponents/__snapshots__/TaxonResult.test.js.snap b/tests/unit/components/SharedComponents/__snapshots__/TaxonResult.test.js.snap index 1b4d1f734..2782d8f15 100644 --- a/tests/unit/components/SharedComponents/__snapshots__/TaxonResult.test.js.snap +++ b/tests/unit/components/SharedComponents/__snapshots__/TaxonResult.test.js.snap @@ -606,7 +606,7 @@ exports[`TaxonResult should render correctly 1`] = ` ] } > -  +  diff --git a/tests/unit/components/__snapshots__/INatIcon.test.js.snap b/tests/unit/components/__snapshots__/INatIcon.test.js.snap index fd142a1b1..6a527a992 100644 --- a/tests/unit/components/__snapshots__/INatIcon.test.js.snap +++ b/tests/unit/components/__snapshots__/INatIcon.test.js.snap @@ -20,6 +20,6 @@ exports[`INatIcon renders correctly 1`] = ` ] } > -  +  `;