Add 'Clear All' button, table for results, custom text component

src/actions/actionTypes.js

@@ -1,7 +1,7 @@
 export const UPDATEVALUE = 'UPDATEVALUE';
 export const UPDATEMULT = 'UPDATEMULT';
+export const CLEARALL = 'CLEARALL';
 export const MENUOPEN = 'MENUOPEN';
 export const MENUCLOSE = 'MENUCLOSE';
 export const MAIN = 'MAIN';
 export const HELP = 'HELP';
-export const SETREF = 'SETREF';

src/actions/calcActions.js

@@ -17,3 +17,9 @@ export function updatemult(form, index, mult) {
 		mult,
 	};
 }
+
+export function clearall() {
+	return {
+		type: types.CLEARALL,
+	};
+}

src/components/calc.js

@@ -1,20 +1,30 @@
 import React, {Component} from 'react';
-import {ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
+import {Alert, ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native';
 
 import Resistor from './resistor';
 import Section from './section';
+import ClearAll from './clearall';
+import MyText from './mytext'
 
-const styles = StyleSheet.create({
+function getUnit(n) {
-	button: {
+	if (n >= 1000000) {
-		width: 100,
+		return {unit: ' MΩ', mult: 1000000};
-		height: 30,
+	} else if (n >= 1000) {
-		padding: 10,
+		return {unit: ' kΩ', mult: 1000};
-		backgroundColor: 'lightgray',
+	} else if (n >= 1) {
-		alignItems: 'center',
+		return {unit: ' Ω', mult: 1};
-		justifyContent: 'center',
+	} else {
-		margin: 3
+		return {unit: ' mΩ', mult: 0.001};
 	}
-});
+}
+
+const styles = {
+	table: {
+		borderBottomColor: 'lightgrey',
+		borderBottomWidth: 1,
+		padding: 3,
+	},
+};
 
 export default class Calc extends Component {
 	constructor(props) {
@@ -24,42 +34,165 @@ export default class Calc extends Component {
 	render() {
 		const {state} = this.props;
 
-		const allValid = state.have.every((x) => x.valid);
+		const targetValid = state.target.valid;
-		const nonEmpty = state.have.some((x) => x.value);
+		const targetNonEmpty = state.target.value ? true : false;
+
+		const haveAllValid = state.have.every((x) => x.valid);
+		const haveNonEmpty = state.have.some((x) => x.value);
+
+		const precision = () => {
+			if (targetValid && targetNonEmpty) {
+				const pieces = state.target.value.split('.');
+				if (pieces[1]) {
+					if (pieces[1].length > 20) {
+						return 20; // Max toFixed() allows
+					}
+					if (pieces[1].length > 2) {
+						return pieces[1].length;
+					}
+				}
+			}
+			return 2;
+		};
+
+		const targetRes = state.target.value * state.target.mult;
 
 		const reciprocalSum = state.have
 			.filter((x) => x.value)
 			.reduce((a,b) => a + 1.0 / (b.value * b.mult), 0.0);
 
+		const sum = 1.0 / reciprocalSum;
+
+		const percentError = Math.abs((sum - targetRes) / targetRes * 100);
+
+		const nextRes = 1.0 / (1.0 / targetRes - reciprocalSum);
+
+		const printSum = () => {
+			if (haveAllValid && haveNonEmpty) {
+				const {unit, mult} = getUnit(sum);
+				const val = sum / mult;
+				return val.toFixed(precision()) + unit;
+			} else {
+				return '---';
+			}
+		};
+
+		const printPercentError = () => {
+			if (targetValid && targetNonEmpty && haveAllValid && haveNonEmpty) {
+				// Check if the 'overall resistor value' matches the target
+				const {unit, mult} = getUnit(targetRes);
+				console.log((targetRes / mult).toFixed(precision()) + unit);
+				if (printSum() === (targetRes / mult).toFixed(precision()) + unit) {
+					return (0.0).toFixed(precision());
+				}
+				return percentError.toFixed(precision());
+			} else {
+				return '---';
+			}
+		};
+
+		const printNextRes= () => {
+			if (targetValid && targetNonEmpty && haveAllValid && haveNonEmpty) {
+				// Check if we are done because error is 0 or value's exact
+				if (nextRes == Infinity || printPercentError() == 0.0) {
+					return 'Done.';
+				} else if (nextRes < 0) {
+					return 'N/A.';
+				}
+				const {unit, mult} = getUnit(nextRes);
+				const val = nextRes / mult;
+				return val.toFixed(precision()) + unit;
+			} else {
+				return '---';
+			}
+		};
+
+		const printInfo = () => {
+			if (!haveAllValid) {
+				return 'A parallel resistor is not valid.';
+			} else if (!targetNonEmpty) {
+				return 'No target resistor.';
+			} else if (!targetValid) {
+				return 'Target resistor not valid.';
+			} else if (!haveNonEmpty) {
+				return 'No resistors in parallel.';
+			} else if (printNextRes() === 'N/A.') {
+				return (
+					<MyText>
+						No solution exists. <MyText
+							style={{color: '#3b6f73'}}
+							onPress={() => {
+								Alert.alert(
+									'No Solution Exists',
+									'This app recommends resistors to be added in parallel. It\'s impossible to increase resistance (to make it closer to the target) by adding another resistor in parallel.\n\nPlease remove the lowest value resistor if you wish to keep solving.',
+									[{text: 'OK'}]
+								);
+							}}
+						>
+							Why?
+						</MyText>
+					</MyText>
+				);
+			} else if (printNextRes() === 'Done.') {
+				return 'Target achieved.';
+			} else {
+				return 'Add the next resistor.';
+			}
+		};
+
 		return (
 			<ScrollView>
 				<View style={{padding: 20}}>
 					<Section>
-						<Text>
+						<MyText>
 							Enter the exact resistance target:
-						</Text>
+						</MyText>
+					</Section>
+					<Section>
 						<Resistor form="target" />
 					</Section>
 					<Section>
-						<Text>
+						<View style={{flexDirection: 'row'}}>
+							<View>
+								<MyText style={styles.table}>
 									Overall parallel resistor value:
-							{allValid && nonEmpty ? ' ' + 1/reciprocalSum : ' ???'}
+								</MyText>
-						</Text>
+								<MyText style={styles.table}>
-						<Text>
+									Error between this and target:
-							Error between this and the target: {0}%
+								</MyText>
-						</Text>
+								<MyText style={styles.table}>
-						<Text>
+									Next resistor value needed:
-							Next recommended resistor value: {0}
+								</MyText>
-						</Text>
+							</View>
+							<View>
+								<MyText style={styles.table} selectable={true}>
+									{printSum()}
+								</MyText>
+								<MyText style={styles.table} selectable={true}>
+									{printPercentError()} %
+								</MyText>
+								<MyText style={styles.table} selectable={true}>
+									{printNextRes()}
+								</MyText>
+							</View>
+						</View>
+						<MyText style={{padding: styles.table.padding}}>
+							{printInfo()}
+						</MyText>
 					</Section>
 					<Section>
-						<Text>
+						<MyText>
 							Enter the resistors you have in parallel:
-						</Text>
+						</MyText>
+					</Section>
+					<Section>
 						{state.have.map((x,n) => 
 							<Resistor form="have" index={n} key={n} />
 						)}
 					</Section>
+					<View style={{alignItems: 'center'}}>
+						<ClearAll />
+					</View>
 				</View>
 			</ScrollView>
 		);

src/components/clearall.js

@@ -0,0 +1,57 @@
+import React, {Component} from 'react';
+import {bindActionCreators} from 'redux';
+import {connect} from 'react-redux';
+import {
+	Alert,
+	StyleSheet,
+	View,
+	Text,
+	TouchableOpacity,
+} from 'react-native';
+
+import * as calcActions from '../actions/calcActions';
+
+const styles = {
+	clearbutton: {
+		height: 30,
+		width: 100,
+		padding: 10,
+		backgroundColor: 'lightgray',
+		alignItems: 'center',
+		justifyContent: 'center',
+		margin: 3,
+	},
+};
+
+class ClearAll extends Component {
+	constructor(props) {
+		super(props);
+	}
+
+	render() {
+		const {actions} = this.props;
+
+		return (
+			<TouchableOpacity
+				onPress={() => {
+					Alert.alert(
+						'Clear all resistors?',
+						'',
+						[
+							{text: 'CANCEL'},
+							{text: 'OK', onPress: actions.clearall},
+						]
+					)
+				}}
+				style={styles.clearbutton} activeOpacity={1}
+			>
+				<Text>Clear all</Text>
+			</TouchableOpacity>
+		);
+	}
+}
+
+export default connect(null, (dispatch) => ({
+	actions: bindActionCreators(calcActions, dispatch)
+}))(ClearAll);
+

src/components/help.js

@@ -1,17 +1,12 @@
 import React, {Component} from 'react';
 import {StyleSheet, View, Text, TouchableOpacity} from 'react-native';
 
-const styles = StyleSheet.create({
-});
-
 export default class Help extends Component {
 	constructor(props) {
 		super(props);
 	}
 
 	render() {
-		//const { counter } = this.props;
-
 		return (
 			<View style={{flex: 1, alignItems: 'center', justifyContent: 'center' }}>
 				<Text>This is a sample counter app.</Text>

src/components/mytext.js

@@ -0,0 +1,25 @@
+import React, {Component} from 'react';
+import {StyleSheet, Text} from 'react-native';
+
+const styles = {
+	mytext: {
+		color: 'black',
+	},
+};
+
+export default class MyText extends Component {
+	constructor(props) {
+		super(props);
+	}
+
+	render() {
+		return (
+			<Text {...this.props} style={[styles.mytext, this.props.style]}>
+				{this.props.children}
+			</Text>
+		);
+	}
+}
+
+
+

src/components/resistor.js

@@ -52,12 +52,10 @@ class Resistor extends Component {
 			updatemult('1');
 		}
 
-		console.log(this);
-
 		return (
 			<View style={{flex: 1, flexDirection: 'row', justifyContent: 'center', margin: 3}}>
 				<TextInput
-					value={data.value}
+					value={data.value || ''}
 					onChangeText={(x) => updatevalue(x)}
 					style={Object.assign({}, styles.resistorinput, {
 						borderColor: data.valid ? 'grey' : 'red',
@@ -80,8 +78,7 @@ class Resistor extends Component {
 				</Picker>
 				<TouchableOpacity
 					onPress={() => {
-						console.log(this);
+						data.value ? Alert.alert(
-						Alert.alert(
 							'Clear resistor value?',
 							data.value + 
 							// I created this kludge for fun (so don't hate on me):
@@ -93,7 +90,7 @@ class Resistor extends Component {
 								{text: 'CANCEL'},
 								{text: 'OK', onPress: clear},
 							]
-						)
+						) : null ;
 					}}
 					style={styles.clearbutton} activeOpacity={1}
 				>
@@ -119,8 +116,6 @@ function mapStateToProps(state, ownProps) {
 	}
 }
 
-export default connect(mapStateToProps,
+export default connect(mapStateToProps, (dispatch) => ({
-	(dispatch) => ({
 	actions: bindActionCreators(calcActions, dispatch)
-	})
+}))(Resistor);
-)(Resistor);

src/containers/calcApp.js

@@ -11,7 +11,6 @@ class CalcApp extends Component {
 
 	render() {
 		const {state} = this.props;
-		console.log(this);
 
 		return (
 			<Calc state={state}/>

src/containers/helpApp.js

@@ -1,23 +1,16 @@
 'use strict';
 
 import React, {Component} from 'react';
-import {bindActionCreators} from 'redux';
 import Help from '../components/help';
-import { connect } from 'react-redux';
 
-class HelpApp extends Component {
+export default class HelpApp extends Component {
 	constructor(props) {
 		super(props);
 	}
 
 	render() {
-		const { state, actions } = this.props;
 		return (
-			<Help {...actions} />
+			<Help />
 		);
 	}
 }
-
-export default connect(state => ({
-	}), (dispatch) => ({
-}))(HelpApp);

src/containers/nav.js

@@ -34,8 +34,8 @@ class Nav extends Component {
 				type="overlay"
 				content={<MenuApp />}
 				tapToClose={true}
-				openDrawerOffset={0.3}
+				openDrawerOffset={(viewport) => viewport.width - 250}
-				captureGestures={false}
+				captureGestures={true}
 				panCloseMask={0.3}
 				closedDrawerOffset={-3}
 				styles={drawerStyles}

src/reducers/calc.js

@@ -91,6 +91,8 @@ export default function calc(state = initialState, action = {}) {
 					),
 				};
 			}
+		case types.CLEARALL:
+			return initialState;
 		default:
 			return state;
 	}