[sword-svn] r3713 - in trunk/bindings: Android/SWORD Android/SWORD/.idea Android/SWORD/gradle/wrapper cordova/cordova-plugin-crosswire-sword/src/android cordova/cordova-plugin-crosswire-sword/www
scribe at crosswire.org
scribe at crosswire.org
Fri Apr 10 15:58:37 MST 2020
Author: scribe
Date: 2020-04-10 15:58:37 -0700 (Fri, 10 Apr 2020)
New Revision: 3713
Modified:
trunk/bindings/Android/SWORD/.idea/gradle.xml
trunk/bindings/Android/SWORD/.idea/misc.xml
trunk/bindings/Android/SWORD/.idea/modules.xml
trunk/bindings/Android/SWORD/.idea/vcs.xml
trunk/bindings/Android/SWORD/build.gradle
trunk/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties
trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/android/SWORD.java
trunk/bindings/cordova/cordova-plugin-crosswire-sword/www/SWORD.js
Log:
updated cordova bindings to support more SWModule methods.
Modified: trunk/bindings/Android/SWORD/.idea/gradle.xml
===================================================================
--- trunk/bindings/Android/SWORD/.idea/gradle.xml 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/.idea/gradle.xml 2020-04-10 22:58:37 UTC (rev 3713)
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <compositeConfiguration>
- <compositeBuild compositeDefinitionSource="SCRIPT" />
- </compositeConfiguration>
+ <option name="delegatedBuild" value="false" />
+ <option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="modules">
+ <set>
+ <option value="/data/home/scribe/src/sword/bindings/Android/SWORD" />
+ <option value="/data/home/scribe/src/sword/bindings/Android/SWORD/app" />
+ </set>
+ </option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
Modified: trunk/bindings/Android/SWORD/.idea/misc.xml
===================================================================
--- trunk/bindings/Android/SWORD/.idea/misc.xml 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/.idea/misc.xml 2020-04-10 22:58:37 UTC (rev 3713)
@@ -11,4 +11,23 @@
<component name="ProjectType">
<option name="id" value="Android" />
</component>
+ <component name="SvnBranchConfigurationManager">
+ <option name="myConfigurationMap">
+ <map>
+ <entry key="$PROJECT_DIR$/../../..">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="branchUrls">
+ <list>
+ <option value="https://crosswire.org/svn/sword/branches" />
+ <option value="https://crosswire.org/svn/sword/tags" />
+ </list>
+ </option>
+ <option name="trunkUrl" value="https://crosswire.org/svn/sword/trunk" />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
</project>
\ No newline at end of file
Modified: trunk/bindings/Android/SWORD/.idea/modules.xml
===================================================================
--- trunk/bindings/Android/SWORD/.idea/modules.xml 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/.idea/modules.xml 2020-04-10 22:58:37 UTC (rev 3713)
@@ -2,7 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
+ <module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/Android-SWORD.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/Android-SWORD.iml" group="SWORD" />
<module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/SWORD.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/SWORD.iml" />
+ <module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/app/SWORD-app.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/app/SWORD-app.iml" group="SWORD/app" />
<module fileurl="file:///data/home/scribe/src/sword/bindings/Android/SWORD/app/app.iml" filepath="/data/home/scribe/src/sword/bindings/Android/SWORD/app/app.iml" />
</modules>
</component>
Modified: trunk/bindings/Android/SWORD/.idea/vcs.xml
===================================================================
--- trunk/bindings/Android/SWORD/.idea/vcs.xml 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/.idea/vcs.xml 2020-04-10 22:58:37 UTC (rev 3713)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/../../.." vcs="svn" />
</component>
</project>
\ No newline at end of file
Modified: trunk/bindings/Android/SWORD/build.gradle
===================================================================
--- trunk/bindings/Android/SWORD/build.gradle 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/build.gradle 2020-04-10 22:58:37 UTC (rev 3713)
@@ -7,7 +7,7 @@
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.1'
+ classpath 'com.android.tools.build:gradle:3.6.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Modified: trunk/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- trunk/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties 2020-04-10 22:58:37 UTC (rev 3713)
@@ -1,6 +1,6 @@
-#Fri May 17 22:10:28 MST 2019
+#Thu Apr 02 12:52:29 MST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
Modified: trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/android/SWORD.java
===================================================================
--- trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/android/SWORD.java 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/android/SWORD.java 2020-04-10 22:58:37 UTC (rev 3713)
@@ -462,6 +462,16 @@
if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
callbackContext.success(mod.getRenderText());
}
+ else if (action.equals("SWModule_getStripText")) {
+ SWModule mod = mgr.getModuleByName(args.getString(0));
+ if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
+ callbackContext.success(mod.getStripText());
+ }
+ else if (action.equals("SWModule_getRawEntry")) {
+ SWModule mod = mgr.getModuleByName(args.getString(0));
+ if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
+ callbackContext.success(mod.getRawEntry());
+ }
else if (action.equals("SWModule_sendText")) {
SWModule mod = mgr.getModuleByName(args.getString(0));
if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
@@ -545,6 +555,16 @@
}
callbackContext.success(r);
}
+ else if (action.equals("SWModule_parseKeyList")) {
+ SWModule mod = mgr.getModuleByName(args.getString(0));
+ if (mod == null) { callbackContext.error("couldn't find module: " + args.getString(0)); return true; }
+ String keyText = args.getString(1);
+ JSONArray r = new JSONArray();
+ for (String k : mod.parseKeyList(keyText)) {
+ r.put(k);
+ }
+ callbackContext.success(r);
+ }
else if (action.equals("HTTPUtils_makeRequest")) {
final String url = args.getString(0);
final String postData = args.getString(1);
Modified: trunk/bindings/cordova/cordova-plugin-crosswire-sword/www/SWORD.js
===================================================================
--- trunk/bindings/cordova/cordova-plugin-crosswire-sword/www/SWORD.js 2020-04-10 22:51:08 UTC (rev 3712)
+++ trunk/bindings/cordova/cordova-plugin-crosswire-sword/www/SWORD.js 2020-04-10 22:58:37 UTC (rev 3713)
@@ -145,6 +145,24 @@
return retVal;
}
+SWModule.prototype.getStripText = function(callback) {
+ var retVal = null;
+ exec(callback?callback:function(m) { retVal = m; },
+ function(err) { utils.alert('[ERROR] problem: ' + err); },
+ "SWORD", "SWModule_getStripText", [this.name]
+ );
+ return retVal;
+}
+
+SWModule.prototype.getRawEntry = function(callback) {
+ var retVal = null;
+ exec(callback?callback:function(m) { retVal = m; },
+ function(err) { utils.alert('[ERROR] problem: ' + err); },
+ "SWORD", "SWModule_getRawEntry", [this.name]
+ );
+ return retVal;
+}
+
SWModule.prototype.shareVerse = function(callback) {
var retVal = null;
exec(callback?callback:function(m) { retVal = m; },
@@ -261,6 +279,15 @@
return retVal;
}
+SWModule.prototype.parseKeyList = function(keyText, callback) {
+ var retVal = [];
+ exec(callback?callback:function(r) { retVal = r; },
+ function(err) { utils.alert('[ERROR] problem: ' + err); },
+ "SWORD", "SWModule_parseKeyList", [this.name, keyText]
+ );
+ return retVal;
+}
+
function SWMgr() {
}
More information about the sword-cvs
mailing list