Skip to content
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

✨ [Compose Multiplatform] License screen can now be opened. #820

Merged
merged 7 commits into from
Aug 27, 2024
Merged

✨ [Compose Multiplatform] License screen can now be opened. #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4ee644
:sparkles: Added implementation to open the license screen from Compo…
Corvus400 Aug 26, 2024
a87af08
:wrench: Changed the usage of onLicenseScreenRequest.
Corvus400 Aug 26, 2024
29b9ca7
:wrench: Changed to not use keyWindow.
Corvus400 Aug 26, 2024
06d5539
Merge branch 'main' into feature/can_be_display_license_screen_compos…
Corvus400 Aug 27, 2024
86ca73a
Merge branch 'main' of github.com:Corvus400/conference-app-2024 into …
Corvus400 Aug 27, 2024
528094e
Merge branch 'main' into feature/can_be_display_license_screen_compos…
Corvus400 Aug 27, 2024
9a7e493
:recycle: I had to add the necessary dependencies to run the tests, s…
Corvus400 Aug 27, 2024
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
13 changes: 12 additions & 1 deletion ...-shared/src/commonMain/kotlin/io/github/droidkaigi/confsched/shared/IosComposeKaigiApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,18 @@ import platform.UIKit.UIApplication
import platform.UIKit.UIViewController
import platform.darwin.NSObject

private object ExternalNavControllerLink {
var onLicenseScreenRequest: (() -> Unit)? = null
}
Comment on lines +82 to +84
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not like this implementation very much. 🤔
If there is a better way to implement it, we will follow it. 🫡


@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
@Suppress("UNUSED")
fun kaigiAppController(
repositories: Repositories,
onLicenseScreenRequest: () -> Unit,
): UIViewController = ComposeUIViewController {
ExternalNavControllerLink.onLicenseScreenRequest = onLicenseScreenRequest

CompositionLocalProvider(
LocalRepositories provides repositories.map
) {
Expand Down Expand Up @@ -207,7 +214,7 @@ private fun NavGraphBuilder.mainScreen(
}

AboutItem.Contributors -> navController.navigate(contributorsScreenRoute)
AboutItem.License -> {} //externalNavController.navigateToLicenseScreen()
AboutItem.License -> externalNavController.navigateToLicenseScreen()
AboutItem.Medium -> externalNavController.navigate(
url = "https://medium.com/droidkaigi",
)
Expand Down Expand Up @@ -295,6 +302,10 @@ private class ExternalNavController(
UIApplication.sharedApplication.openURL(nsUrl)
}

fun navigateToLicenseScreen() {
ExternalNavControllerLink.onLicenseScreenRequest?.invoke()
}

/**
* Navigate to Calendar Registration
*/
Expand Down
3 changes: 2 additions & 1 deletion app-ios/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ let package = Package(
.firebaseAuth,
.firebaseRemoteConfig,
.tca,
.model
.model,
.licenseList,
]
),

Expand Down
16 changes: 15 additions & 1 deletion app-ios/Sources/KMPClient/Views/KmpAppComposeViewControllerWrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import SwiftUI
import LicenseList
@preconcurrency import shared

public struct KmpAppComposeViewControllerWrapper: UIViewControllerRepresentable {
Expand All @@ -8,10 +9,23 @@ public struct KmpAppComposeViewControllerWrapper: UIViewControllerRepresentable
let container = Container.shared
let repositories: any Repositories = container.get(type: (any Repositories).self)
return IosComposeKaigiAppKt.kaigiAppController(
repositories: repositories
repositories: repositories,
onLicenseScreenRequest: {
openLicenseScreen()
}
)
}

public func updateUIViewController(_ uiViewController: UIViewController, context: Context) {
}

private func openLicenseScreen() {
if let windowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
if let rootViewController = windowScene.windows.first?.rootViewController {
let licenseView = LicenseListView()
let hostingController = UIHostingController(rootView: licenseView)
rootViewController.present(hostingController, animated: true, completion: nil)
}
}
}
}
Loading