Whitney -> Lato font (#1407)

* Replace Whitney fonts with Lato

* Escape font family names so Lato works on iOS

* Update custom fonts

* Typography file cleanup

* Rename constants to appConstants

* Fix margins in AddObsModal
This commit is contained in:
Amanda Bullington
2024-04-17 11:30:55 -07:00
committed by GitHub
parent 144d9019c4
commit 2f94987b4c
113 changed files with 1329 additions and 18910 deletions

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

@@ -6,68 +6,28 @@
"sha1": "e6311871bfa114078a3adb8900359160b001f0ba"
},
{
"path": "assets/fonts/Whitney-Book-Italic.otf",
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
"path": "assets/fonts/Lato-Bold.ttf",
"sha1": "6b2c7b124cbf0aaeba48d57fb0fa19f2c6c69683"
},
{
"path": "assets/fonts/Whitney-Book-Pro.otf",
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
"path": "assets/fonts/Lato-BoldItalic.ttf",
"sha1": "bf9e7d4a6185b53a256272869e66762c1e5d503b"
},
{
"path": "assets/fonts/Whitney-Book.otf",
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
"path": "assets/fonts/Lato-Italic.ttf",
"sha1": "63c5d4424bc3466477be05dc122799df7665e571"
},
{
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
"path": "assets/fonts/Lato-Medium.ttf",
"sha1": "c78e94b7cc0b782eef4f9f2be371c3cf9c3f6eaf"
},
{
"path": "assets/fonts/Whitney-Light-Italic.otf",
"sha1": "fb622c4ae9975d3bee45176a2b7a6a73649bedf1"
"path": "assets/fonts/Lato-MediumItalic.ttf",
"sha1": "df1a7160502d9e90c41b92b7243270a769904786"
},
{
"path": "assets/fonts/Whitney-Light-Pro.otf",
"sha1": "d15560faea2b18aef9867a1d2b9e2efb54b17b5b"
},
{
"path": "assets/fonts/Whitney-Light.otf",
"sha1": "d15560faea2b18aef9867a1d2b9e2efb54b17b5b"
},
{
"path": "assets/fonts/Whitney-LightItalic-Pro.otf",
"sha1": "fb622c4ae9975d3bee45176a2b7a6a73649bedf1"
},
{
"path": "assets/fonts/Whitney-Medium-Italic.otf",
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
},
{
"path": "assets/fonts/Whitney-Medium-Pro.otf",
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
},
{
"path": "assets/fonts/Whitney-Medium.otf",
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
},
{
"path": "assets/fonts/Whitney-MediumItalic-Pro.otf",
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
},
{
"path": "assets/fonts/Whitney-Semibold-Italic.otf",
"sha1": "829391a59c4305fe4733009da64fec983091cde1"
},
{
"path": "assets/fonts/Whitney-Semibold-Pro.otf",
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
},
{
"path": "assets/fonts/Whitney-Semibold.otf",
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
},
{
"path": "assets/fonts/Whitney-SemiboldItalic-Pro.otf",
"sha1": "53e8a56ceb630b63316db41017125c52fbf0e845"
"path": "assets/fonts/Lato-Regular.ttf",
"sha1": "f59f9e4f3cbee981a5e6f58a279f9b9613f22599"
},
{
"path": "assets/fonts/inaturalisticons.ttf",

BIN
assets/fonts/Lato-Bold.ttf Normal file
View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

Binary file not shown.

View File

@@ -6,6 +6,8 @@ module.exports = {
"nativewind/babel",
["module-resolver", {
alias: {
// constants is a reserved word, so jest won't run if we name the alias constants
appConstants: "./src/appConstants",
api: "./src/api",
components: "./src/components",
dictionaries: "./src/dictionaries",

View File

@@ -1465,12 +1465,12 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FasterImage: 60d0750ddbcefff0070c4c17309c2d1d6cc650f0
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
MMKV: ed58ad794b3f88c24d604a5b74f3fba17fcbaf74

View File

@@ -10,38 +10,28 @@
00E356F31AD99517003FC87E /* iNaturalistReactNativeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* iNaturalistReactNativeTests.m */; };
03BE06B8FED98F5CD10273BB /* libPods-iNaturalistReactNative.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20043186B311EE211FEB259A /* libPods-iNaturalistReactNative.a */; };
08387561362A4099A1D58774 /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 121B82B7918941189871CFD5 /* INatIcon.ttf */; };
085DD3205807404CAFC32228 /* Lato-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3A9BAF07FCF24F668E2EF5AB /* Lato-Medium.ttf */; };
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1956B4912A7C3C1E00BBBDE4 /* link-inat-model-files.sh in Resources */ = {isa = PBXBuildFile; fileRef = 1956B4902A7C3C1E00BBBDE4 /* link-inat-model-files.sh */; };
197A169D2A7C2567001A03DC /* cvmodel.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = 197A169B2A7C2567001A03DC /* cvmodel.mlmodel */; };
197A169E2A7C2567001A03DC /* taxonomy.json in Resources */ = {isa = PBXBuildFile; fileRef = 197A169C2A7C2567001A03DC /* taxonomy.json */; };
1EF13134839B4163B7221B1C /* Whitney-Light-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 280EEAE853724445825C0BD1 /* Whitney-Light-Italic.otf */; };
24C2A4FB10654A9FA5F6BA36 /* Whitney-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = C13A1C5596344F5F8830E524 /* Whitney-Light.otf */; };
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */; };
42832120F7C944B980FD13BC /* Whitney-MediumItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */; };
4698CEACBD4F4A859CAB0694 /* Whitney-SemiboldItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0DD877E5F25945BCB6707357 /* Whitney-SemiboldItalic-Pro.otf */; };
3DE2C0F71E184822B561A1ED /* Lato-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3A54425709BB4844AFBC680D /* Lato-Italic.ttf */; };
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */; };
54EB1EFEC1F74152902EED02 /* Lato-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C2D97D72EED451C887998A8 /* Lato-BoldItalic.ttf */; };
5A8D64AB921678B40E0229C8 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
70A78BDA30F54E5089C0E524 /* Whitney-Book-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 657E03B58B8E44588A5933FA /* Whitney-Book-Italic.otf */; };
73B478002C534272ABECB43A /* Whitney-Medium-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = DC9FE0074F1340B0A5F2EA35 /* Whitney-Medium-Italic.otf */; };
725BA058C5384A9185E8036A /* Lato-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 00752F4ADC554701A45A848A /* Lato-Bold.ttf */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
85620196EA8747A08658CF40 /* Whitney-LightItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5EA1E325EE494FF8BE364F00 /* Whitney-LightItalic-Pro.otf */; };
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, ); }; };
8B65ED3B29F575FE0054CCEF /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B65ED3A29F575FE0054CCEF /* ShareViewController.swift */; };
8F1AC6772BC1B610002F994B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8F1AC6762BC1B610002F994B /* PrivacyInfo.xcprivacy */; };
8F1AC6782BC1B610002F994B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8F1AC6762BC1B610002F994B /* PrivacyInfo.xcprivacy */; };
8F1AC6792BC1B610002F994B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8F1AC6762BC1B610002F994B /* PrivacyInfo.xcprivacy */; };
9136560F8A3E4C53B7BD08AE /* Whitney-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B5F7CCA093BF4208980F1C36 /* Whitney-Medium.otf */; };
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */; };
A64FC9A5388A49568EC932B6 /* Whitney-Semibold-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 63C92696AD524E14B655C56A /* Whitney-Semibold-Italic.otf */; };
B197D1A2DFD9440C9581D513 /* Whitney-Book-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */; };
B4518F59A698433CA0271ED5 /* Whitney-Semibold-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */; };
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */; };
CD4D097140634EE091BB5818 /* Whitney-Book.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8EB5F71FA6C34855B03FE3FB /* Whitney-Book.otf */; };
CD871292AF3144DC9F9240BA /* Whitney-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 4A5C60A9F7DF42F49CED09FC /* Whitney-Semibold.otf */; };
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 */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -76,12 +66,11 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
00752F4ADC554701A45A848A /* Lato-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Bold.ttf"; path = "../assets/fonts/Lato-Bold.ttf"; sourceTree = "<group>"; };
00E356EE1AD99517003FC87E /* iNaturalistReactNativeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iNaturalistReactNativeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* iNaturalistReactNativeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = iNaturalistReactNativeTests.m; sourceTree = "<group>"; };
097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-MediumItalic-Pro.otf"; path = "../assets/fonts/Whitney-MediumItalic-Pro.otf"; sourceTree = "<group>"; };
0DD877E5F25945BCB6707357 /* Whitney-SemiboldItalic-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-SemiboldItalic-Pro.otf"; path = "../assets/fonts/Whitney-SemiboldItalic-Pro.otf"; sourceTree = "<group>"; };
121B82B7918941189871CFD5 /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = "<group>"; };
121B82B7918941189871CFD5 /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* iNaturalistReactNative.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iNaturalistReactNative.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = iNaturalistReactNative/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = iNaturalistReactNative/AppDelegate.mm; sourceTree = "<group>"; };
@@ -94,14 +83,11 @@
19916F1F2B4F1871000A2D91 /* iNaturalistReactNativeRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = iNaturalistReactNativeRelease.entitlements; path = iNaturalistReactNative/iNaturalistReactNativeRelease.entitlements; sourceTree = "<group>"; };
19A5877328F8E3310016D128 /* iNaturalistReactNative-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iNaturalistReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
20043186B311EE211FEB259A /* libPods-iNaturalistReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative.a"; sourceTree = BUILT_PRODUCTS_DIR; };
280EEAE853724445825C0BD1 /* Whitney-Light-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Light-Italic.otf"; path = "../assets/fonts/Whitney-Light-Italic.otf"; sourceTree = "<group>"; };
2B8BE6258F04B67C38DE834A /* 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>"; };
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney-BookItalic-Pro.otf"; path = "../assets/fonts/Whitney-BookItalic-Pro.otf"; sourceTree = "<group>"; };
4A5C60A9F7DF42F49CED09FC /* Whitney-Semibold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Semibold.otf"; path = "../assets/fonts/Whitney-Semibold.otf"; sourceTree = "<group>"; };
5EA1E325EE494FF8BE364F00 /* Whitney-LightItalic-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-LightItalic-Pro.otf"; path = "../assets/fonts/Whitney-LightItalic-Pro.otf"; sourceTree = "<group>"; };
62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Book-Pro.otf"; path = "../assets/fonts/Whitney-Book-Pro.otf"; sourceTree = "<group>"; };
63C92696AD524E14B655C56A /* Whitney-Semibold-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Semibold-Italic.otf"; path = "../assets/fonts/Whitney-Semibold-Italic.otf"; sourceTree = "<group>"; };
657E03B58B8E44588A5933FA /* Whitney-Book-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Book-Italic.otf"; path = "../assets/fonts/Whitney-Book-Italic.otf"; sourceTree = "<group>"; };
3A54425709BB4844AFBC680D /* Lato-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Italic.ttf"; path = "../assets/fonts/Lato-Italic.ttf"; sourceTree = "<group>"; };
3A9BAF07FCF24F668E2EF5AB /* Lato-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Medium.ttf"; path = "../assets/fonts/Lato-Medium.ttf"; sourceTree = "<group>"; };
4B0AEEF6CA584BCF9880EB35 /* Lato-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Regular.ttf"; path = "../assets/fonts/Lato-Regular.ttf"; sourceTree = "<group>"; };
69DF855D92EA4ADFB73B47F1 /* Lato-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-MediumItalic.ttf"; path = "../assets/fonts/Lato-MediumItalic.ttf"; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = iNaturalistReactNative/LaunchScreen.storyboard; sourceTree = "<group>"; };
8B65ED2B29F575C10054CCEF /* iNaturalistReactNative-ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "iNaturalistReactNative-ShareExtension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
8B65ED3029F575C10054CCEF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
@@ -110,18 +96,12 @@
8B65ED3A29F575FE0054CCEF /* ShareViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ShareViewController.swift; path = "../../node_modules/react-native-share-menu/ios/ShareViewController.swift"; sourceTree = "<group>"; };
8B65ED3C29F576D00054CCEF /* iNaturalistReactNative-ShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "iNaturalistReactNative-ShareExtension.entitlements"; sourceTree = "<group>"; };
8B8BAD0429F54EB300CE5C9F /* iNaturalistReactNative.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = iNaturalistReactNative.entitlements; path = iNaturalistReactNative/iNaturalistReactNative.entitlements; sourceTree = "<group>"; };
8EB5F71FA6C34855B03FE3FB /* Whitney-Book.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Book.otf"; path = "../assets/fonts/Whitney-Book.otf"; sourceTree = "<group>"; };
8C2D97D72EED451C887998A8 /* Lato-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-BoldItalic.ttf"; path = "../assets/fonts/Lato-BoldItalic.ttf"; sourceTree = "<group>"; };
8F1AC6762BC1B610002F994B /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
A336AF0ADEAE537AB1B73F98 /* libPods-iNaturalistReactNative-ShareExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative-ShareExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Semibold-Pro.otf"; path = "../assets/fonts/Whitney-Semibold-Pro.otf"; sourceTree = "<group>"; };
B5F7CCA093BF4208980F1C36 /* Whitney-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Medium.otf"; path = "../assets/fonts/Whitney-Medium.otf"; sourceTree = "<group>"; };
B8FC28F6DD66FAD52B79E072 /* Pods-iNaturalistReactNative.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iNaturalistReactNative.debug.xcconfig"; path = "Target Support Files/Pods-iNaturalistReactNative/Pods-iNaturalistReactNative.debug.xcconfig"; 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>"; };
C13A1C5596344F5F8830E524 /* Whitney-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Light.otf"; path = "../assets/fonts/Whitney-Light.otf"; 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>"; };
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 = "<group>"; };
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 = "<group>"; };
DC9FE0074F1340B0A5F2EA35 /* Whitney-Medium-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Whitney-Medium-Italic.otf"; path = "../assets/fonts/Whitney-Medium-Italic.otf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = inaturalisticons.ttf; path = ../assets/fonts/inaturalisticons.ttf; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -269,24 +249,14 @@
E7A0E0AA690545D78AA7CC73 /* Resources */ = {
isa = PBXGroup;
children = (
BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */,
D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */,
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */,
EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */,
62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */,
097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */,
B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */,
657E03B58B8E44588A5933FA /* Whitney-Book-Italic.otf */,
8EB5F71FA6C34855B03FE3FB /* Whitney-Book.otf */,
280EEAE853724445825C0BD1 /* Whitney-Light-Italic.otf */,
C13A1C5596344F5F8830E524 /* Whitney-Light.otf */,
5EA1E325EE494FF8BE364F00 /* Whitney-LightItalic-Pro.otf */,
DC9FE0074F1340B0A5F2EA35 /* Whitney-Medium-Italic.otf */,
B5F7CCA093BF4208980F1C36 /* Whitney-Medium.otf */,
63C92696AD524E14B655C56A /* Whitney-Semibold-Italic.otf */,
4A5C60A9F7DF42F49CED09FC /* Whitney-Semibold.otf */,
0DD877E5F25945BCB6707357 /* Whitney-SemiboldItalic-Pro.otf */,
121B82B7918941189871CFD5 /* INatIcon.ttf */,
00752F4ADC554701A45A848A /* Lato-Bold.ttf */,
8C2D97D72EED451C887998A8 /* Lato-BoldItalic.ttf */,
3A54425709BB4844AFBC680D /* Lato-Italic.ttf */,
3A9BAF07FCF24F668E2EF5AB /* Lato-Medium.ttf */,
69DF855D92EA4ADFB73B47F1 /* Lato-MediumItalic.ttf */,
4B0AEEF6CA584BCF9880EB35 /* Lato-Regular.ttf */,
);
name = Resources;
sourceTree = "<group>";
@@ -411,27 +381,17 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
197A169E2A7C2567001A03DC /* taxonomy.json in Resources */,
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */,
1956B4912A7C3C1E00BBBDE4 /* link-inat-model-files.sh in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */,
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */,
8F1AC6772BC1B610002F994B /* PrivacyInfo.xcprivacy in Resources */,
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */,
B197D1A2DFD9440C9581D513 /* Whitney-Book-Pro.otf in Resources */,
42832120F7C944B980FD13BC /* Whitney-MediumItalic-Pro.otf in Resources */,
B4518F59A698433CA0271ED5 /* Whitney-Semibold-Pro.otf in Resources */,
70A78BDA30F54E5089C0E524 /* Whitney-Book-Italic.otf in Resources */,
CD4D097140634EE091BB5818 /* Whitney-Book.otf in Resources */,
1EF13134839B4163B7221B1C /* Whitney-Light-Italic.otf in Resources */,
24C2A4FB10654A9FA5F6BA36 /* Whitney-Light.otf in Resources */,
85620196EA8747A08658CF40 /* Whitney-LightItalic-Pro.otf in Resources */,
73B478002C534272ABECB43A /* Whitney-Medium-Italic.otf in Resources */,
9136560F8A3E4C53B7BD08AE /* Whitney-Medium.otf in Resources */,
A64FC9A5388A49568EC932B6 /* Whitney-Semibold-Italic.otf in Resources */,
CD871292AF3144DC9F9240BA /* Whitney-Semibold.otf in Resources */,
4698CEACBD4F4A859CAB0694 /* Whitney-SemiboldItalic-Pro.otf in Resources */,
08387561362A4099A1D58774 /* INatIcon.ttf in Resources */,
725BA058C5384A9185E8036A /* Lato-Bold.ttf in Resources */,
54EB1EFEC1F74152902EED02 /* Lato-BoldItalic.ttf in Resources */,
3DE2C0F71E184822B561A1ED /* Lato-Italic.ttf in Resources */,
085DD3205807404CAFC32228 /* Lato-Medium.ttf in Resources */,
E5DFC1C6FBFA45739CE91C69 /* Lato-MediumItalic.ttf in Resources */,
AE4DC81B3A87484CB3FD6750 /* Lato-Regular.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

View File

@@ -69,24 +69,14 @@
<array>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Whitney-Light-Pro.otf</string>
<string>Whitney-Medium-Pro.otf</string>
<string>Whitney-BookItalic-Pro.otf</string>
<string>inaturalisticons.ttf</string>
<string>Whitney-Book-Pro.otf</string>
<string>Whitney-MediumItalic-Pro.otf</string>
<string>Whitney-Semibold-Pro.otf</string>
<string>Whitney-Book-Italic.otf</string>
<string>Whitney-Book.otf</string>
<string>Whitney-Light-Italic.otf</string>
<string>Whitney-Light.otf</string>
<string>Whitney-LightItalic-Pro.otf</string>
<string>Whitney-Medium-Italic.otf</string>
<string>Whitney-Medium.otf</string>
<string>Whitney-Semibold-Italic.otf</string>
<string>Whitney-Semibold.otf</string>
<string>Whitney-SemiboldItalic-Pro.otf</string>
<string>INatIcon.ttf</string>
<string>Lato-Bold.ttf</string>
<string>Lato-BoldItalic.ttf</string>
<string>Lato-Italic.ttf</string>
<string>Lato-Medium.ttf</string>
<string>Lato-MediumItalic.ttf</string>
<string>Lato-Regular.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>

View File

@@ -6,68 +6,28 @@
"sha1": "e6311871bfa114078a3adb8900359160b001f0ba"
},
{
"path": "assets/fonts/Whitney-Book-Italic.otf",
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
"path": "assets/fonts/Lato-Bold.ttf",
"sha1": "6b2c7b124cbf0aaeba48d57fb0fa19f2c6c69683"
},
{
"path": "assets/fonts/Whitney-Book-Pro.otf",
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
"path": "assets/fonts/Lato-BoldItalic.ttf",
"sha1": "bf9e7d4a6185b53a256272869e66762c1e5d503b"
},
{
"path": "assets/fonts/Whitney-Book.otf",
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
"path": "assets/fonts/Lato-Italic.ttf",
"sha1": "63c5d4424bc3466477be05dc122799df7665e571"
},
{
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
"path": "assets/fonts/Lato-Medium.ttf",
"sha1": "c78e94b7cc0b782eef4f9f2be371c3cf9c3f6eaf"
},
{
"path": "assets/fonts/Whitney-Light-Italic.otf",
"sha1": "fb622c4ae9975d3bee45176a2b7a6a73649bedf1"
"path": "assets/fonts/Lato-MediumItalic.ttf",
"sha1": "df1a7160502d9e90c41b92b7243270a769904786"
},
{
"path": "assets/fonts/Whitney-Light-Pro.otf",
"sha1": "d15560faea2b18aef9867a1d2b9e2efb54b17b5b"
},
{
"path": "assets/fonts/Whitney-Light.otf",
"sha1": "d15560faea2b18aef9867a1d2b9e2efb54b17b5b"
},
{
"path": "assets/fonts/Whitney-LightItalic-Pro.otf",
"sha1": "fb622c4ae9975d3bee45176a2b7a6a73649bedf1"
},
{
"path": "assets/fonts/Whitney-Medium-Italic.otf",
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
},
{
"path": "assets/fonts/Whitney-Medium-Pro.otf",
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
},
{
"path": "assets/fonts/Whitney-Medium.otf",
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
},
{
"path": "assets/fonts/Whitney-MediumItalic-Pro.otf",
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
},
{
"path": "assets/fonts/Whitney-Semibold-Italic.otf",
"sha1": "829391a59c4305fe4733009da64fec983091cde1"
},
{
"path": "assets/fonts/Whitney-Semibold-Pro.otf",
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
},
{
"path": "assets/fonts/Whitney-Semibold.otf",
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
},
{
"path": "assets/fonts/Whitney-SemiboldItalic-Pro.otf",
"sha1": "53e8a56ceb630b63316db41017125c52fbf0e845"
"path": "assets/fonts/Lato-Regular.ttf",
"sha1": "f59f9e4f3cbee981a5e6f58a279f9b9613f22599"
},
{
"path": "assets/fonts/inaturalisticons.ttf",

17670
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

View File

@@ -126,6 +126,7 @@
"realm": "^12.6.2",
"reassure": "^0.11.0",
"sanitize-html": "^2.13.0",
"ts-jest": "^29.1.2",
"vision-camera-plugin-inatvision": "github:inaturalist/vision-camera-plugin-inatvision",
"zustand": "^4.5.2"
},
@@ -144,6 +145,7 @@
"@tanstack/eslint-plugin-query": "^5.28.11",
"@testing-library/jest-native": "^5.4.3",
"@testing-library/react-native": "^12.4.5",
"@types/jest": "^29.5.12",
"@types/react": "^18.2.74",
"@types/react-test-renderer": "^18.0.7",
"babel-jest": "^29.6.3",

View File

@@ -0,0 +1,11 @@
export const fontRegular = "Lato-Regular";
export const fontMedium = "Lato-Medium";
export const fontBold = "Lato-Bold";
export const tailwindFontRegular = "font-Lato-Regular";
export const tailwindFontMedium = "font-Lato-Medium";
export const tailwindFontBold = "font-Lato-Bold";

View File

@@ -65,7 +65,7 @@ const AddObsModal = ( { closeModal, navAndCloseModal }: Props ): React.Node => {
: theme.colors.primary
}
/>
<Body3 className="ml-5">{text}</Body3>
<Body3 className="ml-5 mr-1.5">{text}</Body3>
</View>
) )}
</View>

View File

@@ -1,10 +1,10 @@
// @flow
import classnames from "classnames";
import { Body3Bold } from "components/SharedComponents";
import {
CIRCLE_BUTTON_DIM
} from "components/SharedComponents/Buttons/TransparentCircleButton";
import INatText from "components/SharedComponents/Typography/INatText";
import { Pressable } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
@@ -59,9 +59,9 @@ const CameraZoom = ( {
accessibilityState={{ disabled: false }}
size={20}
>
<INatText className="text-s font-semibold text-white">
<Body3Bold className="text-s text-white">
{zoomButtonText}
</INatText>
</Body3Bold>
</Pressable>
</Animated.View>
);

View File

@@ -1,6 +1,7 @@
// @flow
import classnames from "classnames";
import { Text, View } from "components/styledComponents";
import { Subheading1 } from "components/SharedComponents";
import { View } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
import { useTranslation } from "sharedHooks";
@@ -43,7 +44,7 @@ const PhotoPreview = ( {
: SMALL_PHOTO_DIM + SMALL_PHOTO_GUTTER * 2;
let noPhotosNotice = (
<Text
<Subheading1
className={classnames(
"text-white",
"text-center",
@@ -52,11 +53,11 @@ const PhotoPreview = ( {
)}
>
{t( "Photos-you-take-will-appear-here" )}
</Text>
</Subheading1>
);
if ( isTablet && isLandscapeMode ) {
noPhotosNotice = (
<Text
<Subheading1
className={classnames(
"text-white",
"text-center",
@@ -69,7 +70,7 @@ const PhotoPreview = ( {
)}
>
{t( "Photos-you-take-will-appear-here" )}
</Text>
</Subheading1>
);
}

View File

@@ -5,11 +5,11 @@ import {
Heading2,
ScrollViewWrapper
} from "components/SharedComponents";
import { fontMonoClass, Text, View } from "components/styledComponents";
import { fontMonoClass, View } from "components/styledComponents";
import { t } from "i18next";
import type { Node } from "react";
import React from "react";
import { Platform } from "react-native";
import { Platform, Text } from "react-native";
import Config from "react-native-config";
import RNFS from "react-native-fs";
import useLogs from "sharedHooks/useLogs";

View File

@@ -6,7 +6,6 @@ import {
} from "components/SharedComponents";
import {
fontMonoClass,
Text,
TextInput,
View
} from "components/styledComponents";
@@ -16,7 +15,7 @@ import React, {
useEffect,
useState
} from "react";
import { Platform } from "react-native";
import { Platform, Text } from "react-native";
import IconMaterial from "react-native-vector-icons/MaterialIcons";
import useLogs from "sharedHooks/useLogs";

View File

@@ -1,9 +1,7 @@
// @flow
import searchMessages from "api/messages";
import { Tabs } from "components/SharedComponents";
import ViewWrapper from "components/SharedComponents/ViewWrapper";
import { Text } from "components/styledComponents";
import { Body3, Tabs, ViewWrapper } from "components/SharedComponents";
import { t } from "i18next";
import type { Node } from "react";
import React, { useState } from "react";
@@ -57,9 +55,9 @@ const Messages = (): Node => {
</>
)
: (
<Text className="self-center">
<Body3 className="self-center">
{t( "You-must-be-logged-in-to-view-messages" )}
</Text>
</Body3>
)}
</ViewWrapper>
);

View File

@@ -1,10 +1,12 @@
// @flow
import createFlag from "api/flags";
import { Button, Checkbox } from "components/SharedComponents";
import {
Body1, Body3, Button, Checkbox, Subheading1
} from "components/SharedComponents";
import {
Modal,
SafeAreaView,
Text, View
View
} from "components/styledComponents";
import { t } from "i18next";
import type { Node } from "react";
@@ -102,9 +104,9 @@ const FlagItemModal = ( {
<SafeAreaView className="flex-1">
<View className="flex-row-reverse justify-between p-6 border-b">
<IconMaterial name="close" onPress={closeFlagItemModal} size={30} />
<Text className="text-xl">
<Subheading1 className="text-xl">
{t( "Flag-An-Item" )}
</Text>
</Subheading1>
</View>
<KeyboardAwareScrollView
ref={keyboardScrollRef}
@@ -113,9 +115,9 @@ const FlagItemModal = ( {
extraHeight={200}
className="p-6"
>
<Text className="text-base">
<Body1 className="text-base">
{t( "Flag-Item-Description" )}
</Text>
</Body1>
<View className="flex-row my-2">
<Checkbox
isChecked={checkBoxValue === "spam"}
@@ -123,7 +125,7 @@ const FlagItemModal = ( {
text={t( "Spam" )}
/>
</View>
<Text className="mb-2 text-base" style>{t( "Spam-Examples" )}</Text>
<Body1 className="mb-2 text-base" style>{t( "Spam-Examples" )}</Body1>
<View className="flex-row my-2">
<Checkbox
@@ -132,7 +134,7 @@ const FlagItemModal = ( {
text={t( "Offensive-Inappropriate" )}
/>
</View>
<Text className="mb-2 text-base">{t( "Offensive-Inappropriate-Examples" )}</Text>
<Body1 className="mb-2 text-base">{t( "Offensive-Inappropriate-Examples" )}</Body1>
<View className="flex-row my-2">
<Checkbox
@@ -141,7 +143,7 @@ const FlagItemModal = ( {
text={t( "Other" )}
/>
</View>
<Text className="mb-2 text-base">{t( "Flag-Item-Other-Description" )}</Text>
<Body1 className="mb-2 text-base">{t( "Flag-Item-Other-Description" )}</Body1>
{( checkBoxValue === "other" )
&& (
<>
@@ -154,7 +156,7 @@ const FlagItemModal = ( {
accessibilityLabel={t( "Flag-Item-Other" )}
accessibilityHint={t( "Text-Box-to-Describe-Reason-for-Flag" )}
/>
<Text>{`${explanation.length}/255`}</Text>
<Body3>{`${explanation.length}/255`}</Body3>
</>
)}
<View className="flex-row justify-center m-4">

View File

@@ -7,10 +7,11 @@ import {
List2,
TextInputSheet
} from "components/SharedComponents";
import { Text, View } from "components/styledComponents";
import { View } from "components/styledComponents";
import { t } from "i18next";
import type { Node } from "react";
import React, { useState } from "react";
import { Text } from "react-native";
type Props = {
onAgree:Function,

View File

@@ -4,10 +4,11 @@ import {
Button,
DisplayTaxon
} from "components/SharedComponents";
import { Text, View } from "components/styledComponents";
import { View } from "components/styledComponents";
import { t } from "i18next";
import type { Node } from "react";
import React from "react";
import { Text } from "react-native";
type Props = {
handleClose: Function,

View File

@@ -1,5 +1,6 @@
// @flow
import { tailwindFontBold } from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import { ActivityIndicator, Heading4, INatIcon } from "components/SharedComponents";
import { Pressable, View } from "components/styledComponents";
@@ -39,7 +40,7 @@ const setStyles = ( {
"px-[10px]",
"py-[13px]",
"rounded-lg",
"font-Whitney-Bold"
tailwindFontBold
];
const textClasses = [
"text-center",

View File

@@ -1,11 +1,10 @@
// @flow
import classNames from "classnames";
import { Body3 } from "components/SharedComponents";
import type { Node } from "react";
import React from "react";
import Taxon from "realmModels/Taxon";
import INatTextMedium from "./Typography/INatTextMedium";
type Props = {
fontComponent: Object,
isHorizontal: boolean,
@@ -39,7 +38,7 @@ const ScientificName = ( {
? " "
: "";
const text = piece + spaceChar;
const FontComponent = fontComponent || INatTextMedium;
const FontComponent = fontComponent || Body3;
return (
<FontComponent

View File

@@ -1,9 +1,9 @@
// @flow
import { fontRegular } from "appConstants/fontFamilies.ts";
import { INatIcon, INatIconButton } from "components/SharedComponents";
import { View } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
import { Platform } from "react-native";
import { TextInput, useTheme } from "react-native-paper";
import { useTranslation } from "sharedHooks";
import { getShadowStyle } from "styles/global";
@@ -67,9 +67,7 @@ const SearchBar = ( {
bodyLarge:
{
...theme.fonts.bodyLarge,
fontFamily: `Whitney-Light${Platform.OS === "ios"
? ""
: "-Pro"}`
fontFamily: fontRegular
}
}
};

View File

@@ -1,13 +1,13 @@
// @flow
import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
import { fontRegular } from "appConstants/fontFamilies.ts";
import {
Body3, BottomSheet, Button
} from "components/SharedComponents";
import { View } from "components/styledComponents";
import type { Node } from "react";
import React, { useMemo, useRef, useState } from "react";
import { Platform } from "react-native";
import { useTheme } from "react-native-paper";
import useTranslation from "sharedHooks/useTranslation";
@@ -35,9 +35,7 @@ const TextInputSheet = ( {
const inputStyle = useMemo( ( ) => ( {
height: 223,
fontFamily: `Whitney-Light${Platform.OS === "ios"
? ""
: "-Pro"}`,
fontFamily: fontRegular,
fontSize: 14,
lineHeight: 17,
color: theme.colors.primary,

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontMedium
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextMedium from "./INatTextMedium";
import { Text } from "react-native";
const Body1 = ( props: any ): Node => (
<Text
className={classnames(
"text-base font-medium text-darkGray",
tailwindFontMedium
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
{...props}
/>
);
export default Body1;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontMedium
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextMedium from "./INatTextMedium";
import { Text } from "react-native";
const Body1Bold = ( props: any ): Node => (
<Text
className={classnames(
"text-base font-medium text-darkGray",
tailwindFontMedium
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
{...props}
/>
);
export default Body1Bold;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontRegular
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextLight from "./INatTextLight";
import { Text } from "react-native";
const Body2 = ( props: any ): Node => (
<Text
className={classnames(
"text-md font-light text-darkGray",
tailwindFontRegular
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextLight className="text-md font-light text-darkGray" {...props} />
{...props}
/>
);
export default Body2;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontMedium
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextMedium from "./INatTextMedium";
import { Text } from "react-native";
const Body3 = ( props: any ): Node => (
<Text
className={classnames(
"text-sm font-normal text-darkGray",
tailwindFontMedium
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextMedium className="text-sm font-normal text-darkGray" {...props} />
{...props}
/>
);
export default Body3;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Body3Bold = ( props: any ): Node => (
<Text
className={classnames(
"text-sm font-medium text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatText className="text-sm font-medium text-darkGray" {...props} />
{...props}
/>
);
export default Body3Bold;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontRegular
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextLight from "./INatTextLight";
import { Text } from "react-native";
const Body4 = ( props: any ): Node => (
<Text
className={classnames(
"text-xs font-light text-darkGray",
tailwindFontRegular
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextLight className="text-xs font-light text-darkGray" {...props} />
{...props}
/>
);
export default Body4;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Heading1 = ( props: any ): Node => (
<Text
className={classnames(
"text-3xl text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatText className="text-3xl font-semibold text-darkGray" {...props} />
{...props}
/>
);
export default Heading1;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Heading2 = ( props: any ): Node => (
<Text
className={classnames(
"text-2xl text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatText className="text-2xl font-semibold text-darkGray" {...props} />
{...props}
/>
);
export default Heading2;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Heading3 = ( props: any ): Node => (
<Text
className={classnames(
"text-lg font-semibold text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatText className="text-lg font-semibold text-darkGray" {...props} />
{...props}
/>
);
export default Heading3;

View File

@@ -1,13 +1,19 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Heading4 = ( props: any ): Node => (
<INatText
className="text-md leading-[19px] font-semibold tracking-[2px] text-darkGray"
<Text
className={classnames(
"text-md leading-[19px] tracking-[2px] text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
/>

View File

@@ -1,13 +1,19 @@
// @flow
import {
tailwindFontBold
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatText from "./INatText";
import { Text } from "react-native";
const Heading5 = ( props: any ): Node => (
<INatText
className="text-2xs font-semibold tracking-[1px] text-darkGray"
<Text
className={classnames(
"text-2xs tracking-[1px] text-darkGray",
tailwindFontBold
)}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
/>

View File

@@ -1,28 +0,0 @@
// @flow
import { Text } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
type Props = {
children: any,
testID?: string,
style?: any,
className?: string
}
const INatText = ( {
children, testID, style, className, ...props
}: Props ): Node => (
<Text
/* eslint-disable react/jsx-props-no-spreading */
{...props}
style={style}
testID={testID}
className={className}
>
{children}
</Text>
);
export default INatText;

View File

@@ -1,16 +0,0 @@
// @flow
import { LightText } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
type Props = {
children: any,
};
/* eslint-disable react/jsx-props-no-spreading */
const INatTextLight = ( { children, ...props }: Props ): Node => (
<LightText {...props}>{children}</LightText>
);
export default INatTextLight;

View File

@@ -1,28 +0,0 @@
// @flow
import { MediumText } from "components/styledComponents";
import type { Node } from "react";
import React from "react";
type Props = {
children: any,
testID?: string,
style?: any,
className?: string
}
const INatTextMedium = ( {
children, testID, style, className, ...props
}: Props ): Node => (
<MediumText
/* eslint-disable react/jsx-props-no-spreading */
{...props}
style={style}
testID={testID}
className={className}
>
{children}
</MediumText>
);
export default INatTextMedium;

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontMedium
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextMedium from "./INatTextMedium";
import { Text } from "react-native";
const List1 = ( props: any ): Node => (
<Text
className={classnames(
"text-base font-medium text-darkGray",
tailwindFontMedium
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
{...props}
/>
);
export default List1;

View File

@@ -1,13 +1,19 @@
// @flow
import {
tailwindFontRegular
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextLight from "./INatTextLight";
import { Text } from "react-native";
const List2 = ( props: any ): Node => (
<INatTextLight
className="text-sm leading-[17px] font-light text-darkGray"
<Text
className={classnames(
"text-sm leading-[17px] font-light text-darkGray",
tailwindFontRegular
)}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
/>

View File

@@ -1,13 +1,22 @@
// @flow
import {
tailwindFontRegular
} from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import type { Node } from "react";
import React from "react";
import INatTextLight from "./INatTextLight";
import { Text } from "react-native";
const Subheading1 = ( props: any ): Node => (
<Text
className={classnames(
"text-xl text-darkGray",
tailwindFontRegular
)}
// eslint-disable-next-line react/jsx-props-no-spreading
<INatTextLight className="text-xl text-darkGray" {...props} />
{...props}
/>
);
export default Subheading1;

View File

@@ -1,8 +1,9 @@
import { fontRegular } from "appConstants/fontFamilies.ts";
import linkifyHtml from "linkify-html";
import { isEqual, trim } from "lodash";
import MarkdownIt from "markdown-it";
import * as React from "react";
import { Platform, useWindowDimensions } from "react-native";
import { useWindowDimensions } from "react-native";
import HTML, { defaultSystemFonts } from "react-native-render-html";
import WebView from "react-native-webview";
import sanitizeHtml from "sanitize-html";
@@ -112,14 +113,12 @@ const UserText = ( {
html = linkifyHtml( html, LINKIFY_OPTIONS );
const baseStyle = {
fontFamily: `Whitney-Light${Platform.OS === "ios"
? ""
: "-Pro"}`,
fontFamily: fontRegular,
fontSize: 16,
lineHeight: 22,
...htmlStyle
};
const fonts = ["Whitney-Light", "Whitney-Light-Pro", ...defaultSystemFonts];
const fonts = [fontRegular, ...defaultSystemFonts];
return (
<HTML

View File

@@ -66,9 +66,6 @@ export { default as Heading2 } from "./Typography/Heading2";
export { default as Heading3 } from "./Typography/Heading3";
export { default as Heading4 } from "./Typography/Heading4";
export { default as Heading5 } from "./Typography/Heading5";
export { default as INatText } from "./Typography/INatText";
export { default as INatTextLight } from "./Typography/INatTextLight";
export { default as INatTextMedium } from "./Typography/INatTextMedium";
export { default as List1 } from "./Typography/List1";
export { default as List2 } from "./Typography/List2";
export { default as P } from "./Typography/P";

View File

@@ -1,5 +1,6 @@
// @flow
import { fontRegular } from "appConstants/fontFamilies.ts";
import {
Body2,
Heading4
@@ -7,7 +8,6 @@ import {
import * as React from "react";
import {
Linking,
Platform,
useWindowDimensions
} from "react-native";
import HTML, { defaultSystemFonts } from "react-native-render-html";
@@ -29,13 +29,11 @@ const Wikipedia = ( { taxon }: Props ): React.Node => {
};
const baseStyle = {
fontFamily: `Whitney-Light${Platform.OS === "ios"
? ""
: "-Pro"}`,
fontFamily: fontRegular,
fontSize: 16,
lineHeight: 22
};
const fonts = ["Whitney-Light", "Whitney-Light-Pro", ...defaultSystemFonts];
const fonts = [fontRegular, ...defaultSystemFonts];
let wikipediaUrl = taxon.wikipedia_url;

View File

@@ -14,7 +14,6 @@ import {
Pressable as StyledPressable,
SafeAreaView as UnstyledSafeAreaView,
ScrollView as UnstyledScrollView,
Text as UnstyledText,
TextInput as UntyledTextInput,
View as UnstyledView
} from "react-native";
@@ -33,27 +32,6 @@ const SafeAreaView = styled( UnstyledSafeAreaView === undefined
// $FlowIgnore
const ScrollView = styled( UnstyledScrollView );
// $FlowIgnore
const Text = styled(
UnstyledText,
Platform.OS === "ios"
? "font-Whitney-Book"
: "font-Whitney-Book-Pro"
);
// $FlowIgnore
const MediumText = styled(
UnstyledText,
Platform.OS === "ios"
? "font-Whitney-Medium"
: "font-Whitney-Medium-Pro"
);
// $FlowIgnore
const LightText = styled(
UnstyledText,
Platform.OS === "ios"
? "font-Whitney-Book"
: "font-Whitney-Book-Pro"
);
// $FlowIgnore
const TextInput = styled( UntyledTextInput );
// $FlowIgnore
const Pressable = styled( StyledPressable );
@@ -83,14 +61,11 @@ export {
Image,
ImageBackground,
KeyboardAvoidingView,
LightText,
LinearGradient,
MediumText,
Modal,
Pressable,
SafeAreaView,
ScrollView,
Text,
TextInput,
View
};

View File

@@ -4,6 +4,7 @@ import {
DrawerContentScrollView,
DrawerItem
} from "@react-navigation/drawer";
import { fontRegular } from "appConstants/fontFamilies.ts";
import classnames from "classnames";
import {
Body1,
@@ -14,7 +15,7 @@ import {
import { Pressable, View } from "components/styledComponents";
import type { Node } from "react";
import React, { useCallback, useMemo } from "react";
import { Dimensions, Platform } from "react-native";
import { Dimensions } from "react-native";
import { useTheme } from "react-native-paper";
import User from "realmModels/User";
import { BREAKPOINTS } from "sharedHelpers/breakpoint";
@@ -47,9 +48,7 @@ const CustomDrawerContent = ( { ...props }: Props ): Node => {
fontSize: 16,
lineHeight: 19.2,
letterSpacing: 2,
fontFamily: `Whitney-Light${Platform.OS === "ios"
? ""
: "-Pro"}`,
fontFamily: fontRegular,
color: theme.colors.primary,
fontWeight: "700",
textAlign: "left",

View File

@@ -1,9 +1,10 @@
// @flow
import { HeaderBackground } from "@react-navigation/elements";
import { fontMedium } from "appConstants/fontFamilies.ts";
import BackButton from "components/SharedComponents/Buttons/BackButton";
import type { Node } from "react";
import React from "react";
import { Platform, View } from "react-native";
import { View } from "react-native";
import colors from "styles/tailwindColors";
import ContextHeader from "./ContextHeader";
@@ -23,9 +24,7 @@ const showHeader: Object = {
// https://reactnavigation.org/docs/native-stack-navigator#headertitlealign
headerTitleStyle: {
fontSize: 24,
fontFamily: Platform.OS === "ios"
? "Whitney-Medium"
: "Whitney-Medium-Pro"
fontFamily: fontMedium
}
};
@@ -37,9 +36,7 @@ const showLongHeader: Object = {
// https://reactnavigation.org/docs/native-stack-navigator#headertitlealign
headerTitleStyle: {
fontSize: 16,
fontFamily: Platform.OS === "ios"
? "Whitney-Medium"
: "Whitney-Medium-Pro"
fontFamily: fontMedium
}
};

View File

@@ -64,22 +64,14 @@ module.exports = {
22: "5.5rem"
},
fontFamily: {
"Whitney-Medium": ["Whitney-Medium"],
"Whitney-Medium-Pro": ["Whitney-Medium-Pro"], // Android naming convention
"Whitney-Light": ["Whitney-Light"],
"Whitney-Light-Pro": ["Whitney-Light-Pro"], // Android naming convention
"Whitney-BookItalic": ["Whitney-BookItalic"],
"Whitney-BookItalic-Pro": ["Whitney-BookItalic-Pro"], // Android naming convention
"Whitney-Semibold": ["Whitney-Semibold"],
"Whitney-Semibold-Pro": ["Whitney-Semibold-Pro"], // Android naming convention
"Whitney-Semibold-Italic": ["Whitney-Semibold-Italic"],
"Whitney-Semibold-Italic-Pro": ["Whitney-Semibold-Italic-Pro"], // Android naming convention
"Whitney-Book": ["Whitney-Book"],
"Whitney-Book-Pro": ["Whitney-Book-Pro"], // Android naming convention
"Lato-Bold": ["Lato-Bold"],
"Lato-BoldItalic": ["Lato-BoldItalic"], // working
"Lato-Italic": ["Lato-Italic"], // working
"Lato-Medium": ["Lato-Medium"],
"Lato-MediumItalic": ["Lato-MediumItalic"], // working
"Lato-Regular": ["Lato-Regular"],
// selected from list of fonts already available in RN
// https://infinitbility.com/react-native-font-family-list/
"Papyrus-Condensed": ["Papyrus-Condensed"],
Roboto: ["Roboto"],
monospace: ["monospace"],
Menlo: ["Menlo"]
},

View File

@@ -40,11 +40,6 @@ exports[`ActivityCount renders reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -56,13 +51,14 @@ exports[`ActivityCount renders reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
},
],
],
],
]
}
testID="some_id"

View File

@@ -40,11 +40,6 @@ exports[`CommentsCount renders default reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -56,13 +51,14 @@ exports[`CommentsCount renders default reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
},
],
],
],
]
}
>
@@ -111,11 +107,6 @@ exports[`CommentsCount renders filled reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -127,13 +118,14 @@ exports[`CommentsCount renders filled reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
},
],
],
],
]
}
>
@@ -182,11 +174,6 @@ exports[`CommentsCount renders white reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -198,6 +185,9 @@ exports[`CommentsCount renders white reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
@@ -206,8 +196,6 @@ exports[`CommentsCount renders white reliably 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
>

View File

@@ -40,11 +40,6 @@ exports[`IdentificationsCount renders default reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -56,13 +51,14 @@ exports[`IdentificationsCount renders default reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
},
],
],
],
]
}
>
@@ -111,11 +107,6 @@ exports[`IdentificationsCount renders filled reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -127,13 +118,14 @@ exports[`IdentificationsCount renders filled reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
},
],
],
],
]
}
>
@@ -182,11 +174,6 @@ exports[`IdentificationsCount renders white reliably 1`] = `
</Text>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -198,6 +185,9 @@ exports[`IdentificationsCount renders white reliably 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"marginLeft": 6,
@@ -206,8 +196,6 @@ exports[`IdentificationsCount renders white reliably 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
>

View File

@@ -58,6 +58,9 @@ exports[`Button focus in dark mode should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#74AC00",
},
@@ -67,11 +70,6 @@ exports[`Button focus in dark mode should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -80,15 +78,15 @@ exports[`Button focus in dark mode should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -97,8 +95,6 @@ exports[`Button focus in dark mode should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -166,6 +162,9 @@ exports[`Button focus in dark mode when disabled should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#B9D580",
},
@@ -175,11 +174,6 @@ exports[`Button focus in dark mode when disabled should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -188,15 +182,15 @@ exports[`Button focus in dark mode when disabled should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -205,8 +199,6 @@ exports[`Button focus in dark mode when disabled should render correctly 1`] = `
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"
@@ -274,6 +266,9 @@ exports[`Button neutral in dark mode should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"borderBottomWidth": 1,
"borderLeftWidth": 1,
@@ -301,11 +296,6 @@ exports[`Button neutral in dark mode should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -314,15 +304,15 @@ exports[`Button neutral in dark mode should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -334,8 +324,6 @@ exports[`Button neutral in dark mode should render correctly 1`] = `
"color": "#454545",
},
],
],
],
]
}
testID="RNButton.text"
@@ -403,6 +391,9 @@ exports[`Button neutral in dark mode when disabled should render correctly 1`] =
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"borderBottomWidth": 1,
"borderLeftWidth": 1,
@@ -427,11 +418,6 @@ exports[`Button neutral in dark mode when disabled should render correctly 1`] =
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -440,15 +426,15 @@ exports[`Button neutral in dark mode when disabled should render correctly 1`] =
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -460,8 +446,6 @@ exports[`Button neutral in dark mode when disabled should render correctly 1`] =
"color": "#828181",
},
],
],
],
]
}
testID="RNButton.text"
@@ -529,6 +513,9 @@ exports[`Button primary in dark mode should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#454545",
},
@@ -538,11 +525,6 @@ exports[`Button primary in dark mode should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -551,15 +533,15 @@ exports[`Button primary in dark mode should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -571,8 +553,6 @@ exports[`Button primary in dark mode should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -640,6 +620,9 @@ exports[`Button primary in dark mode when disabled should render correctly 1`] =
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#828181",
},
@@ -649,11 +632,6 @@ exports[`Button primary in dark mode when disabled should render correctly 1`] =
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -662,15 +640,15 @@ exports[`Button primary in dark mode when disabled should render correctly 1`] =
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -682,8 +660,6 @@ exports[`Button primary in dark mode when disabled should render correctly 1`] =
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"
@@ -751,6 +727,9 @@ exports[`Button warning in dark mode should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#9B1010",
},
@@ -760,11 +739,6 @@ exports[`Button warning in dark mode should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -773,15 +747,15 @@ exports[`Button warning in dark mode should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -790,8 +764,6 @@ exports[`Button warning in dark mode should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -859,6 +831,9 @@ exports[`Button warning in dark mode when disabled should render correctly 1`] =
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#b06365",
},
@@ -868,11 +843,6 @@ exports[`Button warning in dark mode when disabled should render correctly 1`] =
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -881,15 +851,15 @@ exports[`Button warning in dark mode when disabled should render correctly 1`] =
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -898,8 +868,6 @@ exports[`Button warning in dark mode when disabled should render correctly 1`] =
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"

View File

@@ -58,6 +58,9 @@ exports[`Button focus should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#74AC00",
},
@@ -67,11 +70,6 @@ exports[`Button focus should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -80,15 +78,15 @@ exports[`Button focus should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -97,8 +95,6 @@ exports[`Button focus should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -166,6 +162,9 @@ exports[`Button focus when disabled should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#B9D580",
},
@@ -175,11 +174,6 @@ exports[`Button focus when disabled should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -188,15 +182,15 @@ exports[`Button focus when disabled should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -205,8 +199,6 @@ exports[`Button focus when disabled should render correctly 1`] = `
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"
@@ -274,6 +266,9 @@ exports[`Button neutral should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"borderBottomWidth": 1,
"borderLeftWidth": 1,
@@ -301,11 +296,6 @@ exports[`Button neutral should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -314,15 +304,15 @@ exports[`Button neutral should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -334,8 +324,6 @@ exports[`Button neutral should render correctly 1`] = `
"color": "#454545",
},
],
],
],
]
}
testID="RNButton.text"
@@ -403,6 +391,9 @@ exports[`Button neutral when disabled should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"borderBottomWidth": 1,
"borderLeftWidth": 1,
@@ -427,11 +418,6 @@ exports[`Button neutral when disabled should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -440,15 +426,15 @@ exports[`Button neutral when disabled should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -460,8 +446,6 @@ exports[`Button neutral when disabled should render correctly 1`] = `
"color": "#828181",
},
],
],
],
]
}
testID="RNButton.text"
@@ -529,6 +513,9 @@ exports[`Button primary should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#454545",
},
@@ -538,11 +525,6 @@ exports[`Button primary should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -551,15 +533,15 @@ exports[`Button primary should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -571,8 +553,6 @@ exports[`Button primary should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -640,6 +620,9 @@ exports[`Button primary when disabled should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#828181",
},
@@ -649,11 +632,6 @@ exports[`Button primary when disabled should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -662,15 +640,15 @@ exports[`Button primary when disabled should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -682,8 +660,6 @@ exports[`Button primary when disabled should render correctly 1`] = `
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"
@@ -751,6 +727,9 @@ exports[`Button warning should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#9B1010",
},
@@ -760,11 +739,6 @@ exports[`Button warning should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -773,15 +747,15 @@ exports[`Button warning should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -790,8 +764,6 @@ exports[`Button warning should render correctly 1`] = `
"color": "#ffffff",
},
],
],
],
]
}
testID="RNButton.text"
@@ -859,6 +831,9 @@ exports[`Button warning when disabled should render correctly 1`] = `
"borderTopLeftRadius": 8,
"borderTopRightRadius": 8,
},
{
"fontFamily": "Lato-Bold",
},
{
"backgroundColor": "#b06365",
},
@@ -868,11 +843,6 @@ exports[`Button warning when disabled should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -881,15 +851,15 @@ exports[`Button warning when disabled should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"textAlign": "center",
@@ -898,8 +868,6 @@ exports[`Button warning when disabled should render correctly 1`] = `
"color": "rgba(255, 255, 255, 0.5)",
},
],
],
],
]
}
testID="RNButton.text"

View File

@@ -68,11 +68,6 @@ exports[`InlineUser renders reliably 1`] = `
</View>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -84,8 +79,9 @@ exports[`InlineUser renders reliably 1`] = `
{
"color": "#454545",
},
],
],
{
"fontFamily": "Lato-Medium",
},
]
}
>
@@ -181,11 +177,6 @@ exports[`InlineUser when offline renders reliably 1`] = `
</View>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -197,8 +188,9 @@ exports[`InlineUser when offline renders reliably 1`] = `
{
"color": "#454545",
},
],
],
{
"fontFamily": "Lato-Medium",
},
]
}
>
@@ -294,11 +286,6 @@ exports[`InlineUser when user has no icon set renders reliably 1`] = `
</View>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -310,8 +297,9 @@ exports[`InlineUser when user has no icon set renders reliably 1`] = `
{
"color": "#454545",
},
],
],
{
"fontFamily": "Lato-Medium",
},
]
}
>

View File

@@ -335,11 +335,6 @@ exports[`ObsGridItem for an observation with a photo should render 1`] = `
<Text
numberOfLines={1}
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 18,
@@ -351,13 +346,14 @@ exports[`ObsGridItem for an observation with a photo should render 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"color": "#ffffff",
},
],
],
],
]
}
>
@@ -681,11 +677,6 @@ exports[`ObsGridItem for an observation without a photo should render 1`] = `
<Text
numberOfLines={1}
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 18,
@@ -697,13 +688,14 @@ exports[`ObsGridItem for an observation without a photo should render 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
[
{
"color": "#ffffff",
},
],
],
],
]
}
>

View File

@@ -26,11 +26,6 @@ exports[`PhotoCount renders correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 14,
@@ -42,14 +37,15 @@ exports[`PhotoCount renders correctly 1`] = `
{
"color": "#454545",
},
{
"fontFamily": "Lato-Medium",
},
{
"paddingHorizontal": 12.5,
"position": "absolute",
"top": 22,
"zIndex": 10,
},
],
],
]
}
>

View File

@@ -70,11 +70,6 @@ exports[`Tabs should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -83,15 +78,15 @@ exports[`Tabs should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"alignSelf": "center",
@@ -103,8 +98,6 @@ exports[`Tabs should render correctly 1`] = `
"paddingBottom": 12,
},
],
],
],
]
}
>
@@ -183,11 +176,6 @@ exports[`Tabs should render correctly 1`] = `
>
<Text
style={
[
{
"fontFamily": "Whitney-Book",
},
[
[
{
"fontSize": 16,
@@ -196,15 +184,15 @@ exports[`Tabs should render correctly 1`] = `
{
"lineHeight": 19,
},
{
"fontWeight": "600",
},
{
"letterSpacing": 2,
},
{
"color": "#454545",
},
{
"fontFamily": "Lato-Bold",
},
[
{
"alignSelf": "center",
@@ -216,8 +204,6 @@ exports[`Tabs should render correctly 1`] = `
"paddingBottom": 12,
},
],
],
],
]
}
>

View File

@@ -3,11 +3,6 @@
exports[`Body1 renders correctly 1`] = `
<Text
style={
[
{
"fontFamily": "Whitney-Medium",
},
[
[
{
"fontSize": 18,
@@ -19,8 +14,9 @@ exports[`Body1 renders correctly 1`] = `
{
"color": "#454545",
},
],
],
{
"fontFamily": "Lato-Medium",
},
]
}
>

Some files were not shown because too many files have changed in this diff Show More