added softunput to manifest, removed js for exchange window

This commit is contained in:
0ceanSlim 2023-08-11 13:26:23 -04:00
parent 86706f60e1
commit 084581a02b
8 changed files with 19 additions and 37 deletions

View File

@ -1 +1 @@
Sats Monitor SatWorth

View File

@ -34,9 +34,9 @@ android {
dependencies { 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("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") implementation("androidx.constraintlayout:constraintlayout:2.1.4")
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.ext:junit:1.1.5")

View File

@ -16,13 +16,16 @@
tools:targetApi="31"> tools:targetApi="31">
<activity <activity
android:name="com.example.satworth.MainActivity" android:name="com.example.satworth.MainActivity"
android:exported="true"> android:exported="true"
android:windowSoftInputMode="adjustPan">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>
</manifest> </manifest>

View File

@ -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);

View File

@ -1,13 +1,14 @@
/* CSS styles for the Bitcoin Price Tracker */ /* CSS styles for the Bitcoin Price Tracker */
body { body {
margin: 0; margin: 0;
padding: 0; padding-left: 20px;
padding-right: 20px;
background: #202020; background: #202020;
color: #ffffff; color: #ffffff;
font-family: monospace, Arial; font-family: monospace, Arial;
font-size: 12px; font-size: 12px;
font-feature-settings: normal; font-feature-settings: normal;
overflow: hidden; overflow-x: hidden;
text-align: center; text-align: center;
} }
@ -29,8 +30,6 @@ a:hover {
.container { .container {
width: auto; width: auto;
margin-left: 20px;
margin-right: 20px;
margin-top: 20px; margin-top: 20px;
background-color: #282828; background-color: #282828;
border: 3px solid #ccc; border: 3px solid #ccc;
@ -72,8 +71,6 @@ a:hover {
#dollars-to-sats { #dollars-to-sats {
width: auto; width: auto;
margin-left: 20px;
margin-right: 20px;
margin-top: 20px; margin-top: 20px;
background-color: #282828; background-color: #282828;
border: 3px solid #ccc; border: 3px solid #ccc;
@ -90,8 +87,6 @@ a:hover {
.satstodollars { .satstodollars {
width: auto; width: auto;
margin-left: 20px;
margin-right: 20px;
margin-top: 20px; margin-top: 20px;
background-color: #282828; background-color: #282828;
border: 3px solid #ccc; border: 3px solid #ccc;
@ -106,7 +101,7 @@ a:hover {
font-size: 18px; font-size: 18px;
border-radius: 7px; border-radius: 7px;
font-family: monospace; font-family: monospace;
background: #282828; background: #101010;
font-style: bolder; font-style: bolder;
color: #f7931a; color: #f7931a;
margin-right: 5px; margin-right: 5px;
@ -118,7 +113,7 @@ a:hover {
#exchange { #exchange {
border: 2px solid #ffffff; border: 2px solid #ffffff;
border-radius: 10px; border-radius: 10px;
padding: 20px; padding: 10px;
text-align: center; text-align: center;
position: fixed; position: fixed;
bottom: 10px; bottom: 10px;
@ -138,8 +133,8 @@ a:hover {
} }
.app-image img { .app-image img {
width: 30px; width: 40px;
height: 30px; height: 40px;
border-radius: 8px; border-radius: 8px;
border: 1px solid #909090; border: 1px solid #909090;
} }

View File

@ -1,7 +1,5 @@
.settings { .settings {
width: auto; width: auto;
margin-left: 20px;
margin-right: 20px;
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
@ -15,11 +13,12 @@
.settings img { .settings img {
width: 25px; width: 25px;
height: 25px; height: 25px;
margin-bottom: 10px; margin-bottom: 20px;
margin-right: 10px; /* Add margin to separate cog image from dropdowns */
} }
.cog-image { .cog-image {
margin-right: 20px; /* Add margin to separate cog image from dropdowns */
} }
.theme-dropdown, .theme-dropdown,

View File

@ -36,7 +36,7 @@ class MainActivity : AppCompatActivity() {
} }
val assetManager = assets 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 -> val scriptContents = scriptFiles.map { fileName ->
try { try {

View File

@ -13,5 +13,5 @@ dependencyResolutionManagement {
} }
} }
rootProject.name = "Sats Monitor" rootProject.name = "SatWorth"
include(":app") include(":app")