[WIP] working without LibraryBaseView

Patrick Jackson · Patrick Jackson · commit 5f081a030240 · 2019-08-04T20:19:35.000-04:00
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/CompletedView.kt
@@ -1,8 +1,9 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.external.ViewWithProvider
 
 
-interface CompletedView : LibraryView {
+interface CompletedView : ViewWithProvider {
     fun showLoading()
     fun hideLoading()
     fun showError(msg: String)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsView.kt
@@ -1,8 +1,8 @@
 package com.willowtreeapps.common.ui
 
-import com.willowtreeapps.common.external.PresenterProvider
+import com.willowtreeapps.common.external.ViewWithProvider
 
-interface DetailsView: LibraryView{
+interface DetailsView: ViewWithProvider{
     fun render(detailsViewState: BookDetailViewState)
     override fun presenter() = detailsPresenter
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/LibraryBaseView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/LibraryBaseView.kt
@@ -4,4 +4,4 @@ import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 
-interface LibraryView : ViewWithProvider
+//interface LibraryView : ViewWithProvider
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/Presenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/Presenter.kt
@@ -4,10 +4,10 @@ import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.*
 
 //a Presenter typed to our app's State type for convenience
-fun <V: LibraryView> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View> {
+fun <V: ViewWithProvider> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View> {
     return createGenericPresenter(actions) as Presenter<View>
 }
 
-fun <V: LibraryView> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View> {
+fun <V: ViewWithProvider> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View> {
     return createGenericPresenter(actions) as Presenter<View>
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ReadingListView.kt
@@ -1,8 +1,9 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.external.ViewWithProvider
 
 
-interface ReadingListView : LibraryView{
+interface ReadingListView : ViewWithProvider{
     fun showLoading()
     fun hideLoading()
     fun showError(msg: String)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchView.kt
@@ -1,15 +1,17 @@
 package com.willowtreeapps.common.ui
 
+import com.willowtreeapps.common.external.ViewWithProvider
 
-interface SearchView : LibraryView {
+
+interface SearchView : ViewWithProvider {
     fun showLoading()
     fun hideLoading()
     fun showError(msg: String)
     fun showResults(books: List<BookListItemViewState>)
     override fun presenter() = searchPresenter
 }
 
-interface BottomNavSheet: LibraryView {
+interface BottomNavSheet: ViewWithProvider {
     override fun presenter() = presenter<BottomNavSheet> { {
         // no op
     }}

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.willowtreeapps.common.ui`
`2`	`2`
`3`		`-import com.willowtreeapps.common.external.PresenterProvider`
	`3`	`+import com.willowtreeapps.common.external.ViewWithProvider`
`4`	`4`
`5`		`-interface DetailsView: LibraryView{`
	`5`	`+interface DetailsView: ViewWithProvider{`
`6`	`6`	`fun render(detailsViewState: BookDetailViewState)`
`7`	`7`	`override fun presenter() = detailsPresenter`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ import com.willowtreeapps.common.AppState`
`4`	`4`	`import com.willowtreeapps.common.external.ViewWithProvider`
`5`	`5`
`6`	`6`
`7`		`-interface LibraryView : ViewWithProvider`
	`7`	`+//interface LibraryView : ViewWithProvider`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ import com.willowtreeapps.common.AppState`
`4`	`4`	`import com.willowtreeapps.common.external.*`
`5`	`5`
`6`	`6`	`//a Presenter typed to our app's State type for convenience`
`7`		`-fun <V: LibraryView> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View> {`
	`7`	`+fun <V: ViewWithProvider> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View> {`
`8`	`8`	`return createGenericPresenter(actions) as Presenter<View>`
`9`	`9`	`}`
`10`	`10`
`11`		`-fun <V: LibraryView> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View> {`
	`11`	`+fun <V: ViewWithProvider> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View> {`
`12`	`12`	`return createGenericPresenter(actions) as Presenter<View>`
`13`	`13`	`}`