From 4f7602884a017f5d59b9b5f4f4355c1f4d2bbac0 Mon Sep 17 00:00:00 2001 From: webfussel Date: Tue, 5 Aug 2025 16:00:28 +0200 Subject: [PATCH] fix: inner paddings for sections --- app/build.gradle.kts | 2 +- .../de/webfussel/soulecho/MainActivity.kt | 3 ++- .../de/webfussel/soulecho/mood/Section.kt | 27 ++++++++----------- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 07fe8ef..cd501f9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ android { defaultConfig { applicationId = "de.webfussel.soulecho" - minSdk = 33 + minSdk = 30 targetSdk = 35 versionCode = 1 versionName = "1.0" diff --git a/app/src/main/java/de/webfussel/soulecho/MainActivity.kt b/app/src/main/java/de/webfussel/soulecho/MainActivity.kt index 1549140..efae831 100644 --- a/app/src/main/java/de/webfussel/soulecho/MainActivity.kt +++ b/app/src/main/java/de/webfussel/soulecho/MainActivity.kt @@ -53,7 +53,8 @@ fun SoulEchoApp(moodViewModel: MoodViewModel) { coroutineScope.launch { moodViewModel.saveMood(it) } - } + }, + paddingValues = paddingValues, ) } "history" -> { diff --git a/app/src/main/java/de/webfussel/soulecho/mood/Section.kt b/app/src/main/java/de/webfussel/soulecho/mood/Section.kt index 03a0df1..c3e6043 100644 --- a/app/src/main/java/de/webfussel/soulecho/mood/Section.kt +++ b/app/src/main/java/de/webfussel/soulecho/mood/Section.kt @@ -1,40 +1,35 @@ package de.webfussel.soulecho.mood -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.* import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.res.painterResource import androidx.compose.material3.Text -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue +import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import de.webfussel.soulecho.LocalMoodState -import de.webfussel.soulecho.mood.Moods.getMoodById import de.webfussel.soulecho.R +import de.webfussel.soulecho.mood.Moods.getMoodById @Composable fun MoodSection( - onMoodChange: (MoodWithInfo) -> Unit = {} + onMoodChange: (MoodWithInfo) -> Unit = {}, + paddingValues: PaddingValues = PaddingValues(0.dp), ) { val currentMood = LocalMoodState.current var dialogOpen by remember { mutableStateOf(false) } val theme = MaterialTheme.colorScheme - Box(modifier = Modifier.fillMaxSize()) { + Box( + modifier = Modifier + .fillMaxSize() + .padding(paddingValues) + ) { Column( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e2cc10..41c2a65 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.10.1" +agp = "8.11.0" kotlin = "2.0.21" coreKtx = "1.10.1" junit = "4.13.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19086b4..4936541 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jul 31 07:35:58 CEST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists