lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove light app text

Browse Source
This commit is contained in:
Julia Friesel
2019-01-17 17:17:22 +01:00
parent 7159124158
commit d905139958
8 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/assets/fonts/Dosis-Book.ttf
BIN
View File
Binary file not shown.
android/app/src/main/assets/fonts/Dosis-medium.ttf
BIN
View File
Binary file not shown.
assets/fonts/Dosis-ExtraLight.ttf
BIN
View File
Binary file not shown.
components/app-text.js
-8
View File
@@ -13,14 +13,6 @@ export default function AppText(props) {
) )
} }
export function AppTextLight(props) {
return (
<Text style={[styles.appTextLight, props.style]}>
{props.children}
</Text>
)
}
export function ActionHint(props) { export function ActionHint(props) {
if(props.isVisible) { if(props.isVisible) {
return ( return (
components/home.js
+7 -7
View File
@@ -8,7 +8,7 @@ import cycleModule from '../lib/cycle'
import { getCycleDaysSortedByDate } from '../db' import { getCycleDaysSortedByDate } from '../db'
import { getFertilityStatusForDay } from '../lib/sympto-adapter' import { getFertilityStatusForDay } from '../lib/sympto-adapter'
import styles from '../styles' import styles from '../styles'
import AppText, { AppTextLight } from './app-text' import AppText from './app-text'
import DripHomeIcon from '../assets/drip-home-icons' import DripHomeIcon from '../assets/drip-home-icons'
import Button from './button' import Button from './button'
@@ -57,9 +57,9 @@ export default class Home extends Component {
<DripHomeIcon name="circle" size={80} color={cycleDayColor}/> <DripHomeIcon name="circle" size={80} color={cycleDayColor}/>
</View> </View>
<View style={[styles.homeIconTextWrapper, styles.wrapperCycle]}> <View style={[styles.homeIconTextWrapper, styles.wrapperCycle]}>
<AppTextLight style={styles.iconText}> <AppText style={styles.iconText}>
{this.state.cycleDayNumber || labels.unknown} {this.state.cycleDayNumber || labels.unknown}
</AppTextLight> </AppText>
</View> </View>
{ this.state.showMore && { this.state.showMore &&
@@ -82,9 +82,9 @@ export default class Home extends Component {
<DripHomeIcon name="drop" size={105} color={periodColor} /> <DripHomeIcon name="drop" size={105} color={periodColor} />
</View> </View>
<View style={[styles.homeIconTextWrapper, styles.wrapperDrop]}> <View style={[styles.homeIconTextWrapper, styles.wrapperDrop]}>
<AppTextLight style={styles.iconText}> <AppText style={styles.iconText}>
{this.state.bleedingPredictionRange} {this.state.bleedingPredictionRange}
</AppTextLight> </AppText>
</View> </View>
{this.state.showMore && {this.state.showMore &&
@@ -109,13 +109,13 @@ export default class Home extends Component {
<View style={styles.homeCircle} position='absolute' /> <View style={styles.homeCircle} position='absolute' />
<View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}> <View style={[styles.homeIconTextWrapper, styles.wrapperCircle]}>
<AppTextLight style={styles.iconText}> <AppText style={styles.iconText}>
{this.state.phase ? {this.state.phase ?
this.state.phase.toString() this.state.phase.toString()
: :
labels.unknown labels.unknown
} }
</AppTextLight> </AppText>
</View> </View>
{this.state.phase && {this.state.phase &&
<AppText> <AppText>
ios/drip.xcodeproj/project.pbxproj
+11 -7
View File
@@ -78,6 +78,7 @@
082F2BD2BEA046FE8EE58763 /* Dosis-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.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 */; }; 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 */; }; 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 */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
@@ -430,6 +431,7 @@
2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */ = {isa = PBXFileReference; name = "Dosis-SemiBold.ttf"; path = "../assets/fonts/Dosis-SemiBold.ttf"; sourceTree = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; 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 = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@@ -747,6 +749,7 @@
2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */, 2A26A6F601D64F3A8D4A02B0 /* Dosis-SemiBold.ttf */,
94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */, 94973D7B7BBA4B0FBE713A0E /* drip-home-icon-font.ttf */,
887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */, 887F1D52A4684A5280CB79AA /* drip-home-icons.ttf */,
096E5227936940FEBA7321FE /* Dosis-medium.ttf */,
); );
name = Resources; name = Resources;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -782,9 +785,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 */,
75B7A700C6354428A41EC7B3 /* Build NodeJS Mobile Native Modules */, 48E955FC462B416A95EF7BEF /* Build NodeJS Mobile Native Modules */,
7CF38FE26E64428D9F852D31 /* Sign NodeJS Mobile Native Modules */, 72D0A476E7B545D7B07DF865 /* Sign NodeJS Mobile Native Modules */,
313F906FC77F438DA3BB36B0 /* Remove NodeJS Mobile Framework Simulator Strips */, 23D0808CFD8C401AA6A359D1 /* Remove NodeJS Mobile Framework Simulator Strips */,
); );
buildRules = ( buildRules = (
); );
@@ -1232,6 +1235,7 @@
082F2BD2BEA046FE8EE58763 /* Dosis-SemiBold.ttf in Resources */, 082F2BD2BEA046FE8EE58763 /* Dosis-SemiBold.ttf in Resources */,
DAA390B1EE7442D88A768596 /* drip-home-icon-font.ttf in Resources */, DAA390B1EE7442D88A768596 /* drip-home-icon-font.ttf in Resources */,
BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */, BA7CE1E95B7843D7B0CF85FF /* drip-home-icons.ttf in Resources */,
26DAA39DDC6B436E8342239B /* Dosis-medium.ttf in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -1281,7 +1285,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";
}; };
75B7A700C6354428A41EC7B3 /* Build NodeJS Mobile Native Modules */ = { 48E955FC462B416A95EF7BEF /* Build NodeJS Mobile Native Modules */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -1349,7 +1353,7 @@ fi
popd popd
"; ";
}; };
7CF38FE26E64428D9F852D31 /* Sign NodeJS Mobile Native Modules */ = { 72D0A476E7B545D7B07DF865 /* Sign NodeJS Mobile Native Modules */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -1395,7 +1399,7 @@ embed_framework()
{ {
FRAMEWORK_NAME=\"$(basename \"$1\")\" FRAMEWORK_NAME=\"$(basename \"$1\")\"
cp -r \"$1\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\" 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\" /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 find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d | while read frmwrk_path; do embed_framework \"$frmwrk_path\"; done
@@ -1409,7 +1413,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
"; ";
}; };
313F906FC77F438DA3BB36B0 /* Remove NodeJS Mobile Framework Simulator Strips */ = { 23D0808CFD8C401AA6A359D1 /* Remove NodeJS Mobile Framework Simulator Strips */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
ios/drip/Info.plist
+1 -3
View File
@@ -72,7 +72,6 @@
<string>Prompt-Thin.ttf</string> <string>Prompt-Thin.ttf</string>
<string>fontello.ttf</string> <string>fontello.ttf</string>
<string>drip-icon-font.ttf</string> <string>drip-icon-font.ttf</string>
<<<<<<< HEAD
<string>Dosis-Bold.ttf</string> <string>Dosis-Bold.ttf</string>
<string>Dosis-Book.ttf</string> <string>Dosis-Book.ttf</string>
<string>Dosis-ExtraBold.ttf</string> <string>Dosis-ExtraBold.ttf</string>
@@ -80,10 +79,9 @@
<string>Dosis-Light.ttf</string> <string>Dosis-Light.ttf</string>
<string>Dosis-Medium.ttf</string> <string>Dosis-Medium.ttf</string>
<string>Dosis-SemiBold.ttf</string> <string>Dosis-SemiBold.ttf</string>
=======
<string>drip-home-icon-font.ttf</string> <string>drip-home-icon-font.ttf</string>
<string>drip-home-icons.ttf</string> <string>drip-home-icons.ttf</string>
>>>>>>> master <string>Dosis-medium.ttf</string>
</array> </array>
</dict> </dict>
</plist> </plist>
styles/index.js
-6
View File
@@ -16,7 +16,6 @@ export const periodColor = '#802249'
const headerFont = 'Prompt-Thin' const headerFont = 'Prompt-Thin'
const textFont = 'Dosis-Light' const textFont = 'Dosis-Light'
const textFontLight = 'Dosis-ExtraLight'
const textFontBold = 'Dosis-Book' const textFontBold = 'Dosis-Book'
const regularSize = 16 const regularSize = 16
@@ -34,11 +33,6 @@ export default StyleSheet.create({
fontSize: regularSize, fontSize: regularSize,
letterSpacing: 0.5 letterSpacing: 0.5
}, },
appTextLight: {
color: 'black',
fontFamily: textFontLight,
fontSize: regularSize
},
actionHint: { actionHint: {
color: secondaryColor, color: secondaryColor,
fontFamily: textFont, fontFamily: textFont,