AppLoading/AppText/AppTextInput/Button/FramedSegment/Link -> ./common

components/settings/about.js

@@ -1,9 +1,9 @@
 import React, { Component } from 'react'
 import { ScrollView } from 'react-native'
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import labels from '../../i18n/en/settings'
 import links from '../../i18n/en/links'
-import FramedSegment from '../framed-segment'
+import FramedSegment from '../common/framed-segment'
 
 export default class AboutSection extends Component {
   render() {

components/settings/data-management/index.js

@@ -1,8 +1,8 @@
 import React, { Component } from 'react'
 import { ScrollView, View } from 'react-native'
-import AppText from '../../app-text'
-import FramedSegment from '../../framed-segment'
-import AppLoadingView from '../../app-loading'
+import AppText from '../../common/app-text'
+import FramedSegment from '../../common/framed-segment'
+import AppLoadingView from '../../common/app-loading'
 import SettingsButton from '../shared/settings-button'
 import { openImportDialog, getFileContent, importData } from './import-dialog'
 import openShareDialogAndExport from './export-dialog'

components/settings/license.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { View, ScrollView } from 'react-native'
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 import styles from '../../styles/index'
 import labels from '../../i18n/en/settings'
 

components/settings/nfp-settings/index.js

@@ -4,8 +4,8 @@ import {
 } from 'react-native'
 import styles from '../../../styles'
 import labels from '../../../i18n/en/settings'
-import AppText from '../../app-text'
-import FramedSegment from '../../framed-segment'
+import AppText from '../../common/app-text'
+import FramedSegment from '../../common/framed-segment'
 import TempSlider from './temp-slider'
 import UseCervixSetting from './use-cervix'
 import Icon from 'react-native-vector-icons/Entypo'

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { View } from 'react-native'
 import Slider from '@ptomasroos/react-native-multi-slider'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   scaleObservable,
   saveTempScale,

components/settings/nfp-settings/use-cervix.js

@@ -3,7 +3,7 @@ import {
   View,
   Switch
 } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   useCervixObservable,
   saveUseCervix

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

@@ -3,7 +3,7 @@ import { View } from 'react-native'
 import nodejs from 'nodejs-mobile-react-native'
 
 import { requestHash, changeEncryptionAndRestartApp } from '../../../db'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import PasswordField from '../shared/password-field'
 import SettingsButton from '../shared/settings-button'
 

components/settings/password/index.js

@@ -3,8 +3,8 @@ import { ScrollView } from 'react-native'
 import CreatePassword from './create'
 import ChangePassword from './update'
 import DeletePassword from './delete'
-import FramedSegment from '../../framed-segment'
-import AppText from '../../app-text'
+import FramedSegment from '../../common/framed-segment'
+import AppText from '../../common/app-text'
 import {
   hasEncryptionObservable
 } from '../../../local-storage'

components/settings/reminders/index.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import {
   ScrollView,
 } from 'react-native'
-import FramedSegment from '../../framed-segment'
+import FramedSegment from '../../common/framed-segment'
 import TempReminderPicker from './temp-reminder-picker'
 import PeriodReminderPicker from './period-reminder'
 

components/settings/reminders/period-reminder.js

@@ -3,7 +3,7 @@ import {
   View,
   Switch
 } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   periodReminderObservable,
   savePeriodReminder

components/settings/reminders/temp-reminder-picker.js

@@ -5,7 +5,7 @@ import {
   Switch
 } from 'react-native'
 import DateTimePicker from 'react-native-modal-datetime-picker-nevo'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import {
   tempReminderObservable,
   saveTempReminder

components/settings/settings-menu.js

@@ -9,7 +9,7 @@ import styles from '../../styles/index'
 
 import settingsLabels from '../../i18n/en/settings'
 
-import AppText from '../app-text'
+import AppText from '../common/app-text'
 
 const labels = settingsLabels.menuTitles
 

components/settings/shared/password-field.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import AppTextInput from '../../app-text-input'
+import AppTextInput from '../../common/app-text-input'
 
 import styles from '../../../styles'
 

components/settings/shared/settings-button.js

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import { TouchableOpacity } from 'react-native'
-import AppText from '../../app-text'
+import AppText from '../../common/app-text'
 import styles from '../../../styles'
 
 const SettingsButton = ({ children, style, secondary, ...props }) => {