Skip to content

Commit 0f7b04b

Browse files
authored
Merge pull request #1542 from joreilly/remove_multipane_option
remove redundant decompose multipane option
2 parents c31f524 + a2fc320 commit 0f7b04b

File tree

6 files changed

+8
-98
lines changed

6 files changed

+8
-98
lines changed

iosApp/iosApp/AppDelegate.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class AppDelegate : NSObject, UIApplicationDelegate, ObservableObject {
4444
}
4545
}
4646
},
47-
isMultiPane: UIDevice.current.userInterfaceIdiom != UIUserInterfaceIdiom.phone,
4847
initialConferenceId: nil,
4948
settingsComponent: nil
5049
)
@@ -62,7 +61,6 @@ class AppDelegate : NSObject, UIApplicationDelegate, ObservableObject {
6261
),
6362
onSignOut: {},
6463
onSignIn: {},
65-
isMultiPane: UIDevice.current.userInterfaceIdiom != UIUserInterfaceIdiom.phone,
6664
initialConferenceId: conferenceId,
6765
settingsComponent: nil
6866
)

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class DefaultAppComponent(
3535
componentContext: ComponentContext,
3636
private val onSignOut: () -> Unit,
3737
private val onSignIn: () -> Unit,
38-
private val isMultiPane: Boolean = false,
3938
initialConferenceId: String? = null,
4039
private val settingsComponent: SettingsComponent? = null
4140
) : AppComponent, KoinComponent, ComponentContext by componentContext {
@@ -137,7 +136,6 @@ class DefaultAppComponent(
137136
user = user,
138137
conference = config.conference,
139138
conferenceThemeColor = config.conferenceThemeColor,
140-
isMultiPane = isMultiPane,
141139
onSwitchConference = ::showConferences,
142140
onSignOut = {
143141
onSignOut()

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/ConferenceComponent.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class DefaultConferenceComponent(
3737
private val user: User?,
3838
private val conference: String,
3939
override val conferenceThemeColor: String?,
40-
private val isMultiPane: Boolean,
4140
private val onSwitchConference: () -> Unit,
4241
private val onSignOut: () -> Unit,
4342
private val onSignIn: () -> Unit,
@@ -63,7 +62,6 @@ class DefaultConferenceComponent(
6362
componentContext = componentContext,
6463
conference = conference,
6564
user = user,
66-
isMultiPane = isMultiPane,
6765
onSwitchConference = onSwitchConference,
6866
onSessionSelected = { navigation.push(Config.SessionDetails(sessionId = it)) },
6967
onSpeakerSelected = { navigation.push(Config.SpeakerDetails(speakerId = it)) },

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/HomeComponent.kt

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ interface HomeComponent {
3131

3232
sealed class Child {
3333
class Sessions(val component: SessionsComponent) : Child()
34-
class MultiPane(val component: MultiPaneComponent) : Child()
3534
class Speakers(val component: SpeakersComponent) : Child()
3635
class Bookmarks(val component: BookmarksComponent) : Child()
3736
class Venue(val component: VenueComponent) : Child()
@@ -44,7 +43,6 @@ class DefaultHomeComponent(
4443
componentContext: ComponentContext,
4544
override val conference: String,
4645
override val user: User?,
47-
private val isMultiPane: Boolean,
4846
private val onSwitchConference: () -> Unit,
4947
private val onSessionSelected: (id: String) -> Unit,
5048
private val onSpeakerSelected: (id: String) -> Unit,
@@ -67,27 +65,15 @@ class DefaultHomeComponent(
6765
private fun child(config: Config, componentContext: ComponentContext): Child =
6866
when (config) {
6967
Config.Sessions ->
70-
if (isMultiPane) {
71-
Child.MultiPane(
72-
DefaultMultiPaneComponent(
73-
componentContext = componentContext,
74-
conference = conference,
75-
user = user,
76-
onSignIn = onSignIn,
77-
onSpeakerSelected = onSpeakerSelected,
78-
)
79-
)
80-
} else {
81-
Child.Sessions(
82-
DefaultSessionsComponent(
83-
componentContext = componentContext,
84-
conference = conference,
85-
user = user,
86-
onSessionSelected = onSessionSelected,
87-
onSignIn = onSignIn,
88-
)
68+
Child.Sessions(
69+
DefaultSessionsComponent(
70+
componentContext = componentContext,
71+
conference = conference,
72+
user = user,
73+
onSessionSelected = onSessionSelected,
74+
onSignIn = onSignIn,
8975
)
90-
}
76+
)
9177

9278
Config.Speakers ->
9379
Child.Speakers(

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/MultiPaneComponent.kt

Lines changed: 0 additions & 69 deletions
This file was deleted.

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/App.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ fun HomeView(component: HomeComponent) {
151151
snackbarHostState = snackbarHostState
152152
)
153153

154-
is HomeComponent.Child.MultiPane -> Text(text = "Multi-pane mode is not yet supported")
155154
is HomeComponent.Child.Speakers -> SpeakersUI(child.component)
156155
is HomeComponent.Child.Bookmarks ->
157156
BookmarksUI(

0 commit comments

Comments
 (0)