Calendar redesign

components/settings/common/confirm-with-password.js

@@ -7,7 +7,7 @@ import AppTextInput from '../../common/app-text-input'
 import Button from '../../common/button'
 
 import { requestHash, openDb } from '../../../db'
-import { Containers } from '../../../styles/redesign'
+import { Containers } from '../../../styles'
 import settings from '../../../i18n/en/settings'
 import { shared } from '../../../i18n/en/labels'
 

components/settings/data-management/delete-data.js

@@ -5,8 +5,8 @@ import PropTypes from 'prop-types'
 
 import Button from '../../common/button'
 
-import ConfirmWithPassword from '../shared/confirm-with-password'
-import alertError from '../shared/alert-error'
+import ConfirmWithPassword from '../common/confirm-with-password'
+import alertError from '../common/alert-error'
 
 import { clearDb, isDbEmpty } from '../../../db'
 import { hasEncryptionObservable } from '../../../local-storage'
@@ -94,7 +94,7 @@ export default class DeleteData extends Component {
     }
 
     return (
-      <Button isCTA isSmall={false} onPress={this.alertBeforeDeletion}>
+      <Button isCTA onPress={this.alertBeforeDeletion}>
         {settings.deleteSegment.title}
       </Button>
     )

components/settings/data-management/export-dialog.js

@@ -2,7 +2,7 @@ import Share from 'react-native-share'
 
 import { getCycleDaysSortedByDate } from '../../../db'
 import getDataAsCsvDataUri from '../../../lib/import-export/export-to-csv'
-import alertError from '../shared/alert-error'
+import alertError from '../common/alert-error'
 import settings from '../../../i18n/en/settings'
 import { EXPORT_FILE_NAME } from './constants'
 import RNFS from 'react-native-fs'

components/settings/data-management/import-dialog.js

@@ -4,7 +4,7 @@ import rnfs from 'react-native-fs'
 import importCsv from '../../../lib/import-export/import-from-csv'
 import { shared as sharedLabels } from '../../../i18n/en/labels'
 import labels from '../../../i18n/en/settings'
-import alertError from '../shared/alert-error'
+import alertError from '../common/alert-error'
 
 export function openImportDialog(onImportData) {
   Alert.alert(

components/settings/data-management/index.js

@@ -66,13 +66,13 @@ export default class DataManagement extends Component {
           <AppPage>
             <Segment title={labels.export.button}>
               <AppText>{labels.export.segmentExplainer}</AppText>
-              <Button isCTA isSmall={false} onPress={this.startExport}>
+              <Button isCTA onPress={this.startExport}>
                 {labels.export.button}
               </Button>
             </Segment>
             <Segment title={labels.import.button}>
               <AppText>{labels.import.segmentExplainer}</AppText>
-              <Button isCTA isSmall={false} onPress={this.startImport}>
+              <Button isCTA onPress={this.startImport}>
                 {labels.import.button}
               </Button>
             </Segment>

components/settings/menu-item.js

@@ -9,7 +9,7 @@ import Segment from '../common/segment'
 import { connect } from 'react-redux'
 import { navigate } from '../../slices/navigation'
 
-import { Colors, Containers, Sizes } from '../../styles/redesign'
+import { Colors, Containers, Sizes } from '../../styles'
 
 const MenuItem = ({ item, last, navigate }) => {
   return (

components/settings/nfp-settings/index.js

@@ -9,7 +9,7 @@ import TemperatureSlider from './temperature-slider'
 import Segment from '../../common/segment'
 
 import { useCervixObservable, saveUseCervix } from '../../../local-storage'
-import { Colors, Spacing, Typography } from '../../../styles/redesign'
+import { Colors, Spacing, Typography } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 
 export default class Settings extends Component {

components/settings/nfp-settings/slider-label.js

@@ -4,7 +4,7 @@ import { StyleSheet } from 'react-native'
 
 import AppText from '../../common/app-text'
 
-import { Fonts, Sizes } from '../../../styles/redesign'
+import { Fonts, Sizes } from '../../../styles'
 
 const sliderRadius = 5
 const width = 50

components/settings/nfp-settings/temperature-slider.js

@@ -2,11 +2,11 @@ import React, { Component } from 'react'
 import { StyleSheet, View } from 'react-native'
 import Slider from '@ptomasroos/react-native-multi-slider'
 
-import alertError from '../shared/alert-error'
+import alertError from '../common/alert-error'
 import SliderLabel from './slider-label'
 
 import { scaleObservable, saveTempScale } from '../../../local-storage'
-import { Colors, Sizes } from '../../../styles/redesign'
+import { Colors, Sizes } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config'
 

components/settings/password/delete.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
 import Button from '../../common/button'
-import ConfirmWithPassword from '../shared/confirm-with-password'
+import ConfirmWithPassword from '../common/confirm-with-password'
 
 import { changeEncryptionAndRestartApp } from '../../../db'
 import labels from '../../../i18n/en/settings'

components/settings/password/enter-new-password.js

@@ -7,7 +7,7 @@ import AppTextInput from '../../common/app-text-input'
 import Button from '../../common/button'
 
 import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
-import { Colors, Spacing } from '../../../styles/redesign'
+import { Colors, Spacing } from '../../../styles'
 import settings from '../../../i18n/en/settings'
 
 const LISTENER_TYPE = 'create-or-change-pw'

components/settings/password/update.js

@@ -5,7 +5,7 @@ import Button from '../../common/button'
 
 import EnterNewPassword from './enter-new-password'
 import showBackUpReminder from './show-backup-reminder'
-import ConfirmWithPassword from '../shared/confirm-with-password'
+import ConfirmWithPassword from '../common/confirm-with-password'
 
 import settings from '../../../i18n/en/settings'