From 43bf702fc2a58ed5bb5e1502b4a8db8f23fdf8d6 Mon Sep 17 00:00:00 2001
From: aladdin <aladdin@ddex.io>
Date: Sat, 5 May 2018 02:18:27 +0800
Subject: [PATCH 1/2] Export refreshTitleStyle as props

---
 Example/lib/refreshableScrollView.android.js | 3 ++-
 Example/lib/refreshableScrollView.ios.js     | 3 ++-
 Example/lib/ultimateListView.js              | 2 ++
 src/refreshableScrollView.android.js         | 3 ++-
 src/refreshableScrollView.ios.js             | 3 ++-
 src/ultimateListView.js                      | 2 ++
 6 files changed, 12 insertions(+), 4 deletions(-)

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 {
       >
         <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
diff --git a/Example/lib/refreshableScrollView.ios.js b/Example/lib/refreshableScrollView.ios.js
index e29399b..ae78652 100644
--- a/Example/lib/refreshableScrollView.ios.js
+++ b/Example/lib/refreshableScrollView.ios.js
@@ -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',
@@ -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>
diff --git a/Example/lib/ultimateListView.js b/Example/lib/ultimateListView.js
index c824ebe..a0526bb 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',
@@ -117,6 +118,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,
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 {
       >
         <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
diff --git a/src/refreshableScrollView.ios.js b/src/refreshableScrollView.ios.js
index e29399b..ae78652 100644
--- a/src/refreshableScrollView.ios.js
+++ b/src/refreshableScrollView.ios.js
@@ -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',
@@ -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>
diff --git a/src/ultimateListView.js b/src/ultimateListView.js
index c824ebe..a0526bb 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',
@@ -117,6 +118,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,

From 2fbcacac112535c4a5dcea2152c2471aca45c80e Mon Sep 17 00:00:00 2001
From: aladdin <aladdin@ddex.io>
Date: Sat, 5 May 2018 02:33:39 +0800
Subject: [PATCH 2/2] Add waitingSpinnerTextStyle props

---
 Example/lib/ultimateListView.js | 6 ++++--
 src/ultimateListView.js         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Example/lib/ultimateListView.js b/Example/lib/ultimateListView.js
index a0526bb..905fd2d 100644
--- a/Example/lib/ultimateListView.js
+++ b/Example/lib/ultimateListView.js
@@ -76,6 +76,7 @@ export default class UltimateListView extends Component {
     fetchingSpinnerSize: 'large',
     waitingSpinnerSize: 'small',
     waitingSpinnerText: 'Loading...',
+    waitingSpinnerTextStyle: undefined,
 
     // Pagination Button
     paginationBtnText: 'Load more...',
@@ -140,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,
@@ -296,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>
     )
   }
@@ -330,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>
diff --git a/src/ultimateListView.js b/src/ultimateListView.js
index a0526bb..905fd2d 100644
--- a/src/ultimateListView.js
+++ b/src/ultimateListView.js
@@ -76,6 +76,7 @@ export default class UltimateListView extends Component {
     fetchingSpinnerSize: 'large',
     waitingSpinnerSize: 'small',
     waitingSpinnerText: 'Loading...',
+    waitingSpinnerTextStyle: undefined,
 
     // Pagination Button
     paginationBtnText: 'Load more...',
@@ -140,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,
@@ -296,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>
     )
   }
@@ -330,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>