Skip to content

Add Two props to customize refresh title style and waiting title style #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Add Two props to customize refresh title style and waiting title style #53

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
43bf702
Export refreshTitleStyle as props
May 4, 2018
2fbcaca
Add waitingSpinnerTextStyle props
May 4, 2018
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
3 changes: 2 additions & 1 deletion Example/lib/refreshableScrollView.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -214,7 +215,7 @@ export default class RefreshableScrollView extends ScrollView {
>
<View style={defaultHeaderStyles.status}>
{this.renderSpinner()}
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
<Text style={[defaultHeaderStyles.statusTitle, this.props.refreshTitleStyle]}>{this.state.refreshTitle}</Text>
</View>
{this.props.displayDate &&
<Text
Expand Down
3 changes: 2 additions & 1 deletion Example/lib/refreshableScrollView.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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',
Expand Down Expand Up @@ -182,7 +183,7 @@ export default class RefreshableScrollView extends ScrollView {
<View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
<View style={defaultHeaderStyles.status}>
{this.renderSpinner()}
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
<Text style={[defaultHeaderStyles.statusTitle, this.props.refreshTitleStyle]}>{this.state.refreshTitle}</Text>
</View>
{this.props.displayDate &&
<Text style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
Expand Down
8 changes: 6 additions & 2 deletions Example/lib/ultimateListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -75,6 +76,7 @@ export default class UltimateListView extends Component {
fetchingSpinnerSize: 'large',
waitingSpinnerSize: 'small',
waitingSpinnerText: 'Loading...',
waitingSpinnerTextStyle: undefined,

// Pagination Button
paginationBtnText: 'Load more...',
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -294,7 +298,7 @@ export default class UltimateListView extends Component {

return (
<View style={styles.fetchingView}>
<Text style={styles.paginationViewText}>{this.props.waitingSpinnerText}</Text>
<Text style={[styles.paginationViewText, this.props.waitingSpinnerTextStyle]}>{this.props.waitingSpinnerText}</Text>
</View>
)
}
Expand Down Expand Up @@ -328,7 +332,7 @@ export default class UltimateListView extends Component {
<View style={styles.paginationView}>
<ActivityIndicator color={this.props.spinnerColor} size={this.props.waitingSpinnerSize} />
<Text
style={[styles.paginationViewText, { marginLeft: 5 }]}
style={[styles.paginationViewText, { marginLeft: 5 }, this.props.waitingSpinnerTextStyle]}
>{this.props.waitingSpinnerText}
</Text>
</View>
Expand Down
3 changes: 2 additions & 1 deletion src/refreshableScrollView.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -214,7 +215,7 @@ export default class RefreshableScrollView extends ScrollView {
>
<View style={defaultHeaderStyles.status}>
{this.renderSpinner()}
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
<Text style={[defaultHeaderStyles.statusTitle, this.props.refreshTitleStyle]}>{this.state.refreshTitle}</Text>
</View>
{this.props.displayDate &&
<Text
Expand Down
3 changes: 2 additions & 1 deletion src/refreshableScrollView.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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',
Expand Down Expand Up @@ -182,7 +183,7 @@ export default class RefreshableScrollView extends ScrollView {
<View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
<View style={defaultHeaderStyles.status}>
{this.renderSpinner()}
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
<Text style={[defaultHeaderStyles.statusTitle, this.props.refreshTitleStyle]}>{this.state.refreshTitle}</Text>
</View>
{this.props.displayDate &&
<Text style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
Expand Down
8 changes: 6 additions & 2 deletions src/ultimateListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -75,6 +76,7 @@ export default class UltimateListView extends Component {
fetchingSpinnerSize: 'large',
waitingSpinnerSize: 'small',
waitingSpinnerText: 'Loading...',
waitingSpinnerTextStyle: undefined,

// Pagination Button
paginationBtnText: 'Load more...',
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -294,7 +298,7 @@ export default class UltimateListView extends Component {

return (
<View style={styles.fetchingView}>
<Text style={styles.paginationViewText}>{this.props.waitingSpinnerText}</Text>
<Text style={[styles.paginationViewText, this.props.waitingSpinnerTextStyle]}>{this.props.waitingSpinnerText}</Text>
</View>
)
}
Expand Down Expand Up @@ -328,7 +332,7 @@ export default class UltimateListView extends Component {
<View style={styles.paginationView}>
<ActivityIndicator color={this.props.spinnerColor} size={this.props.waitingSpinnerSize} />
<Text
style={[styles.paginationViewText, { marginLeft: 5 }]}
style={[styles.paginationViewText, { marginLeft: 5 }, this.props.waitingSpinnerTextStyle]}
>{this.props.waitingSpinnerText}
</Text>
</View>
Expand Down