From 51c71aae912036dd3d94acd4b4d7d7ba3a141ad3 Mon Sep 17 00:00:00 2001 From: takahirom Date: Tue, 20 Aug 2024 22:34:00 +0900 Subject: [PATCH] Fix ios kmp resource issue --- app-ios/App/App.xcodeproj/project.pbxproj | 4 +++- .../droidkaigi/confsched/ui/PresenterDefaultsProvider.kt | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app-ios/App/App.xcodeproj/project.pbxproj b/app-ios/App/App.xcodeproj/project.pbxproj index 75c9839e4..e727d8744 100644 --- a/app-ios/App/App.xcodeproj/project.pbxproj +++ b/app-ios/App/App.xcodeproj/project.pbxproj @@ -173,7 +173,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/zsh; - shellScript = "cd ${SRCROOT}/../..\n./gradlew assembleSharedXCFramework --no-configuration-cache\n"; + shellScript = "cd ${SRCROOT}/../..\n./gradlew embedAndSignAppleFrameworkForXcode --no-configuration-cache\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -315,6 +315,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Preview Content\""; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "DroidKaigi2024App-Info.plist"; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; @@ -354,6 +355,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Preview Content\""; ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "DroidKaigi2024App-Info.plist"; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; diff --git a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt index c302b5b5f..06b48b803 100644 --- a/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt +++ b/core/ui/src/commonMain/kotlin/io/github/droidkaigi/confsched/ui/PresenterDefaultsProvider.kt @@ -1,7 +1,10 @@ package io.github.droidkaigi.confsched.ui import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.Density import io.github.droidkaigi.confsched.compose.ComposeEffectErrorHandler import io.github.droidkaigi.confsched.compose.LocalComposeEffectErrorHandler import io.github.droidkaigi.confsched.compose.compositionLocalProviderWithReturnValue @@ -11,7 +14,10 @@ fun providePresenterDefaults( userMessageStateHolder: UserMessageStateHolder = rememberUserMessageStateHolder(), block: @Composable (UserMessageStateHolder) -> T, ): T { - val composeResourceErrorMessages = composeResourceErrorMessages() + var composeResourceErrorMessages: List = listOf() + CompositionLocalProvider(LocalDensity provides Density(1F)) { + composeResourceErrorMessages = composeResourceErrorMessages() + } val handler = remember(userMessageStateHolder) { object : ComposeEffectErrorHandler { override suspend fun emit(throwable: Throwable) {