diff --git a/android/app/src/main/assets/fonts/OpenSans-Light.ttf b/android/app/src/main/assets/fonts/OpenSans-Light.ttf new file mode 100644 index 0000000..563872c Binary files /dev/null and b/android/app/src/main/assets/fonts/OpenSans-Light.ttf differ diff --git a/android/app/src/main/assets/fonts/OpenSans-Regular.ttf b/android/app/src/main/assets/fonts/OpenSans-Regular.ttf new file mode 100644 index 0000000..2e31d02 Binary files /dev/null and b/android/app/src/main/assets/fonts/OpenSans-Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf b/android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf new file mode 100644 index 0000000..99db86a Binary files /dev/null and b/android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf differ diff --git a/assets/fonts/Dosis-Book.ttf b/assets/fonts/Dosis-Book.ttf deleted file mode 100644 index 81b0df1..0000000 Binary files a/assets/fonts/Dosis-Book.ttf and /dev/null differ diff --git a/assets/fonts/Dosis-medium.ttf b/assets/fonts/Dosis-medium.ttf deleted file mode 100644 index 2f28866..0000000 Binary files a/assets/fonts/Dosis-medium.ttf and /dev/null differ diff --git a/assets/fonts/OpenSans-Light.ttf b/assets/fonts/OpenSans-Light.ttf new file mode 100644 index 0000000..563872c Binary files /dev/null and b/assets/fonts/OpenSans-Light.ttf differ diff --git a/assets/fonts/OpenSans-SemiBold.ttf b/assets/fonts/OpenSans-SemiBold.ttf new file mode 100644 index 0000000..99db86a Binary files /dev/null and b/assets/fonts/OpenSans-SemiBold.ttf differ diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index 130e18d..0d8e0d6 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -80,6 +80,9 @@ BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */; }; 26DAA39DDC6B436E8342239B /* Dosis-medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 096E5227936940FEBA7321FE /* Dosis-medium.ttf */; }; B9A5B9946C4C456C823B7641 /* Prompt-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5E7B0A75F8004C6699B70F86 /* Prompt-ExtraLight.ttf */; }; + 5D921C348AC14944835A4D82 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 673C016DDDD74C2F89050279 /* OpenSans-Light.ttf */; }; + 2B66457E5A344222AB41C4FF /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D05637D8F19344B098982AE5 /* OpenSans-Regular.ttf */; }; + 71D0BCE4666A4AB8A0874B5A /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 644690BCCEBF41789960B9A2 /* OpenSans-SemiBold.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -434,6 +437,9 @@ 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */ = {isa = PBXFileReference; name = "drip-home-icons.ttf"; path = "../assets/fonts/drip-home-icons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 096E5227936940FEBA7321FE /* Dosis-medium.ttf */ = {isa = PBXFileReference; name = "Dosis-medium.ttf"; path = "../assets/fonts/Dosis-medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 5E7B0A75F8004C6699B70F86 /* Prompt-ExtraLight.ttf */ = {isa = PBXFileReference; name = "Prompt-ExtraLight.ttf"; path = "../assets/fonts/Prompt-ExtraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 673C016DDDD74C2F89050279 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; name = "OpenSans-Light.ttf"; path = "../assets/fonts/OpenSans-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D05637D8F19344B098982AE5 /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; name = "OpenSans-Regular.ttf"; path = "../assets/fonts/OpenSans-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 644690BCCEBF41789960B9A2 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; name = "OpenSans-SemiBold.ttf"; path = "../assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -753,6 +759,9 @@ 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */, 096E5227936940FEBA7321FE /* Dosis-medium.ttf */, 5E7B0A75F8004C6699B70F86 /* Prompt-ExtraLight.ttf */, + 673C016DDDD74C2F89050279 /* OpenSans-Light.ttf */, + D05637D8F19344B098982AE5 /* OpenSans-Regular.ttf */, + 644690BCCEBF41789960B9A2 /* OpenSans-SemiBold.ttf */, ); name = Resources; sourceTree = ""; @@ -788,9 +797,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */, - C2AF97AAA8EF4B9CAEC31899 /* Build NodeJS Mobile Native Modules */, - EC3DEBD6208348CEBCD3EDAB /* Sign NodeJS Mobile Native Modules */, - 4A08D7C6561E4A3DAED98A8F /* Remove NodeJS Mobile Framework Simulator Strips */, + C52FE1F07D2540FEB02224ED /* Build NodeJS Mobile Native Modules */, + 7F65CDD695CB4BB7B863E328 /* Sign NodeJS Mobile Native Modules */, + 28DCEE6D292742008DE5CFDC /* Remove NodeJS Mobile Framework Simulator Strips */, ); buildRules = ( ); @@ -1240,6 +1249,9 @@ BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */, 26DAA39DDC6B436E8342239B /* Dosis-medium.ttf in Resources */, B9A5B9946C4C456C823B7641 /* Prompt-ExtraLight.ttf in Resources */, + 5D921C348AC14944835A4D82 /* OpenSans-Light.ttf in Resources */, + 2B66457E5A344222AB41C4FF /* OpenSans-Regular.ttf in Resources */, + 71D0BCE4666A4AB8A0874B5A /* OpenSans-SemiBold.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1289,7 +1301,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - C2AF97AAA8EF4B9CAEC31899 /* Build NodeJS Mobile Native Modules */ = { + C52FE1F07D2540FEB02224ED /* Build NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1357,7 +1369,7 @@ fi popd "; }; - EC3DEBD6208348CEBCD3EDAB /* Sign NodeJS Mobile Native Modules */ = { + 7F65CDD695CB4BB7B863E328 /* Sign NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1417,7 +1429,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete "; }; - 4A08D7C6561E4A3DAED98A8F /* Remove NodeJS Mobile Framework Simulator Strips */ = { + 28DCEE6D292742008DE5CFDC /* Remove NodeJS Mobile Framework Simulator Strips */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/ios/drip/Info.plist b/ios/drip/Info.plist index 57c8558..b4d4486 100644 --- a/ios/drip/Info.plist +++ b/ios/drip/Info.plist @@ -83,6 +83,9 @@ drip-home-icons.ttf Dosis-medium.ttf Prompt-ExtraLight.ttf + OpenSans-Light.ttf + OpenSans-Regular.ttf + OpenSans-SemiBold.ttf diff --git a/styles/index.js b/styles/index.js index dac8fad..34f617e 100644 --- a/styles/index.js +++ b/styles/index.js @@ -15,8 +15,8 @@ export const periodColor = '#802249' const headerFont = 'Prompt-ExtraLight' -const textFont = 'Dosis-Book' -const textFontBold = 'Dosis-medium' +const textFont = 'OpenSans-Light' +const textFontBold = 'OpenSans-SemiBold' const regularSize = 16 const hintSize = 14