From 65d0e4f3a101d018112684136e6bc6b5b037c70f Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 15 Aug 2021 16:07:04 +0200 Subject: [PATCH 1/5] Install react-native-simple-toast --- ios/drip.xcodeproj/project.pbxproj | 4 ++++ package-lock.json | 5 +++++ package.json | 1 + 3 files changed, 10 insertions(+) diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index b4db73c..37bf487 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -566,11 +566,13 @@ "${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework", "${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework", "${BUILT_PRODUCTS_DIR}/RealmJS/RealmJS.framework", + "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework", "${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework", "${BUILT_PRODUCTS_DIR}/glog/glog.framework", "${PODS_ROOT}/../../node_modules/nodejs-mobile-react-native/ios/NodeMobile.framework", "${BUILT_PRODUCTS_DIR}/react-native-document-picker/react_native_document_picker.framework", "${BUILT_PRODUCTS_DIR}/react-native-restart/react_native_restart.framework", + "${BUILT_PRODUCTS_DIR}/react-native-simple-toast/react_native_simple_toast.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -602,11 +604,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmJS.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NodeMobile.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_document_picker.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_restart.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_simple_toast.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/package-lock.json b/package-lock.json index 0754d37..910a4ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29994,6 +29994,11 @@ "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-3.0.0.tgz", "integrity": "sha512-5P/Fhou5jW1yY475h+wIR+VZAUZ1Gnx8N4QKGToOLNo1yUhDeLxYRhm3bGCcS/MEy35NOZ222/43SQGfUzCl/g==" }, + "react-native-simple-toast": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/react-native-simple-toast/-/react-native-simple-toast-1.1.3.tgz", + "integrity": "sha512-bkZy25axqlU4L6IoTysSl5KOQA7qdxzivbXz/L/yAw9g9fENxjzYvUUtv5wWtgq7mzOe5HiJ7GCQrOl3MhIevQ==" + }, "react-native-swipe-gestures": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz", diff --git a/package.json b/package.json index 9b2817c..9b45579 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "react-native-push-notification": "3.2.1", "react-native-restart": "0.0.17", "react-native-share": "^3.0.0", + "react-native-simple-toast": "^1.1.3", "react-native-vector-icons": "^7.1.0", "react-redux": "^6.0.0", "realm": "^3.6.5", From f188f018b9ee8341387ce7912aa6f8eee0658060 Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 15 Aug 2021 16:15:10 +0200 Subject: [PATCH 2/5] Refactor existing Toast --- components/settings/data-management/delete-data.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/settings/data-management/delete-data.js b/components/settings/data-management/delete-data.js index 83c70d3..343e96d 100644 --- a/components/settings/data-management/delete-data.js +++ b/components/settings/data-management/delete-data.js @@ -1,7 +1,8 @@ import React, { Component } from 'react' import RNFS from 'react-native-fs' -import { Alert, ToastAndroid } from 'react-native' +import { Alert } from 'react-native' import PropTypes from 'prop-types' +import Toast from 'react-native-simple-toast' import Button from '../../common/button' @@ -69,7 +70,7 @@ export default class DeleteData extends Component { clearDb() } await this.deleteExportedFile() - ToastAndroid.show(success.message, ToastAndroid.LONG) + Toast.show(success.message, Toast.LONG) } catch (err) { alertError(errors.couldNotDeleteFile) } @@ -104,4 +105,4 @@ export default class DeleteData extends Component { DeleteData.propTypes = { isDeletingData: PropTypes.bool, onStartDeletion: PropTypes.func.isRequired -} \ No newline at end of file +} From 233d14968dcf336b6baeae273df9e24fe4fd40b3 Mon Sep 17 00:00:00 2001 From: MariaZ Date: Fri, 20 Aug 2021 20:10:00 +0200 Subject: [PATCH 3/5] Package-lock.json commit --- package-lock.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package-lock.json b/package-lock.json index 910a4ca..6e744e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,6 +33,7 @@ "react-native-push-notification": "3.2.1", "react-native-restart": "0.0.17", "react-native-share": "^3.0.0", + "react-native-simple-toast": "^1.1.3", "react-native-vector-icons": "^7.1.0", "react-redux": "^6.0.0", "realm": "^3.6.5", @@ -14536,6 +14537,11 @@ "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-3.0.0.tgz", "integrity": "sha512-5P/Fhou5jW1yY475h+wIR+VZAUZ1Gnx8N4QKGToOLNo1yUhDeLxYRhm3bGCcS/MEy35NOZ222/43SQGfUzCl/g==" }, + "node_modules/react-native-simple-toast": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/react-native-simple-toast/-/react-native-simple-toast-1.1.3.tgz", + "integrity": "sha512-bkZy25axqlU4L6IoTysSl5KOQA7qdxzivbXz/L/yAw9g9fENxjzYvUUtv5wWtgq7mzOe5HiJ7GCQrOl3MhIevQ==" + }, "node_modules/react-native-swipe-gestures": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz", From 4bff5a3d6823aaecaf5b43ff794114908850402e Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 29 Aug 2021 14:03:29 +0200 Subject: [PATCH 4/5] Move toast showing function to helper --- components/helpers/general.js | 5 +++++ components/settings/data-management/delete-data.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 components/helpers/general.js diff --git a/components/helpers/general.js b/components/helpers/general.js new file mode 100644 index 0000000..9ce055a --- /dev/null +++ b/components/helpers/general.js @@ -0,0 +1,5 @@ +import Toast from 'react-native-simple-toast' + +export const showToast = (text) => Toast.show( + text, Toast.SHORT, ['RCTModalHostViewController', 'UIAlertController'] +) diff --git a/components/settings/data-management/delete-data.js b/components/settings/data-management/delete-data.js index 343e96d..da5ef45 100644 --- a/components/settings/data-management/delete-data.js +++ b/components/settings/data-management/delete-data.js @@ -2,7 +2,6 @@ import React, { Component } from 'react' import RNFS from 'react-native-fs' import { Alert } from 'react-native' import PropTypes from 'prop-types' -import Toast from 'react-native-simple-toast' import Button from '../../common/button' @@ -10,6 +9,7 @@ import ConfirmWithPassword from '../common/confirm-with-password' import alertError from '../common/alert-error' import { clearDb, isDbEmpty } from '../../../db' +import { showToast } from '../../helpers/general' import { hasEncryptionObservable } from '../../../local-storage' import settings from '../../../i18n/en/settings' import { shared as sharedLabels } from '../../../i18n/en/labels' @@ -70,7 +70,7 @@ export default class DeleteData extends Component { clearDb() } await this.deleteExportedFile() - Toast.show(success.message, Toast.LONG) + showToast(success.message) } catch (err) { alertError(errors.couldNotDeleteFile) } From d2a452e3c950aa7490ce6a9199a950d5c1eaa2b3 Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 29 Aug 2021 14:08:37 +0200 Subject: [PATCH 5/5] Add toast to saving/deleting symptom data --- components/cycle-day/symptom-edit-view.js | 18 ++++++++++++++---- i18n/en/labels.js | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/components/cycle-day/symptom-edit-view.js b/components/cycle-day/symptom-edit-view.js index a6e0de9..b7e4a03 100644 --- a/components/cycle-day/symptom-edit-view.js +++ b/components/cycle-day/symptom-edit-view.js @@ -1,6 +1,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import { Dimensions, ScrollView, StyleSheet, View } from 'react-native' +import { connect } from 'react-redux' import AppModal from '../common/app-modal' import AppSwitch from '../common/app-switch' @@ -13,9 +14,9 @@ import SelectBoxGroup from './select-box-group' import SelectTabGroup from './select-tab-group' import Temperature from './temperature' -import { connect } from 'react-redux' import { getDate } from '../../slices/date' import { blank, save, shouldShow, symtomPage } from '../helpers/cycle-day' +import { showToast } from '../helpers/general' import { shared as sharedLabels } from '../../i18n/en/labels' import info from '../../i18n/en/symptom-info' @@ -84,11 +85,13 @@ class SymptomEditView extends Component { onRemove = () => { this.saveData(true) + showToast(sharedLabels.dataDeleted) this.props.onClose() } onSave = () => { this.saveData() + showToast(sharedLabels.dataSaved) this.props.onClose() } @@ -135,8 +138,15 @@ class SymptomEditView extends Component { save[symptom](data, date, shouldDeleteData) } + closeView = () => { + const { onClose } = this.props + + showToast(sharedLabels.dataSaved) + onClose() + } + render() { - const { onClose, symptom } = this.props + const { symptom } = this.props const { data, shouldShowExclude, shouldShowInfo, @@ -148,13 +158,13 @@ class SymptomEditView extends Component { const noteText = symptom === 'note' ? data.value : data.note return ( - + - + {symptom === 'temperature' &&