use unified Ti.UI.createRefreshControl API for iOS & Android

nl.fokkezb.pullToRefresh/controllers/widget.js

@@ -1,107 +1,86 @@
 var refreshControl;
-var list;
 
 $.refresh = refresh;
-
-$.show = show;
 $.hide = hide;
-$.getList = getList;
-$.getControl = getControl;
+$.show = show;
+$.setPullText = setPullText;
 
-(function constructor(args) {
+var args = arguments[0] || {};
+
+if (!_.isArray(args.children) || !_.contains(['Ti.UI.ListView', 'Ti.UI.TableView', 'de.marcelpociot.CollectionView'], args.children[0].apiName)) {
+  console.error('[pullToRefresh] is missing required Ti.UI.ListView or Ti.UI.TableView or de.marcelpociot.CollectionView as first child element.');
+}
 
-  if (args.dontInit || (!OS_IOS && !OS_ANDROID)){
-    if (!args.dontInit) console.warn('[pullToRefresh] only supports iOS and Android.');
+var list = args.children[0];
+var refreshText = args.refreshText ? args.refreshText : 'Loading';
+var pullText = args.pullText ? args.pullText : 'Loading';
 
-    if (_.isArray(args.children)) {
-      _.map(args.children, $.addTopLevelView);
-    }
+delete args.children;
+delete args.refreshText;
+delete args.pullText;
 
-    return;
-  }
+(function constructor(args) {
 
-  if (!_.isArray(args.children) || !_.contains(['Titanium.UI.ListView', 'Titanium.UI.TableView', 'Ti.UI.ListView', 'Ti.UI.TableView', 'de.marcelpociot.CollectionView'], args.children[args.children.length-1].apiName)) {
-    console.error('[pullToRefresh] is missing required Ti.UI.ListView or Ti.UI.TableView or de.marcelpociot.CollectionView as first child element.');
+  if (!OS_IOS && !OS_ANDROID) {
+    console.warn('[pullToRefresh] only supports iOS and Android.');
     return;
   }
 
-  list = _.last(args.children);
-  delete args.children;
-
   _.extend($, args);
 
-  if (OS_IOS) {
-    refreshControl = Ti.UI.createRefreshControl(args);
+    refreshControl = Ti.UI.createRefreshControl({
+      title: createText(pullText, '#FFF'),
+      tintColor: '#ededeb'
+    });
+
     refreshControl.addEventListener('refreshstart', onRefreshstart);
 
     list.refreshControl = refreshControl;
 
     $.addTopLevelView(list);
 
-  } else if (OS_ANDROID) {
-    refreshControl = require('com.rkam.swiperefreshlayout').createSwipeRefresh(_.extend({
-      view: list
-    }, args));
-
-    refreshControl.addEventListener('refreshing', onRefreshstart);
-
-    $.addTopLevelView(refreshControl);
-  }
-
-})(arguments[0] || {});
+})(args);
 
 function refresh() {
-
-  if (!list) {
-    return;
-  }
-
   show();
 
   onRefreshstart();
 }
 
 function hide() {
 
-  if (!refreshControl) {
-    return;
-  }
-
-  if (OS_IOS) {
+    refreshControl.title = createText(pullText, '#FFF');
     refreshControl.endRefreshing();
 
-  } else if (OS_ANDROID) {
-    refreshControl.setRefreshing(false);
-  }
 }
 
 function show() {
-
-  if (!refreshControl) {
-    return;
-  }
-
-  if (OS_IOS) {
     refreshControl.beginRefreshing();
-
-  } else if (OS_ANDROID) {
-    refreshControl.setRefreshing(true);
-  }
-}
-
-function getList() {
-  return list;
-}
-
-function getControl() {
-  return refreshControl;
 }
 
 function onRefreshstart() {
+    refreshControl.title = createText(refreshText, '#FFF');
 
   $.trigger('release', {
     source: $,
     hide: hide
   });
 
 }
+
+function createText(text, color) {
+  return Ti.UI.createAttributedString({
+    text: text,
+    attributes: [
+      {
+        type: Ti.UI.ATTRIBUTE_FOREGROUND_COLOR ,
+        value: color,
+        range: [0, text.length]
+      }
+    ]
+  });
+}
+
+function setPullText(text) {
+  pullText = text;
+}

nl.fokkezb.pullToRefresh/widget.json

@@ -3,11 +3,11 @@
 	"name": "Pull to Refresh Widget",
 	"description" : "Uniform wrapper for iOS RefreshControl and Android SwipeRefreshLayout.",
 	"author": "Fokke Zandbergen",
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"copyright":"Copyright (c) 2013-2015",
 	"license":"Apache 2.0",
 	"min-alloy-version": "1.5",
-	"min-titanium-version":"3.4",
+	"min-titanium-version":"6.2",
 	"tags":"tableview,headerpullview,pulltorefresh,swiperefreshlayout,listview,pullview,refreshcontrol,ticollectionview",
 	"platforms":"ios,android",
 	"modules": {