diff --git a/DynamicBibleIonic/config.xml b/DynamicBibleIonic/config.xml index e568da1f..2358e910 100644 --- a/DynamicBibleIonic/config.xml +++ b/DynamicBibleIonic/config.xml @@ -1,58 +1,72 @@ - - - Dynamic Bible - A bible app designed for bible study - Dynamic Bible - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + Dynamic Bible + A bible app designed for bible study + Jason Wall + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DynamicBibleIonic/res/drawable-land-hdpi/screen.png b/DynamicBibleIonic/res/drawable-land-hdpi/screen.png new file mode 100644 index 00000000..b0caa894 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-hdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-land-ldpi/screen.png b/DynamicBibleIonic/res/drawable-land-ldpi/screen.png new file mode 100644 index 00000000..7164971b Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-ldpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-land-mdpi/screen.png b/DynamicBibleIonic/res/drawable-land-mdpi/screen.png new file mode 100644 index 00000000..eb4a74cb Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-mdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-land-xhdpi/screen.png b/DynamicBibleIonic/res/drawable-land-xhdpi/screen.png new file mode 100644 index 00000000..8d56754d Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-xhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-land-xxhdpi/screen.png b/DynamicBibleIonic/res/drawable-land-xxhdpi/screen.png new file mode 100644 index 00000000..1fb25f4c Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-xxhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-land-xxxhdpi/screen.png b/DynamicBibleIonic/res/drawable-land-xxxhdpi/screen.png new file mode 100644 index 00000000..4adc2b30 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-land-xxxhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-hdpi/screen.png b/DynamicBibleIonic/res/drawable-port-hdpi/screen.png new file mode 100644 index 00000000..a9f68879 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-hdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-ldpi/screen.png b/DynamicBibleIonic/res/drawable-port-ldpi/screen.png new file mode 100644 index 00000000..f7628063 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-ldpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-mdpi/screen.png b/DynamicBibleIonic/res/drawable-port-mdpi/screen.png new file mode 100644 index 00000000..4bf9bb1b Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-mdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-xhdpi/screen.png b/DynamicBibleIonic/res/drawable-port-xhdpi/screen.png new file mode 100644 index 00000000..7a26829e Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-xhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-xxhdpi/screen.png b/DynamicBibleIonic/res/drawable-port-xxhdpi/screen.png new file mode 100644 index 00000000..5b9d5dd4 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-xxhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/drawable-port-xxxhdpi/screen.png b/DynamicBibleIonic/res/drawable-port-xxxhdpi/screen.png new file mode 100644 index 00000000..843161f1 Binary files /dev/null and b/DynamicBibleIonic/res/drawable-port-xxxhdpi/screen.png differ diff --git a/DynamicBibleIonic/res/mipmap-hdpi/icon.png b/DynamicBibleIonic/res/mipmap-hdpi/icon.png new file mode 100644 index 00000000..4d96acb0 Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-hdpi/icon.png differ diff --git a/DynamicBibleIonic/res/mipmap-ldpi/icon.png b/DynamicBibleIonic/res/mipmap-ldpi/icon.png new file mode 100644 index 00000000..a0a56088 Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-ldpi/icon.png differ diff --git a/DynamicBibleIonic/res/mipmap-mdpi/icon.png b/DynamicBibleIonic/res/mipmap-mdpi/icon.png new file mode 100644 index 00000000..d1d5123a Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-mdpi/icon.png differ diff --git a/DynamicBibleIonic/res/mipmap-xhdpi/icon.png b/DynamicBibleIonic/res/mipmap-xhdpi/icon.png new file mode 100644 index 00000000..e1e7d3cc Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-xhdpi/icon.png differ diff --git a/DynamicBibleIonic/res/mipmap-xxhdpi/icon.png b/DynamicBibleIonic/res/mipmap-xxhdpi/icon.png new file mode 100644 index 00000000..e220d79d Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-xxhdpi/icon.png differ diff --git a/DynamicBibleIonic/res/mipmap-xxxhdpi/icon.png b/DynamicBibleIonic/res/mipmap-xxxhdpi/icon.png new file mode 100644 index 00000000..178ab3dc Binary files /dev/null and b/DynamicBibleIonic/res/mipmap-xxxhdpi/icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-hdpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-hdpi-icon.png index c6d763a7..4d96acb0 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-hdpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-ldpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-ldpi-icon.png index a873721a..a0a56088 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-ldpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-mdpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-mdpi-icon.png index a043dbe3..d1d5123a 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-mdpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-xhdpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-xhdpi-icon.png index cdc6fba9..e1e7d3cc 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-xhdpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-xxhdpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-xxhdpi-icon.png index 1fb74561..e220d79d 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-xxhdpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/icon/drawable-xxxhdpi-icon.png b/DynamicBibleIonic/resources/android/icon/drawable-xxxhdpi-icon.png index 173c9608..178ab3dc 100644 Binary files a/DynamicBibleIonic/resources/android/icon/drawable-xxxhdpi-icon.png and b/DynamicBibleIonic/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-hdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-hdpi-screen.png index 16a0e8e2..b0caa894 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-hdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-ldpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-ldpi-screen.png index 97e0d4de..7164971b 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-ldpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-mdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-mdpi-screen.png index eb1e850a..eb4a74cb 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-mdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-xhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-xhdpi-screen.png index b5dd61f4..8d56754d 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-xhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-xxhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-xxhdpi-screen.png index 56540a1f..1fb25f4c 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-xxhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-land-xxxhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-land-xxxhdpi-screen.png index 6916379d..4adc2b30 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-hdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-hdpi-screen.png index 41036783..a9f68879 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-hdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-ldpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-ldpi-screen.png index a5eb7b4e..f7628063 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-ldpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-mdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-mdpi-screen.png index 0f7ef4b0..4bf9bb1b 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-mdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-xhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-xhdpi-screen.png index 2f2d8573..7a26829e 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-xhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-xxhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-xxhdpi-screen.png index b65a64cd..5b9d5dd4 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-xxhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/DynamicBibleIonic/resources/android/splash/drawable-port-xxxhdpi-screen.png b/DynamicBibleIonic/resources/android/splash/drawable-port-xxxhdpi-screen.png index 26e23346..843161f1 100644 Binary files a/DynamicBibleIonic/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/DynamicBibleIonic/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/DynamicBibleIonic/src/app/app.module.ts b/DynamicBibleIonic/src/app/app.module.ts index 7d993d53..babb45de 100644 --- a/DynamicBibleIonic/src/app/app.module.ts +++ b/DynamicBibleIonic/src/app/app.module.ts @@ -13,6 +13,7 @@ import {ComponentLoader} from "../components/component-loader/component-loader.t import {Passage} from "../components/passage/passage.ts"; import {Strongs} from "../components/strongs/strongs.ts"; import {Words} from "../components/words/words.ts"; +import {Error} from "../components/error/error.ts"; import {StrongsModal} from "../components/strongs-modal/strongs-modal.ts"; @NgModule({ @@ -24,7 +25,8 @@ import {StrongsModal} from "../components/strongs-modal/strongs-modal.ts"; Passage, Strongs, StrongsModal, - Words + Words, + Error ], imports: [ IonicModule.forRoot(MyApp), @@ -38,7 +40,8 @@ import {StrongsModal} from "../components/strongs-modal/strongs-modal.ts"; Passage, Strongs, StrongsModal, - Words + Words, + Error ], providers: [{ provide: ErrorHandler, useClass: IonicErrorHandler }, Storage] }) diff --git a/DynamicBibleIonic/src/bible-service.ts b/DynamicBibleIonic/src/bible-service.ts index 634b561f..ff94e4fe 100644 --- a/DynamicBibleIonic/src/bible-service.ts +++ b/DynamicBibleIonic/src/bible-service.ts @@ -23,7 +23,9 @@ export class BibleService this.result = { cs: [], testament: "", - ref: "" + ref: "", + status: 0, + msg: ":)" }; this.count = Number(section.end.chapter) - Number(section.start.chapter) + 1; @@ -41,11 +43,15 @@ export class BibleService }, error: function (request, status, error) { - console.log(error); + self.result.status = -1; + self.result.msg = "Unable to retrieve bible passage " + self.result.ref + "."; } }); } + if (self.result.status == -1) + return self.result; + for (let j = 0; j < this.chapters.length; j++) { const vss: BibleVerse[] = []; diff --git a/DynamicBibleIonic/src/components/error/error.html b/DynamicBibleIonic/src/components/error/error.html new file mode 100644 index 00000000..22d0c783 --- /dev/null +++ b/DynamicBibleIonic/src/components/error/error.html @@ -0,0 +1,10 @@ + + Error + + + +
+

{{item}}

+ \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/error/error.scss b/DynamicBibleIonic/src/components/error/error.scss new file mode 100644 index 00000000..24bec99d --- /dev/null +++ b/DynamicBibleIonic/src/components/error/error.scss @@ -0,0 +1,3 @@ +.error-title { + background-color:#fad0b2; +} \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/error/error.ts b/DynamicBibleIonic/src/components/error/error.ts new file mode 100644 index 00000000..f62369cd --- /dev/null +++ b/DynamicBibleIonic/src/components/error/error.ts @@ -0,0 +1,26 @@ +import { EventEmitter, Component, Input, Output } from "@angular/core"; + +@Component({ + selector: "error", + templateUrl: "error.html" +}) +export class Error +{ + @Output() + onClose = new EventEmitter(); + + @Input() + item: string; + + @Input() + cardItem: CardItem; + + constructor() + { + } + + close() + { + this.onClose.emit(this.cardItem); + } +} \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/words/words.html b/DynamicBibleIonic/src/components/words/words.html index 7d2fd0bd..0d528519 100644 --- a/DynamicBibleIonic/src/components/words/words.html +++ b/DynamicBibleIonic/src/components/words/words.html @@ -5,11 +5,7 @@ - - - - {{makePassage(ref)}} - - + + {{makePassage(ref)}} \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/words/words.scss b/DynamicBibleIonic/src/components/words/words.scss index e764880c..bee20737 100644 --- a/DynamicBibleIonic/src/components/words/words.scss +++ b/DynamicBibleIonic/src/components/words/words.scss @@ -1,5 +1,5 @@ .words-title { - background-color:#ffe0e0; + background-color:#f5b9f3; } words ion-scroll { @@ -17,4 +17,55 @@ ion-col .button{ ion-col { margin-bottom: 0px !important; +} + +@media screen and (max-width: 499px) { + words .passage-button + { + width: 100%; + } +} + +@media screen and (max-width: 699px) and (min-width: 500px) { + words .passage-button + { + width: 46%; + } +} + +@media screen and (max-width: 799px) and (min-width: 700px) { + words .passage-button + { + width: 31%; + } +} + +@media screen and (max-width: 899px) and (min-width: 800px) { + words .passage-button + { + width: 23%; + } +} + +@media screen and (max-width: 1199px) and (min-width: 900px) { + words .passage-button + { + width: 18%; + } +} +@media screen and (min-width: 1200px) { + words .passage-button + { + width: 13.5%; + } +} + +words .passage-button +{ + font-size: 1em; + float: left; + padding: .5em; + background-color: #fceeee; + margin: .3em; + text-align: center; } \ No newline at end of file diff --git a/DynamicBibleIonic/src/components/words/words.ts b/DynamicBibleIonic/src/components/words/words.ts index d5ce0dbb..7da4ac23 100644 --- a/DynamicBibleIonic/src/components/words/words.ts +++ b/DynamicBibleIonic/src/components/words/words.ts @@ -25,11 +25,6 @@ export class Words { this.onClose.emit(this.cardItem); } - getColumns() - { - return Array.from(Array(Math.ceil(this.item.refs.length / 4)).keys()) - } - makePassage(p: string) { return Reference.bookName(parseInt(p.split(":")[0])) + ' ' + p.split(":")[1] + ":" + p.split(":")[2]; diff --git a/DynamicBibleIonic/src/mocks.ts b/DynamicBibleIonic/src/mocks.ts deleted file mode 100644 index 9ca6a322..00000000 --- a/DynamicBibleIonic/src/mocks.ts +++ /dev/null @@ -1,82 +0,0 @@ -export class ConfigMock -{ - - public get(): any - { - return ''; - } - - public getBoolean(): boolean - { - return true; - } - - public getNumber(): number - { - return 1; - } -} - -export class FormMock -{ - public register(): any - { - return true; - } -} - -export class NavMock -{ - - public pop(): any - { - return new Promise(function (resolve: Function): void - { - resolve(); - }); - } - - public push(): any - { - return new Promise(function (resolve: Function): void - { - resolve(); - }); - } - - public getActive(): any - { - return { - 'instance': { - 'model': 'something', - }, - }; - } - - public setRoot(): any - { - return true; - } -} - -export class PlatformMock -{ - public ready(): any - { - return new Promise((resolve: Function) => - { - resolve(); - }); - } -} - -export class MenuMock -{ - public close(): any - { - return new Promise((resolve: Function) => - { - resolve(); - }); - } -} \ No newline at end of file diff --git a/DynamicBibleIonic/src/pages/search/search.html b/DynamicBibleIonic/src/pages/search/search.html index 5d4e4705..f9f87db7 100644 --- a/DynamicBibleIonic/src/pages/search/search.html +++ b/DynamicBibleIonic/src/pages/search/search.html @@ -23,9 +23,10 @@ --> + - +