diff --git a/android/app/src/main/assets/fonts/Prompt-ExtraLight.ttf b/android/app/src/main/assets/fonts/Prompt-ExtraLight.ttf new file mode 100644 index 0000000..117b09c Binary files /dev/null and b/android/app/src/main/assets/fonts/Prompt-ExtraLight.ttf differ diff --git a/android/app/src/main/assets/fonts/Prompt-Light.ttf b/android/app/src/main/assets/fonts/Prompt-Light.ttf index e00a747..084cdac 100644 Binary files a/android/app/src/main/assets/fonts/Prompt-Light.ttf and b/android/app/src/main/assets/fonts/Prompt-Light.ttf differ diff --git a/assets/fonts/Dosis-Light.ttf b/assets/fonts/Dosis-Light.ttf deleted file mode 100644 index ca38014..0000000 Binary files a/assets/fonts/Dosis-Light.ttf and /dev/null differ diff --git a/assets/fonts/Prompt-ExtraLight.ttf b/assets/fonts/Prompt-ExtraLight.ttf new file mode 100644 index 0000000..117b09c Binary files /dev/null and b/assets/fonts/Prompt-ExtraLight.ttf differ diff --git a/assets/fonts/Prompt-Thin.ttf b/assets/fonts/Prompt-Thin.ttf deleted file mode 100644 index 2767999..0000000 Binary files a/assets/fonts/Prompt-Thin.ttf and /dev/null differ diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index c4c65ce..130e18d 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -79,6 +79,7 @@ DAA390B1EE7442D88A768596 /* drip-home-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */; }; 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 */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -432,6 +433,7 @@ 94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */ = {isa = PBXFileReference; name = "drip-home-icon-font.ttf"; path = "../assets/fonts/drip-home-icon-font.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -750,6 +752,7 @@ 94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */, 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */, 096E5227936940FEBA7321FE /* Dosis-medium.ttf */, + 5E7B0A75F8004C6699B70F86 /* Prompt-ExtraLight.ttf */, ); name = Resources; sourceTree = ""; @@ -785,9 +788,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */, - 48E955FC462B416A95EF7BEF /* Build NodeJS Mobile Native Modules */, - 72D0A476E7B545D7B07DF865 /* Sign NodeJS Mobile Native Modules */, - 23D0808CFD8C401AA6A359D1 /* Remove NodeJS Mobile Framework Simulator Strips */, + C2AF97AAA8EF4B9CAEC31899 /* Build NodeJS Mobile Native Modules */, + EC3DEBD6208348CEBCD3EDAB /* Sign NodeJS Mobile Native Modules */, + 4A08D7C6561E4A3DAED98A8F /* Remove NodeJS Mobile Framework Simulator Strips */, ); buildRules = ( ); @@ -1236,6 +1239,7 @@ DAA390B1EE7442D88A768596 /* drip-home-icon-font.ttf in Resources */, BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */, 26DAA39DDC6B436E8342239B /* Dosis-medium.ttf in Resources */, + B9A5B9946C4C456C823B7641 /* Prompt-ExtraLight.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1285,7 +1289,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - 48E955FC462B416A95EF7BEF /* Build NodeJS Mobile Native Modules */ = { + C2AF97AAA8EF4B9CAEC31899 /* Build NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1353,7 +1357,7 @@ fi popd "; }; - 72D0A476E7B545D7B07DF865 /* Sign NodeJS Mobile Native Modules */ = { + EC3DEBD6208348CEBCD3EDAB /* Sign NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1413,7 +1417,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete "; }; - 23D0808CFD8C401AA6A359D1 /* Remove NodeJS Mobile Framework Simulator Strips */ = { + 4A08D7C6561E4A3DAED98A8F /* Remove NodeJS Mobile Framework Simulator Strips */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/ios/drip/Info.plist b/ios/drip/Info.plist index 94d1ab3..57c8558 100644 --- a/ios/drip/Info.plist +++ b/ios/drip/Info.plist @@ -82,6 +82,7 @@ drip-home-icon-font.ttf drip-home-icons.ttf Dosis-medium.ttf + Prompt-ExtraLight.ttf diff --git a/styles/index.js b/styles/index.js index f83aae0..dac8fad 100644 --- a/styles/index.js +++ b/styles/index.js @@ -13,10 +13,10 @@ export const shadesOfRed = [ export const cycleDayColor = '#29287f' export const periodColor = '#802249' -const headerFont = 'Prompt-Thin' +const headerFont = 'Prompt-ExtraLight' -const textFont = 'Dosis-Light' -const textFontBold = 'Dosis-Book' +const textFont = 'Dosis-Book' +const textFontBold = 'Dosis-medium' const regularSize = 16 const hintSize = 14 @@ -81,7 +81,7 @@ export default StyleSheet.create({ }, accentCircle: { borderColor: secondaryColor, - borderWidth: 0.5, + borderWidth: 1, width: 40, height: 40, borderRadius: 100,