diff --git a/android/app/src/main/assets/fonts/Prompt-Light.ttf b/android/app/src/main/assets/fonts/Prompt-Light.ttf new file mode 100644 index 0000000..e00a747 Binary files /dev/null and b/android/app/src/main/assets/fonts/Prompt-Light.ttf differ diff --git a/android/app/src/main/assets/fonts/Prompt-Thin.ttf b/android/app/src/main/assets/fonts/Prompt-Thin.ttf new file mode 100644 index 0000000..2767999 Binary files /dev/null and b/android/app/src/main/assets/fonts/Prompt-Thin.ttf differ diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index f10af1e..c80c17b 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -776,9 +776,9 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 2B572382D4504B8FB4B9D251 /* Embed Frameworks */, - F85E9E4D30F74E27BB3D026C /* Build NodeJS Mobile Native Modules */, - BCF143021AC2470C9CD6CB12 /* Sign NodeJS Mobile Native Modules */, - 0AEA0C86A5B54C3EA9D361BB /* Remove NodeJS Mobile Framework Simulator Strips */, + 853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */, + 8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */, + 0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */, ); buildRules = ( ); @@ -1273,7 +1273,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - F85E9E4D30F74E27BB3D026C /* Build NodeJS Mobile Native Modules */ = { + 853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1341,7 +1341,7 @@ fi popd "; }; - BCF143021AC2470C9CD6CB12 /* Sign NodeJS Mobile Native Modules */ = { + 8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1401,7 +1401,7 @@ find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -del find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete "; }; - 0AEA0C86A5B54C3EA9D361BB /* Remove NodeJS Mobile Framework Simulator Strips */ = { + 0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( diff --git a/styles/index.js b/styles/index.js index f6db098..36393df 100644 --- a/styles/index.js +++ b/styles/index.js @@ -13,9 +13,10 @@ export const shadesOfRed = [ export const cycleDayColor = '#29287f' export const periodColor = '#802249' -//const fontRegular = 'Prompt-Light' -const fontRegular = 'Dosis-Light' -const fontLight = 'Promt-Light' +const fontRegular = 'Prompt-Light' +const fontLight = 'Prompt-Thin' +const textFont = 'Dosis-Light' +const textFontLight = 'Dosis-ExtraLight' const regularSize = 16 @@ -27,12 +28,12 @@ const colorInActive = '#666666' export default StyleSheet.create({ appText: { color: 'black', - fontFamily: fontRegular, + fontFamily: textFont, fontSize: regularSize }, appTextLight: { color: 'black', - fontFamily: 'Promt-Light', + fontFamily: textFontLight, fontSize: regularSize }, paragraph: { @@ -40,7 +41,7 @@ export default StyleSheet.create({ }, emphasis: { fontWeight: 'bold', - fontFamily: fontRegular, + fontFamily: textFont }, title: { fontSize: 18, @@ -78,6 +79,11 @@ export default StyleSheet.create({ borderRadius: 100, position: 'absolute' }, + errorMessage: { + color: shadesOfRed[2], + marginLeft: 10, + marginTop: 6, + }, homeView: { marginHorizontal: 50, marginTop: 20, @@ -102,17 +108,21 @@ export default StyleSheet.create({ marginBottom: 10, }, wrapperCycle: { - width: 70, - height: 75 + width: 80, + height: 77 }, wrapperDrop: { + width: 81, + height: 85, + marginTop: 20 + }, + wrapperCircle: { width: 80, height: 80, - marginTop: 20 }, homeCircle: { borderRadius: 100, - borderWidth: 1, + borderWidth: 0.7, width: 80, height: 80, alignItems: 'center', @@ -141,6 +151,10 @@ export default StyleSheet.create({ color: 'black', marginBottom: 5 }, + symptomInfoIcon: { + marginRight: 20, + marginLeft: 20 + }, symptomBoxImage: { width: 50, height: 50 @@ -201,9 +215,6 @@ export default StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', }, - headerSymptom: { - paddingRight: 20 - }, navigationArrow: { padding: 20 }, @@ -250,10 +261,11 @@ export default StyleSheet.create({ marginTop: defaultTopMargin, marginHorizontal: defaultIndentation, padding: 7, + fontFamily: 'textFont' }, settingsSegmentTitle: { fontWeight: 'bold', - fontFamily: fontRegular + fontFamily: 'textFont' }, settingsButton: { backgroundColor: secondaryColor, @@ -261,6 +273,9 @@ export default StyleSheet.create({ alignItems: 'center', margin: 10, }, + settingsButtonDisabled: { + backgroundColor: colorInActive + }, settingsButtonText: { color: fontOnPrimaryColor },