diff --git a/android/app/src/main/assets/fonts/Dosis-Bold.ttf b/android/app/src/main/assets/fonts/Dosis-Bold.ttf new file mode 100644 index 0000000..ae4652e Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/Dosis-Book.ttf b/android/app/src/main/assets/fonts/Dosis-Book.ttf new file mode 100644 index 0000000..81b0df1 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-Book.ttf differ diff --git a/android/app/src/main/assets/fonts/Dosis-ExtraBold.ttf b/android/app/src/main/assets/fonts/Dosis-ExtraBold.ttf new file mode 100644 index 0000000..263ab50 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-ExtraBold.ttf differ 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/android/app/src/main/assets/fonts/Dosis-Medium.ttf b/android/app/src/main/assets/fonts/Dosis-Medium.ttf new file mode 100644 index 0000000..2f28866 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/Dosis-SemiBold.ttf b/android/app/src/main/assets/fonts/Dosis-SemiBold.ttf new file mode 100644 index 0000000..42d65b8 Binary files /dev/null and b/android/app/src/main/assets/fonts/Dosis-SemiBold.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/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/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 17b099d..32a06fa 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 */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -412,6 +419,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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -720,6 +734,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 */, ); name = Resources; sourceTree = ""; @@ -755,9 +776,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */, - F64994825D454BDD8D73467F /* Build NodeJS Mobile Native Modules */, - E01FA74D87244C06A5D9B389 /* Sign NodeJS Mobile Native Modules */, - 28C4AB8094CC4A7E8DE0E83B /* Remove NodeJS Mobile Framework Simulator Strips */, + 0F721AB8229E4E1DA1F46E40 /* Build NodeJS Mobile Native Modules */, + 27C4FE9E75B84FB08C4B946F /* Sign NodeJS Mobile Native Modules */, + E4050042ED444F638791BDA6 /* Remove NodeJS Mobile Framework Simulator Strips */, ); buildRules = ( ); @@ -1196,6 +1217,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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1245,7 +1273,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - F64994825D454BDD8D73467F /* Build NodeJS Mobile Native Modules */ = { + 0F721AB8229E4E1DA1F46E40 /* Build NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1313,7 +1341,7 @@ fi popd "; }; - E01FA74D87244C06A5D9B389 /* Sign NodeJS Mobile Native Modules */ = { + 27C4FE9E75B84FB08C4B946F /* Sign NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1373,7 +1401,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete "; }; - 28C4AB8094CC4A7E8DE0E83B /* Remove NodeJS Mobile Framework Simulator Strips */ = { + E4050042ED444F638791BDA6 /* Remove NodeJS Mobile Framework Simulator Strips */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/ios/drip/Info.plist b/ios/drip/Info.plist index 31237d6..a8a6c54 100644 --- a/ios/drip/Info.plist +++ b/ios/drip/Info.plist @@ -72,6 +72,13 @@ Prompt-Thin.ttf fontello.ttf drip-icon-font.ttf + Dosis-Bold.ttf + Dosis-Book.ttf + Dosis-ExtraBold.ttf + Dosis-ExtraLight.ttf + Dosis-Light.ttf + Dosis-Medium.ttf + Dosis-SemiBold.ttf diff --git a/styles/index.js b/styles/index.js index 78730f3..5b93442 100644 --- a/styles/index.js +++ b/styles/index.js @@ -13,8 +13,9 @@ export const shadesOfRed = [ export const cycleDayColor = '#29287f' export const periodColor = '#802249' -const fontRegular = 'Prompt-Light' -const fontLight = 'Prompt-Thin' +//const fontRegular = 'Prompt-Light' +const fontRegular = 'Dosis-Light' +const fontLight = 'Dosis-ExtraLight' const regularSize = 16 @@ -396,4 +397,4 @@ export const iconStyles = { menuIconInactive: { color: colorInActive, }, -} \ No newline at end of file +}