all script functions are isolated in their own js file, currency select pulled out of price tracker

2023-08-09 11:08:03 -04:00 · 2023-08-09 11:08:03 -04:00 · d910ac19a7
parent 113a320850
commit d910ac19a7
6 changed files with 118 additions and 59 deletions
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@ -5,6 +5,27 @@
    <link rel="stylesheet" type="text/css" href="style.css">
 </head>

+<div class="currency-dropdown">
+    <label for="currency-select">Select Currency: </label>
+    <select id="currency-select">
+        <option value="usd">Dollars</option>
+        <option value="ars">Argentine Peso</option>
+        <option value="brl">Brazilian Real</option>
+        <option value="cny">Chinese Yuan</option>
+        <option value="eur">Euros</option>
+        <option value="inr">Indian Rupee</option>
+        <option value="jpy">Yen</option>
+        <option value="ngn">Nigerian Naira</option>
+        <option value="pkr">Pakistani Rupee</option>
+        <option value="php">Philippine Peso</option>
+        <option value="rub">Russian Ruble</option>
+        <option value="thb">Thai Baht</option>
+        <option value="try">Turkish Lira</option>
+        <option value="uah">Ukrainian Hryvnia</option>
+        <option value="vnd">Dong</option>
+    </select>
+</div>
+
 <body>
 <div class="container">
    <div class="price-display">
@ -16,26 +37,6 @@

    <div id="dollars-to-sats"></div>

-    <div class="currency-dropdown">
-        <label for="currency-select">Select Currency: </label>
-        <select id="currency-select">
-            <option value="usd">Dollars</option>
-            <option value="ars">Argentine Peso</option>
-            <option value="brl">Brazilian Real</option>
-            <option value="cny">Chinese Yuan</option>
-            <option value="eur">Euros</option>
-            <option value="inr">Indian Rupee</option>
-            <option value="jpy">Yen</option>
-            <option value="ngn">Nigerian Naira</option>
-            <option value="pkr">Pakistani Rupee</option>
-            <option value="php">Philippine Peso</option>
-            <option value="rub">Russian Ruble</option>
-            <option value="thb">Thai Baht</option>
-            <option value="try">Turkish Lira</option>
-            <option value="uah">Ukrainian Hryvnia</option>
-            <option value="vnd">Dong</option>
-        </select>
-    </div>
 </div>

 </body>
--- a/app/src/main/assets/script.js
+++ b/app/src/main/assets/script.js
@ -1,8 +1,5 @@
-// Function to fetch and update the Bitcoin price
-function updateBitcoinPrice() {
-    const currencySelect = document.getElementById('currency-select');
-    const selectedCurrency = currencySelect.value;
-
+// bitcoinPriceTracker.js
+function updateBitcoinPrice(selectedCurrency) {
    fetch(`https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=${selectedCurrency}`)
        .then(response => response.json())
        .then(data => {
@ -14,24 +11,16 @@ function updateBitcoinPrice() {
            const formattedPrice = `${selectedCurrency.toUpperCase()} ` + bitcoinPrice.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 0 });

            bitcoinPriceElement.textContent = formattedPrice; // Display the formatted Bitcoin price
-
-            // Calculate currency to sats
-            const currencyToSatsElement = document.getElementById('dollars-to-sats');
-            const satsConversionFactor = 100000000; // 1 bitcoin = 100 million sats
-
-            // Calculate how many sats you can get for 1 unit of the selected currency based on the fetched Bitcoin price
-            const currencyValue = 1;
-            const sats = (currencyValue / bitcoinPrice) * satsConversionFactor;
-
-            currencyToSatsElement.textContent = `1 ${selectedCurrency.toUpperCase()} = ${sats.toFixed(0)} sats`; // Display the result
        })
        .catch(error => console.error(error));
 }

-// Function to refresh the Bitcoin price every 30 seconds
 function refreshBitcoinPrice() {
-    updateBitcoinPrice(); // Call the function immediately to display the price on page load
-    setInterval(updateBitcoinPrice, 1000); // Call the function every 1 second (1,000 milliseconds)
+    const currencySelect = document.getElementById('currency-select');
+    const selectedCurrency = currencySelect.value;
+
+    updateBitcoinPrice(selectedCurrency); // Call the function immediately to display the price on page load
+    setInterval(() => updateBitcoinPrice(selectedCurrency), 10000); // Call the function every 30 seconds
 }

 // Call the function to refresh the Bitcoin price
--- a/app/src/main/assets/script2.js
+++ b/app/src/main/assets/script2.js
@ -1,19 +1,28 @@
-fetch('https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=usd')
-.then(response => response.json())
-.then(data => {
-  const bitcoinPrice = data['bitcoin']['usd'];
-  const satoshisToDollars = (satoshis) => {
-    const bitcoinAmount = satoshis / 100000000;
-    const dollarsAmount = bitcoinAmount * bitcoinPrice;
-    return dollarsAmount.toFixed(2);
-  };
-  const satoshisInputElement = document.getElementById('sats-input');
-  const dollarsOutputElement = document.getElementById('dollars-output');
-  // Listen for changes to the satoshis input and update the dollars output
-  satoshisInputElement.addEventListener('input', (event) => {
-    const satoshis = event.target.value;
-    const dollars = satoshisToDollars(satoshis);
-    dollarsOutputElement.textContent = `$${dollars}`;
-  });
-})
-.catch(error => console.error(error));
+// fiatToSatsConverter.js
+function updateFiatToSatsConversion(selectedCurrency) {
+    fetch(`https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=${selectedCurrency}`)
+        .then(response => response.json())
+        .then(data => {
+            const bitcoinPrice = data['bitcoin'][selectedCurrency];
+            const satsConversionFactor = 100000000; // 1 bitcoin = 100 million sats
+
+            const currencyValue = 1;
+            const sats = (currencyValue / bitcoinPrice) * satsConversionFactor;
+
+            const currencyToSatsElement = document.getElementById('dollars-to-sats');
+            currencyToSatsElement.textContent = `1 ${selectedCurrency.toUpperCase()} = ${sats.toFixed(0)} sats`; // Display the result
+        })
+        .catch(error => console.error(error));
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    const currencySelect = document.getElementById('currency-select');
+    const selectedCurrency = currencySelect.value;
+
+    updateFiatToSatsConversion(selectedCurrency); // Call the function on page load
+
+    currencySelect.addEventListener('change', () => {
+        const selectedCurrency = currencySelect.value;
+        updateFiatToSatsConversion(selectedCurrency);
+    });
+});
--- a/app/src/main/assets/script3.js
+++ b/app/src/main/assets/script3.js
@ -0,0 +1,10 @@
+// currencySelection.js
+document.addEventListener('DOMContentLoaded', () => {
+    const currencySelect = document.getElementById('currency-select');
+
+    currencySelect.addEventListener('change', () => {
+        const selectedCurrency = currencySelect.value;
+        updateBitcoinPrice(selectedCurrency); // Update Bitcoin price when currency is changed
+        updateFiatToSatsConversion(selectedCurrency); // Update fiat to sats conversion when currency is changed
+    });
+});
--- a/app/src/main/assets/script4.js
+++ b/app/src/main/assets/script4.js
@ -0,0 +1,32 @@
+// satsToDollarsCalc.js
+function updateSatsToDollarsConversion() {
+    const satsInputElement = document.getElementById('sats-input');
+    const dollarsOutputElement = document.getElementById('dollars-output');
+
+    const satsValue = parseFloat(satsInputElement.value);
+
+    if (!isNaN(satsValue)) {
+        const currencySelect = document.getElementById('currency-select');
+        const selectedCurrency = currencySelect.value;
+
+        fetch(`https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=${selectedCurrency}`)
+            .then(response => response.json())
+            .then(data => {
+                const bitcoinPrice = data['bitcoin'][selectedCurrency];
+                const satsConversionFactor = 100000000; // 1 bitcoin = 100 million sats
+
+                const dollarsValue = (satsValue / satsConversionFactor) * bitcoinPrice;
+
+                dollarsOutputElement.textContent = `${dollarsValue.toFixed(2)} ${selectedCurrency.toUpperCase()}`;
+            })
+            .catch(error => console.error(error));
+    } else {
+        dollarsOutputElement.textContent = 'Invalid input';
+    }
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    const satsInputElement = document.getElementById('sats-input');
+
+    satsInputElement.addEventListener('input', updateSatsToDollarsConversion);
+});
--- a/app/src/main/java/com/example/satworth/MainActivity.kt
+++ b/app/src/main/java/com/example/satworth/MainActivity.kt
@ -52,8 +52,26 @@ class MainActivity : AppCompatActivity() {
            ""
        }

-// Combine the content of both scripts
-        val javaScriptCode = "$firstScript\n$secondScript"
+// Load the content of the second script file
+        val thirdScript = try {
+            assets.open("script3.js").bufferedReader().use { it.readText() }
+        } catch (e: IOException) {
+            e.printStackTrace()
+            // If loading the third script fails, set an empty script
+            ""
+        }
+
+// Load the content of the second script file
+        val fourthScript = try {
+            assets.open("script4.js").bufferedReader().use { it.readText() }
+        } catch (e: IOException) {
+            e.printStackTrace()
+            // If loading the fourth script fails, set an empty script
+            ""
+        }
+
+// Combine the content of scripts
+        val javaScriptCode = "$firstScript\n$secondScript\n$thirdScript\n$fourthScript"

        // Load the CSS code from the "style.css" file
        val cssCode = try {