Merge pull request #1542 from joreilly/remove_multipane_option

remove redundant decompose multipane option
joreilly · Mar 9, 2025 · 0f7b04b · 0f7b04b
2 parents c31f524 + a2fc320
commit 0f7b04b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 98 deletions.
diff --git a/iosApp/iosApp/AppDelegate.swift b/iosApp/iosApp/AppDelegate.swift
@@ -44,7 +44,6 @@ class AppDelegate : NSObject, UIApplicationDelegate, ObservableObject {
                     }
                 }
             },
-            isMultiPane: UIDevice.current.userInterfaceIdiom != UIUserInterfaceIdiom.phone,
             initialConferenceId: nil,
             settingsComponent: nil
         )
@@ -62,7 +61,6 @@ class AppDelegate : NSObject, UIApplicationDelegate, ObservableObject {
             ),
             onSignOut: {},
             onSignIn: {},
-            isMultiPane: UIDevice.current.userInterfaceIdiom != UIUserInterfaceIdiom.phone,
             initialConferenceId: conferenceId,
             settingsComponent: nil
         )

diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt
@@ -35,7 +35,6 @@ class DefaultAppComponent(
     componentContext: ComponentContext,
     private val onSignOut: () -> Unit,
     private val onSignIn: () -> Unit,
-    private val isMultiPane: Boolean = false,
     initialConferenceId: String? = null,
     private val settingsComponent: SettingsComponent? = null
 ) : AppComponent, KoinComponent, ComponentContext by componentContext {
@@ -137,7 +136,6 @@ class DefaultAppComponent(
                         user = user, 
                         conference = config.conference,
                         conferenceThemeColor = config.conferenceThemeColor,
-                        isMultiPane = isMultiPane,
                         onSwitchConference = ::showConferences,
                         onSignOut = {
                             onSignOut()

diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/ConferenceComponent.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/ConferenceComponent.kt
@@ -37,7 +37,6 @@ class DefaultConferenceComponent(
     private val user: User?,
     private val conference: String,
     override val conferenceThemeColor: String?,
-    private val isMultiPane: Boolean,
     private val onSwitchConference: () -> Unit,
     private val onSignOut: () -> Unit,
     private val onSignIn: () -> Unit,
@@ -63,7 +62,6 @@ class DefaultConferenceComponent(
                         componentContext = componentContext,
                         conference = conference,
                         user = user,
-                        isMultiPane = isMultiPane,
                         onSwitchConference = onSwitchConference,
                         onSessionSelected = { navigation.push(Config.SessionDetails(sessionId = it)) },
                         onSpeakerSelected = { navigation.push(Config.SpeakerDetails(speakerId = it)) },

diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/HomeComponent.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/HomeComponent.kt
@@ -31,7 +31,6 @@ interface HomeComponent {
 
     sealed class Child {
         class Sessions(val component: SessionsComponent) : Child()
-        class MultiPane(val component: MultiPaneComponent) : Child()
         class Speakers(val component: SpeakersComponent) : Child()
         class Bookmarks(val component: BookmarksComponent) : Child()
         class Venue(val component: VenueComponent) : Child()
@@ -44,7 +43,6 @@ class DefaultHomeComponent(
     componentContext: ComponentContext,
     override val conference: String,
     override val user: User?,
-    private val isMultiPane: Boolean,
     private val onSwitchConference: () -> Unit,
     private val onSessionSelected: (id: String) -> Unit,
     private val onSpeakerSelected: (id: String) -> Unit,
@@ -67,27 +65,15 @@ class DefaultHomeComponent(
     private fun child(config: Config, componentContext: ComponentContext): Child =
         when (config) {
             Config.Sessions ->
-                if (isMultiPane) {
-                    Child.MultiPane(
-                        DefaultMultiPaneComponent(
-                            componentContext = componentContext,
-                            conference = conference,
-                            user = user,
-                            onSignIn = onSignIn,
-                            onSpeakerSelected = onSpeakerSelected,
-                        )
-                    )
-                } else {
-                    Child.Sessions(
-                        DefaultSessionsComponent(
-                            componentContext = componentContext,
-                            conference = conference,
-                            user = user,
-                            onSessionSelected = onSessionSelected,
-                            onSignIn = onSignIn,
-                        )
+                Child.Sessions(
+                    DefaultSessionsComponent(
+                        componentContext = componentContext,
+                        conference = conference,
+                        user = user,
+                        onSessionSelected = onSessionSelected,
+                        onSignIn = onSignIn,
                     )
-                }
+                )
 
             Config.Speakers ->
                 Child.Speakers(

diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/MultiPaneComponent.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/MultiPaneComponent.kt
diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/App.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/App.kt
@@ -151,7 +151,6 @@ fun HomeView(component: HomeComponent) {
                                 snackbarHostState = snackbarHostState
                             )
 
-                        is HomeComponent.Child.MultiPane -> Text(text = "Multi-pane mode is not yet supported")
                         is HomeComponent.Child.Speakers -> SpeakersUI(child.component)
                         is HomeComponent.Child.Bookmarks ->
                             BookmarksUI(