From 2e880a65f25841da379aa420e865ce9f3cdfc2fc Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:39:31 +0900 Subject: [PATCH 1/4] :wrench: The issue where the bottom navigation overlapped with the Create Profile button and made it difficult to press has been fixed. --- .../confsched/profilecard/ProfileCardViewController.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt index eaf2053ab..5a4ef00ce 100644 --- a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt +++ b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt @@ -1,5 +1,7 @@ package io.github.droidkaigi.confsched.profilecard +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.ui.unit.dp import io.github.droidkaigi.confsched.compose.EventFlow import io.github.droidkaigi.confsched.data.Repositories import io.github.droidkaigi.confsched.droidkaigiui.composeViewController @@ -22,6 +24,10 @@ fun profileCardViewController( imageBitmap.toUiImage() ?: UIImage(), ) }, + // FIXME This is a workaround. For permanent support, we will get the inset value etc. from the iOS side and respond. + contentPadding = PaddingValues( + bottom = 30.dp, + ) ) } From 91e579064d4a4c4576a8c29ae405b87a29871cfd Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:39:53 +0900 Subject: [PATCH 2/4] :wrench: ./gradlew detekt --auto-correct --- .../confsched/profilecard/ProfileCardViewController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt index 5a4ef00ce..af4ff13d6 100644 --- a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt +++ b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt @@ -27,7 +27,7 @@ fun profileCardViewController( // FIXME This is a workaround. For permanent support, we will get the inset value etc. from the iOS side and respond. contentPadding = PaddingValues( bottom = 30.dp, - ) + ), ) } From 1ce0c91d9af3c76dffed1337874d97d0e6b8c938 Mon Sep 17 00:00:00 2001 From: Todayama_R <13657682+Corvus400@users.noreply.github.com> Date: Tue, 3 Sep 2024 02:54:44 +0900 Subject: [PATCH 3/4] Update feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt Co-authored-by: Takahiro Menju --- .../confsched/profilecard/ProfileCardViewController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt index af4ff13d6..4bcd8b759 100644 --- a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt +++ b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt @@ -26,7 +26,7 @@ fun profileCardViewController( }, // FIXME This is a workaround. For permanent support, we will get the inset value etc. from the iOS side and respond. contentPadding = PaddingValues( - bottom = 30.dp, + bottom = 30.dp, // Hight of bottom tab bar ), ) } From 21566bc377da497420448dae1a11d59da773a568 Mon Sep 17 00:00:00 2001 From: todayama_r <13657682+Corvus400@users.noreply.github.com> Date: Tue, 3 Sep 2024 02:55:38 +0900 Subject: [PATCH 4/4] :wrench: Fix typo. --- .../confsched/profilecard/ProfileCardViewController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt index 4bcd8b759..798e8ebaa 100644 --- a/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt +++ b/feature/profilecard/src/iosMain/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardViewController.kt @@ -26,7 +26,7 @@ fun profileCardViewController( }, // FIXME This is a workaround. For permanent support, we will get the inset value etc. from the iOS side and respond. contentPadding = PaddingValues( - bottom = 30.dp, // Hight of bottom tab bar + bottom = 30.dp, // Height of bottom tab bar ), ) }