changes in formules

App.tsx

@@ -1,6 +1,7 @@
 import {NavigationContainer} from '@react-navigation/native';
 import {createNativeStackNavigator} from '@react-navigation/native-stack';
 import * as React from 'react';
+import {LogBox} from 'react-native';
 import {DefaultTheme, Provider as PaperProvider} from 'react-native-paper';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import {GetJsonData} from './src/asyncStorage';
@@ -51,6 +52,8 @@ type userDataProp = {
  userName: string;
 };
 
+LogBox.ignoreAllLogs();
+
 export default function App() {
  const [loading, setLoading] = React.useState<boolean>(true);
  const [userData, setUserData] = React.useState<userDataProp>({

android/app/build.gradle

@@ -153,6 +153,9 @@ dependencies {
  implementation("com.facebook.react:react-android")
 
  implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
+ implementation project(':react-native-location')
+ implementation("com.google.android.gms:play-services-base:16.0.1")
+ implementation("com.google.android.gms:play-services-location:16.0.0")
 
  debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
  debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http:https://schemas.android.com/apk/res/android">
 
  <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
  <application
  android:name=".MainApplication"

android/settings.gradle

@@ -2,3 +2,5 @@ rootProject.name = 'ductcalculator'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/react-native-gradle-plugin')
+include ':react-native-location'
+project(':react-native-location').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-location/android')

package.json

@@ -20,9 +20,12 @@
  "@react-native-async-storage/async-storage": "^1.17.11",
  "@react-navigation/native": "^6.1.4",
  "@react-navigation/native-stack": "^6.9.10",
+ "axios": "^1.3.4",
+ "jetifier": "^2.0.0",
  "react": "18.2.0",
  "react-hook-form": "^7.43.1",
  "react-native": "0.71.3",
+ "react-native-location": "^2.5.0",
  "react-native-paper": "^5.2.0",
  "react-native-paper-dropdown": "^1.0.7",
  "react-native-pinchable": "^0.2.1",

src/app/DuctChecker/checkerFns.ts

@@ -76,7 +76,7 @@ export function fricationMethodCalculation(
  velocityCircular: (VelocityCircle * 196.85).toFixed(2),
  velocityRectangular: (VelocityRectangle * 196.85).toFixed(2),
  mmHeight: (DuctHeight * 25.4).toFixed(2),
- mmWidth: (DuctHeight * 2 * 25.4).toFixed(2),
+ mmWidth: (DuctHeight * 2 * 39.3701 * 25.4).toFixed(2),
  };
  }
 }
@@ -109,7 +109,7 @@ export function velocityMethodCalculation(
  frictionCircular: FrictionCircle.toFixed(2),
  frictionRectangular: FrictionRectangle.toFixed(2),
  mmHeight: (DuctHeight * 1000).toFixed(2),
- mmWidth: (DuctHeight * 2 * 1000).toFixed(2),
+ mmWidth: (DuctWidth * 1000).toFixed(2),
  };
  } catch (e) {
  console.log(e);
@@ -122,7 +122,7 @@ export function velocityMethodCalculation(
  frictionCircular: (FrictionCircle * 0.12).toFixed(2),
  frictionRectangular: (FrictionRectangle * 0.12).toFixed(2),
  mmHeight: (DuctHeight * 25.4).toFixed(2),
- mmWidth: (DuctHeight * 2 * 25.4).toFixed(2),
+ mmWidth: (DuctWidth * 39.3701 * 25.4).toFixed(2),
  };
  } catch (e) {
  console.log('e', e);

src/app/DuctChecker/index.tsx

@@ -7,6 +7,7 @@ import {ClearStorage, StoreStringData} from '../../asyncStorage';
 import FormSelect from '../../components/FormComponents/FormSelect';
 import TextInputAvoidingView from '../../components/KeyBoardAvoidingView';
 import ScreenWrapper from '../../layout/ScreenWrapper';
+import {ductMoreDetailsInsert} from '../../services';
 import {colorWhite, firstColor, thirdColor} from '../../styles/constants';
 import MainStyles from '../../styles/mainStyles';
 import SpaceStyles from '../../styles/spaceStyles';
@@ -38,9 +39,11 @@ export default function DuctChecker() {
  const [height2, setHeight2] = useState<string>('');
  const [width2, setWidth2] = useState<string>('');
  const [length, setLength] = useState<string>('1200');
- const [shape, setShape] = useState<string>('Straight');
+ const [shape, setShape] = useState<string>('Streight');
  const [quantity, setQuantity] = useState<string>('1');
 
+ const [userData, setUserData] = useState<any | undefined>();
+
  useEffect(() => {
  const d = async () => {
  const val = await AsyncStorage.getItem('data');
@@ -49,8 +52,24 @@ export default function DuctChecker() {
  }
  };
  d();
+ getData('userDetails', setUserData);
  }, []);
 
+ const getData = async (
+ str: string,
+ setVal: (val: string) => void,
+ ): Promise<any> => {
+ try {
+ const value: string | null = await AsyncStorage.getItem(str);
+ if (value) {
+ setVal(JSON.parse(value));
+ return value;
+ }
+ } catch (e) {
+ // error reading value
+ }
+ };
+
  useEffect(() => {
  if (sizerData) {
  setHeight1(sizerData.mmHeight?.toString());
@@ -79,6 +98,19 @@ export default function DuctChecker() {
  shape,
  quantity,
  );
+
+ const payload = {
+ ...userData,
+ height1,
+ height2,
+ length,
+ quantity,
+ shape,
+ width1,
+ width2,
+ };
+
+ ductMoreDetailsInsert(payload);
  setDuctData(data);
  setVisible(true);
  } else {

src/app/DuctChecker/result.tsx

@@ -25,6 +25,8 @@ export default function ResultsChecker({
  <View style={MainStyles.flexRow}>
  <View style={[SpaceStyles.m1, MainStyles.halfInput]}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Circular Duct"
  style={SpaceStyles.mrp}
@@ -36,6 +38,8 @@ export default function ResultsChecker({
  </View>
  <View style={[SpaceStyles.m1, MainStyles.halfInput]}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Rectangular Duct"
  style={SpaceStyles.mrp}
@@ -50,6 +54,8 @@ export default function ResultsChecker({
  <View style={MainStyles.flexRow}>
  <View style={[SpaceStyles.m1, MainStyles.halfInput]}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Circular Duct"
  style={SpaceStyles.mrp}
@@ -61,6 +67,8 @@ export default function ResultsChecker({
  </View>
  <View style={[SpaceStyles.m1, MainStyles.halfInput]}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Rectangle Duct"
  style={SpaceStyles.mrp}
@@ -117,6 +125,8 @@ export default function ResultsChecker({
  <View style={SpaceStyles.m1}>
  <TextInput
  editable={false}
+ dense
+ mode="outlined"
  label="Diameter"
  style={SpaceStyles.mrp}
  value={checkerData?.ductDiamaeter?.toString()}
@@ -127,6 +137,8 @@ export default function ResultsChecker({
  </View>
  <View style={SpaceStyles.m1}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Duct Width"
  style={SpaceStyles.mrp}
@@ -138,6 +150,8 @@ export default function ResultsChecker({
  </View>
  <View style={SpaceStyles.m1}>
  <TextInput
+ dense
+ mode="outlined"
  editable={false}
  label="Duct Height"
  style={SpaceStyles.mrp}
@@ -149,36 +163,38 @@ export default function ResultsChecker({
  </View>
  </View>
  <View style={MainStyles.halfInput}>
- <Text
- style={[
- TextStyles.colorMedium,
- SpaceStyles.py5,
- SpaceStyles.px1,
- TextStyles.textCenter,
- ]}
- variant="titleSmall">
- Duct Ratio
- </Text>
- <Text
- style={[
- TextStyles.colorMedium,
- SpaceStyles.py2,
- SpaceStyles.px1,
- TextStyles.textCenter,
- ]}
- variant="titleSmall">
- 1.4 : 1
- </Text>
- <Text
- style={[
- TextStyles.colorMedium,
- SpaceStyles.py2,
- SpaceStyles.px1,
- TextStyles.textCenter,
- ]}
- variant="titleSmall">
- Height : Width
- </Text>
+ <View style={MainStyles.ratioBox}>
+ <Text
+ style={[
+ TextStyles.colorMedium,
+ SpaceStyles.py5,
+ SpaceStyles.px1,
+ TextStyles.textCenter,
+ ]}
+ variant="titleSmall">
+ Duct Ratio
+ </Text>
+ <Text
+ style={[
+ TextStyles.colorMedium,
+ SpaceStyles.py2,
+ SpaceStyles.px1,
+ TextStyles.textCenter,
+ ]}
+ variant="titleSmall">
+ {checkerData?.mmHeight / 1000 / checkerData?.ductWidth} : 1
+ </Text>
+ <Text
+ style={[
+ TextStyles.colorMedium,
+ SpaceStyles.py2,
+ SpaceStyles.px1,
+ TextStyles.textCenter,
+ ]}
+ variant="titleSmall">
+ Height : Width
+ </Text>
+ </View>
  </View>
  </View>
  </Card.Content>

src/app/DuctSizer/giDuctResult.tsx

@@ -1,7 +1,15 @@
 import React from 'react';
-import {Linking, ScrollView, StyleSheet, View} from 'react-native';
+import {
+ Linking,
+ Platform,
+ ScrollView,
+ StyleSheet,
+ TouchableOpacity,
+ View,
+} from 'react-native';
 import {Button, Card, Text} from 'react-native-paper';
-import {colorBlack} from '../../styles/constants';
+import {colorBlack, firstColor} from '../../styles/constants';
+import MainStyles from '../../styles/mainStyles';
 import SpaceStyles from '../../styles/spaceStyles';
 import TextStyles from '../../styles/textStyles';
 
@@ -16,10 +24,11 @@ const btnArr = [
 
 const TabButton = ({sizerData}: {sizerData: any}) => {
  const handleFabricDetailsOpen = () => {
+ const android_url =
+ 'https://play.google.com/store/apps/details?id=com.prihoda.calculator';
+ const ios_url = 'https://apps.apple.com/in/app/prihoda/id1148389151';
  try {
- Linking.openURL(
- 'https://play.google.com/store/apps/details?id=com.prihoda.calculator',
- );
+ Linking.openURL(Platform.OS === 'ios' ? ios_url : android_url);
  } catch (e) {
  console.log(e);
  }
@@ -55,14 +64,21 @@ const TabButton = ({sizerData}: {sizerData: any}) => {
  </React.Fragment>
  ))}
  {label === 'Fabric' ? (
- <Button
- textColor="#3498db"
- mode="outlined"
- compact
- style={{marginVertical: 4}}
- onPress={handleFabricDetailsOpen}>
- Click here for Fabric Details
- </Button>
+ <TouchableOpacity
+ style={styles.touchableStyle}
+ onPress={() => handleFabricDetailsOpen()}>
+ <Text
+ style={[
+ MainStyles.justifyCenter,
+ {
+ color: firstColor,
+ borderBottomWidth: 1,
+ borderBottomColor: firstColor,
+ },
+ ]}>
+ Click here for Fabric Details
+ </Text>
+ </TouchableOpacity>
  ) : null}
  </View>
  </React.Fragment>
@@ -74,7 +90,9 @@ const TabButton = ({sizerData}: {sizerData: any}) => {
 export default function GiDuctResult({sizerData}: {sizerData: any}) {
  return (
  <Card.Content>
- <Text style={[SpaceStyles.p2, {color: colorBlack}]} variant="titleMedium">
+ <Text
+ style={[SpaceStyles.p2, TextStyles.colorMedium]}
+ variant="titleMedium">
  Duct Costing
  </Text>
  <View style={SpaceStyles.my1}>
@@ -104,4 +122,20 @@ const styles = StyleSheet.create({
  justifyContent: 'space-between',
  borderBottomWidth: 1,
  },
+ touchableStyle: {
+ marginVertical: 4,
+ display: 'flex',
+ flexDirection: 'row',
+ justifyContent: 'center',
+ paddingTop: 5,
+ },
 });
+
+// <Button
+// textColor="#3498db"
+// mode="outlined"
+// compact
+// style={{marginVertical: 4}}
+// onPress={handleFabricDetailsOpen}>
+// Click here for Fabric Details
+// </Button>;