improve on review issues
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -776,9 +776,9 @@
|
|||||||
13B07F8E1A680F5B00A75B9A /* Resources */,
|
13B07F8E1A680F5B00A75B9A /* Resources */,
|
||||||
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
|
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
|
||||||
2B572382D4504B8FB4B9D251 /* Embed Frameworks */,
|
2B572382D4504B8FB4B9D251 /* Embed Frameworks */,
|
||||||
F85E9E4D30F74E27BB3D026C /* Build NodeJS Mobile Native Modules */,
|
853FD03BE98A45968B26EEDC /* Build NodeJS Mobile Native Modules */,
|
||||||
BCF143021AC2470C9CD6CB12 /* Sign NodeJS Mobile Native Modules */,
|
8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */,
|
||||||
0AEA0C86A5B54C3EA9D361BB /* Remove NodeJS Mobile Framework Simulator Strips */,
|
0DE12B33FBEF4D8583EA7537 /* Remove NodeJS Mobile Framework Simulator Strips */,
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
@@ -1273,7 +1273,7 @@
|
|||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.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;
|
isa = PBXShellScriptBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
@@ -1341,7 +1341,7 @@ fi
|
|||||||
popd
|
popd
|
||||||
";
|
";
|
||||||
};
|
};
|
||||||
BCF143021AC2470C9CD6CB12 /* Sign NodeJS Mobile Native Modules */ = {
|
8032B5E1DD5B4FE4BE67AE4A /* Sign NodeJS Mobile Native Modules */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
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
|
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;
|
isa = PBXShellScriptBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
|||||||
+29
-14
@@ -13,9 +13,10 @@ export const shadesOfRed = [
|
|||||||
export const cycleDayColor = '#29287f'
|
export const cycleDayColor = '#29287f'
|
||||||
export const periodColor = '#802249'
|
export const periodColor = '#802249'
|
||||||
|
|
||||||
//const fontRegular = 'Prompt-Light'
|
const fontRegular = 'Prompt-Light'
|
||||||
const fontRegular = 'Dosis-Light'
|
const fontLight = 'Prompt-Thin'
|
||||||
const fontLight = 'Promt-Light'
|
const textFont = 'Dosis-Light'
|
||||||
|
const textFontLight = 'Dosis-ExtraLight'
|
||||||
|
|
||||||
const regularSize = 16
|
const regularSize = 16
|
||||||
|
|
||||||
@@ -27,12 +28,12 @@ const colorInActive = '#666666'
|
|||||||
export default StyleSheet.create({
|
export default StyleSheet.create({
|
||||||
appText: {
|
appText: {
|
||||||
color: 'black',
|
color: 'black',
|
||||||
fontFamily: fontRegular,
|
fontFamily: textFont,
|
||||||
fontSize: regularSize
|
fontSize: regularSize
|
||||||
},
|
},
|
||||||
appTextLight: {
|
appTextLight: {
|
||||||
color: 'black',
|
color: 'black',
|
||||||
fontFamily: 'Promt-Light',
|
fontFamily: textFontLight,
|
||||||
fontSize: regularSize
|
fontSize: regularSize
|
||||||
},
|
},
|
||||||
paragraph: {
|
paragraph: {
|
||||||
@@ -40,7 +41,7 @@ export default StyleSheet.create({
|
|||||||
},
|
},
|
||||||
emphasis: {
|
emphasis: {
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
fontFamily: fontRegular,
|
fontFamily: textFont
|
||||||
},
|
},
|
||||||
title: {
|
title: {
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
@@ -78,6 +79,11 @@ export default StyleSheet.create({
|
|||||||
borderRadius: 100,
|
borderRadius: 100,
|
||||||
position: 'absolute'
|
position: 'absolute'
|
||||||
},
|
},
|
||||||
|
errorMessage: {
|
||||||
|
color: shadesOfRed[2],
|
||||||
|
marginLeft: 10,
|
||||||
|
marginTop: 6,
|
||||||
|
},
|
||||||
homeView: {
|
homeView: {
|
||||||
marginHorizontal: 50,
|
marginHorizontal: 50,
|
||||||
marginTop: 20,
|
marginTop: 20,
|
||||||
@@ -102,17 +108,21 @@ export default StyleSheet.create({
|
|||||||
marginBottom: 10,
|
marginBottom: 10,
|
||||||
},
|
},
|
||||||
wrapperCycle: {
|
wrapperCycle: {
|
||||||
width: 70,
|
width: 80,
|
||||||
height: 75
|
height: 77
|
||||||
},
|
},
|
||||||
wrapperDrop: {
|
wrapperDrop: {
|
||||||
|
width: 81,
|
||||||
|
height: 85,
|
||||||
|
marginTop: 20
|
||||||
|
},
|
||||||
|
wrapperCircle: {
|
||||||
width: 80,
|
width: 80,
|
||||||
height: 80,
|
height: 80,
|
||||||
marginTop: 20
|
|
||||||
},
|
},
|
||||||
homeCircle: {
|
homeCircle: {
|
||||||
borderRadius: 100,
|
borderRadius: 100,
|
||||||
borderWidth: 1,
|
borderWidth: 0.7,
|
||||||
width: 80,
|
width: 80,
|
||||||
height: 80,
|
height: 80,
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@@ -141,6 +151,10 @@ export default StyleSheet.create({
|
|||||||
color: 'black',
|
color: 'black',
|
||||||
marginBottom: 5
|
marginBottom: 5
|
||||||
},
|
},
|
||||||
|
symptomInfoIcon: {
|
||||||
|
marginRight: 20,
|
||||||
|
marginLeft: 20
|
||||||
|
},
|
||||||
symptomBoxImage: {
|
symptomBoxImage: {
|
||||||
width: 50,
|
width: 50,
|
||||||
height: 50
|
height: 50
|
||||||
@@ -201,9 +215,6 @@ export default StyleSheet.create({
|
|||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
justifyContent: 'space-between',
|
justifyContent: 'space-between',
|
||||||
},
|
},
|
||||||
headerSymptom: {
|
|
||||||
paddingRight: 20
|
|
||||||
},
|
|
||||||
navigationArrow: {
|
navigationArrow: {
|
||||||
padding: 20
|
padding: 20
|
||||||
},
|
},
|
||||||
@@ -250,10 +261,11 @@ export default StyleSheet.create({
|
|||||||
marginTop: defaultTopMargin,
|
marginTop: defaultTopMargin,
|
||||||
marginHorizontal: defaultIndentation,
|
marginHorizontal: defaultIndentation,
|
||||||
padding: 7,
|
padding: 7,
|
||||||
|
fontFamily: 'textFont'
|
||||||
},
|
},
|
||||||
settingsSegmentTitle: {
|
settingsSegmentTitle: {
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
fontFamily: fontRegular
|
fontFamily: 'textFont'
|
||||||
},
|
},
|
||||||
settingsButton: {
|
settingsButton: {
|
||||||
backgroundColor: secondaryColor,
|
backgroundColor: secondaryColor,
|
||||||
@@ -261,6 +273,9 @@ export default StyleSheet.create({
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
margin: 10,
|
margin: 10,
|
||||||
},
|
},
|
||||||
|
settingsButtonDisabled: {
|
||||||
|
backgroundColor: colorInActive
|
||||||
|
},
|
||||||
settingsButtonText: {
|
settingsButtonText: {
|
||||||
color: fontOnPrimaryColor
|
color: fontOnPrimaryColor
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user