changes in customization texts and small changes to styling

components/common/app-switch.js

@@ -34,10 +34,10 @@ AppSwitch.propTypes = {
 const styles = StyleSheet.create({
   container: {
     ...Containers.rowContainer,
+    marginTop: Spacing.tiny,
   },
   switch: {
     flex: 1,
-    marginBottom: Spacing.tiny,
     transform:
       Platform.OS === 'ios'
         ? [{ scaleX: 0.8 }, { scaleY: 0.8 }]

components/settings/customization/index.js

@@ -246,23 +246,21 @@ const Settings = () => {
         />
       </Segment>
       <Pressable onPress={sliderDisabledPrompt}>
-
         <Segment title={labels.fertilityTracking.title}>
           {isTemperatureTrackingCategoryEnabled &&
-           isMucusTrackingCategoryEnabled ||
+          (isMucusTrackingCategoryEnabled ||
-           isCervixTrackingCategoryEnabled ?
+            isCervixTrackingCategoryEnabled) ? (
-           (
+            <>
-              <>
+              <AppText>{labels.fertilityTracking.message}</AppText>
-                <AppSwitch
+              <AppSwitch
-                  onToggle={fertilityTrackingToggle}
+                onToggle={fertilityTrackingToggle}
-                  text={fertilityTrackingText}
+                text={fertilityTrackingText}
-                  value={isFertilityTrackingEnabled}
+                value={isFertilityTrackingEnabled}
-                />
+              />
-              </>
+            </>
-            ) :
+          ) : (
-            (
             <AppText>{labels.disabled.message}</AppText>
-            )}
+          )}
         </Segment>
       </Pressable>
 

i18n/en/settings.js

@@ -41,7 +41,7 @@ export default {
   disabled: {
     title: 'This feature is turned off',
     message:
-      'Please first enable the temperature tracking category in the customization settings.',
+      'To use the temperature scale please first enable the temperature tracking category above.',
   },
   tempReminder: {
     title: 'Temperature reminder',
@@ -68,8 +68,10 @@ export default {
   },
   fertilityTracking: {
     title: 'Fertility phases calculation',
-    on: 'The quick brown fox jumps over the lazy dog',
+    message:
-    off: 'No no',
+      'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal rules, drip will calculate cycle phases with the provided data.',
+    on: 'If you switch this off, drip will not show fertility related information.',
+    off: 'If you switch this on, drip will show fertility related information.',
   },
   secondarySymptom: {
     title: 'Secondary symptom',
@@ -80,16 +82,16 @@ export default {
     disabled: {
       title: 'Disabled',
       message:
-        'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature in the customization settings.',
+        'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature above.',
       noSecondaryEnabled:
-        'To switch the secondary symptom both cervical mucus an cervix need to be enabled in the customization settings.',
+        'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.',
     },
     mucus: 'cervical mucus',
     cervix: 'cervix',
   },
   periodPrediction: {
     title: 'Period predictions',
-    on: 'drip predicts your 3 next menstrual bleedings based on the statistics of your previously tracked cycles, min 3 complete cycles.',
+    on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.',
     off: 'There are no predictions for menstrual cycles displayed. If turned on the calendar and the home screen will display period predictions.',
   },
   passwordSettings: {

styles/containers.js

@@ -36,6 +36,6 @@ export default {
   },
   segmentContainer: {
     marginHorizontal: Spacing.base,
-    marginBottom: Spacing.tiny,
+    marginBottom: Spacing.base,
   },
 }