Skip to content
This repository was archived by the owner on Jul 17, 2019. It is now read-only.

Add default pager title for fragment pager #6

Open
Judrummer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add default pager title for fragment pager #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d068944
add default pager title for fragment pager
Judrummer Jul 8, 2016
c9a90e3
fix to char sequence
Judrummer Jul 8, 2016
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
6 changes: 3 additions & 3 deletions ...n/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ abstract class FragmentPagerProxyAdapter<ARG>(fragmentManager: FragmentManager)

internal var items: List<ARG> = listOf()

abstract var pageTitle: ((Int, ARG) -> String)
abstract var pageTitle: ((Int, ARG) -> CharSequence?)

abstract var item: ((Int, ARG) -> Fragment)

Expand All @@ -28,11 +28,11 @@ abstract class FragmentPagerProxyAdapter<ARG>(fragmentManager: FragmentManager)

fun <ARG, L : List<ARG>> ViewPager.rx_fragmentsWith(observable: Observable<L>, fragmentManager: FragmentManager,
getItem: (Int, ARG) -> Fragment,
getPageTitle: ((Int, ARG) -> String)): Subscription {
getPageTitle: ((Int, ARG) -> CharSequence?) = { i, a -> null }): Subscription {
val proxyAdapter = object : FragmentPagerProxyAdapter<ARG>(fragmentManager) {

override var item: (Int, ARG) -> Fragment = getItem
override var pageTitle: ((Int, ARG) -> String) = getPageTitle
override var pageTitle: ((Int, ARG) -> CharSequence?) = getPageTitle

}
return rx_fragmentsWith(observable, proxyAdapter)
Expand Down
8 changes: 4 additions & 4 deletions ...lin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ abstract class FragmentStatePagerProxyAdapter<ARG>(fragmentManager: FragmentMana

internal var items: List<ARG> = listOf()

abstract var pageTitle: ((Int, ARG) -> String)
abstract var pageTitle: ((Int, ARG) -> CharSequence?)

abstract var item: ((Int, ARG) -> Fragment)

Expand All @@ -25,11 +25,11 @@ abstract class FragmentStatePagerProxyAdapter<ARG>(fragmentManager: FragmentMana

fun <ARG, L : List<ARG>> ViewPager.rx_fragmentsStateWith(observable: Observable<L>, fragmentManager: FragmentManager,
getItem: (Int, ARG) -> Fragment,
getPageTitle: ((Int, ARG) -> String)): Subscription {
getPageTitle: ((Int, ARG) -> CharSequence?) = { i, a -> null }): Subscription {
val proxyAdapter = object : FragmentStatePagerProxyAdapter<ARG>(fragmentManager) {

override var item: (Int, ARG) -> Fragment = getItem
override var pageTitle: ((Int, ARG) -> String) = getPageTitle
override var pageTitle: ((Int, ARG) -> CharSequence?) = getPageTitle

}
return rx_fragmentsStateWith(observable, proxyAdapter)
Expand All @@ -39,6 +39,6 @@ fun <ARG, ADT : FragmentStatePagerProxyAdapter<ARG>, L : List<ARG>> ViewPager.rx
adapter = fragmentPagerProxyAdapter
return observable.subscribe {
Copy link
Owner

@kittinunf kittinunf Jul 8, 2016

Choose a reason for hiding this comment

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

Can you force this to be on MainThread?

fragmentPagerProxyAdapter.items = it
post { fragmentPagerProxyAdapter.notifyDataSetChanged() }
fragmentPagerProxyAdapter.notifyDataSetChanged()
}
}