Merge branch 'delete-password-button-fix' into 'master'

Delete password button fix

Closes #327

See merge request bloodyhealth/drip!199

CHANGELOG.md

@@ -4,7 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.0.1] - 2019-02-22
+## [0.0.2] - 2019-04-16
+## Second updated beta release version
+### Changes
+- First day of the week in calendar is now Monday instead of Sunday
+- Minor styling consistency
+
+### Fixed
+- Typos
+- Bleeding value is visible in shortcut from Homescreen
+- Delete button for sex, pain and mood
+- Dates on chart
+
+## [0.0.1] - 2019-02-15
 ## First beta release version
 ### Added (list of core functionality)
 - you can track your menstrual bleeding

android/app/src/main/AndroidManifest.xml

@@ -52,39 +52,12 @@
         <meta-data  android:name="com.dieam.reactnativepushnotification.notification_color"
                     android:resource="@android:color/white"/>
 
-        <!-- < Only if you're using GCM or localNotificationSchedule() > -->
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND" >
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </receiver>
-        <!-- < Only if you're using GCM or localNotificationSchedule() > -->
-
         <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
         <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
-        <service
-            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
-            android:exported="false" >
-            <intent-filter>
-                <!-- < Only if you're using GCM or localNotificationSchedule() > -->
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <!-- < Only if you're using GCM or localNotificationSchedule() > -->
-
-                <!-- <Else> -->
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-                <!-- </Else> -->
-            </intent-filter>
-        </service>
-
     </application>
 
 </manifest>

components/settings/password/create.js

@@ -19,7 +19,7 @@ export default class CreatePassword extends Component {
   }
 
   startSettingPassword = () => {
-    showBackUpReminder(this.toggleSettingPassword)
+    showBackUpReminder(this.toggleSettingPassword, () => {})
   }
 
   render () {

components/settings/password/delete.js

@@ -1,4 +1,6 @@
 import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
 import labels from '../../../i18n/en/settings'
 import { changeEncryptionAndRestartApp } from '../../../db'
 import ConfirmWithPassword from '../shared/confirm-with-password'
@@ -14,7 +16,7 @@ export default class DeletePassword extends Component {
 
   startConfirmWithPassword = () => {
     this.setState({ enteringCurrentPassword: true })
-    this.props.onStartDeletingPassword()
+    this.props.onStartDelete()
   }
 
   startDeletePassword = async () => {
@@ -23,6 +25,7 @@ export default class DeletePassword extends Component {
 
   cancelConfirmationWithPassword = () => {
     this.setState({ enteringCurrentPassword: false })
+    this.props.onCancelDelete()
   }
 
   render() {
@@ -44,4 +47,9 @@ export default class DeletePassword extends Component {
       </SettingsButton>
     )
   }
+}
+
+DeletePassword.propTypes = {
+  onStartDelete: PropTypes.func,
+  onCancelDelete: PropTypes.func
 }

components/settings/password/index.js

@@ -24,10 +24,18 @@ export default class PasswordSetting extends Component {
     this.setState({ isChangingPassword: true })
   }
 
+  onCancelChangingPassword = () => {
+    this.setState({ isChangingPassword: false })
+  }
+
   onDeletingPassword = () => {
     this.setState({ isDeletingPassword: true })
   }
 
+  onCancelDeletingPassword = () => {
+    this.setState({ isDeletingPassword: false })
+  }
+
   render() {
 
     const {
@@ -53,13 +61,15 @@ export default class PasswordSetting extends Component {
 
           { (isPasswordSet && !isDeletingPassword) && (
             <ChangePassword
-              onStartChangingPassword = {this.onChangingPassword}
+              onStartChange = {this.onChangingPassword}
+              onCancelChange = {this.onCancelChangingPassword}
             />
           )}
 
           { (isPasswordSet && !isChangingPassword) && (
             <DeletePassword
-              onStartDeletingPassword = {this.onDeletingPassword}
+              onStartDelete = {this.onDeletingPassword}
+              onCancelDelete = {this.onCancelDeletingPassword}
             />
           )}
         </FramedSegment>

components/settings/password/show-backup-reminder.js

@@ -2,7 +2,7 @@ import { Alert } from 'react-native'
 import { shared } from '../../../i18n/en/labels'
 import labels from '../../../i18n/en/settings'
 
-export default function showBackUpReminder(okHandler, isDelete) {
+export default function showBackUpReminder(okHandler, cancelHandler, isDelete) {
   let title, message
   if (isDelete) {
     title = labels.passwordSettings.deleteBackupReminderTitle
@@ -17,10 +17,12 @@ export default function showBackUpReminder(okHandler, isDelete) {
     message,
     [{
       text: shared.cancel,
+      onPress: cancelHandler,
       style: 'cancel'
     }, {
       text: shared.ok,
       onPress: okHandler
-    }]
+    }],
+    { onDismiss: cancelHandler }
   )
 }

components/settings/password/update.js

@@ -1,4 +1,6 @@
 import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+
 import settings from '../../../i18n/en/settings'
 import EnterNewPassword from './enter-new-password'
 import SettingsButton from '../shared/settings-button'
@@ -17,10 +19,15 @@ export default class ChangePassword extends Component {
   }
 
   startChangingPassword = () => {
-    showBackUpReminder(() => {
-      this.setState({ enteringCurrentPassword: true })
-    })
-    this.props.onStartChangingPassword()
+    showBackUpReminder(
+      this.startEnteringCurrentPassword,
+      this.cancelConfirmationWithPassword
+    )
+  }
+
+  startEnteringCurrentPassword = () => {
+    this.setState({ enteringCurrentPassword: true })
+    this.props.onStartChange()
   }
 
   startEnteringNewPassword = () => {
@@ -37,6 +44,7 @@ export default class ChangePassword extends Component {
       enteringNewPassword: false,
       enteringCurrentPassword: false
     })
+    this.props.onCancelChange()
   }
 
   render() {
@@ -71,4 +79,9 @@ export default class ChangePassword extends Component {
       </SettingsButton>
     )
   }
+}
+
+ChangePassword.propTypes = {
+  onStartChange: PropTypes.func,
+  onCancelChange: PropTypes.func
 }

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

@@ -1,4 +1,5 @@
 import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { View, Alert } from 'react-native'
 
 import nodejs from 'nodejs-mobile-react-native'
@@ -99,4 +100,9 @@ export default class ConfirmWithPassword extends Component {
     )
 
   }
+}
+
+ConfirmWithPassword.propTypes = {
+  onSuccess: PropTypes.func,
+  onCancel: PropTypes.func
 }

package-lock.json

@@ -7526,9 +7526,8 @@
       }
     },
     "react-native-push-notification": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/react-native-push-notification/-/react-native-push-notification-3.1.1.tgz",
-      "integrity": "sha512-4+4yQXNPqh5IVvpSBmR4Cy/UeMjTcfE8KIJgEuT7pME97WK+aGPn6W3ybhOoXC1n+ZWKfrAlsHydLE4xfBZDJg=="
+      "version": "github:jfr3000/react-native-push-notification#f9e83510d687116ea79ee30fde6b93ba5a07b019",
+      "from": "github:jfr3000/react-native-push-notification"
     },
     "react-native-restart": {
       "version": "0.0.7",

package.json

@@ -36,7 +36,7 @@
     "react-native-fs": "^2.13.3",
     "react-native-hyperlink": "0.0.14",
     "react-native-modal-datetime-picker-nevo": "^4.11.0",
-    "react-native-push-notification": "^3.1.1",
+    "react-native-push-notification": "github:jfr3000/react-native-push-notification",
     "react-native-restart": "0.0.7",
     "react-native-share": "^1.1.3",
     "react-native-vector-icons": "^5.0.0",