diff --git a/assets/adaptive-icon.png b/assets/adaptive-icon.png
deleted file mode 100644
index 03d6f6b..0000000
Binary files a/assets/adaptive-icon.png and /dev/null differ
diff --git a/assets/favicon.png b/assets/favicon.png
deleted file mode 100644
index e75f697..0000000
Binary files a/assets/favicon.png and /dev/null differ
diff --git a/assets/icon.png b/assets/icon.png
deleted file mode 100644
index a0b1526..0000000
Binary files a/assets/icon.png and /dev/null differ
diff --git a/assets/images/addition_styled_button.jpeg b/assets/images/addition_styled_button.jpeg
new file mode 100644
index 0000000..fa54f09
Binary files /dev/null and b/assets/images/addition_styled_button.jpeg differ
diff --git a/assets/images/create_layout.jpeg b/assets/images/create_layout.jpeg
new file mode 100644
index 0000000..d7fd855
Binary files /dev/null and b/assets/images/create_layout.jpeg differ
diff --git a/assets/splash.png b/assets/splash.png
deleted file mode 100644
index 6f47774..0000000
Binary files a/assets/splash.png and /dev/null differ
diff --git a/src/components/Body.js b/src/components/Body.js
index 04cd52b..d68d8c5 100644
--- 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 (
-
-
+
+
);
diff --git a/src/components/buttons/ButtonsBody.js b/src/components/buttons/ButtonsBody.js
index 8a957df..8204a64 100644
--- 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 (
-
+
)
})
}
diff --git a/src/components/buttons/CommandButton.js b/src/components/buttons/CommandButton.js
index 6d87fdb..4305841 100644
--- a/src/components/buttons/CommandButton.js
+++ b/src/components/buttons/CommandButton.js
@@ -2,11 +2,12 @@ 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) => {
@@ -14,7 +15,7 @@ export default function(props) {
}
const checkIsNumeric = (value) => {
- return /^-?\d+$/.test(value)
+ return /^-?\d+$/.test(value) || value == '.'
}
const getNumber = (value) => {
@@ -22,7 +23,7 @@ export default function(props) {
}
const getOperator = (value) => {
- props.updateNumber(value)
+ // props.updateNumber(value)
}
return (