From d068944134e525a5c9c4fda53b42cd7f7198d8ab Mon Sep 17 00:00:00 2001 From: Tipatai Puthanukunkit Date: Fri, 8 Jul 2016 15:58:32 +0700 Subject: [PATCH 1/2] add default pager title for fragment pager --- .../support/v7/widget/FragmentPagerExtension.kt | 6 +++--- .../support/v7/widget/FragmentStatePagerExtension.kt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt index d4a8a3a..187dc4b 100644 --- a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt +++ b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt @@ -12,7 +12,7 @@ abstract class FragmentPagerProxyAdapter(fragmentManager: FragmentManager) internal var items: List = listOf() - abstract var pageTitle: ((Int, ARG) -> String) + abstract var pageTitle: ((Int, ARG) -> String?) abstract var item: ((Int, ARG) -> Fragment) @@ -28,11 +28,11 @@ abstract class FragmentPagerProxyAdapter(fragmentManager: FragmentManager) fun > ViewPager.rx_fragmentsWith(observable: Observable, fragmentManager: FragmentManager, getItem: (Int, ARG) -> Fragment, - getPageTitle: ((Int, ARG) -> String)): Subscription { + getPageTitle: ((Int, ARG) -> String?) = { i, a -> null }): Subscription { val proxyAdapter = object : FragmentPagerProxyAdapter(fragmentManager) { override var item: (Int, ARG) -> Fragment = getItem - override var pageTitle: ((Int, ARG) -> String) = getPageTitle + override var pageTitle: ((Int, ARG) -> String?) = getPageTitle } return rx_fragmentsWith(observable, proxyAdapter) diff --git a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt index c177ea8..cdc675c 100644 --- a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt +++ b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt @@ -11,7 +11,7 @@ abstract class FragmentStatePagerProxyAdapter(fragmentManager: FragmentMana internal var items: List = listOf() - abstract var pageTitle: ((Int, ARG) -> String) + abstract var pageTitle: ((Int, ARG) -> String?) abstract var item: ((Int, ARG) -> Fragment) @@ -25,11 +25,11 @@ abstract class FragmentStatePagerProxyAdapter(fragmentManager: FragmentMana fun > ViewPager.rx_fragmentsStateWith(observable: Observable, fragmentManager: FragmentManager, getItem: (Int, ARG) -> Fragment, - getPageTitle: ((Int, ARG) -> String)): Subscription { + getPageTitle: ((Int, ARG) -> String?) = { i, a -> null }): Subscription { val proxyAdapter = object : FragmentStatePagerProxyAdapter(fragmentManager) { override var item: (Int, ARG) -> Fragment = getItem - override var pageTitle: ((Int, ARG) -> String) = getPageTitle + override var pageTitle: ((Int, ARG) -> String?) = getPageTitle } return rx_fragmentsStateWith(observable, proxyAdapter) @@ -39,6 +39,6 @@ fun , L : List> ViewPager.rx adapter = fragmentPagerProxyAdapter return observable.subscribe { fragmentPagerProxyAdapter.items = it - post { fragmentPagerProxyAdapter.notifyDataSetChanged() } + fragmentPagerProxyAdapter.notifyDataSetChanged() } } \ No newline at end of file From c9a90e31736f3c3a992e48d8a76c9e40c76f767f Mon Sep 17 00:00:00 2001 From: Tipatai Puthanukunkit Date: Fri, 8 Jul 2016 16:01:02 +0700 Subject: [PATCH 2/2] fix to char sequence --- .../support/v7/widget/FragmentPagerExtension.kt | 6 +++--- .../support/v7/widget/FragmentStatePagerExtension.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt index 187dc4b..77a2bf8 100644 --- a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt +++ b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentPagerExtension.kt @@ -12,7 +12,7 @@ abstract class FragmentPagerProxyAdapter(fragmentManager: FragmentManager) internal var items: List = listOf() - abstract var pageTitle: ((Int, ARG) -> String?) + abstract var pageTitle: ((Int, ARG) -> CharSequence?) abstract var item: ((Int, ARG) -> Fragment) @@ -28,11 +28,11 @@ abstract class FragmentPagerProxyAdapter(fragmentManager: FragmentManager) fun > ViewPager.rx_fragmentsWith(observable: Observable, fragmentManager: FragmentManager, getItem: (Int, ARG) -> Fragment, - getPageTitle: ((Int, ARG) -> String?) = { i, a -> null }): Subscription { + getPageTitle: ((Int, ARG) -> CharSequence?) = { i, a -> null }): Subscription { val proxyAdapter = object : FragmentPagerProxyAdapter(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) diff --git a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt index cdc675c..7b98915 100644 --- a/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt +++ b/reactiveandroid-appcompat-v7/src/main/kotlin/com/github/kittinunf/reactiveandroid/support/v7/widget/FragmentStatePagerExtension.kt @@ -11,7 +11,7 @@ abstract class FragmentStatePagerProxyAdapter(fragmentManager: FragmentMana internal var items: List = listOf() - abstract var pageTitle: ((Int, ARG) -> String?) + abstract var pageTitle: ((Int, ARG) -> CharSequence?) abstract var item: ((Int, ARG) -> Fragment) @@ -25,11 +25,11 @@ abstract class FragmentStatePagerProxyAdapter(fragmentManager: FragmentMana fun > ViewPager.rx_fragmentsStateWith(observable: Observable, fragmentManager: FragmentManager, getItem: (Int, ARG) -> Fragment, - getPageTitle: ((Int, ARG) -> String?) = { i, a -> null }): Subscription { + getPageTitle: ((Int, ARG) -> CharSequence?) = { i, a -> null }): Subscription { val proxyAdapter = object : FragmentStatePagerProxyAdapter(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)