From b623f3fb75cb5fe464b2c3f98087d6ffe24ca048 Mon Sep 17 00:00:00 2001 From: Ruben <ruben@rubend.nl> Date: Mon, 4 Nov 2024 16:31:44 +0100 Subject: [PATCH] Added padding. --- .../queuetimes/ExampleInstrumentedTest.kt | 24 ------------------- .../nl/rubend/queuetimes/data/park/Ride.kt | 4 +++- .../rubend/queuetimes/data/parks/ParkInfo.kt | 10 +++++--- .../nl/rubend/queuetimes/ExampleUnitTest.kt | 17 ------------- 4 files changed, 10 insertions(+), 45 deletions(-) delete mode 100644 app/src/androidTest/java/nl/rubend/queuetimes/ExampleInstrumentedTest.kt delete mode 100644 app/src/test/java/nl/rubend/queuetimes/ExampleUnitTest.kt diff --git a/app/src/androidTest/java/nl/rubend/queuetimes/ExampleInstrumentedTest.kt b/app/src/androidTest/java/nl/rubend/queuetimes/ExampleInstrumentedTest.kt deleted file mode 100644 index f9d32b1..0000000 --- a/app/src/androidTest/java/nl/rubend/queuetimes/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package nl.rubend.queuetimes - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("nl.rubend.queuetimes", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/java/nl/rubend/queuetimes/data/park/Ride.kt b/app/src/main/java/nl/rubend/queuetimes/data/park/Ride.kt index aeb9ed0..44d9caa 100644 --- a/app/src/main/java/nl/rubend/queuetimes/data/park/Ride.kt +++ b/app/src/main/java/nl/rubend/queuetimes/data/park/Ride.kt @@ -3,11 +3,13 @@ package nl.rubend.queuetimes.data.park import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.absolutePadding import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp import kotlinx.datetime.Instant import kotlinx.serialization.Serializable import nl.rubend.queuetimes.components.timeView @@ -23,7 +25,7 @@ data class Ride( @Composable fun compose() { Row(modifier=if(!is_open) Modifier.background(Color.Red) else Modifier) { - Text(name, overflow= TextOverflow.Ellipsis, modifier=Modifier.weight(1f), maxLines=1) + Text(name, overflow= TextOverflow.Ellipsis, modifier=Modifier.absolutePadding(left = 10.dp).weight(1f), maxLines=1) Spacer(Modifier) timeView(wait_time) // Text("updated at ${ride.last_updated.toLocalDateTime(TimeZone.currentSystemDefault())}") diff --git a/app/src/main/java/nl/rubend/queuetimes/data/parks/ParkInfo.kt b/app/src/main/java/nl/rubend/queuetimes/data/parks/ParkInfo.kt index c31d2a8..8b72907 100644 --- a/app/src/main/java/nl/rubend/queuetimes/data/parks/ParkInfo.kt +++ b/app/src/main/java/nl/rubend/queuetimes/data/parks/ParkInfo.kt @@ -1,10 +1,12 @@ package nl.rubend.queuetimes.data.parks import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.absolutePadding import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp import kotlinx.serialization.Serializable import nl.rubend.queuetimes.ParkStore @@ -22,9 +24,11 @@ data class ParkInfo( fun compose() { val store = ParkStore(LocalContext.current) Text( - modifier=Modifier.clickable { - store.savePark(this) - }, + modifier= Modifier + .absolutePadding(left = 10.dp) + .clickable { + store.savePark(this) + }, text=name ) } diff --git a/app/src/test/java/nl/rubend/queuetimes/ExampleUnitTest.kt b/app/src/test/java/nl/rubend/queuetimes/ExampleUnitTest.kt deleted file mode 100644 index fae7365..0000000 --- a/app/src/test/java/nl/rubend/queuetimes/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package nl.rubend.queuetimes - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file -- GitLab