diff --git a/.idea/.name b/.idea/.name index 7880ec9..42b21d1 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Sats Monitor \ No newline at end of file +SatWorth \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6857fa5..9992b44 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,9 +34,9 @@ android { dependencies { - implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.core:core-ktx:1.10.1") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.8.0") + implementation("com.google.android.material:material:1.9.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba730a6..7afdfa3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,13 +16,16 @@ tools:targetApi="31"> + android:exported="true" + android:windowSoftInputMode="adjustPan"> + + diff --git a/app/src/main/assets/scripts/transformExchange.js b/app/src/main/assets/scripts/transformExchange.js deleted file mode 100644 index b235592..0000000 --- a/app/src/main/assets/scripts/transformExchange.js +++ /dev/null @@ -1,15 +0,0 @@ - let initialHeight = window.innerHeight; - - function adjustExchangePosition() { - const currentHeight = window.innerHeight; - const heightDifference = initialHeight - currentHeight; - const exchangeElement = document.getElementById('exchange'); - - if (heightDifference > 0) { - exchangeElement.style.transform = `translate(0, ${heightDifference}px)`; - } else { - exchangeElement.style.transform = 'translate(0, 0)'; - } - } - - window.addEventListener('resize', adjustExchangePosition); \ No newline at end of file diff --git a/app/src/main/assets/style.css b/app/src/main/assets/style.css index 6942b93..18e5dce 100644 --- a/app/src/main/assets/style.css +++ b/app/src/main/assets/style.css @@ -1,13 +1,14 @@ /* CSS styles for the Bitcoin Price Tracker */ body { margin: 0; - padding: 0; + padding-left: 20px; + padding-right: 20px; background: #202020; color: #ffffff; font-family: monospace, Arial; font-size: 12px; font-feature-settings: normal; - overflow: hidden; + overflow-x: hidden; text-align: center; } @@ -29,8 +30,6 @@ a:hover { .container { width: auto; - margin-left: 20px; - margin-right: 20px; margin-top: 20px; background-color: #282828; border: 3px solid #ccc; @@ -72,8 +71,6 @@ a:hover { #dollars-to-sats { width: auto; - margin-left: 20px; - margin-right: 20px; margin-top: 20px; background-color: #282828; border: 3px solid #ccc; @@ -90,8 +87,6 @@ a:hover { .satstodollars { width: auto; - margin-left: 20px; - margin-right: 20px; margin-top: 20px; background-color: #282828; border: 3px solid #ccc; @@ -106,7 +101,7 @@ a:hover { font-size: 18px; border-radius: 7px; font-family: monospace; - background: #282828; + background: #101010; font-style: bolder; color: #f7931a; margin-right: 5px; @@ -118,7 +113,7 @@ a:hover { #exchange { border: 2px solid #ffffff; border-radius: 10px; - padding: 20px; + padding: 10px; text-align: center; position: fixed; bottom: 10px; @@ -138,8 +133,8 @@ a:hover { } .app-image img { - width: 30px; - height: 30px; + width: 40px; + height: 40px; border-radius: 8px; border: 1px solid #909090; } \ No newline at end of file diff --git a/app/src/main/assets/styles/settings.css b/app/src/main/assets/styles/settings.css index f2045b9..8c0863f 100644 --- a/app/src/main/assets/styles/settings.css +++ b/app/src/main/assets/styles/settings.css @@ -1,7 +1,5 @@ .settings { width: auto; - margin-left: 20px; - margin-right: 20px; margin-top: 20px; display: flex; align-items: center; @@ -15,11 +13,12 @@ .settings img { width: 25px; height: 25px; - margin-bottom: 10px; + margin-bottom: 20px; + margin-right: 10px; /* Add margin to separate cog image from dropdowns */ } .cog-image { - margin-right: 20px; /* Add margin to separate cog image from dropdowns */ + } .theme-dropdown, diff --git a/app/src/main/java/com/example/satworth/MainActivity.kt b/app/src/main/java/com/example/satworth/MainActivity.kt index 491cf23..d04c759 100644 --- a/app/src/main/java/com/example/satworth/MainActivity.kt +++ b/app/src/main/java/com/example/satworth/MainActivity.kt @@ -36,7 +36,7 @@ class MainActivity : AppCompatActivity() { } val assetManager = assets - val scriptFiles = listOf("scripts/viewBitcoinPrice.js", "scripts/viewFiatToSats.js", "scripts/selectCurrency.js", "scripts/calcSatsToFiat.js","scripts/transformExchange.js") + val scriptFiles = listOf("scripts/viewBitcoinPrice.js", "scripts/viewFiatToSats.js", "scripts/selectCurrency.js", "scripts/calcSatsToFiat.js") val scriptContents = scriptFiles.map { fileName -> try { diff --git a/settings.gradle.kts b/settings.gradle.kts index 41fa99a..e9150cc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,5 +13,5 @@ dependencyResolutionManagement { } } -rootProject.name = "Sats Monitor" +rootProject.name = "SatWorth" include(":app")