diff --git a/android/app/src/main/assets/fonts/Dosis-ExtraLight.ttf b/android/app/src/main/assets/fonts/Dosis-ExtraLight.ttf new file mode 100644 index 0000000..7501e97 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-ExtraLight.ttf differ diff --git a/android/app/src/main/assets/fonts/Dosis-Light.ttf b/android/app/src/main/assets/fonts/Dosis-Light.ttf new file mode 100644 index 0000000..ca38014 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-Light.ttf differ diff --git a/assets/fonts/Dosis-Book.ttf b/assets/fonts/Dosis-Book.ttf new file mode 100644 index 0000000..81b0df1 Binary files /dev/null and b/assets/fonts/Dosis-Book.ttf differ diff --git a/assets/fonts/Dosis-ExtraLight.ttf b/assets/fonts/Dosis-ExtraLight.ttf new file mode 100644 index 0000000..7501e97 Binary files /dev/null and b/assets/fonts/Dosis-ExtraLight.ttf differ diff --git a/assets/fonts/Dosis-Light.ttf b/assets/fonts/Dosis-Light.ttf new file mode 100644 index 0000000..ca38014 Binary files /dev/null and b/assets/fonts/Dosis-Light.ttf differ diff --git a/assets/fonts/Dosis-medium.ttf b/assets/fonts/Dosis-medium.ttf new file mode 100644 index 0000000..2f28866 Binary files /dev/null and b/assets/fonts/Dosis-medium.ttf differ diff --git a/assets/fonts/Prompt-Light.ttf b/assets/fonts/Prompt-Light.ttf deleted file mode 100644 index e00a747..0000000 Binary files a/assets/fonts/Prompt-Light.ttf and /dev/null differ diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index f0cc598..9728bbf 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -69,6 +69,13 @@ F165D5E4692041AD900573C8 /* Prompt-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CB2405AD4098483C85C1A261 /* Prompt-Thin.ttf */; }; BF3587E45FCA48DEA13183A1 /* fontello.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB0CB875BB2749F4A46AA5F1 /* fontello.ttf */; }; BBD61F152BE74DD7AED99DFB /* drip-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 05154E9AE0EA4BE19F3D9E0B /* drip-icon-font.ttf */; }; + 603395317D2E430CB186563E /* Dosis-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E877E85FF5D24E5BA0E2FAF6 /* Dosis-Bold.ttf */; }; + FB7D6EB165EA43ECBA23EC7A /* Dosis-Book.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B2B00C6F14084717B1C21702 /* Dosis-Book.ttf */; }; + E4809ED51AE54B3EBFDEFDFA /* Dosis-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 753D3CC26048498884261EC6 /* Dosis-ExtraBold.ttf */; }; + DC49A82960AF42C3B9168DB3 /* Dosis-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5A481D3A46E4831A3863C68 /* Dosis-ExtraLight.ttf */; }; + 64083B0F5264453FAC04251B /* Dosis-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 97B6A2FB33264796A4D917E0 /* Dosis-Light.ttf */; }; + 9CA5B31E59524C9490DAFD48 /* Dosis-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E40B398D54045B358F0DB /* Dosis-Medium.ttf */; }; + 082F2BD2BEA046FE8EE58763 /* Dosis-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */; }; 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 */; }; /* End PBXBuildFile section */ @@ -414,6 +421,13 @@ CB2405AD4098483C85C1A261 /* Prompt-Thin.ttf */ = {isa = PBXFileReference; name = "Prompt-Thin.ttf"; path = "../assets/fonts/Prompt-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; BB0CB875BB2749F4A46AA5F1 /* fontello.ttf */ = {isa = PBXFileReference; name = "fontello.ttf"; path = "../assets/fonts/fontello.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 05154E9AE0EA4BE19F3D9E0B /* drip-icon-font.ttf */ = {isa = PBXFileReference; name = "drip-icon-font.ttf"; path = "../assets/fonts/drip-icon-font.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E877E85FF5D24E5BA0E2FAF6 /* Dosis-Bold.ttf */ = {isa = PBXFileReference; name = "Dosis-Bold.ttf"; path = "../assets/fonts/Dosis-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + B2B00C6F14084717B1C21702 /* Dosis-Book.ttf */ = {isa = PBXFileReference; name = "Dosis-Book.ttf"; path = "../assets/fonts/Dosis-Book.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 753D3CC26048498884261EC6 /* Dosis-ExtraBold.ttf */ = {isa = PBXFileReference; name = "Dosis-ExtraBold.ttf"; path = "../assets/fonts/Dosis-ExtraBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D5A481D3A46E4831A3863C68 /* Dosis-ExtraLight.ttf */ = {isa = PBXFileReference; name = "Dosis-ExtraLight.ttf"; path = "../assets/fonts/Dosis-ExtraLight.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 97B6A2FB33264796A4D917E0 /* Dosis-Light.ttf */ = {isa = PBXFileReference; name = "Dosis-Light.ttf"; path = "../assets/fonts/Dosis-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2A1E40B398D54045B358F0DB /* Dosis-Medium.ttf */ = {isa = PBXFileReference; name = "Dosis-Medium.ttf"; path = "../assets/fonts/Dosis-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */ = {isa = PBXFileReference; name = "Dosis-SemiBold.ttf"; path = "../assets/fonts/Dosis-SemiBold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; 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; }; /* End PBXFileReference section */ @@ -724,6 +738,13 @@ CB2405AD4098483C85C1A261 /* Prompt-Thin.ttf */, BB0CB875BB2749F4A46AA5F1 /* fontello.ttf */, 05154E9AE0EA4BE19F3D9E0B /* drip-icon-font.ttf */, + E877E85FF5D24E5BA0E2FAF6 /* Dosis-Bold.ttf */, + B2B00C6F14084717B1C21702 /* Dosis-Book.ttf */, + 753D3CC26048498884261EC6 /* Dosis-ExtraBold.ttf */, + D5A481D3A46E4831A3863C68 /* Dosis-ExtraLight.ttf */, + 97B6A2FB33264796A4D917E0 /* Dosis-Light.ttf */, + 2A1E40B398D54045B358F0DB /* Dosis-Medium.ttf */, + 2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */, 94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */, 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */, ); @@ -761,9 +782,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */, - 0909337B049F4ECB933412B2 /* Build NodeJS Mobile Native Modules */, - B6AAD324BDBA4E92AB5627B3 /* Sign NodeJS Mobile Native Modules */, - 3DE3CFA1BEC54E9D9B5B9D47 /* Remove NodeJS Mobile Framework Simulator Strips */, + 0244C597A2A04526BFF61B8C /* Build NodeJS Mobile Native Modules */, + 9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */, + 57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */, ); buildRules = ( ); @@ -1202,6 +1223,13 @@ F165D5E4692041AD900573C8 /* Prompt-Thin.ttf in Resources */, BF3587E45FCA48DEA13183A1 /* fontello.ttf in Resources */, BBD61F152BE74DD7AED99DFB /* drip-icon-font.ttf in Resources */, + 603395317D2E430CB186563E /* Dosis-Bold.ttf in Resources */, + FB7D6EB165EA43ECBA23EC7A /* Dosis-Book.ttf in Resources */, + E4809ED51AE54B3EBFDEFDFA /* Dosis-ExtraBold.ttf in Resources */, + DC49A82960AF42C3B9168DB3 /* Dosis-ExtraLight.ttf in Resources */, + 64083B0F5264453FAC04251B /* Dosis-Light.ttf in Resources */, + 9CA5B31E59524C9490DAFD48 /* Dosis-Medium.ttf in Resources */, + 082F2BD2BEA046FE8EE58763 /* Dosis-SemiBold.ttf in Resources */, DAA390B1EE7442D88A768596 /* drip-home-icon-font.ttf in Resources */, BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */, ); @@ -1253,7 +1281,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - 0909337B049F4ECB933412B2 /* Build NodeJS Mobile Native Modules */ = { + 0244C597A2A04526BFF61B8C /* Build NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1321,7 +1349,7 @@ fi popd "; }; - B6AAD324BDBA4E92AB5627B3 /* Sign NodeJS Mobile Native Modules */ = { + 9AAC1A9690414880B0E4B349 /* Sign NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1367,7 +1395,7 @@ embed_framework() { FRAMEWORK_NAME=\"$(basename \"$1\")\" cp -r \"$1\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\" - + /usr/bin/codesign --force --sign $EXPANDED_CODE_SIGN_IDENTITY --preserve-metadata=identifier,entitlements,flags --timestamp=none \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/$FRAMEWORK_NAME\" } find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d | while read frmwrk_path; do embed_framework \"$frmwrk_path\"; done @@ -1381,7 +1409,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete "; }; - 3DE3CFA1BEC54E9D9B5B9D47 /* Remove NodeJS Mobile Framework Simulator Strips */ = { + 57F5EF05D2424834A33EAF38 /* Remove NodeJS Mobile Framework Simulator Strips */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/ios/drip/Info.plist b/ios/drip/Info.plist index d44ff1b..713f70a 100644 --- a/ios/drip/Info.plist +++ b/ios/drip/Info.plist @@ -72,8 +72,18 @@ Prompt-Thin.ttf fontello.ttf drip-icon-font.ttf +<<<<<<< HEAD + Dosis-Bold.ttf + Dosis-Book.ttf + Dosis-ExtraBold.ttf + Dosis-ExtraLight.ttf + Dosis-Light.ttf + Dosis-Medium.ttf + Dosis-SemiBold.ttf +======= drip-home-icon-font.ttf drip-home-icons.ttf +>>>>>>> master diff --git a/styles/index.js b/styles/index.js index 90774bc..1609e6e 100644 --- a/styles/index.js +++ b/styles/index.js @@ -13,8 +13,11 @@ export const shadesOfRed = [ export const cycleDayColor = '#29287f' export const periodColor = '#802249' -const fontRegular = 'Prompt-Light' -const fontLight = 'Prompt-Thin' +const headerFont = 'Prompt-Thin' + +const textFont = 'Dosis-Light' +const textFontLight = 'Dosis-ExtraLight' +const textFontBold = 'Dosis-Book' const regularSize = 16 const hintSize = 14 @@ -27,12 +30,13 @@ const colorInActive = '#666666' export default StyleSheet.create({ appText: { color: 'black', - fontFamily: fontRegular, - fontSize: regularSize + fontFamily: textFont, + fontSize: regularSize, + letterSpacing: 0.5 }, appTextLight: { color: 'black', - fontFamily: fontLight, + fontFamily: textFontLight, fontSize: regularSize }, actionHint: { @@ -46,6 +50,7 @@ export default StyleSheet.create({ }, emphasis: { fontWeight: 'bold', + fontFamily: textFontBold }, link: { color: cycleDayColor, @@ -69,13 +74,13 @@ export default StyleSheet.create({ }, dateHeader: { fontSize: 20, - fontFamily: fontLight, + fontFamily: headerFont, color: fontOnPrimaryColor, textAlign: 'center', }, headerText: { fontSize: 30, - fontFamily: fontLight, + fontFamily: headerFont, color: fontOnPrimaryColor, textAlign: 'center', paddingBottom: 4 @@ -155,7 +160,7 @@ export default StyleSheet.create({ fontSize: 15, color: fontOnPrimaryColor, textAlign: 'center', - fontFamily: fontLight + fontFamily: headerFont }, symptomViewHeading: { fontSize: 20, @@ -246,10 +251,11 @@ export default StyleSheet.create({ }, menuText: { color: fontOnPrimaryColor, - fontFamily: fontLight + fontFamily: headerFont }, menuTextInActive: { - color: colorInActive + color: colorInActive, + fontFamily: headerFont }, temperatureTextInput: { fontSize: 20, @@ -275,12 +281,14 @@ export default StyleSheet.create({ marginTop: defaultTopMargin, marginHorizontal: defaultIndentation, padding: 7, + fontFamily: textFont }, settingsSegmentLast: { marginBottom: defaultTopMargin, }, settingsSegmentTitle: { - fontWeight: 'bold' + fontWeight: 'bold', + fontFamily: textFontBold }, settingsButton: { padding: 10,