mirror of
https://github.com/inaturalist/iNaturalistReactNative.git
synced 2025-12-23 22:18:36 -05:00
1209 font styling fixes (#1257)
* Added font files for Book and Semibold, Added MediumText component. * Update snapshots for font changes
This commit is contained in:
BIN
android/app/src/main/assets/fonts/Whitney-Book-Pro.otf
Executable file
BIN
android/app/src/main/assets/fonts/Whitney-Book-Pro.otf
Executable file
Binary file not shown.
BIN
android/app/src/main/assets/fonts/Whitney-MediumItalic-Pro.otf
Executable file
BIN
android/app/src/main/assets/fonts/Whitney-MediumItalic-Pro.otf
Executable file
Binary file not shown.
BIN
android/app/src/main/assets/fonts/Whitney-Semibold-Pro.otf
Executable file
BIN
android/app/src/main/assets/fonts/Whitney-Semibold-Pro.otf
Executable file
Binary file not shown.
@@ -17,6 +17,10 @@
|
||||
"path": "assets/fonts/Whitney Semibold Regular.otf",
|
||||
"sha1": "fc560886d72adf37cccbad5bf8c58d7e0e546027"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-Book-Pro.otf",
|
||||
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",
|
||||
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
|
||||
@@ -29,6 +33,14 @@
|
||||
"path": "assets/fonts/Whitney-Medium-Pro.otf",
|
||||
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-MediumItalic-Pro.otf",
|
||||
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-Semibold-Pro.otf",
|
||||
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/inaturalisticons.ttf",
|
||||
"sha1": "177ae18eacc4a277489677b4abdc441b4487df13"
|
||||
|
||||
BIN
assets/fonts/Whitney-Book-Pro.otf
Executable file
BIN
assets/fonts/Whitney-Book-Pro.otf
Executable file
Binary file not shown.
BIN
assets/fonts/Whitney-MediumItalic-Pro.otf
Executable file
BIN
assets/fonts/Whitney-MediumItalic-Pro.otf
Executable file
Binary file not shown.
BIN
assets/fonts/Whitney-Semibold-Pro.otf
Executable file
BIN
assets/fonts/Whitney-Semibold-Pro.otf
Executable file
Binary file not shown.
@@ -699,7 +699,7 @@ EXTERNAL SOURCES:
|
||||
:path: "../node_modules/react-native/ReactCommon/yoga"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
|
||||
boost: 57d2868c099736d80fcd648bf211b4431e51a558
|
||||
BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
|
||||
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
|
||||
FBLazyVector: 9840513ec2766e31fb9e34c2dabb2c4671400fcd
|
||||
@@ -778,4 +778,4 @@ SPEC CHECKSUMS:
|
||||
|
||||
PODFILE CHECKSUM: 77ed9526d4011b245ce5afa1ea331dea4c67d753
|
||||
|
||||
COCOAPODS: 1.14.3
|
||||
COCOAPODS: 1.14.2
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
20A80CB2AD058BDA23462D38 /* libPods-iNaturalistReactNative-ShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAA404A663814006B0F659A /* libPods-iNaturalistReactNative-ShareExtension.a */; };
|
||||
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */; };
|
||||
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */; };
|
||||
5A8D64AB921678B40E0229C8 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
|
||||
5A8D64AB921678B40E0229C8 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
|
||||
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, ); }; };
|
||||
@@ -26,6 +26,12 @@
|
||||
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 */; };
|
||||
D2853A71785A4FF6AB137F4C /* INatIcon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC5CF9E037E74ADF9CF9710B /* INatIcon.ttf */; };
|
||||
DB7705D32B96D3BE00009B55 /* Whitney Book Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DB7705D22B96D2E700009B55 /* Whitney Book Regular.otf */; };
|
||||
DB7705D52B96D42300009B55 /* Whitney Semibold Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DB7705D42B96D42200009B55 /* Whitney Semibold Regular.otf */; };
|
||||
DB7705D72B96D46000009B55 /* Whitney Semibold Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = DB7705D62B96D46000009B55 /* Whitney Semibold Italic.otf */; };
|
||||
B197D1A2DFD9440C9581D513 /* Whitney-Book-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */; };
|
||||
42832120F7C944B980FD13BC /* Whitney-MediumItalic-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = 097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */; };
|
||||
B4518F59A698433CA0271ED5 /* Whitney-Semibold-Pro.otf in Resources */ = {isa = PBXBuildFile; fileRef = B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
@@ -87,13 +93,19 @@
|
||||
8B8BAD0429F54EB300CE5C9F /* iNaturalistReactNative.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = iNaturalistReactNative.entitlements; path = iNaturalistReactNative/iNaturalistReactNative.entitlements; 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>"; };
|
||||
BBAA404A663814006B0F659A /* libPods-iNaturalistReactNative-ShareExtension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-iNaturalistReactNative-ShareExtension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
CC5CF9E037E74ADF9CF9710B /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = "<group>"; };
|
||||
CC5CF9E037E74ADF9CF9710B /* INatIcon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = INatIcon.ttf; path = ../assets/fonts/INatIcon.ttf; sourceTree = "<group>"; };
|
||||
CEBBC55F32B65362EB71A4C6 /* 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>"; };
|
||||
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>"; };
|
||||
DB7705D22B96D2E700009B55 /* Whitney Book Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney Book Regular.otf"; path = "../assets/fonts/Whitney Book Regular.otf"; sourceTree = "<group>"; };
|
||||
DB7705D42B96D42200009B55 /* Whitney Semibold Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney Semibold Regular.otf"; path = "../assets/fonts/Whitney Semibold Regular.otf"; sourceTree = "<group>"; };
|
||||
DB7705D62B96D46000009B55 /* Whitney Semibold Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Whitney Semibold Italic.otf"; path = "../assets/fonts/Whitney Semibold Italic.otf"; sourceTree = "<group>"; };
|
||||
E67BC54FF5D9263C1DCFB23D /* 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>"; };
|
||||
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>"; };
|
||||
FF1A612F80DAF77B84AD4694 /* 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>"; };
|
||||
62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */ = {isa = PBXFileReference; name = "Whitney-Book-Pro.otf"; path = "../assets/fonts/Whitney-Book-Pro.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
|
||||
097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */ = {isa = PBXFileReference; name = "Whitney-MediumItalic-Pro.otf"; path = "../assets/fonts/Whitney-MediumItalic-Pro.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
|
||||
B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */ = {isa = PBXFileReference; name = "Whitney-Semibold-Pro.otf"; path = "../assets/fonts/Whitney-Semibold-Pro.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
@@ -108,7 +120,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
5A8D64AB921678B40E0229C8 /* BuildFile in Frameworks */,
|
||||
5A8D64AB921678B40E0229C8 /* (null) in Frameworks */,
|
||||
A019DB3A4661689827F5BB56 /* libPods-iNaturalistReactNative.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -231,10 +243,16 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
BA9D41ECEBFA4C38B74009B3 /* Whitney-Light-Pro.otf */,
|
||||
DB7705D42B96D42200009B55 /* Whitney Semibold Regular.otf */,
|
||||
D09FA3A0162844FF80A5EF96 /* Whitney-Medium-Pro.otf */,
|
||||
DB7705D22B96D2E700009B55 /* Whitney Book Regular.otf */,
|
||||
DB7705D62B96D46000009B55 /* Whitney Semibold Italic.otf */,
|
||||
374CB22E29943E63005885ED /* Whitney-BookItalic-Pro.otf */,
|
||||
EE004FD2EC174086A7AB2908 /* inaturalisticons.ttf */,
|
||||
CC5CF9E037E74ADF9CF9710B /* INatIcon.ttf */,
|
||||
62CACBCC44D64A7EB95AACF1 /* Whitney-Book-Pro.otf */,
|
||||
097C2902AB1249AA9846CED3 /* Whitney-MediumItalic-Pro.otf */,
|
||||
B397CFD4AEFF474A89A3D27B /* Whitney-Semibold-Pro.otf */,
|
||||
);
|
||||
name = Resources;
|
||||
sourceTree = "<group>";
|
||||
@@ -361,11 +379,17 @@
|
||||
197A169E2A7C2567001A03DC /* taxonomy.json in Resources */,
|
||||
374CB22F29943E63005885ED /* Whitney-BookItalic-Pro.otf in Resources */,
|
||||
1956B4912A7C3C1E00BBBDE4 /* link-inat-model-files.sh in Resources */,
|
||||
DB7705D32B96D3BE00009B55 /* Whitney Book Regular.otf in Resources */,
|
||||
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
|
||||
DB7705D52B96D42300009B55 /* Whitney Semibold Regular.otf in Resources */,
|
||||
A252B2AEA64E47C9AC1D20E8 /* Whitney-Light-Pro.otf in Resources */,
|
||||
BA2479FA3D7B40A7BEF7B3CD /* Whitney-Medium-Pro.otf in Resources */,
|
||||
4FB3B444D46A4115B867B9CC /* inaturalisticons.ttf in Resources */,
|
||||
D2853A71785A4FF6AB137F4C /* INatIcon.ttf in Resources */,
|
||||
DB7705D72B96D46000009B55 /* Whitney Semibold Italic.otf in Resources */,
|
||||
B197D1A2DFD9440C9581D513 /* Whitney-Book-Pro.otf in Resources */,
|
||||
42832120F7C944B980FD13BC /* Whitney-MediumItalic-Pro.otf in Resources */,
|
||||
B4518F59A698433CA0271ED5 /* Whitney-Semibold-Pro.otf in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -927,7 +951,11 @@
|
||||
"-DFOLLY_MOBILE=1",
|
||||
"-DFOLLY_USE_LIBCPP=1",
|
||||
);
|
||||
OTHER_LDFLAGS = "$(inherited)";
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-Wl",
|
||||
"-ld_classic",
|
||||
);
|
||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||
SDKROOT = iphoneos;
|
||||
};
|
||||
@@ -996,7 +1024,11 @@
|
||||
"-DFOLLY_MOBILE=1",
|
||||
"-DFOLLY_USE_LIBCPP=1",
|
||||
);
|
||||
OTHER_LDFLAGS = "$(inherited)";
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-Wl",
|
||||
"-ld_classic",
|
||||
);
|
||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||
SDKROOT = iphoneos;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
|
||||
@@ -69,6 +69,9 @@
|
||||
<string>Whitney Semibold Italic.otf</string>
|
||||
<string>Whitney Book Regular.otf</string>
|
||||
<string>INatIcon.ttf</string>
|
||||
<string>Whitney-Book-Pro.otf</string>
|
||||
<string>Whitney-MediumItalic-Pro.otf</string>
|
||||
<string>Whitney-Semibold-Pro.otf</string>
|
||||
</array>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>LaunchScreen</string>
|
||||
|
||||
@@ -17,6 +17,10 @@
|
||||
"path": "assets/fonts/Whitney Semibold Regular.otf",
|
||||
"sha1": "fc560886d72adf37cccbad5bf8c58d7e0e546027"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-Book-Pro.otf",
|
||||
"sha1": "639b8a8bf3e1cc3de30d0f49e666aca3999ca65a"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-BookItalic-Pro.otf",
|
||||
"sha1": "15854f60175a0e82b794c259431ec45ea4b40103"
|
||||
@@ -29,6 +33,14 @@
|
||||
"path": "assets/fonts/Whitney-Medium-Pro.otf",
|
||||
"sha1": "33ca073c11f46dc266a7dc1adeaa102891bd76d1"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-MediumItalic-Pro.otf",
|
||||
"sha1": "cfd53e87d774dd1f2abaa92054ce7f810804c986"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/Whitney-Semibold-Pro.otf",
|
||||
"sha1": "7a107095a453c8cd8046d9ccded5d88e6809e89f"
|
||||
},
|
||||
{
|
||||
"path": "assets/fonts/inaturalisticons.ttf",
|
||||
"sha1": "177ae18eacc4a277489677b4abdc441b4487df13"
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
// @flow
|
||||
import classNames from "classnames";
|
||||
import {
|
||||
Body1Bold, Body3, Body4, INatText
|
||||
Body1, Body3, Body4,
|
||||
INatTextMedium
|
||||
} from "components/SharedComponents";
|
||||
import { View } from "components/styledComponents";
|
||||
import type { Node } from "react";
|
||||
@@ -95,13 +96,13 @@ const DisplayTaxonName = ( {
|
||||
return (
|
||||
isItalics
|
||||
? (
|
||||
<INatText
|
||||
<INatTextMedium
|
||||
// eslint-disable-next-line react/no-array-index-key
|
||||
key={`DisplayTaxonName-${keyBase}-${taxon.id}-${rankLevel}-${piece}-${index}`}
|
||||
className={classNames( "italic font-normal", textClass( ) )}
|
||||
className={classNames( "italic font-light", textClass( ) )}
|
||||
>
|
||||
{text}
|
||||
</INatText>
|
||||
</INatTextMedium>
|
||||
)
|
||||
: text
|
||||
);
|
||||
@@ -114,7 +115,7 @@ const DisplayTaxonName = ( {
|
||||
let TopTextComponent = TopTextComponentProp;
|
||||
if ( !TopTextComponent ) {
|
||||
TopTextComponent = !small
|
||||
? Body1Bold
|
||||
? Body1
|
||||
: Body3;
|
||||
}
|
||||
let BottomTextComponent = BottomTextComponentProp;
|
||||
@@ -180,9 +181,9 @@ const DisplayTaxonName = ( {
|
||||
|
||||
if ( !taxon ) {
|
||||
return (
|
||||
<Body1Bold className={textClass( )} numberOfLines={1}>
|
||||
<Body1 className={textClass( )} numberOfLines={1}>
|
||||
{t( "unknown" )}
|
||||
</Body1Bold>
|
||||
</Body1>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
import type { Node } from "react";
|
||||
import React from "react";
|
||||
|
||||
import INatTextLight from "./INatTextLight";
|
||||
import INatTextMedium from "./INatTextMedium";
|
||||
|
||||
const Body1 = ( props: any ): Node => (
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
<INatTextLight className="text-base font-medium text-darkGray" {...props} />
|
||||
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
|
||||
);
|
||||
|
||||
export default Body1;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
import type { Node } from "react";
|
||||
import React from "react";
|
||||
|
||||
import INatText from "./INatText";
|
||||
import INatTextMedium from "./INatTextMedium";
|
||||
|
||||
const Body1Bold = ( props: any ): Node => (
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
<INatText className="text-base font-medium text-darkGray" {...props} />
|
||||
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
|
||||
);
|
||||
|
||||
export default Body1Bold;
|
||||
|
||||
28
src/components/SharedComponents/Typography/INatTextMedium.js
Normal file
28
src/components/SharedComponents/Typography/INatTextMedium.js
Normal file
@@ -0,0 +1,28 @@
|
||||
// @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;
|
||||
@@ -3,11 +3,11 @@
|
||||
import type { Node } from "react";
|
||||
import React from "react";
|
||||
|
||||
import INatTextLight from "./INatTextLight";
|
||||
import INatTextMedium from "./INatTextMedium";
|
||||
|
||||
const List1 = ( props: any ): Node => (
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
<INatTextLight className="text-base font-medium text-darkGray" {...props} />
|
||||
<INatTextMedium className="text-base font-medium text-darkGray" {...props} />
|
||||
);
|
||||
|
||||
export default List1;
|
||||
|
||||
@@ -64,6 +64,8 @@ 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";
|
||||
|
||||
@@ -29,6 +29,13 @@ const SafeAreaView = styled( UnstyledSafeAreaView );
|
||||
const ScrollView = styled( UnstyledScrollView );
|
||||
// $FlowIgnore
|
||||
const Text = styled(
|
||||
UnstyledText,
|
||||
Platform.OS === "ios"
|
||||
? "font-Whitney-Semibold"
|
||||
: "font-Whitney-Semibold-Pro"
|
||||
);
|
||||
// $FlowIgnore
|
||||
const MediumText = styled(
|
||||
UnstyledText,
|
||||
Platform.OS === "ios"
|
||||
? "font-Whitney-Medium"
|
||||
@@ -38,8 +45,8 @@ const Text = styled(
|
||||
const LightText = styled(
|
||||
UnstyledText,
|
||||
Platform.OS === "ios"
|
||||
? "font-Whitney-Light"
|
||||
: "font-Whitney-Light-Pro"
|
||||
? "font-Whitney-Book"
|
||||
: "font-Whitney-Book-Pro"
|
||||
);
|
||||
// $FlowIgnore
|
||||
const TextInput = styled( UntyledTextInput );
|
||||
@@ -69,6 +76,7 @@ export {
|
||||
KeyboardAvoidingView,
|
||||
LightText,
|
||||
LinearGradient,
|
||||
MediumText,
|
||||
Modal,
|
||||
Pressable,
|
||||
SafeAreaView,
|
||||
|
||||
@@ -42,7 +42,7 @@ exports[`ActivityCount renders reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ exports[`CommentsCount renders default reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -111,7 +111,7 @@ exports[`CommentsCount renders filled reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -180,7 +180,7 @@ exports[`CommentsCount renders white reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ exports[`IdentificationsCount renders default reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -111,7 +111,7 @@ exports[`IdentificationsCount renders filled reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -180,7 +180,7 @@ exports[`IdentificationsCount renders white reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -69,7 +69,7 @@ exports[`Button focus in dark mode should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -177,7 +177,7 @@ exports[`Button focus in dark mode when disabled should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -303,7 +303,7 @@ exports[`Button neutral in dark mode should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -429,7 +429,7 @@ exports[`Button neutral in dark mode when disabled should render correctly 1`] =
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -540,7 +540,7 @@ exports[`Button primary in dark mode should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -651,7 +651,7 @@ exports[`Button primary in dark mode when disabled should render correctly 1`] =
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -762,7 +762,7 @@ exports[`Button warning in dark mode should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -870,7 +870,7 @@ exports[`Button warning in dark mode when disabled should render correctly 1`] =
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -69,7 +69,7 @@ exports[`Button focus should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -177,7 +177,7 @@ exports[`Button focus when disabled should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -303,7 +303,7 @@ exports[`Button neutral should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -429,7 +429,7 @@ exports[`Button neutral when disabled should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -540,7 +540,7 @@ exports[`Button primary should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -651,7 +651,7 @@ exports[`Button primary when disabled should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -762,7 +762,7 @@ exports[`Button warning should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -870,7 +870,7 @@ exports[`Button warning when disabled should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -70,7 +70,7 @@ exports[`InlineUser renders reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -181,7 +181,7 @@ exports[`InlineUser when offline renders reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -292,7 +292,7 @@ exports[`InlineUser when user has no icon set renders reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ exports[`PhotoCount renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -72,7 +72,7 @@ exports[`Tabs should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
@@ -185,7 +185,7 @@ exports[`Tabs should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,19 +5,21 @@ exports[`Body1 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Medium",
|
||||
},
|
||||
[
|
||||
{
|
||||
"fontSize": 18,
|
||||
"lineHeight": 22,
|
||||
},
|
||||
{
|
||||
"fontWeight": "500",
|
||||
},
|
||||
{
|
||||
"color": "#454545",
|
||||
},
|
||||
[
|
||||
{
|
||||
"fontSize": 18,
|
||||
"lineHeight": 22,
|
||||
},
|
||||
{
|
||||
"fontWeight": "500",
|
||||
},
|
||||
{
|
||||
"color": "#454545",
|
||||
},
|
||||
],
|
||||
],
|
||||
]
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Body2 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Body3 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Body4 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Heading1 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Heading2 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Heading3 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Heading4 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Heading5 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Medium",
|
||||
"fontFamily": "Whitney-Semibold",
|
||||
},
|
||||
[
|
||||
[
|
||||
|
||||
@@ -5,19 +5,21 @@ exports[`List1 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Medium",
|
||||
},
|
||||
[
|
||||
{
|
||||
"fontSize": 18,
|
||||
"lineHeight": 22,
|
||||
},
|
||||
{
|
||||
"fontWeight": "500",
|
||||
},
|
||||
{
|
||||
"color": "#454545",
|
||||
},
|
||||
[
|
||||
{
|
||||
"fontSize": 18,
|
||||
"lineHeight": 22,
|
||||
},
|
||||
{
|
||||
"fontWeight": "500",
|
||||
},
|
||||
{
|
||||
"color": "#454545",
|
||||
},
|
||||
],
|
||||
],
|
||||
]
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`List2 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@ exports[`Subheading1 renders correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -139,7 +139,7 @@ exports[`Checkbox renders reliably 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
@@ -308,7 +308,7 @@ exports[`Checkbox renders reliably being checked 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
@@ -343,7 +343,7 @@ exports[`TaxonResult should render correctly 1`] = `
|
||||
style={
|
||||
[
|
||||
{
|
||||
"fontFamily": "Whitney-Light",
|
||||
"fontFamily": "Whitney-Book",
|
||||
},
|
||||
[
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user