diff --git a/Example/lib/refreshableScrollView.android.js b/Example/lib/refreshableScrollView.android.js index 42dee12..abc55fd 100644 --- a/Example/lib/refreshableScrollView.android.js +++ b/Example/lib/refreshableScrollView.android.js @@ -34,6 +34,7 @@ export default class RefreshableScrollView extends ScrollView { refreshableTitlePull: 'Pull to refresh', refreshableTitleRefreshing: 'Loading...', refreshableTitleRelease: 'Release to load', + refreshTitleStyle: undefined, customRefreshView: null, displayDate: false, dateFormat: 'yyyy-MM-dd hh:mm', @@ -214,7 +215,7 @@ export default class RefreshableScrollView extends ScrollView { > {this.renderSpinner()} - {this.state.refreshTitle} + {this.state.refreshTitle} {this.props.displayDate && {this.renderSpinner()} - {this.state.refreshTitle} + {this.state.refreshTitle} {this.props.displayDate && {this.props.dateTitle + this.state.date} diff --git a/Example/lib/ultimateListView.js b/Example/lib/ultimateListView.js index c824ebe..905fd2d 100644 --- a/Example/lib/ultimateListView.js +++ b/Example/lib/ultimateListView.js @@ -55,6 +55,7 @@ export default class UltimateListView extends Component { refreshableTitlePull: 'Pull to refresh', refreshableTitleRefreshing: 'Loading...', refreshableTitleRelease: 'Release to load', + refreshTitleStyle: undefined, customRefreshView: null, displayDate: false, dateFormat: 'yyyy-MM-dd hh:mm', @@ -75,6 +76,7 @@ export default class UltimateListView extends Component { fetchingSpinnerSize: 'large', waitingSpinnerSize: 'small', waitingSpinnerText: 'Loading...', + waitingSpinnerTextStyle: undefined, // Pagination Button paginationBtnText: 'Load more...', @@ -117,6 +119,7 @@ export default class UltimateListView extends Component { refreshableTitlePull: PropTypes.string, refreshableTitleRefreshing: PropTypes.string, refreshableTitleRelease: PropTypes.string, + refreshTitleStyle: PropTypes.object, customRefreshView: PropTypes.func, displayDate: PropTypes.bool, dateFormat: PropTypes.string, @@ -138,6 +141,7 @@ export default class UltimateListView extends Component { fetchingSpinnerSize: PropTypes.any, waitingSpinnerSize: PropTypes.any, waitingSpinnerText: PropTypes.string, + waitingSpinnerTextStyle: PropTypes.object, // Pagination Button paginationBtnText: PropTypes.string, @@ -294,7 +298,7 @@ export default class UltimateListView extends Component { return ( - {this.props.waitingSpinnerText} + {this.props.waitingSpinnerText} ) } @@ -328,7 +332,7 @@ export default class UltimateListView extends Component { {this.props.waitingSpinnerText} diff --git a/src/refreshableScrollView.android.js b/src/refreshableScrollView.android.js index 42dee12..abc55fd 100644 --- a/src/refreshableScrollView.android.js +++ b/src/refreshableScrollView.android.js @@ -34,6 +34,7 @@ export default class RefreshableScrollView extends ScrollView { refreshableTitlePull: 'Pull to refresh', refreshableTitleRefreshing: 'Loading...', refreshableTitleRelease: 'Release to load', + refreshTitleStyle: undefined, customRefreshView: null, displayDate: false, dateFormat: 'yyyy-MM-dd hh:mm', @@ -214,7 +215,7 @@ export default class RefreshableScrollView extends ScrollView { > {this.renderSpinner()} - {this.state.refreshTitle} + {this.state.refreshTitle} {this.props.displayDate && {this.renderSpinner()} - {this.state.refreshTitle} + {this.state.refreshTitle} {this.props.displayDate && {this.props.dateTitle + this.state.date} diff --git a/src/ultimateListView.js b/src/ultimateListView.js index c824ebe..905fd2d 100644 --- a/src/ultimateListView.js +++ b/src/ultimateListView.js @@ -55,6 +55,7 @@ export default class UltimateListView extends Component { refreshableTitlePull: 'Pull to refresh', refreshableTitleRefreshing: 'Loading...', refreshableTitleRelease: 'Release to load', + refreshTitleStyle: undefined, customRefreshView: null, displayDate: false, dateFormat: 'yyyy-MM-dd hh:mm', @@ -75,6 +76,7 @@ export default class UltimateListView extends Component { fetchingSpinnerSize: 'large', waitingSpinnerSize: 'small', waitingSpinnerText: 'Loading...', + waitingSpinnerTextStyle: undefined, // Pagination Button paginationBtnText: 'Load more...', @@ -117,6 +119,7 @@ export default class UltimateListView extends Component { refreshableTitlePull: PropTypes.string, refreshableTitleRefreshing: PropTypes.string, refreshableTitleRelease: PropTypes.string, + refreshTitleStyle: PropTypes.object, customRefreshView: PropTypes.func, displayDate: PropTypes.bool, dateFormat: PropTypes.string, @@ -138,6 +141,7 @@ export default class UltimateListView extends Component { fetchingSpinnerSize: PropTypes.any, waitingSpinnerSize: PropTypes.any, waitingSpinnerText: PropTypes.string, + waitingSpinnerTextStyle: PropTypes.object, // Pagination Button paginationBtnText: PropTypes.string, @@ -294,7 +298,7 @@ export default class UltimateListView extends Component { return ( - {this.props.waitingSpinnerText} + {this.props.waitingSpinnerText} ) } @@ -328,7 +332,7 @@ export default class UltimateListView extends Component { {this.props.waitingSpinnerText}