From 1d0ff54794b5edea7cdf1d2d66710a0fa885bcc5 Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Sun, 28 Oct 2018 11:51:26 +0100 Subject: New upstream version 1.8.1 --- bindings/Android/Makefile | 14 + bindings/Android/README | 25 + bindings/Android/SWORD/.gitignore | 9 + bindings/Android/SWORD/.idea/codeStyleSettings.xml | 228 + bindings/Android/SWORD/.idea/compiler.xml | 22 + .../SWORD/.idea/copyright/profiles_settings.xml | 3 + bindings/Android/SWORD/.idea/gradle.xml | 18 + bindings/Android/SWORD/.idea/misc.xml | 52 + bindings/Android/SWORD/.idea/modules.xml | 9 + bindings/Android/SWORD/.idea/runConfigurations.xml | 12 + bindings/Android/SWORD/.idea/vcs.xml | 6 + bindings/Android/SWORD/app/.gitignore | 1 + bindings/Android/SWORD/app/CMakeLists.txt | 221 + bindings/Android/SWORD/app/build.gradle | 41 + bindings/Android/SWORD/app/proguard-rules.pro | 25 + .../crosswire/sword/ExampleInstrumentedTest.java | 26 + .../Android/SWORD/app/src/main/AndroidManifest.xml | 23 + bindings/Android/SWORD/app/src/main/cpp/frontend | 1 + bindings/Android/SWORD/app/src/main/cpp/jni | 1 + bindings/Android/SWORD/app/src/main/cpp/keys | 1 + bindings/Android/SWORD/app/src/main/cpp/mgr | 1 + bindings/Android/SWORD/app/src/main/cpp/modules | 1 + bindings/Android/SWORD/app/src/main/cpp/utilfuns | 1 + .../org/crosswire/android/bishop/MainActivity.java | 121 + .../android/bishop/NavigationDrawerFragment.java | 284 + .../org/crosswire/android/sword/AndroidMgr.java | 45 + .../src/main/res/drawable-hdpi/drawer_shadow.9.png | Bin 0 -> 161 bytes .../app/src/main/res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2829 bytes .../src/main/res/drawable-mdpi/drawer_shadow.9.png | Bin 0 -> 142 bytes .../app/src/main/res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2820 bytes .../main/res/drawable-xhdpi/drawer_shadow.9.png | Bin 0 -> 174 bytes .../app/src/main/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes .../main/res/drawable-xxhdpi/drawer_shadow.9.png | Bin 0 -> 208 bytes .../app/src/main/res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 202 bytes .../app/src/main/res/layout/activity_main.xml | 26 + .../SWORD/app/src/main/res/layout/drawer_main.xml | 9 + .../app/src/main/res/layout/fragment_main.xml | 16 + .../Android/SWORD/app/src/main/res/menu/global.xml | 7 + .../Android/SWORD/app/src/main/res/menu/main.xml | 13 + .../SWORD/app/src/main/res/menu/menu_swordtest.xml | 7 + .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4208 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2555 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6114 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10056 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 14696 bytes .../app/src/main/res/values-w820dp/dimens.xml | 6 + .../SWORD/app/src/main/res/values/colors.xml | 6 + .../SWORD/app/src/main/res/values/dimens.xml | 10 + .../SWORD/app/src/main/res/values/strings.xml | 14 + .../SWORD/app/src/main/res/values/styles.xml | 17 + .../java/org/crosswire/sword/ExampleUnitTest.java | 17 + bindings/Android/SWORD/build.gradle | 23 + bindings/Android/SWORD/gradle.properties | 17 + .../SWORD/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../SWORD/gradle/wrapper/gradle-wrapper.properties | 6 + bindings/Android/SWORD/gradlew | 160 + bindings/Android/SWORD/gradlew.bat | 90 + bindings/Android/SWORD/settings.gradle | 1 + bindings/corba/omniorbcpp/Makefile | 2 + bindings/corba/omniorbcpp/swordorb-impl.cpp | 6 +- bindings/corba/orbitcpp/webmgr.hpp | 27 +- bindings/cordova/Makefile | 10 + bindings/cordova/README | 5 + .../org.crosswire.sword.cordova.SWORD/LICENSE | 202 + .../org.crosswire.sword.cordova.SWORD/README.md | 22 + .../RELEASENOTES.md | 57 + .../org.crosswire.sword.cordova.SWORD/doc/index.md | 213 + .../org.crosswire.sword.cordova.SWORD/package.json | 28 + .../org.crosswire.sword.cordova.SWORD/plugin.xml | 164 + .../src/android/SWORD.java | 660 +++ .../src/blackberry10/index.js | 69 + .../src/firefoxos/DeviceProxy.js | 39 + .../src/ios/CDVDevice.h | 30 + .../src/ios/CDVDevice.m | 90 + .../src/ios/SWORD-Bridging-Header.h | 1 + .../src/ios/SWORD.swift | 805 +++ .../src/tizen/DeviceProxy.js | 39 + .../src/ubuntu/device.cpp | 64 + .../src/ubuntu/device.h | 47 + .../src/ubuntu/device.js | 34 + .../src/windows8/DeviceProxy.js | 50 + .../src/wp/Device.cs | 135 + .../org.crosswire.sword.cordova.SWORD/www/SWORD.js | 414 ++ bindings/csharp/NativeMethods.cs | 36 +- bindings/csharp/tests/ManagerTests.cs | 15 +- bindings/flatapi.cpp | 408 +- bindings/java-jni/Makefile | 5 +- bindings/java-jni/README | 51 +- bindings/java-jni/jni/Android.mk | 25 +- .../jni/org_crosswire_android_sword_InstallMgr.h | 85 - .../jni/org_crosswire_android_sword_SWMgr.h | 141 - .../org_crosswire_android_sword_SWMgr_ModInfo.h | 13 - .../org_crosswire_android_sword_SWMgr_SearchHit.h | 13 - .../jni/org_crosswire_android_sword_SWModule.h | 191 - ...rg_crosswire_android_sword_SWModule_SearchHit.h | 13 - ...android_sword_SWModule_SearchProgressReporter.h | 13 - bindings/java-jni/jni/swordstub.cpp | 858 ++- bindings/java-jni/jni/webmgr.hpp | 120 - .../org/crosswire/android/sword/InstallMgr.java | 10 +- .../src/org/crosswire/android/sword/SWMgr.java | 33 +- .../src/org/crosswire/android/sword/SWModule.java | 14 +- bindings/objc/LongRunningTests/Info.plist | 24 + bindings/objc/Makefile | 21 + bindings/objc/ObjCSword.h | 3 + bindings/objc/ObjCSword.xcodeproj/project.pbxproj | 6199 ++++++++++++++++---- .../ObjCSword_preLion.xcodeproj/project.pbxproj | 1060 ---- bindings/objc/README | 27 - bindings/objc/SWORDTests/Info.plist | 22 + bindings/objc/SWORDTests/SWORDTests.m | 38 + .../objc/TestResources/TestModules/populate.sh | 2 + bindings/objc/build_clucene/Makefile | 25 - bindings/objc/build_clucene/build_mac_clucene.sh | 158 - bindings/objc/build_sword/build_mac_sword.sh | 225 - .../objc/build_sword/build_ub_mac_swordutils.sh | 59 - bindings/objc/build_sword/readme.txt | 9 - bindings/objc/dependencies/Makefile | 39 + bindings/objc/dependencies/readme.txt | 4 + bindings/objc/dependencies/retrieve.sh | 19 - bindings/objc/dependencies/retrieve_iOS.sh | 6 - bindings/objc/src/DefaultFilterProvider.h | 2 - bindings/objc/src/DefaultFilterProvider.mm | 2 +- bindings/objc/src/FilterProviderFactory.mm | 6 +- bindings/objc/src/Notifications.h | 6 - bindings/objc/src/SwordBible.h | 9 +- bindings/objc/src/SwordBible.mm | 167 +- bindings/objc/src/SwordBibleBook.h | 15 +- bindings/objc/src/SwordBibleBook.mm | 28 +- bindings/objc/src/SwordBibleChapter.h | 4 +- bindings/objc/src/SwordBibleChapter.m | 6 - bindings/objc/src/SwordBibleTextEntry.h | 2 +- bindings/objc/src/SwordBibleTextEntry.m | 11 +- bindings/objc/src/SwordBook.h | 2 +- bindings/objc/src/SwordBook.mm | 35 +- bindings/objc/src/SwordCommentary.h | 2 - bindings/objc/src/SwordCommentary.mm | 6 - bindings/objc/src/SwordDictionary.mm | 37 +- bindings/objc/src/SwordFilter.mm | 23 +- bindings/objc/src/SwordInstallSource.h | 11 +- bindings/objc/src/SwordInstallSource.mm | 115 +- bindings/objc/src/SwordInstallSourceManager.h | 39 +- bindings/objc/src/SwordInstallSourceManager.mm | 336 +- bindings/objc/src/SwordKey.mm | 30 +- bindings/objc/src/SwordListKey.mm | 33 +- bindings/objc/src/SwordLocaleManager.h | 5 + bindings/objc/src/SwordLocaleManager.mm | 14 +- bindings/objc/src/SwordManager.h | 29 +- bindings/objc/src/SwordManager.mm | 343 +- bindings/objc/src/SwordModule+Index.mm | 5 +- bindings/objc/src/SwordModule.h | 74 +- bindings/objc/src/SwordModule.mm | 299 +- bindings/objc/src/SwordModuleTextEntry.h | 4 +- bindings/objc/src/SwordModuleTextEntry.m | 11 +- bindings/objc/src/SwordModuleTreeEntry.h | 4 +- bindings/objc/src/SwordModuleTreeEntry.m | 9 - bindings/objc/src/SwordUtil.h | 19 + bindings/objc/src/SwordUtil.m | 75 +- bindings/objc/src/SwordVerseKey.h | 4 +- bindings/objc/src/SwordVerseKey.mm | 44 +- bindings/objc/src/SwordVerseManager.h | 1 - bindings/objc/src/SwordVerseManager.mm | 16 +- bindings/objc/src/VerseEnumerator.mm | 13 +- bindings/objc/src/services/Configuration.m | 9 - bindings/objc/src/services/OSXConfiguration.m | 32 +- bindings/objc/sword/Info.plist | 24 + bindings/objc/sword/SWORD.h | 12 + bindings/objc/sword/sword.m | 12 + bindings/objc/test/SwordBibleTest.swift | 28 + bindings/objc/test/SwordInstallSourceManagerTest.m | 253 + bindings/objc/test/SwordListKeyTest.h | 4 +- bindings/objc/test/SwordListKeyTest.m | 24 +- bindings/objc/test/SwordLocaleManagerTest.swift | 30 + bindings/objc/test/SwordManagerTest.h | 16 - bindings/objc/test/SwordManagerTest.m | 84 +- bindings/objc/test/SwordManagerTest.swift | 67 + bindings/objc/test/SwordModuleLongRunTest.h | 4 +- bindings/objc/test/SwordModuleLongRunTest.mm | 29 +- bindings/objc/test/SwordModuleTest.h | 11 +- bindings/objc/test/SwordModuleTest.m | 200 +- bindings/objc/test/TestGlobals.h | 12 + bindings/objc/test/Tests-Bridging-Header.h | 6 + bindings/objc/test/Tests-Info.plist | 2 +- bindings/swig/deprecations.i | 21 +- bindings/swig/package/Makefile.in | 13 +- bindings/swig/package/aclocal.m4 | 137 +- bindings/swig/package/compile | 347 -- bindings/swig/package/config.guess | 192 +- bindings/swig/package/config.sub | 40 +- bindings/swig/package/configure | 116 +- bindings/swig/package/configure.ac | 2 +- bindings/swig/package/deprecations.i | 21 +- bindings/swig/package/m4/libtool.m4 | 12 +- bindings/swig/package/missing | 4 +- bindings/swig/package/rendercallback.h | 6 +- bindings/swig/package/swconfig.i | 8 +- bindings/swig/package/sword.i | 4 +- bindings/swig/python/CMakeLists.txt | 8 +- bindings/swig/rendercallback.h | 6 +- bindings/swig/swconfig.i | 8 +- bindings/swig/sword.i | 4 +- bindings/swig/vstudio/SwigSword.csproj | 184 +- bindings/swig/vstudio/libsword-csharpbindings.sln | 72 +- bindings/swig/vstudio/libsword_csharpsword.vcproj | 1932 +++--- bindings/usrinst.sh | 2 +- 208 files changed, 13938 insertions(+), 6789 deletions(-) create mode 100644 bindings/Android/Makefile create mode 100644 bindings/Android/README create mode 100644 bindings/Android/SWORD/.gitignore create mode 100644 bindings/Android/SWORD/.idea/codeStyleSettings.xml create mode 100644 bindings/Android/SWORD/.idea/compiler.xml create mode 100644 bindings/Android/SWORD/.idea/copyright/profiles_settings.xml create mode 100644 bindings/Android/SWORD/.idea/gradle.xml create mode 100644 bindings/Android/SWORD/.idea/misc.xml create mode 100644 bindings/Android/SWORD/.idea/modules.xml create mode 100644 bindings/Android/SWORD/.idea/runConfigurations.xml create mode 100644 bindings/Android/SWORD/.idea/vcs.xml create mode 100644 bindings/Android/SWORD/app/.gitignore create mode 100644 bindings/Android/SWORD/app/CMakeLists.txt create mode 100644 bindings/Android/SWORD/app/build.gradle create mode 100644 bindings/Android/SWORD/app/proguard-rules.pro create mode 100644 bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java create mode 100644 bindings/Android/SWORD/app/src/main/AndroidManifest.xml create mode 120000 bindings/Android/SWORD/app/src/main/cpp/frontend create mode 120000 bindings/Android/SWORD/app/src/main/cpp/jni create mode 120000 bindings/Android/SWORD/app/src/main/cpp/keys create mode 120000 bindings/Android/SWORD/app/src/main/cpp/mgr create mode 120000 bindings/Android/SWORD/app/src/main/cpp/modules create mode 120000 bindings/Android/SWORD/app/src/main/cpp/utilfuns create mode 100644 bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java create mode 100644 bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java create mode 100644 bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png create mode 100644 bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png create mode 100644 bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/menu/global.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/menu/main.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/values/colors.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/values/dimens.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/values/strings.xml create mode 100644 bindings/Android/SWORD/app/src/main/res/values/styles.xml create mode 100644 bindings/Android/SWORD/app/src/test/java/org/crosswire/sword/ExampleUnitTest.java create mode 100644 bindings/Android/SWORD/build.gradle create mode 100644 bindings/Android/SWORD/gradle.properties create mode 100644 bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.jar create mode 100644 bindings/Android/SWORD/gradle/wrapper/gradle-wrapper.properties create mode 100755 bindings/Android/SWORD/gradlew create mode 100644 bindings/Android/SWORD/gradlew.bat create mode 100644 bindings/Android/SWORD/settings.gradle create mode 100644 bindings/cordova/Makefile create mode 100644 bindings/cordova/README create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/LICENSE create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/README.md create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/RELEASENOTES.md create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/doc/index.md create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/package.json create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/android/SWORD.java create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/blackberry10/index.js create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/firefoxos/DeviceProxy.js create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.h create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/CDVDevice.m create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD-Bridging-Header.h create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ios/SWORD.swift create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/tizen/DeviceProxy.js create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.cpp create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.h create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/ubuntu/device.js create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/windows8/DeviceProxy.js create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/src/wp/Device.cs create mode 100644 bindings/cordova/org.crosswire.sword.cordova.SWORD/www/SWORD.js delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h delete mode 100644 bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h delete mode 100644 bindings/java-jni/jni/webmgr.hpp create mode 100644 bindings/objc/LongRunningTests/Info.plist create mode 100644 bindings/objc/Makefile delete mode 100644 bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj delete mode 100644 bindings/objc/README create mode 100644 bindings/objc/SWORDTests/Info.plist create mode 100644 bindings/objc/SWORDTests/SWORDTests.m create mode 100755 bindings/objc/TestResources/TestModules/populate.sh delete mode 100644 bindings/objc/build_clucene/Makefile delete mode 100755 bindings/objc/build_clucene/build_mac_clucene.sh delete mode 100755 bindings/objc/build_sword/build_mac_sword.sh delete mode 100755 bindings/objc/build_sword/build_ub_mac_swordutils.sh delete mode 100644 bindings/objc/build_sword/readme.txt create mode 100644 bindings/objc/dependencies/Makefile create mode 100644 bindings/objc/dependencies/readme.txt delete mode 100755 bindings/objc/dependencies/retrieve.sh delete mode 100755 bindings/objc/dependencies/retrieve_iOS.sh create mode 100644 bindings/objc/sword/Info.plist create mode 100644 bindings/objc/sword/SWORD.h create mode 100644 bindings/objc/sword/sword.m create mode 100644 bindings/objc/test/SwordBibleTest.swift create mode 100644 bindings/objc/test/SwordInstallSourceManagerTest.m create mode 100644 bindings/objc/test/SwordLocaleManagerTest.swift delete mode 100644 bindings/objc/test/SwordManagerTest.h create mode 100644 bindings/objc/test/SwordManagerTest.swift create mode 100644 bindings/objc/test/TestGlobals.h create mode 100644 bindings/objc/test/Tests-Bridging-Header.h delete mode 100755 bindings/swig/package/compile (limited to 'bindings') diff --git a/bindings/Android/Makefile b/bindings/Android/Makefile new file mode 100644 index 0000000..33ccb06 --- /dev/null +++ b/bindings/Android/Makefile @@ -0,0 +1,14 @@ +all: javawrapper + cp -a SWORD/app/build/intermediates/transforms/stripDebugSymbol/release/0/lib/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/ + +debug: javawrapper + cp -a SWORD/app/build/intermediates/cmake/debug/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/ + +javawrapper: + cp -a SWORD/app/src/main/java/org/crosswire/android/sword/* ../cordova/org.crosswire.sword.cordova.SWORD/src/android/ + +clean: + #these are from ../java-jni + rm SWORD/app/src/main/java/org/crosswire/android/sword/InstallMgr.java SWORD/app/src/main/java/org/crosswire/android/sword/SWMgr.java SWORD/app/src/main/java/org/crosswire/android/sword/SWModule.java + + diff --git a/bindings/Android/README b/bindings/Android/README new file mode 100644 index 0000000..2714e53 --- /dev/null +++ b/bindings/Android/README @@ -0,0 +1,25 @@ +This folder contains Android bindings based on the java-jni bindings. + +The first step to building these bindings is to build the java-jni/ +bindings. These bindings use code generated from there. +See the ../java-jni README before continuing. + +There is an Android Studio project here under SWORD/ + +This Android Studio project should be used to build the NDK +native code here. + +After that, a make in this folder will copy the native libs +to the ../cordova/ bindings to produce a working cordova plugin + +The steps to build all of this are usually: +1) make in the ../java-jni bindings folder +2) build all in SWORD Android Studio project +3) a make in this folder, which finally copies the binary libs + to the ../cordova/ bindings folder to produce a working + cordova plugin + +Android java bindings can be used after step 2 +cordova javascript bindings can be used after step 3 + +Hope this helps get you started. Let me know your progress! diff --git a/bindings/Android/SWORD/.gitignore b/bindings/Android/SWORD/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/bindings/Android/SWORD/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/bindings/Android/SWORD/.idea/codeStyleSettings.xml b/bindings/Android/SWORD/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..719bb8b --- /dev/null +++ b/bindings/Android/SWORD/.idea/codeStyleSettings.xml @@ -0,0 +1,228 @@ + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/compiler.xml b/bindings/Android/SWORD/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/bindings/Android/SWORD/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml b/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/bindings/Android/SWORD/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/gradle.xml b/bindings/Android/SWORD/.idea/gradle.xml new file mode 100644 index 0000000..96b6a99 --- /dev/null +++ b/bindings/Android/SWORD/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/misc.xml b/bindings/Android/SWORD/.idea/misc.xml new file mode 100644 index 0000000..bac5576 --- /dev/null +++ b/bindings/Android/SWORD/.idea/misc.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + Android API 24 Platform + + + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/modules.xml b/bindings/Android/SWORD/.idea/modules.xml new file mode 100644 index 0000000..8baebac --- /dev/null +++ b/bindings/Android/SWORD/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/runConfigurations.xml b/bindings/Android/SWORD/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/bindings/Android/SWORD/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/.idea/vcs.xml b/bindings/Android/SWORD/.idea/vcs.xml new file mode 100644 index 0000000..45cf85c --- /dev/null +++ b/bindings/Android/SWORD/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/app/.gitignore b/bindings/Android/SWORD/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/bindings/Android/SWORD/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/bindings/Android/SWORD/app/CMakeLists.txt b/bindings/Android/SWORD/app/CMakeLists.txt new file mode 100644 index 0000000..d9625aa --- /dev/null +++ b/bindings/Android/SWORD/app/CMakeLists.txt @@ -0,0 +1,221 @@ +# For more information about using CMake with Android Studio, read the +# documentation: https://d.android.com/studio/projects/add-native-code.html + +# Sets the minimum version of CMake required to build the native library. + +cmake_minimum_required(VERSION 3.4.1) + +#SET(NDK_DEBUG 0) +SET(CMAKE_C_FLAGS "-D__unix__ ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-D_FTPLIB_NO_COMPAT ${CMAKE_C_FLAGS}") + +SET(CMAKE_C_FLAGS "-Wno-invalid-source-encoding ${CMAKE_C_FLAGS}") + + +SET(CMAKE_C_FLAGS "-DOS_ANDROID ${CMAKE_C_FLAGS}") + +SET(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DSTDC_HEADERS ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-Dunix ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DANDROID ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEBZIP2 ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEXZ ${CMAKE_C_FLAGS}") +SET(CMAKE_C_FLAGS "-DEXCLUDEXZ ${CMAKE_C_FLAGS}") + +#SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") +#SET(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS}") + +# Creates and names a library, sets it as either STATIC +# or SHARED, and provides the relative paths to its source code. +# You can define multiple libraries, and CMake builds them for you. +# Gradle automatically packages shared libraries with your APK. + +SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") + +add_library( # Sets the name of the library. + sword + + # Sets the library as a shared library. + SHARED + + # Provides a relative path to your source file(s). + src/main/cpp/jni/swordstub.cpp + ../../../../src/utilfuns/swversion.cpp + ../../../../src/modules/comments/zcom/zcom.cpp + ../../../../src/modules/comments/zcom4/zcom4.cpp + ../../../../src/modules/comments/rawfiles/rawfiles.cpp + ../../../../src/modules/comments/rawcom4/rawcom4.cpp + ../../../../src/modules/comments/rawcom/rawcom.cpp + ../../../../src/modules/comments/swcom.cpp + ../../../../src/modules/comments/hrefcom/hrefcom.cpp + ../../../../src/modules/swmodule.cpp + ../../../../src/modules/tests/echomod.cpp + ../../../../src/modules/genbook/swgenbook.cpp + ../../../../src/modules/genbook/rawgenbook/rawgenbook.cpp + ../../../../src/modules/lexdict/swld.cpp + ../../../../src/modules/lexdict/rawld4/rawld4.cpp + ../../../../src/modules/lexdict/zld/zld.cpp + ../../../../src/modules/lexdict/rawld/rawld.cpp + ../../../../src/modules/texts/rawtext/rawtext.cpp + ../../../../src/modules/texts/rawtext4/rawtext4.cpp + ../../../../src/modules/texts/swtext.cpp + ../../../../src/modules/texts/ztext/ztext.cpp + ../../../../src/modules/texts/ztext4/ztext4.cpp + ../../../../src/modules/common/rawstr4.cpp + ../../../../src/modules/common/lzsscomprs.cpp + ../../../../src/modules/common/zipcomprs.cpp + ../../../../src/modules/common/rawverse4.cpp + ../../../../src/modules/common/swcipher.cpp + ../../../../src/modules/common/swcomprs.cpp + ../../../../src/modules/common/rawverse.cpp + ../../../../src/modules/common/sapphire.cpp + ../../../../src/modules/common/zstr.cpp + ../../../../src/modules/common/entriesblk.cpp + ../../../../src/modules/common/zverse.cpp + ../../../../src/modules/common/zverse4.cpp + ../../../../src/modules/common/rawstr.cpp + ../../../../src/modules/filters/gbfwordjs.cpp + ../../../../src/modules/filters/utf8latin1.cpp + ../../../../src/modules/filters/utf8greekaccents.cpp + ../../../../src/modules/filters/utf16utf8.cpp + ../../../../src/modules/filters/gbfwebif.cpp + ../../../../src/modules/filters/utf8transliterator.cpp + ../../../../src/modules/filters/gbfstrongs.cpp + ../../../../src/modules/filters/thmlhtmlhref.cpp + ../../../../src/modules/filters/thmlxhtml.cpp + ../../../../src/modules/filters/thmlgbf.cpp + ../../../../src/modules/filters/utf8utf16.cpp + ../../../../src/modules/filters/utf8cantillation.cpp + ../../../../src/modules/filters/utf8arshaping.cpp + ../../../../src/modules/filters/cipherfil.cpp + ../../../../src/modules/filters/thmlheadings.cpp + ../../../../src/modules/filters/thmlscripref.cpp + ../../../../src/modules/filters/latin1utf8.cpp + ../../../../src/modules/filters/gbfhtml.cpp + ../../../../src/modules/filters/thmlosis.cpp + ../../../../src/modules/filters/utf8nfkd.cpp + ../../../../src/modules/filters/thmlstrongs.cpp + ../../../../src/modules/filters/osisenum.cpp + ../../../../src/modules/filters/osisfootnotes.cpp + ../../../../src/modules/filters/osisglosses.cpp + ../../../../src/modules/filters/osisheadings.cpp + ../../../../src/modules/filters/osishtmlhref.cpp + ../../../../src/modules/filters/osislemma.cpp + ../../../../src/modules/filters/osismorph.cpp + ../../../../src/modules/filters/osismorphsegmentation.cpp + ../../../../src/modules/filters/osisosis.cpp + ../../../../src/modules/filters/osisplain.cpp + ../../../../src/modules/filters/osisredletterwords.cpp + ../../../../src/modules/filters/osisrtf.cpp + ../../../../src/modules/filters/osisscripref.cpp + ../../../../src/modules/filters/osisstrongs.cpp + ../../../../src/modules/filters/osisvariants.cpp + ../../../../src/modules/filters/osiswebif.cpp + ../../../../src/modules/filters/osiswordjs.cpp + ../../../../src/modules/filters/osisxhtml.cpp + ../../../../src/modules/filters/osisxlit.cpp + ../../../../src/modules/filters/osisreferencelinks.cpp + ../../../../src/modules/filters/thmlmorph.cpp + ../../../../src/modules/filters/gbfplain.cpp + ../../../../src/modules/filters/gbfhtmlhref.cpp + ../../../../src/modules/filters/gbfxhtml.cpp + ../../../../src/modules/filters/utf8html.cpp + ../../../../src/modules/filters/utf8nfc.cpp + ../../../../src/modules/filters/rtfhtml.cpp + ../../../../src/modules/filters/gbfredletterwords.cpp + ../../../../src/modules/filters/latin1utf16.cpp + ../../../../src/modules/filters/thmlhtml.cpp + ../../../../src/modules/filters/gbfthml.cpp + ../../../../src/modules/filters/teihtmlhref.cpp + ../../../../src/modules/filters/teixhtml.cpp + ../../../../src/modules/filters/gbfrtf.cpp + ../../../../src/modules/filters/gbfosis.cpp + ../../../../src/modules/filters/teirtf.cpp + ../../../../src/modules/filters/thmlwordjs.cpp + ../../../../src/modules/filters/papyriplain.cpp + ../../../../src/modules/filters/utf8bidireorder.cpp + ../../../../src/modules/filters/gbfheadings.cpp + ../../../../src/modules/filters/thmlrtf.cpp + ../../../../src/modules/filters/swoptfilter.cpp + ../../../../src/modules/filters/utf8arabicpoints.cpp + ../../../../src/modules/filters/unicodertf.cpp + ../../../../src/modules/filters/gbffootnotes.cpp + ../../../../src/modules/filters/greeklexattribs.cpp + ../../../../src/modules/filters/thmlfootnotes.cpp + ../../../../src/modules/filters/thmlplain.cpp + ../../../../src/modules/filters/utf8hebrewpoints.cpp + ../../../../src/modules/filters/thmlwebif.cpp + ../../../../src/modules/filters/thmlvariants.cpp + ../../../../src/modules/filters/thmllemma.cpp + ../../../../src/modules/filters/gbfmorph.cpp + ../../../../src/modules/filters/teiplain.cpp + ../../../../src/modules/filters/swbasicfilter.cpp + ../../../../src/modules/filters/scsuutf8.cpp + ../../../../src/modules/filters/gbflatex.cpp + ../../../../src/modules/filters/thmllatex.cpp + ../../../../src/modules/filters/teilatex.cpp + ../../../../src/modules/filters/osislatex.cpp + ../../../../src/mgr/stringmgr.cpp + ../../../../src/mgr/swmgr.cpp + ../../../../src/mgr/swsearchable.cpp + ../../../../src/mgr/localemgr.cpp + ../../../../src/mgr/swconfig.cpp + ../../../../src/mgr/markupfiltmgr.cpp + ../../../../src/mgr/encfiltmgr.cpp + ../../../../src/mgr/swfiltermgr.cpp + ../../../../src/mgr/swcacher.cpp + ../../../../src/mgr/installmgr.cpp + ../../../../src/mgr/swlocale.cpp + ../../../../src/mgr/filemgr.cpp + ../../../../src/mgr/versificationmgr.cpp + ../../../../src/mgr/remotetrans.cpp + ../../../../src/mgr/ftplibftpt.cpp + ../../../../src/utilfuns/swobject.cpp + ../../../../src/utilfuns/roman.cpp + ../../../../src/utilfuns/swbuf.cpp + ../../../../src/utilfuns/utilstr.cpp + ../../../../src/utilfuns/ftplib.c + ../../../../src/utilfuns/ftpparse.c + ../../../../src/utilfuns/url.cpp + ../../../../src/utilfuns/utilxml.cpp +# ../../../../src/utilfuns/regex.c + ../../../../src/keys/swkey.cpp + ../../../../src/keys/versetreekey.cpp + ../../../../src/keys/treekeyidx.cpp + ../../../../src/keys/versekey.cpp + ../../../../src/keys/strkey.cpp + ../../../../src/keys/treekey.cpp + ../../../../src/keys/listkey.cpp + ../../../../src/frontend/swdisp.cpp + ../../../../src/frontend/swlog.cpp + ../../../../src/utilfuns/zlib/untgz.c + + ) + +include_directories(../../../../include) +# Searches for a specified prebuilt library and stores the path as a +# variable. Because CMake includes system libraries in the search path by +# default, you only need to specify the name of the public NDK library +# you want to add. CMake verifies that the library exists before +# completing its build. + +find_library( # Sets the name of the path variable. + log-lib + + # Specifies the name of the NDK library that + # you want CMake to locate. + log) + +# Specifies libraries CMake should link to your target library. You +# can link multiple libraries, such as libraries you define in this +# build script, prebuilt third-party libraries, or system libraries. + +target_link_libraries( # Specifies the target library. + sword + + # Links the target library to the log library + # included in the NDK. + #${log-lib} + log + z + ) \ No newline at end of file diff --git a/bindings/Android/SWORD/app/build.gradle b/bindings/Android/SWORD/app/build.gradle new file mode 100644 index 0000000..38f6a6b --- /dev/null +++ b/bindings/Android/SWORD/app/build.gradle @@ -0,0 +1,41 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion '26.0.2' + defaultConfig { + applicationId "org.crosswire.sword" + minSdkVersion 14 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + externalNativeBuild { + cmake { + cppFlags "-frtti -fexceptions" + } + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + externalNativeBuild { + cmake { + path "CMakeLists.txt" + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'com.android.support:design:25.3.0' + testCompile 'junit:junit:4.12' +} diff --git a/bindings/Android/SWORD/app/proguard-rules.pro b/bindings/Android/SWORD/app/proguard-rules.pro new file mode 100644 index 0000000..b7161c9 --- /dev/null +++ b/bindings/Android/SWORD/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/scribe/Android/Sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java b/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java new file mode 100644 index 0000000..88a21a1 --- /dev/null +++ b/bindings/Android/SWORD/app/src/androidTest/java/org/crosswire/sword/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package org.crosswire.sword; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("org.crosswire.sword", appContext.getPackageName()); + } +} diff --git a/bindings/Android/SWORD/app/src/main/AndroidManifest.xml b/bindings/Android/SWORD/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8c5ed54 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/frontend b/bindings/Android/SWORD/app/src/main/cpp/frontend new file mode 120000 index 0000000..0c85939 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/frontend @@ -0,0 +1 @@ +../../../../../../../src/frontend \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/jni b/bindings/Android/SWORD/app/src/main/cpp/jni new file mode 120000 index 0000000..2042a86 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/jni @@ -0,0 +1 @@ +../../../../../../java-jni/jni/ \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/keys b/bindings/Android/SWORD/app/src/main/cpp/keys new file mode 120000 index 0000000..82c5ec9 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/keys @@ -0,0 +1 @@ +../../../../../../../src/keys \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/mgr b/bindings/Android/SWORD/app/src/main/cpp/mgr new file mode 120000 index 0000000..ff01498 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/mgr @@ -0,0 +1 @@ +../../../../../../../src/mgr \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/modules b/bindings/Android/SWORD/app/src/main/cpp/modules new file mode 120000 index 0000000..5ce3fc2 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/modules @@ -0,0 +1 @@ +../../../../../../../src/modules \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/cpp/utilfuns b/bindings/Android/SWORD/app/src/main/cpp/utilfuns new file mode 120000 index 0000000..f9cd74a --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/cpp/utilfuns @@ -0,0 +1 @@ +../../../../../../../src/utilfuns \ No newline at end of file diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java new file mode 100644 index 0000000..e6626a4 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/MainActivity.java @@ -0,0 +1,121 @@ +package org.crosswire.android.bishop; + +import android.app.Activity; + +import android.app.ActionBar; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.support.v4.widget.DrawerLayout; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +import org.crosswire.sword.R; + +public class MainActivity extends Activity + implements NavigationDrawerFragment.NavigationDrawerCallbacks { + + /** + * Fragment managing the behaviors, interactions and presentation of the navigation drawer. + */ + private NavigationDrawerFragment mNavigationDrawerFragment; + + /** + * Used to store the last screen title. For use in {@link #restoreActionBar()}. + */ + private CharSequence mTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + mNavigationDrawerFragment = (NavigationDrawerFragment) + getFragmentManager().findFragmentById(R.id.navigation_drawer); + mTitle = getTitle(); + + // Set up the drawer. + mNavigationDrawerFragment.setUp( + R.id.navigation_drawer, + (DrawerLayout) findViewById(R.id.drawer_layout)); + } + + @Override + public void onNavigationDrawerItemSelected(int position) { + // update the main content by replacing fragments + FragmentManager fragmentManager = getFragmentManager(); + fragmentManager.beginTransaction() + .replace(R.id.container, PlaceholderFragment.newInstance(position + 1)) + .commit(); + } + + public void onSectionAttached(int number) { + switch (number) { + case 1: + mTitle = getString(R.string.title_section1); + break; + case 2: + mTitle = getString(R.string.title_section2); + break; + case 3: + mTitle = getString(R.string.title_section3); + break; + } + } + + public void restoreActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(mTitle); + } + + /** + * A placeholder fragment containing a simple view. + */ + public static class PlaceholderFragment extends Fragment { + /** + * The fragment argument representing the section number for this + * fragment. + */ + private static final String ARG_SECTION_NUMBER = "section_number"; + + public PlaceholderFragment() { + } + + /** + * Returns a new instance of this fragment for the given section + * number. + */ + public static PlaceholderFragment newInstance(int sectionNumber) { + PlaceholderFragment fragment = new PlaceholderFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_SECTION_NUMBER, sectionNumber); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.fragment_main, container, false); + return rootView; + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + ((MainActivity) activity).onSectionAttached( + getArguments().getInt(ARG_SECTION_NUMBER)); + } + } + +} diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java new file mode 100644 index 0000000..29bac37 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/bishop/NavigationDrawerFragment.java @@ -0,0 +1,284 @@ +package org.crosswire.android.bishop; + + +import android.app.Activity; +import android.app.ActionBar; +import android.app.Fragment; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import org.crosswire.sword.R; + +/** + * Fragment used for managing interactions for and presentation of a navigation drawer. + * See the + * design guidelines for a complete explanation of the behaviors implemented here. + */ +public class NavigationDrawerFragment extends Fragment { + + /** + * Remember the position of the selected item. + */ + private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position"; + + /** + * Per the design guidelines, you should show the drawer on launch until the user manually + * expands it. This shared preference tracks this. + */ + private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned"; + + /** + * A pointer to the current callbacks instance (the Activity). + */ + private NavigationDrawerCallbacks mCallbacks; + + /** + * Helper component that ties the action bar to the navigation drawer. + */ + private ActionBarDrawerToggle mDrawerToggle; + + private DrawerLayout mDrawerLayout; + private ListView mDrawerListView; + private View mFragmentContainerView; + + private int mCurrentSelectedPosition = 0; + private boolean mFromSavedInstanceState; + private boolean mUserLearnedDrawer; + + public NavigationDrawerFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Read in the flag indicating whether or not the user has demonstrated awareness of the + // drawer. See PREF_USER_LEARNED_DRAWER for details. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false); + + if (savedInstanceState != null) { + mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION); + mFromSavedInstanceState = true; + } + + // Select either the default item (0) or the last selected item. + selectItem(mCurrentSelectedPosition); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + // Indicate that this fragment would like to influence the set of actions in the action bar. + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + mDrawerListView = (ListView) inflater.inflate( + R.layout.drawer_main, container, false); + mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerListView.setAdapter(new ArrayAdapter( + getActionBar().getThemedContext(), + android.R.layout.simple_list_item_activated_1, + android.R.id.text1, + new String[]{ + getString(R.string.title_section1), + getString(R.string.title_section2), + getString(R.string.title_section3), + })); + mDrawerListView.setItemChecked(mCurrentSelectedPosition, true); + return mDrawerListView; + } + + public boolean isDrawerOpen() { + return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView); + } + + /** + * Users of this fragment must call this method to set up the navigation drawer interactions. + * + * @param fragmentId The android:id of this fragment in its activity's layout. + * @param drawerLayout The DrawerLayout containing this fragment's UI. + */ + public void setUp(int fragmentId, DrawerLayout drawerLayout) { + mFragmentContainerView = getActivity().findViewById(fragmentId); + mDrawerLayout = drawerLayout; + + // set a custom shadow that overlays the main content when the drawer opens + mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + // set up the drawer's list view with items and click listener + + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + + // ActionBarDrawerToggle ties together the the proper interactions + // between the navigation drawer and the action bar app icon. + mDrawerToggle = new ActionBarDrawerToggle( + getActivity(), /* host Activity */ + mDrawerLayout, /* DrawerLayout object */ + R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */ + R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ + R.string.navigation_drawer_close /* "close drawer" description for accessibility */ + ) { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + if (!isAdded()) { + return; + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + if (!isAdded()) { + return; + } + + if (!mUserLearnedDrawer) { + // The user manually opened the drawer; store this flag to prevent auto-showing + // the navigation drawer automatically in the future. + mUserLearnedDrawer = true; + SharedPreferences sp = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); + } + + getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + }; + + // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer, + // per the navigation drawer design guidelines. + if (!mUserLearnedDrawer && !mFromSavedInstanceState) { + mDrawerLayout.openDrawer(mFragmentContainerView); + } + + // Defer code dependent on restoration of previous instance state. + mDrawerLayout.post(new Runnable() { + @Override + public void run() { + mDrawerToggle.syncState(); + } + }); + + mDrawerLayout.setDrawerListener(mDrawerToggle); + } + + private void selectItem(int position) { + mCurrentSelectedPosition = position; + if (mDrawerListView != null) { + mDrawerListView.setItemChecked(position, true); + } + if (mDrawerLayout != null) { + mDrawerLayout.closeDrawer(mFragmentContainerView); + } + if (mCallbacks != null) { + mCallbacks.onNavigationDrawerItemSelected(position); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mCallbacks = (NavigationDrawerCallbacks) activity; + } catch (ClassCastException e) { + throw new ClassCastException("Activity must implement NavigationDrawerCallbacks."); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mCallbacks = null; + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + // Forward the new configuration the drawer toggle component. + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + // If the drawer is open, show the global app actions in the action bar. See also + // showGlobalContextActionBar, which controls the top-left area of the action bar. + if (mDrawerLayout != null && isDrawerOpen()) { + inflater.inflate(R.menu.global, menu); + showGlobalContextActionBar(); + } + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (mDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + + if (item.getItemId() == R.id.action_example) { + Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * Per the navigation drawer design guidelines, updates the action bar to show the global app + * 'context', rather than just what's in the current screen. + */ + private void showGlobalContextActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setTitle(R.string.app_name); + } + + private ActionBar getActionBar() { + return getActivity().getActionBar(); + } + + /** + * Callbacks interface that all activities using this fragment must implement. + */ + public static interface NavigationDrawerCallbacks { + /** + * Called when an item in the navigation drawer is selected. + */ + void onNavigationDrawerItemSelected(int position); + } +} diff --git a/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java new file mode 100644 index 0000000..61392e6 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/java/org/crosswire/android/sword/AndroidMgr.java @@ -0,0 +1,45 @@ +/****************************************************************************** + * + * AndroidMgr.java - + * + * $Id: SWMgr.java 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +package org.crosswire.android.sword; + +import android.app.Application; +import android.content.Context; + +public class AndroidMgr extends SWMgr { + + private Application app; + + public AndroidMgr(Application app) { + super(false); + this.app = app; + reInit(); + } + + @Override + public String getStorageBasePath() { + Context context = app.getApplicationContext(); + return context.getFilesDir().getAbsolutePath(); + } +} + + diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png new file mode 100644 index 0000000..236bff5 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/drawer_shadow.9.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png new file mode 100644 index 0000000..c59f601 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-hdpi/ic_drawer.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png new file mode 100644 index 0000000..ffe3a28 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/drawer_shadow.9.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 0000000..1ed2c56 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-mdpi/ic_drawer.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png new file mode 100644 index 0000000..fabe9d9 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 0000000..a5fa74d Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-xhdpi/ic_drawer.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png new file mode 100644 index 0000000..b91e9d7 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 0000000..9c4685d Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/drawable-xxhdpi/ic_drawer.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..0c3c3cc --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml new file mode 100644 index 0000000..7a02f93 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/drawer_main.xml @@ -0,0 +1,9 @@ + diff --git a/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml b/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..3f80d4e --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/bindings/Android/SWORD/app/src/main/res/menu/global.xml b/bindings/Android/SWORD/app/src/main/res/menu/global.xml new file mode 100644 index 0000000..e3f1dfa --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/global.xml @@ -0,0 +1,7 @@ + + + diff --git a/bindings/Android/SWORD/app/src/main/res/menu/main.xml b/bindings/Android/SWORD/app/src/main/res/menu/main.xml new file mode 100644 index 0000000..037dc19 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/main.xml @@ -0,0 +1,13 @@ + + + + diff --git a/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml b/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml new file mode 100644 index 0000000..7cb68bd --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/menu/menu_swordtest.xml @@ -0,0 +1,7 @@ + + + diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9a078e3 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..efc028a Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..3af2608 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9bec2e6 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..34947cd Binary files /dev/null and b/bindings/Android/SWORD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml b/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/bindings/Android/SWORD/app/src/main/res/values/colors.xml b/bindings/Android/SWORD/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/bindings/Android/SWORD/app/src/main/res/values/dimens.xml b/bindings/Android/SWORD/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..d1c4b97 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + 16dp + + 16dp + 16dp + + + 240dp + diff --git a/bindings/Android/SWORD/app/src/main/res/values/strings.xml b/bindings/Android/SWORD/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c92ade9 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/strings.xml @@ -0,0 +1,14 @@ + + SWORD + Settings + MainActivity + + Section 1 + Section 2 + Section 3 + + Open navigation drawer + Close navigation drawer + + Example action + diff --git a/bindings/Android/SWORD/app/src/main/res/values/styles.xml b/bindings/Android/SWORD/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..3f48db4 --- /dev/null +++ b/bindings/Android/SWORD/app/src/main/res/values/styles.xml @@ -0,0 +1,17 @@ + + + + + +