Merge pull request #49 from sampocs/pochyly

disabled emoji and resolved period issue
sampocs · Apr 26, 2019 · 2ff6991 · 2ff6991
2 parents 09eafe1 + 8044e9e
commit 2ff6991
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/screens/AddHabitScreen.js b/screens/AddHabitScreen.js
@@ -139,13 +139,13 @@ class AddHabitScreen extends React.Component {
             habitSettings.type = Constants.PROGRESS
             habitSettings.habitInfo = {
                 unit: this.state.unit,
-                goal: parseInt(this.state.goal)
+                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
             }
 
             habitHistory.type = Constants.PROGRESS
             habitHistory.habitInfo = {
                 progress: 0,
-                goal: parseInt(this.state.goal)
+                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
             }
         }
         else if (this.state.includeSubtasksChecked) {
@@ -180,7 +180,7 @@ class AddHabitScreen extends React.Component {
             }
             return false
         }
-        if (this.state.includeMeasurementsChecked && this.state.goal === '') {
+        if (this.state.includeMeasurementsChecked && (this.state.goal === '' || this.state.goal === '.')) {
             if (alertUser) {
                 AlertIOS.alert(
                     '',
@@ -244,6 +244,7 @@ class AddHabitScreen extends React.Component {
                             }}
                             returnKeyType={'done'}
                             selectTextOnFocus={true}
+                            keyboardType={'ascii-capable'}
                             value={this.state.habitName}
                         />
                     </View>
@@ -361,6 +362,7 @@ class AddHabitScreen extends React.Component {
                                         autoCapitalize={'none'}
                                         selectTextOnFocus={true}
                                         value={this.state.unit}
+                                        keyboardType={'ascii-capable'}
                                         editable={this.state.includeMeasurementsChecked}
                                     />
                                 </View>

diff --git a/screens/EditHabitScreen.js b/screens/EditHabitScreen.js
@@ -145,13 +145,13 @@ class EditHabitScreen extends React.Component {
             habitSettings.type = Constants.PROGRESS
             habitSettings.habitInfo = {
                 unit: this.state.unit,
-                goal: parseInt(this.state.goal)
+                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
             }
 
             habitHistory.type = Constants.PROGRESS
             habitHistory.habitInfo = {
                 progress: 0,
-                goal: parseInt(this.state.goal)
+                goal: this.state.goal === '.' ? 0 : parseInt(this.state.goal)
             }
         }
         else if (this.state.includeSubtasksChecked) {
@@ -187,7 +187,7 @@ class EditHabitScreen extends React.Component {
             }
             return false
         }
-        if (this.state.includeMeasurementsChecked && this.state.goal === '') {
+        if (this.state.includeMeasurementsChecked && (this.state.goal === '' || this.state.goal === '.')) {
             if (alertUser) {
                 AlertIOS.alert(
                     '',
@@ -239,6 +239,7 @@ class EditHabitScreen extends React.Component {
                             }}
                             returnKeyType={'done'}
                             selectTextOnFocus={true}
+                            keyboardType={'ascii-capable'}
                             value={this.state.habitName}
                             editable={false}
                         />
@@ -341,6 +342,7 @@ class EditHabitScreen extends React.Component {
                                         autoCapitalize={'none'}
                                         selectTextOnFocus={true}
                                         value={this.state.unit}
+                                        keyboardType={'ascii-capable'}
                                         editable={this.state.includeMeasurementsChecked}
                                     />
                                 </View>

diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
@@ -148,6 +148,7 @@ class LoginScreen extends React.Component {
                         style={styles.textInput}
                         placeholder="Email"
                         textContentType="emailAddress"
+                        keyboardType={'ascii-capable'}
                         autoCapitalize="none"
                         autoCorrect={false}
                         returnKeyType="next"

diff --git a/screens/SignUpScreen.js b/screens/SignUpScreen.js
@@ -142,6 +142,7 @@ class SignUpScreen extends React.Component {
                         style={styles.textInput}
                         placeholder="Email"
                         textContentType="emailAddress"
+                        keyboardType={'ascii-capable'}
                         autoCapitalize="none"
                         autoCorrect={false}
                         keyboardType="email-address"