Addiction of function to get all numbers return to textfield

LordWeli · May 6, 2021 · f333702 · f333702
1 parent 47d6ed6
commit f333702
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/assets/adaptive-icon.png b/assets/adaptive-icon.png
diff --git a/assets/favicon.png b/assets/favicon.png
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/assets/images/addition_styled_button.jpeg b/assets/images/addition_styled_button.jpeg
diff --git a/assets/images/create_layout.jpeg b/assets/images/create_layout.jpeg
diff --git a/assets/splash.png b/assets/splash.png
diff --git a/src/components/Body.js b/src/components/Body.js
@@ -3,17 +3,22 @@ import { StyleSheet, View, TextInput } from 'react-native';
 import ButtonsBody from './buttons/ButtonsBody'
 
 export default function(props) {
- const [numbers, setNumbers] = useState();
+ const [numbers, setNumbers] = useState([]);
+
 
  const updateSetNumbers = (value) => {
- setNumbers(value)
+ setNumbers([...numbers, value])
+ }
+
+ const clearInput = () => {
+ setNumbers([])
  }
 
  return (
  <View style={styles(props).container}>
  <View style={styles(props).areaContainer}>
- <TextInput editable={false} style={styles(props).textArea} textAlign='right' value={numbers}/>
- <ButtonsBody updateState={updateSetNumbers} theme={props.theme}/>
+ <TextInput editable={false} style={styles(props).textArea} textAlign='right' value={numbers.join(' ')}/>
+ <ButtonsBody updateState={updateSetNumbers} clearInput={clearInput} theme={props.theme}/>
  </View>
  </View>
  );

diff --git a/src/components/buttons/ButtonsBody.js b/src/components/buttons/ButtonsBody.js
@@ -30,7 +30,7 @@ export default function(props) {
  {
  titles.line.map((text, text_index) => {
  return (
- <CommandButton valueButton={text} key={text_index} updateNumber={props.updateState} theme={props.theme}/>
+ <CommandButton valueButton={text} key={text_index} updateNumber={props.updateState} clearInput={props.clearInput} theme={props.theme}/>
  )
  })
  }

diff --git a/src/components/buttons/CommandButton.js b/src/components/buttons/CommandButton.js
@@ -2,27 +2,28 @@ import React from 'react';
 import { StyleSheet, TouchableOpacity, Text } from 'react-native';
 
 export default function(props) {
- const operators = ['C', '%', '*', '←', '/', '-', '+', '.', '=', '≠']
+ const operators = ['C', '%', '*', '←', '/', '-', '+', '=', '≠']
 
  const getButtonText = (value) => {
  if(checkIsOperator(value)) { getOperator(value) }
  if(checkIsNumeric(value)) { getNumber(value) }
+ if(value == 'C') { props.clearInput() }
  }
 
  const checkIsOperator = (value) => {
  return operators.includes(value)
  }
 
  const checkIsNumeric = (value) => {
- return /^-?\d+$/.test(value)
+ return /^-?\d+$/.test(value) || value == '.'
  }
 
  const getNumber = (value) => {
  props.updateNumber(value)
  }
 
  const getOperator = (value) => {
- props.updateNumber(value)
+ // props.updateNumber(value)
  }
 
  return (