Skip to content

Fix iOS sharing on iPad. #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hiebeler merged 3 commits into from
Apr 4, 2025
Merged

Fix iOS sharing on iPad. #293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
401cc1e
Fix iOS sharing on iPad.
terrakok Apr 2, 2025
d2ec3c2
Use context.viewController instead of global window.
terrakok Apr 2, 2025
788a0fd
Refactor popoverPresentationController config
terrakok Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions app/src/iosMain/kotlin/com/daniebeler/pfpixelix/domain/service/platform/Platform.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ import co.touchlab.kermit.Logger
import com.daniebeler.pfpixelix.domain.service.preferences.UserPreferences
import com.daniebeler.pfpixelix.utils.KmpContext
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.useContents
import me.tatarka.inject.annotations.Inject
import platform.CoreGraphics.CGRectMake
import platform.Foundation.NSBundle
import platform.Foundation.NSURL
import platform.Foundation.NSURL.Companion.URLWithString
import platform.SafariServices.SFSafariViewController
import platform.UIKit.UIActivityViewController
import platform.UIKit.UIApplication
import platform.UIKit.UIDevice
import platform.UIKit.*
import platform.UIKit.UIUserInterfaceIdiom
import platform.UIKit.UIUserInterfaceIdiomPad
import platform.UIKit.popoverPresentationController

@Inject
actual class Platform actual constructor(
Expand All @@ -24,10 +25,11 @@ actual class Platform actual constructor(
actual fun openUrl(url: String) {
if (prefs.useInAppBrowser) {
val safariViewController = SFSafariViewController(uRL = NSURL(string = url))
UIApplication.sharedApplication.keyWindow?.rootViewController?.presentViewController(
safariViewController,
val self = context.viewController
self.presentViewController(
viewControllerToPresent = safariViewController,
animated = true,
null
completion = null
)

} else {
Expand All @@ -41,7 +43,8 @@ actual class Platform actual constructor(

actual fun dismissBrowser() {
if (prefs.useInAppBrowser) {
UIApplication.sharedApplication.keyWindow?.rootViewController?.dismissModalViewControllerAnimated(true)
val self = context.viewController
self.dismissModalViewControllerAnimated(true)
}
}

Expand All @@ -54,7 +57,11 @@ actual class Platform actual constructor(
)
if (isIpad()) {
Logger.d("share on iPad")
vc.popoverPresentationController?.sourceView = self.view
vc.popoverPresentationController?.apply {
sourceView = self.view
sourceRect = self.view.center.useContents { CGRectMake(x, y, 0.0, 0.0) }
permittedArrowDirections = 0uL
}
}
self.presentViewController(vc, true, null)
}
Expand Down