diff --git a/DynamicBibleIonic/config.xml b/DynamicBibleIonic/config.xml index 258691a7..67efcc02 100644 --- a/DynamicBibleIonic/config.xml +++ b/DynamicBibleIonic/config.xml @@ -96,5 +96,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/package-lock.json b/DynamicBibleIonic/package-lock.json index feb7f43c..e3da96e9 100644 --- a/DynamicBibleIonic/package-lock.json +++ b/DynamicBibleIonic/package-lock.json @@ -1,6 +1,6 @@ { "name": "dynamicbible", - "version": "3.1.0", + "version": "3.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2605,11 +2605,313 @@ } }, "cordova-android-support-gradle-release": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-1.4.4.tgz", - "integrity": "sha512-DOwZ+MX0CBoagXV6cHqfQacVjsrDea8z2wuM427AIvi2eAFvojw85o1XMCdJ4kSDMbsUUaNPw12h7uY0m+rcvg==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-1.4.7.tgz", + "integrity": "sha512-3hDS3mBjSAEzKM4gZBze8G02/aNQgcww1CyUneuYPOYvleTPk3Q4OYkjmHHuE4FEgr4v9EY6j6bJqoX9pMZHgg==", "requires": { + "semver": "5.1.0", "xml2js": "~0.4.19" + }, + "dependencies": { + "semver": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", + "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU=" + } + } + }, + "cordova-ios": { + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz", + "integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==", + "requires": { + "abbrev": "*", + "ansi": "*", + "balanced-match": "*", + "base64-js": "1.2.0", + "big-integer": "*", + "bplist-creator": "*", + "bplist-parser": "*", + "brace-expansion": "*", + "concat-map": "*", + "cordova-common": "2.2.5", + "cordova-registry-mapper": "*", + "elementtree": "0.1.6", + "glob": "5.0.15", + "inflight": "*", + "inherits": "*", + "ios-sim": "6.1.3", + "minimatch": "*", + "nopt": "3.0.6", + "once": "*", + "path-is-absolute": "*", + "plist": "2.1.0", + "q": "1.5.1", + "sax": "0.3.5", + "shelljs": "0.5.3", + "simctl": "*", + "simple-plist": "0.2.1", + "stream-buffers": "2.2.0", + "tail": "0.4.0", + "underscore": "*", + "unorm": "*", + "uuid": "3.0.1", + "wrappy": "*", + "xcode": "0.9.3", + "xml-escape": "1.1.0", + "xmlbuilder": "8.2.2", + "xmldom": "*" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ansi": { + "version": "0.3.1", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "base64-js": { + "version": "1.2.0", + "bundled": true + }, + "big-integer": { + "version": "1.6.32", + "bundled": true + }, + "bplist-creator": { + "version": "0.0.7", + "bundled": true, + "requires": { + "stream-buffers": "~2.2.0" + } + }, + "bplist-parser": { + "version": "0.1.1", + "bundled": true, + "requires": { + "big-integer": "^1.6.7" + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "cordova-common": { + "version": "2.2.5", + "bundled": true, + "requires": { + "ansi": "^0.3.1", + "bplist-parser": "^0.1.0", + "cordova-registry-mapper": "^1.1.8", + "elementtree": "0.1.6", + "glob": "^5.0.13", + "minimatch": "^3.0.0", + "plist": "^2.1.0", + "q": "^1.4.1", + "shelljs": "^0.5.3", + "underscore": "^1.8.3", + "unorm": "^1.3.3" + } + }, + "cordova-registry-mapper": { + "version": "1.1.15", + "bundled": true + }, + "elementtree": { + "version": "0.1.6", + "bundled": true, + "requires": { + "sax": "0.3.5" + } + }, + "glob": { + "version": "5.0.15", + "bundled": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ios-sim": { + "version": "6.1.3", + "bundled": true, + "requires": { + "bplist-parser": "^0.0.6", + "nopt": "1.0.9", + "plist": "^2.1.0", + "simctl": "^1.1.1" + }, + "dependencies": { + "bplist-parser": { + "version": "0.0.6", + "bundled": true + }, + "nopt": { + "version": "1.0.9", + "bundled": true, + "requires": { + "abbrev": "1" + } + } + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "plist": { + "version": "2.1.0", + "bundled": true, + "requires": { + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + }, + "q": { + "version": "1.5.1", + "bundled": true + }, + "sax": { + "version": "0.3.5", + "bundled": true + }, + "shelljs": { + "version": "0.5.3", + "bundled": true + }, + "simctl": { + "version": "1.1.1", + "bundled": true, + "requires": { + "shelljs": "^0.2.6", + "tail": "^0.4.0" + }, + "dependencies": { + "shelljs": { + "version": "0.2.6", + "bundled": true + } + } + }, + "simple-plist": { + "version": "0.2.1", + "bundled": true, + "requires": { + "bplist-creator": "0.0.7", + "bplist-parser": "0.1.1", + "plist": "2.0.1" + }, + "dependencies": { + "base64-js": { + "version": "1.1.2", + "bundled": true + }, + "plist": { + "version": "2.0.1", + "bundled": true, + "requires": { + "base64-js": "1.1.2", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.x" + } + } + } + }, + "stream-buffers": { + "version": "2.2.0", + "bundled": true + }, + "tail": { + "version": "0.4.0", + "bundled": true + }, + "underscore": { + "version": "1.9.1", + "bundled": true + }, + "unorm": { + "version": "1.4.1", + "bundled": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "xcode": { + "version": "0.9.3", + "bundled": true, + "requires": { + "pegjs": "^0.10.0", + "simple-plist": "^0.2.1", + "uuid": "3.0.1" + } + }, + "xml-escape": { + "version": "1.1.0", + "bundled": true + }, + "xmlbuilder": { + "version": "8.2.2", + "bundled": true + }, + "xmldom": { + "version": "0.1.27", + "bundled": true + } } }, "cordova-plugin-browsertab": { @@ -5879,6 +6181,11 @@ "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-3.0.0.tgz", "integrity": "sha1-QLja9P16MRUL0AIWD2ZJbiKpjDw=" }, + "ios-deploy": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.4.tgz", + "integrity": "sha512-pgyc19zgtwGrfx3GL8yV0c0dAPucTpJ0VZkuS3DcqxIZYC48+UW+tBTxI43u1ZDk17mop0ABLs1SkAy5SUQ6pQ==" + }, "ip": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", @@ -7990,6 +8297,11 @@ "sha.js": "^2.4.8" } }, + "pegjs": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=" + }, "performance-now": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", diff --git a/DynamicBibleIonic/package.json b/DynamicBibleIonic/package.json index b6422e96..0597c408 100644 --- a/DynamicBibleIonic/package.json +++ b/DynamicBibleIonic/package.json @@ -35,7 +35,8 @@ "@ionic/storage": "2.1.3", "angularfire2": "^5.0.0-rc.4", "cordova-android": "7.0.0", - "cordova-android-support-gradle-release": "^1.4.4", + "cordova-android-support-gradle-release": "^1.4.7", + "cordova-ios": "4.5.5", "cordova-plugin-browsertab": "^0.2.0", "cordova-plugin-buildinfo": "^2.0.2", "cordova-plugin-compat": "^1.2.0", @@ -52,6 +53,7 @@ "ionic-plugin-keyboard": "^2.2.1", "ionic2-auto-complete": "^1.6.2-alpha", "ionicons": "3.0.0", + "ios-deploy": "^1.9.4", "promise-polyfill": "^6.0.2", "rxjs": "5.5.2", "sw-toolbox": "3.6.0", @@ -120,7 +122,8 @@ } }, "platforms": [ - "android" + "android", + "ios" ] } } \ No newline at end of file diff --git a/DynamicBibleIonic/resources/icon.png b/DynamicBibleIonic/resources/icon.png index 4f215286..0ecb56ca 100644 Binary files a/DynamicBibleIonic/resources/icon.png and b/DynamicBibleIonic/resources/icon.png differ diff --git a/DynamicBibleIonic/resources/icon.png.md5 b/DynamicBibleIonic/resources/icon.png.md5 index 6b02c66e..d528db59 100644 --- a/DynamicBibleIonic/resources/icon.png.md5 +++ b/DynamicBibleIonic/resources/icon.png.md5 @@ -1 +1 @@ -09a1448b9ee0c0b89b3dcf3805065b3f \ No newline at end of file +78e36d38973bfff2b2a0d33793e19111 \ No newline at end of file diff --git a/DynamicBibleIonic/resources/ios/icon/icon-1024.png b/DynamicBibleIonic/resources/ios/icon/icon-1024.png new file mode 100644 index 00000000..c7c97382 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-1024.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-40.png b/DynamicBibleIonic/resources/ios/icon/icon-40.png new file mode 100644 index 00000000..5fd74bde Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-40.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-40@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-40@2x.png new file mode 100644 index 00000000..0817b40d Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-40@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-40@3x.png b/DynamicBibleIonic/resources/ios/icon/icon-40@3x.png new file mode 100644 index 00000000..701b8fc2 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-40@3x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-50.png b/DynamicBibleIonic/resources/ios/icon/icon-50.png new file mode 100644 index 00000000..b352f026 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-50.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-50@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-50@2x.png new file mode 100644 index 00000000..2c7cc76f Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-50@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-60.png b/DynamicBibleIonic/resources/ios/icon/icon-60.png new file mode 100644 index 00000000..ac848517 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-60.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-60@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-60@2x.png new file mode 100644 index 00000000..6f52ced3 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-60@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-60@3x.png b/DynamicBibleIonic/resources/ios/icon/icon-60@3x.png new file mode 100644 index 00000000..6123325e Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-60@3x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-72.png b/DynamicBibleIonic/resources/ios/icon/icon-72.png new file mode 100644 index 00000000..2aca87c2 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-72.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-72@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-72@2x.png new file mode 100644 index 00000000..12ce62e3 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-72@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-76.png b/DynamicBibleIonic/resources/ios/icon/icon-76.png new file mode 100644 index 00000000..332a8c52 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-76.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-76@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-76@2x.png new file mode 100644 index 00000000..53c47e10 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-76@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-83.5@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-83.5@2x.png new file mode 100644 index 00000000..4f0b71d6 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-83.5@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-small.png b/DynamicBibleIonic/resources/ios/icon/icon-small.png new file mode 100644 index 00000000..8d8e7c42 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-small.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-small@2x.png b/DynamicBibleIonic/resources/ios/icon/icon-small@2x.png new file mode 100644 index 00000000..74e79b75 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-small@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon-small@3x.png b/DynamicBibleIonic/resources/ios/icon/icon-small@3x.png new file mode 100644 index 00000000..9dca2aab Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon-small@3x.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon.png b/DynamicBibleIonic/resources/ios/icon/icon.png new file mode 100644 index 00000000..ed2097c2 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon.png differ diff --git a/DynamicBibleIonic/resources/ios/icon/icon@2x.png b/DynamicBibleIonic/resources/ios/icon/icon@2x.png new file mode 100644 index 00000000..da3ffd09 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/icon/icon@2x.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-568h@2x~iphone.png b/DynamicBibleIonic/resources/ios/splash/Default-568h@2x~iphone.png new file mode 100644 index 00000000..a1bdcb99 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-667h.png b/DynamicBibleIonic/resources/ios/splash/Default-667h.png new file mode 100644 index 00000000..1c0090a7 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-667h.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-736h.png b/DynamicBibleIonic/resources/ios/splash/Default-736h.png new file mode 100644 index 00000000..5e9b503a Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-736h.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Landscape-736h.png b/DynamicBibleIonic/resources/ios/splash/Default-Landscape-736h.png new file mode 100644 index 00000000..5170182f Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Landscape@2x~ipad.png b/DynamicBibleIonic/resources/ios/splash/Default-Landscape@2x~ipad.png new file mode 100644 index 00000000..5a142957 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Landscape@~ipadpro.png b/DynamicBibleIonic/resources/ios/splash/Default-Landscape@~ipadpro.png new file mode 100644 index 00000000..6fb10950 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Landscape~ipad.png b/DynamicBibleIonic/resources/ios/splash/Default-Landscape~ipad.png new file mode 100644 index 00000000..120e7d80 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Portrait@2x~ipad.png b/DynamicBibleIonic/resources/ios/splash/Default-Portrait@2x~ipad.png new file mode 100644 index 00000000..b9629642 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Portrait@~ipadpro.png b/DynamicBibleIonic/resources/ios/splash/Default-Portrait@~ipadpro.png new file mode 100644 index 00000000..b4e1ad7d Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default-Portrait~ipad.png b/DynamicBibleIonic/resources/ios/splash/Default-Portrait~ipad.png new file mode 100644 index 00000000..f2767546 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default@2x~iphone.png b/DynamicBibleIonic/resources/ios/splash/Default@2x~iphone.png new file mode 100644 index 00000000..ab5ed08f Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default@2x~iphone.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default@2x~universal~anyany.png b/DynamicBibleIonic/resources/ios/splash/Default@2x~universal~anyany.png new file mode 100644 index 00000000..50f3b15b Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/DynamicBibleIonic/resources/ios/splash/Default~iphone.png b/DynamicBibleIonic/resources/ios/splash/Default~iphone.png new file mode 100644 index 00000000..fc27cde6 Binary files /dev/null and b/DynamicBibleIonic/resources/ios/splash/Default~iphone.png differ diff --git a/DynamicBibleIonic/resources/splash.png b/DynamicBibleIonic/resources/splash.png index 2a847418..b0087175 100644 Binary files a/DynamicBibleIonic/resources/splash.png and b/DynamicBibleIonic/resources/splash.png differ diff --git a/DynamicBibleIonic/resources/splash.png.md5 b/DynamicBibleIonic/resources/splash.png.md5 index 523c072d..80b5db83 100644 --- a/DynamicBibleIonic/resources/splash.png.md5 +++ b/DynamicBibleIonic/resources/splash.png.md5 @@ -1 +1 @@ -49e4535f16c2a438a6b12181af3996a8 \ No newline at end of file +a064173fc6ef32c7f336527ea64b17a0 \ No newline at end of file diff --git a/DynamicBibleIonic/src/pages/search/search.scss b/DynamicBibleIonic/src/pages/search/search.scss index 0d54ec96..d0213ea0 100644 --- a/DynamicBibleIonic/src/pages/search/search.scss +++ b/DynamicBibleIonic/src/pages/search/search.scss @@ -1,3 +1,11 @@ + +ion-app.ios [padding] .scroll-content { + padding: 6px; +} +.toolbar .searchbar-ios .searchbar-input { + background: rgba(0, 0, 0, 0); +} + .toolbar { contain: inherit; overflow: inherit; @@ -28,6 +36,7 @@ ion-auto-complete { p { margin: 1em 0; font-size: 1em; + color: black; } .button-large { height: 3.6rem !important;