V2 Refactor
This commit is contained in:
parent
1f1ac760ca
commit
48aaa67687
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
output.css
|
||||
@ -1,90 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
||||
<head>
|
||||
<<<<<<< HEAD
|
||||
<!--<link rel="stylesheet" type="text/css" href="themes/*">
|
||||
<link rel="stylesheet" type="text/css" href="styles/*">-->
|
||||
<link rel="stylesheet" type="text/css" href="style/output.css">
|
||||
=======
|
||||
>>>>>>> 444601f0cb9165b77f4c460bdf72f1cb567eb544
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" type="text/css" href="themes/Dark.css">
|
||||
</head>
|
||||
<body class="bg-black">
|
||||
|
||||
<div class="container">
|
||||
<div class="settings"><img src='file:///android_asset/images/cog.png' alt='cog' />
|
||||
<div class="theme-dropdown">
|
||||
<label for="theme-select"> </label>
|
||||
<select id="theme-select">
|
||||
<option value="Dark.css">Dark</option>
|
||||
<option value="Lava.css">Lava</option>
|
||||
<option value="Midnight.css">Midnight</option>
|
||||
<option value="Solar.css">Solar</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="currency-dropdown">
|
||||
<label for="currency-select"> </label>
|
||||
<select id="currency-select">
|
||||
<option value="usd">U.S. Dollar</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="pln">Polish Zloty</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>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="price-display">
|
||||
<div class="bitcoin-logo">
|
||||
<img src='file:///android_asset/images/logo.png' alt='BTC' />
|
||||
</div>
|
||||
<div id="bitcoin-price"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div id="dollars-to-sats"></div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="satstodollars">
|
||||
<h2>Sats to fiat Calc</h2>
|
||||
<label for="sats-input">Enter the amount of Bitcoin in satoshis:</label>
|
||||
<br>
|
||||
<input type="number" id="sats-input">
|
||||
<br>
|
||||
<output id="dollars-output"></output>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="exchange">
|
||||
<h2>Buy Bitcoin Here 👇</h2>
|
||||
<div class="app-image">
|
||||
<a href="https://www.swanbitcoin.com/oceanslim"><img src="file:///android_asset/images/swan.png" alt="App 1"></a>
|
||||
</div>
|
||||
<div class="app-image">
|
||||
<a href="https://river.com/signup?r=5WLPVSJQ"><img src="file:///android_asset/images/river.png" alt="App 2"></a>
|
||||
</div>
|
||||
<div class="app-image">
|
||||
<a href="https://cash.app/app/HRPBCNS"><img src="file:///android_asset/images/cashapp.png" alt="App 3"></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
91
app/src/main/assets/index.html
Normal file
91
app/src/main/assets/index.html
Normal file
@ -0,0 +1,91 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<!--<link rel="stylesheet" type="text/css" href="themes/*">
|
||||
<link rel="stylesheet" type="text/css" href="themes/Dark.css" />
|
||||
<link rel="stylesheet" type="text/css" href="styles/*">-->
|
||||
<link rel="stylesheet" href="style/output.css" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
</head>
|
||||
<body class="bg-secondary grid-cols-1 text-center text-text">
|
||||
<div class="container">
|
||||
<div class="settings">
|
||||
<img src="file:///android_asset/images/cog.png" alt="cog" />
|
||||
<div class="theme-dropdown">
|
||||
<label for="theme-select"> </label>
|
||||
<select id="theme-select">
|
||||
<option value="dark">Dark</option>
|
||||
<option value="lava">Lava</option>
|
||||
<option value="midnight">Midnight</option>
|
||||
<option value="solar">Solar</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="currency-dropdown">
|
||||
<label for="currency-select"> </label>
|
||||
<select id="currency-select">
|
||||
<option value="usd">U.S. Dollar</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="pln">Polish Zloty</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>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="price-display">
|
||||
<div class="bitcoin-logo">
|
||||
<img src="file:///android_asset/images/logo.png" alt="BTC" />
|
||||
</div>
|
||||
<div id="bitcoin-price"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div id="dollars-to-sats"></div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="satstodollars">
|
||||
<h2>Sats to fiat Calc</h2>
|
||||
<label for="sats-input">Enter the amount of Bitcoin in satoshis:</label>
|
||||
<br />
|
||||
<input type="number" id="sats-input" />
|
||||
<br />
|
||||
<output id="dollars-output"></output>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="exchange">
|
||||
<h2>Buy Bitcoin Here 👇</h2>
|
||||
<div class="app-image">
|
||||
<a href="https://www.swanbitcoin.com/oceanslim"
|
||||
><img src="file:///android_asset/images/swan.png" alt="App 1"
|
||||
/></a>
|
||||
</div>
|
||||
<div class="app-image">
|
||||
<a href="https://river.com/signup?r=5WLPVSJQ"
|
||||
><img src="file:///android_asset/images/river.png" alt="App 2"
|
||||
/></a>
|
||||
</div>
|
||||
<div class="app-image">
|
||||
<a href="https://cash.app/app/HRPBCNS"
|
||||
><img src="file:///android_asset/images/cashapp.png" alt="App 3"
|
||||
/></a>
|
||||
</div>
|
||||
</div>
|
||||
<script type="module" src="/js/main.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,5 +1,5 @@
|
||||
// satsToDollarsCalc.js
|
||||
function updateSatsToDollarsConversion() {
|
||||
export function updateSatsToDollarsConversion() {
|
||||
const satsInputElement = document.getElementById('sats-input');
|
||||
const dollarsOutputElement = document.getElementById('dollars-output');
|
||||
|
||||
@ -24,9 +24,3 @@ function updateSatsToDollarsConversion() {
|
||||
dollarsOutputElement.textContent = '';
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const satsInputElement = document.getElementById('sats-input');
|
||||
|
||||
satsInputElement.addEventListener('input', updateSatsToDollarsConversion);
|
||||
});
|
||||
39
app/src/main/assets/js/main.js
Normal file
39
app/src/main/assets/js/main.js
Normal file
@ -0,0 +1,39 @@
|
||||
import "/style/output.css";
|
||||
|
||||
import { updateFiatToSatsConversion } from "./viewFiatToSats";
|
||||
//import { updateBitcoinPrice, refreshBitcoinPrice } from "./viewBitcoinPrice";
|
||||
import { updateSatsToDollarsConversion } from "./calcSatsToFiat";
|
||||
|
||||
function updateBitcoinPrice(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 bitcoinPriceElement = document.getElementById('bitcoin-price');
|
||||
const formattedPrice = `${selectedCurrency.toUpperCase()} ` + bitcoinPrice.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 0 });
|
||||
bitcoinPriceElement.textContent = formattedPrice;
|
||||
})
|
||||
.catch(error => console.error(error));
|
||||
}
|
||||
|
||||
updateBitcoinPrice('usd');
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const satsInputElement = document.getElementById('sats-input');
|
||||
const currencySelect = document.getElementById('currency-select');
|
||||
|
||||
// Initially fetch Bitcoin price in USD
|
||||
updateBitcoinPrice('usd');
|
||||
|
||||
satsInputElement.addEventListener('input', updateSatsToDollarsConversion);
|
||||
|
||||
currencySelect.addEventListener('change', () => {
|
||||
const selectedCurrency = currencySelect.value;
|
||||
updateBitcoinPrice(selectedCurrency);
|
||||
updateFiatToSatsConversion(selectedCurrency);
|
||||
updateSatsToDollarsConversion(selectedCurrency);
|
||||
});
|
||||
|
||||
refreshBitcoinPrice('usd'); // Refresh Bitcoin price in USD
|
||||
|
||||
});
|
||||
@ -1,5 +1,5 @@
|
||||
// bitcoinPriceTracker.js
|
||||
function updateBitcoinPrice(selectedCurrency) {
|
||||
export function updateBitcoinPrice(selectedCurrency) {
|
||||
fetch(`https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=${selectedCurrency}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
@ -11,13 +11,7 @@ function updateBitcoinPrice(selectedCurrency) {
|
||||
.catch(error => console.error(error));
|
||||
}
|
||||
|
||||
function refreshBitcoinPrice(selectedCurrency) {
|
||||
export function refreshBitcoinPrice(selectedCurrency) {
|
||||
updateBitcoinPrice(selectedCurrency);
|
||||
setInterval(() => updateBitcoinPrice(selectedCurrency), 300000);
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const currencySelect = document.getElementById('currency-select');
|
||||
const selectedCurrency = currencySelect.value;
|
||||
refreshBitcoinPrice(selectedCurrency);
|
||||
});
|
||||
@ -1,5 +1,5 @@
|
||||
// fiatToSatsConverter.js
|
||||
function updateFiatToSatsConversion(selectedCurrency) {
|
||||
export function updateFiatToSatsConversion(selectedCurrency) {
|
||||
fetch(`https://api.coingecko.com/api/v3/simple/price?ids=bitcoin&vs_currencies=${selectedCurrency}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
@ -12,14 +12,3 @@ function updateFiatToSatsConversion(selectedCurrency) {
|
||||
})
|
||||
.catch(error => console.error(error));
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const currencySelect = document.getElementById('currency-select');
|
||||
const selectedCurrency = currencySelect.value;
|
||||
updateFiatToSatsConversion(selectedCurrency);
|
||||
|
||||
currencySelect.addEventListener('change', () => {
|
||||
const selectedCurrency = currencySelect.value;
|
||||
updateFiatToSatsConversion(selectedCurrency);
|
||||
});
|
||||
});
|
||||
@ -1,12 +0,0 @@
|
||||
// currencySelection.js
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const currencySelect = document.getElementById('currency-select');
|
||||
const satsInputElement = document.getElementById('sats-input');
|
||||
|
||||
currencySelect.addEventListener('change', () => {
|
||||
const selectedCurrency = currencySelect.value;
|
||||
updateBitcoinPrice(selectedCurrency);
|
||||
updateFiatToSatsConversion(selectedCurrency);
|
||||
updateSatsToDollarsConversion(selectedCurrency);
|
||||
});
|
||||
});
|
||||
@ -1,20 +0,0 @@
|
||||
// Function to change the theme based on the selected option
|
||||
function changeTheme() {
|
||||
console.log("changeTheme() called"); // Add this line
|
||||
var themeSelect = document.getElementById("theme-select");
|
||||
var selectedTheme = themeSelect.value;
|
||||
|
||||
// Construct the theme CSS file path based on the selected theme
|
||||
var themeCSSFile = "themes/" + selectedTheme + ".css";
|
||||
|
||||
// Set the theme CSS file as the stylesheet link's href
|
||||
var styleSheet = document.querySelector('link[href^="themes/"]');
|
||||
styleSheet.href = themeCSSFile;
|
||||
}
|
||||
|
||||
// Add an event listener to the theme dropdown to change the theme on selection change
|
||||
document.getElementById("theme-select").addEventListener("change", changeTheme);
|
||||
|
||||
// Initial theme setup when the page loads
|
||||
console.log("Initial theme setup"); // Add this line
|
||||
changeTheme(); // This line was missing in your previous code
|
||||
@ -1,5 +1,56 @@
|
||||
@config "../style/tailwind.config.js";
|
||||
@config "tailwind.config.js";
|
||||
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
@layer base {
|
||||
:root {
|
||||
--color-bgPrimary: rgb(225, 225, 225);
|
||||
--color-bgSecondary: rgb(255, 255, 255);
|
||||
--color-bgInverted: rgb(16, 16, 16);
|
||||
--color-text: rgb(0, 0, 0);
|
||||
--color-textMuted: rgb(100, 100, 100);
|
||||
--color-textInverted: rgb(255, 255, 255);
|
||||
}
|
||||
:root[data-theme="dark"] {
|
||||
--color-bgPrimary: rgb(16, 16, 16);
|
||||
--color-bgSecondary: rgb(40, 40, 40);
|
||||
--color-bgInverted: rgb(225, 225, 225);
|
||||
--color-text: rgb(255, 255, 255);
|
||||
--color-textMuted: rgb(200, 200, 200);
|
||||
--color-textInverted: rgb(16, 16, 16);
|
||||
}
|
||||
:root[data-theme="midnight"] {
|
||||
--color-bgPrimary: rgb(25, 24, 48);
|
||||
--color-bgSecondary: rgb(31, 31, 65);
|
||||
--color-bgInverted: rgb(250, 208, 0);
|
||||
--color-text: rgb(206, 197, 255);
|
||||
--color-textMuted: rgb(102, 241, 255);
|
||||
--color-textInverted: rgb(236, 208, 0);
|
||||
}
|
||||
}
|
||||
|
||||
.loader {
|
||||
border-top-color: #3498db; /* Spinner color */
|
||||
-webkit-animation: spinner 1.5s linear infinite; /* Safari */
|
||||
animation: spinner 1.5s linear infinite;
|
||||
}
|
||||
|
||||
@-webkit-keyframes spinner {
|
||||
0% {
|
||||
-webkit-transform: rotate(0deg);
|
||||
} /* Safari */
|
||||
100% {
|
||||
-webkit-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes spinner {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,585 +0,0 @@
|
||||
/*
|
||||
! tailwindcss v3.3.6 | MIT License | https://tailwindcss.com
|
||||
*/
|
||||
|
||||
/*
|
||||
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
|
||||
2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
|
||||
*/
|
||||
|
||||
*,
|
||||
::before,
|
||||
::after {
|
||||
box-sizing: border-box;
|
||||
/* 1 */
|
||||
border-width: 0;
|
||||
/* 2 */
|
||||
border-style: solid;
|
||||
/* 2 */
|
||||
border-color: #e5e7eb;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
::before,
|
||||
::after {
|
||||
--tw-content: '';
|
||||
}
|
||||
|
||||
/*
|
||||
1. Use a consistent sensible line-height in all browsers.
|
||||
2. Prevent adjustments of font size after orientation changes in iOS.
|
||||
3. Use a more readable tab size.
|
||||
4. Use the user's configured `sans` font-family by default.
|
||||
5. Use the user's configured `sans` font-feature-settings by default.
|
||||
6. Use the user's configured `sans` font-variation-settings by default.
|
||||
*/
|
||||
|
||||
html {
|
||||
line-height: 1.5;
|
||||
/* 1 */
|
||||
-webkit-text-size-adjust: 100%;
|
||||
/* 2 */
|
||||
-moz-tab-size: 4;
|
||||
/* 3 */
|
||||
-o-tab-size: 4;
|
||||
tab-size: 4;
|
||||
/* 3 */
|
||||
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
|
||||
/* 4 */
|
||||
font-feature-settings: normal;
|
||||
/* 5 */
|
||||
font-variation-settings: normal;
|
||||
/* 6 */
|
||||
}
|
||||
|
||||
/*
|
||||
1. Remove the margin in all browsers.
|
||||
2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.
|
||||
*/
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
/* 1 */
|
||||
line-height: inherit;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
1. Add the correct height in Firefox.
|
||||
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
|
||||
3. Ensure horizontal rules are visible by default.
|
||||
*/
|
||||
|
||||
hr {
|
||||
height: 0;
|
||||
/* 1 */
|
||||
color: inherit;
|
||||
/* 2 */
|
||||
border-top-width: 1px;
|
||||
/* 3 */
|
||||
}
|
||||
|
||||
/*
|
||||
Add the correct text decoration in Chrome, Edge, and Safari.
|
||||
*/
|
||||
|
||||
abbr:where([title]) {
|
||||
-webkit-text-decoration: underline dotted;
|
||||
text-decoration: underline dotted;
|
||||
}
|
||||
|
||||
/*
|
||||
Remove the default font size and weight for headings.
|
||||
*/
|
||||
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-size: inherit;
|
||||
font-weight: inherit;
|
||||
}
|
||||
|
||||
/*
|
||||
Reset links to optimize for opt-in styling instead of opt-out.
|
||||
*/
|
||||
|
||||
a {
|
||||
color: inherit;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
|
||||
/*
|
||||
Add the correct font weight in Edge and Safari.
|
||||
*/
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Use the user's configured `mono` font-family by default.
|
||||
2. Use the user's configured `mono` font-feature-settings by default.
|
||||
3. Use the user's configured `mono` font-variation-settings by default.
|
||||
4. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
samp,
|
||||
pre {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||
/* 1 */
|
||||
font-feature-settings: normal;
|
||||
/* 2 */
|
||||
font-variation-settings: normal;
|
||||
/* 3 */
|
||||
font-size: 1em;
|
||||
/* 4 */
|
||||
}
|
||||
|
||||
/*
|
||||
Add the correct font size in all browsers.
|
||||
*/
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
/*
|
||||
Prevent `sub` and `sup` elements from affecting the line height in all browsers.
|
||||
*/
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
|
||||
2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
|
||||
3. Remove gaps between table borders by default.
|
||||
*/
|
||||
|
||||
table {
|
||||
text-indent: 0;
|
||||
/* 1 */
|
||||
border-color: inherit;
|
||||
/* 2 */
|
||||
border-collapse: collapse;
|
||||
/* 3 */
|
||||
}
|
||||
|
||||
/*
|
||||
1. Change the font styles in all browsers.
|
||||
2. Remove the margin in Firefox and Safari.
|
||||
3. Remove default padding in all browsers.
|
||||
*/
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
/* 1 */
|
||||
font-feature-settings: inherit;
|
||||
/* 1 */
|
||||
font-variation-settings: inherit;
|
||||
/* 1 */
|
||||
font-size: 100%;
|
||||
/* 1 */
|
||||
font-weight: inherit;
|
||||
/* 1 */
|
||||
line-height: inherit;
|
||||
/* 1 */
|
||||
color: inherit;
|
||||
/* 1 */
|
||||
margin: 0;
|
||||
/* 2 */
|
||||
padding: 0;
|
||||
/* 3 */
|
||||
}
|
||||
|
||||
/*
|
||||
Remove the inheritance of text transform in Edge and Firefox.
|
||||
*/
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Correct the inability to style clickable types in iOS and Safari.
|
||||
2. Remove default button styles.
|
||||
*/
|
||||
|
||||
button,
|
||||
[type='button'],
|
||||
[type='reset'],
|
||||
[type='submit'] {
|
||||
-webkit-appearance: button;
|
||||
/* 1 */
|
||||
background-color: transparent;
|
||||
/* 2 */
|
||||
background-image: none;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
Use the modern Firefox focus style for all focusable elements.
|
||||
*/
|
||||
|
||||
:-moz-focusring {
|
||||
outline: auto;
|
||||
}
|
||||
|
||||
/*
|
||||
Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
|
||||
*/
|
||||
|
||||
:-moz-ui-invalid {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/*
|
||||
Add the correct vertical alignment in Chrome and Firefox.
|
||||
*/
|
||||
|
||||
progress {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
/*
|
||||
Correct the cursor style of increment and decrement buttons in Safari.
|
||||
*/
|
||||
|
||||
::-webkit-inner-spin-button,
|
||||
::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Correct the odd appearance in Chrome and Safari.
|
||||
2. Correct the outline style in Safari.
|
||||
*/
|
||||
|
||||
[type='search'] {
|
||||
-webkit-appearance: textfield;
|
||||
/* 1 */
|
||||
outline-offset: -2px;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
Remove the inner padding in Chrome and Safari on macOS.
|
||||
*/
|
||||
|
||||
::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Correct the inability to style clickable types in iOS and Safari.
|
||||
2. Change font properties to `inherit` in Safari.
|
||||
*/
|
||||
|
||||
::-webkit-file-upload-button {
|
||||
-webkit-appearance: button;
|
||||
/* 1 */
|
||||
font: inherit;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
Add the correct display in Chrome and Safari.
|
||||
*/
|
||||
|
||||
summary {
|
||||
display: list-item;
|
||||
}
|
||||
|
||||
/*
|
||||
Removes the default spacing and border for appropriate elements.
|
||||
*/
|
||||
|
||||
blockquote,
|
||||
dl,
|
||||
dd,
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
h5,
|
||||
h6,
|
||||
hr,
|
||||
figure,
|
||||
p,
|
||||
pre {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
legend {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
ol,
|
||||
ul,
|
||||
menu {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Reset default styling for dialogs.
|
||||
*/
|
||||
|
||||
dialog {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Prevent resizing textareas horizontally by default.
|
||||
*/
|
||||
|
||||
textarea {
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
|
||||
2. Set the default placeholder color to the user's configured gray 400 color.
|
||||
*/
|
||||
|
||||
input::-moz-placeholder, textarea::-moz-placeholder {
|
||||
opacity: 1;
|
||||
/* 1 */
|
||||
color: #9ca3af;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
input::placeholder,
|
||||
textarea::placeholder {
|
||||
opacity: 1;
|
||||
/* 1 */
|
||||
color: #9ca3af;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
Set the default cursor for buttons.
|
||||
*/
|
||||
|
||||
button,
|
||||
[role="button"] {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/*
|
||||
Make sure disabled buttons don't get the pointer cursor.
|
||||
*/
|
||||
|
||||
:disabled {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
/*
|
||||
1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
|
||||
2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
|
||||
This can trigger a poorly considered lint error in some tools but is included by design.
|
||||
*/
|
||||
|
||||
img,
|
||||
svg,
|
||||
video,
|
||||
canvas,
|
||||
audio,
|
||||
iframe,
|
||||
embed,
|
||||
object {
|
||||
display: block;
|
||||
/* 1 */
|
||||
vertical-align: middle;
|
||||
/* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
|
||||
*/
|
||||
|
||||
img,
|
||||
video {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/* Make elements with the HTML hidden attribute stay hidden by default */
|
||||
|
||||
[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
*, ::before, ::after {
|
||||
--tw-border-spacing-x: 0;
|
||||
--tw-border-spacing-y: 0;
|
||||
--tw-translate-x: 0;
|
||||
--tw-translate-y: 0;
|
||||
--tw-rotate: 0;
|
||||
--tw-skew-x: 0;
|
||||
--tw-skew-y: 0;
|
||||
--tw-scale-x: 1;
|
||||
--tw-scale-y: 1;
|
||||
--tw-pan-x: ;
|
||||
--tw-pan-y: ;
|
||||
--tw-pinch-zoom: ;
|
||||
--tw-scroll-snap-strictness: proximity;
|
||||
--tw-gradient-from-position: ;
|
||||
--tw-gradient-via-position: ;
|
||||
--tw-gradient-to-position: ;
|
||||
--tw-ordinal: ;
|
||||
--tw-slashed-zero: ;
|
||||
--tw-numeric-figure: ;
|
||||
--tw-numeric-spacing: ;
|
||||
--tw-numeric-fraction: ;
|
||||
--tw-ring-inset: ;
|
||||
--tw-ring-offset-width: 0px;
|
||||
--tw-ring-offset-color: #fff;
|
||||
--tw-ring-color: rgb(59 130 246 / 0.5);
|
||||
--tw-ring-offset-shadow: 0 0 #0000;
|
||||
--tw-ring-shadow: 0 0 #0000;
|
||||
--tw-shadow: 0 0 #0000;
|
||||
--tw-shadow-colored: 0 0 #0000;
|
||||
--tw-blur: ;
|
||||
--tw-brightness: ;
|
||||
--tw-contrast: ;
|
||||
--tw-grayscale: ;
|
||||
--tw-hue-rotate: ;
|
||||
--tw-invert: ;
|
||||
--tw-saturate: ;
|
||||
--tw-sepia: ;
|
||||
--tw-drop-shadow: ;
|
||||
--tw-backdrop-blur: ;
|
||||
--tw-backdrop-brightness: ;
|
||||
--tw-backdrop-contrast: ;
|
||||
--tw-backdrop-grayscale: ;
|
||||
--tw-backdrop-hue-rotate: ;
|
||||
--tw-backdrop-invert: ;
|
||||
--tw-backdrop-opacity: ;
|
||||
--tw-backdrop-saturate: ;
|
||||
--tw-backdrop-sepia: ;
|
||||
}
|
||||
|
||||
::backdrop {
|
||||
--tw-border-spacing-x: 0;
|
||||
--tw-border-spacing-y: 0;
|
||||
--tw-translate-x: 0;
|
||||
--tw-translate-y: 0;
|
||||
--tw-rotate: 0;
|
||||
--tw-skew-x: 0;
|
||||
--tw-skew-y: 0;
|
||||
--tw-scale-x: 1;
|
||||
--tw-scale-y: 1;
|
||||
--tw-pan-x: ;
|
||||
--tw-pan-y: ;
|
||||
--tw-pinch-zoom: ;
|
||||
--tw-scroll-snap-strictness: proximity;
|
||||
--tw-gradient-from-position: ;
|
||||
--tw-gradient-via-position: ;
|
||||
--tw-gradient-to-position: ;
|
||||
--tw-ordinal: ;
|
||||
--tw-slashed-zero: ;
|
||||
--tw-numeric-figure: ;
|
||||
--tw-numeric-spacing: ;
|
||||
--tw-numeric-fraction: ;
|
||||
--tw-ring-inset: ;
|
||||
--tw-ring-offset-width: 0px;
|
||||
--tw-ring-offset-color: #fff;
|
||||
--tw-ring-color: rgb(59 130 246 / 0.5);
|
||||
--tw-ring-offset-shadow: 0 0 #0000;
|
||||
--tw-ring-shadow: 0 0 #0000;
|
||||
--tw-shadow: 0 0 #0000;
|
||||
--tw-shadow-colored: 0 0 #0000;
|
||||
--tw-blur: ;
|
||||
--tw-brightness: ;
|
||||
--tw-contrast: ;
|
||||
--tw-grayscale: ;
|
||||
--tw-hue-rotate: ;
|
||||
--tw-invert: ;
|
||||
--tw-saturate: ;
|
||||
--tw-sepia: ;
|
||||
--tw-drop-shadow: ;
|
||||
--tw-backdrop-blur: ;
|
||||
--tw-backdrop-brightness: ;
|
||||
--tw-backdrop-contrast: ;
|
||||
--tw-backdrop-grayscale: ;
|
||||
--tw-backdrop-hue-rotate: ;
|
||||
--tw-backdrop-invert: ;
|
||||
--tw-backdrop-opacity: ;
|
||||
--tw-backdrop-saturate: ;
|
||||
--tw-backdrop-sepia: ;
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@media (min-width: 640px) {
|
||||
.container {
|
||||
max-width: 640px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.container {
|
||||
max-width: 768px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.container {
|
||||
max-width: 1024px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1280px) {
|
||||
.container {
|
||||
max-width: 1280px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1536px) {
|
||||
.container {
|
||||
max-width: 1536px;
|
||||
}
|
||||
}
|
||||
|
||||
.bg-white {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
||||
}
|
||||
|
||||
.bg-black {
|
||||
--tw-bg-opacity: 1;
|
||||
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
|
||||
}
|
||||
@ -2,8 +2,16 @@
|
||||
module.exports = {
|
||||
content: ["./**/*.{html,js}"],
|
||||
theme: {
|
||||
extend: {},
|
||||
extend: {
|
||||
colors: {
|
||||
bgPrimary: "var(--color-bgPrimary)",
|
||||
bgSecondary:"var(--color-bgSecondary)",
|
||||
bgInverted: "var(--color-bgInverted)",
|
||||
text: "var(--color-text)",
|
||||
textMuted: "var(--color-textMuted)",
|
||||
textInverted: "var(--color-textInverted)",
|
||||
}
|
||||
},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
@ -28,7 +28,7 @@ class MainActivity : AppCompatActivity() {
|
||||
webView.clearCache(true)
|
||||
|
||||
// Initialize with the default theme
|
||||
currentThemeCSSCode = loadThemeCSS("themes/Dark.css")
|
||||
currentThemeCSSCode = loadThemeCSS("style/output.css")
|
||||
loadWebViewWithTheme(currentThemeCSSCode)
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
// Load the HTML content
|
||||
val htmlContent = try {
|
||||
assetManager.open("app.html").bufferedReader().use { it.readText() }
|
||||
assetManager.open("index.html").bufferedReader().use { it.readText() }
|
||||
} catch (e: IOException) {
|
||||
e.printStackTrace()
|
||||
"<html><body><h1>Error loading HTML</h1></body></html>"
|
||||
@ -46,11 +46,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
// Load all styles from the 'styles' directory
|
||||
val styleFiles = listOf(
|
||||
"styles/settings.css",
|
||||
"styles/bitcoinPrice.css",
|
||||
"styles/exchange.css",
|
||||
"styles/fiatToSats.css",
|
||||
"styles/satsToFiat.css"
|
||||
"style/output.css",
|
||||
)
|
||||
|
||||
val styleContents = styleFiles.map { fileName ->
|
||||
@ -64,11 +60,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
// Load the JavaScript code
|
||||
val scriptFiles = listOf(
|
||||
"scripts/selectTheme.js",
|
||||
"scripts/viewBitcoinPrice.js",
|
||||
"scripts/viewFiatToSats.js",
|
||||
"scripts/selectCurrency.js",
|
||||
"scripts/calcSatsToFiat.js"
|
||||
"js/main.js",
|
||||
)
|
||||
|
||||
val scriptContents = scriptFiles.map { fileName ->
|
||||
@ -80,31 +72,6 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
val cssFiles = listOf(
|
||||
"style/output.css"
|
||||
//"themes/Dark.css",
|
||||
//"themes/Midnight.css",
|
||||
//"themes/Lava.css",
|
||||
//"themes/Solar.css",
|
||||
//"styles/settings.css",
|
||||
//"styles/bitcoinPrice.css",
|
||||
//"styles/exchange.css",
|
||||
//"styles/fiatToSats.css",
|
||||
//"styles/satsToFiat.css"
|
||||
) // List of your CSS files
|
||||
|
||||
val cssCode = cssFiles.joinToString("\n") { fileName ->
|
||||
try {
|
||||
assetManager.open(fileName).bufferedReader().use { it.readText() }
|
||||
} catch (e: IOException) {
|
||||
e.printStackTrace()
|
||||
"/* Error loading $fileName */"
|
||||
}
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> 444601f0cb9165b77f4c460bdf72f1cb567eb544
|
||||
val javaScriptCode = scriptContents.joinToString("\n")
|
||||
|
||||
// Combine the HTML, CSS, and JavaScript code
|
||||
|
||||
Loading…
Reference in New Issue
Block a user