From 228cde3d6c9ea7bded87c29a6f417993b028639f Mon Sep 17 00:00:00 2001 From: Igor Escodro Date: Mon, 22 Apr 2024 19:49:54 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9E=20Fix=20Bottom=20Sheet=20is=20?= =?UTF-8?q?not=20following=20the=20App=20Theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A recent change to add the alarm option in the Bottom Sheet broke the background color. In removed the manual background color relying that the MaterialTheme would work but didn't test it properly. Closes #662 --- .../com/escodro/task/presentation/add/TaskBottomSheet.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/features/task/src/commonMain/kotlin/com/escodro/task/presentation/add/TaskBottomSheet.kt b/features/task/src/commonMain/kotlin/com/escodro/task/presentation/add/TaskBottomSheet.kt index c21598a1d..ac504cc64 100644 --- a/features/task/src/commonMain/kotlin/com/escodro/task/presentation/add/TaskBottomSheet.kt +++ b/features/task/src/commonMain/kotlin/com/escodro/task/presentation/add/TaskBottomSheet.kt @@ -1,11 +1,13 @@ package com.escodro.task.presentation.add +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -44,6 +46,7 @@ internal fun AddTaskBottomSheet( modifier = Modifier .fillMaxWidth() .fillMaxWidth(0.5f) + .background(MaterialTheme.colorScheme.surface) .padding(16.dp), verticalArrangement = Arrangement.SpaceAround, ) { From f8f8796b7dd8a2f67a5ad392690349617837e1c9 Mon Sep 17 00:00:00 2001 From: Igor Escodro Date: Tue, 23 Apr 2024 18:28:29 -0400 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=96=20Release=20Alkaa=203.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New version released --- gradle/libs.versions.toml | 4 ++-- ios-app/alkaa.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5caf7a19c..e83606ca9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # Project -version_code = "30003" -version_name = "3.0.3" +version_code = "30004" +version_name = "3.0.4" android_gradle_plugin = "8.3.2" kotlin = "1.9.23" android_sdk_compile = "34" diff --git a/ios-app/alkaa.xcodeproj/project.pbxproj b/ios-app/alkaa.xcodeproj/project.pbxproj index f744cf885..0bf17ad8f 100644 --- a/ios-app/alkaa.xcodeproj/project.pbxproj +++ b/ios-app/alkaa.xcodeproj/project.pbxproj @@ -335,7 +335,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 30003; + CURRENT_PROJECT_VERSION = 30004; DEVELOPMENT_ASSET_PATHS = "\"alkaa/Preview Content\""; DEVELOPMENT_TEAM = 5Z3927U4ZC; ENABLE_PREVIEWS = YES; @@ -354,7 +354,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.0.3; + MARKETING_VERSION = 3.0.4; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -377,7 +377,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 30003; + CURRENT_PROJECT_VERSION = 30004; DEVELOPMENT_ASSET_PATHS = "\"alkaa/Preview Content\""; DEVELOPMENT_TEAM = 5Z3927U4ZC; ENABLE_PREVIEWS = YES; @@ -396,7 +396,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.0.3; + MARKETING_VERSION = 3.0.4; OTHER_LDFLAGS = ( "$(inherited)", "-framework",