From 9e7a5465d4448517e93fe61f6a0a49a2831083f5 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 13:04:14 -0500 Subject: [PATCH 1/6] Fix the application name in angular --- src/android/app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 91516985..6f0a47d9 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - dynamicbible - dynamicbible + Dynamic Bible + Dynamic Bible walljm.dynamicbible walljm.dynamicbible 200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com From 578db7eae97ca10e247107c34fa8fe7ca2d46690 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 13:04:38 -0500 Subject: [PATCH 2/6] set button overlay to transparent so you don't see it anymore after a button has been pressed --- src/src/styles/app.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss index 42d8e529..a4cc1cd4 100644 --- a/src/src/styles/app.scss +++ b/src/src/styles/app.scss @@ -41,7 +41,6 @@ body { color: #777; } - .card-title { font-size: 1.5rem; font-family: "Roboto Condensed"; @@ -165,6 +164,9 @@ a { box-shadow: none !important; border: 1px solid #eee; } +.mat-button-focus-overlay { + background-color: transparent !important; +} .full-width { width: 100%; From bef7e4d19932544cc5dcad8288fababc3bcb8e78 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 13:41:48 -0500 Subject: [PATCH 3/6] fix settings bottom margin --- src/src/app/components/settings/settings.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/src/app/components/settings/settings.component.html b/src/src/app/components/settings/settings.component.html index 704133d7..efbadb49 100644 --- a/src/src/app/components/settings/settings.component.html +++ b/src/src/app/components/settings/settings.component.html @@ -170,3 +170,4 @@ +

From 298a54e8e88ee34a6cad810f89514c4b08d42a6e Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 13:42:16 -0500 Subject: [PATCH 4/6] tweak what happens when a long passage title interferes with the close button --- src/src/styles/app.scss | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss index a4cc1cd4..e3e7c572 100644 --- a/src/src/styles/app.scss +++ b/src/src/styles/app.scss @@ -48,14 +48,15 @@ body { padding: 1rem; border-top-left-radius: var(--card-border-radius); border-top-right-radius: var(--card-border-radius); + padding-right: 3.2rem; > mat-icon { font-size: 1.8rem; } span { - line-height: 110%; - vertical-align: top; + // line-height: 110%; + vertical-align: text-top; padding-left: 1rem; } } @@ -69,8 +70,9 @@ body { } .card-close-button { - float: right; - margin-right: 0.8rem !important; + position: absolute !important; + right: 1.5rem; + top: 0.5rem; mat-icon { font-size: 2.3rem; line-height: 2rem !important; @@ -164,9 +166,6 @@ a { box-shadow: none !important; border: 1px solid #eee; } -.mat-button-focus-overlay { - background-color: transparent !important; -} .full-width { width: 100%; @@ -175,3 +174,12 @@ a { p { font-size: var(--card-font-size); } + +// overrides + +.mat-button-focus-overlay { + background-color: transparent !important; +} +.mat-icon-button { + line-height: inherit !important; +} From 82159cc84c28e662d8157766928fcb9a084045de Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 14:18:01 -0500 Subject: [PATCH 5/6] tweak size of dialogs on small screens --- .../help-modal/help-modal.component.html | 312 +++++++++--------- .../help-modal/help-modal.component.scss | 11 +- .../verse-picker-modal.component.ts | 2 +- src/src/styles/app.scss | 18 + 4 files changed, 189 insertions(+), 154 deletions(-) diff --git a/src/src/app/components/help-modal/help-modal.component.html b/src/src/app/components/help-modal/help-modal.component.html index 36ba5782..4d45ef17 100644 --- a/src/src/app/components/help-modal/help-modal.component.html +++ b/src/src/app/components/help-modal/help-modal.component.html @@ -7,168 +7,176 @@ -
-

How to search for a verse

-

- To bring up a passage, just type in a reference, or use the verse picker in - the top right corner. Dynamic Bible will recognize most abbreviations of - books, and can handle ranges within a book. Here are a few examples to get - you started: -

-

Examples of Search Items:

-
    -
  • John 1 (displays whole chapter)
    • -
  • John 3:16 (displays single verse)
    • -
  • Jn 3:16 (handles abbreviation of John)
    • -
  • - Jn 3:16-17 (displays verses starting with chapter 1 verse 3 through - chapter 1 vs 5) -
    • -
  • John 3:16-4:4
    • -
  • Jn 3-4 (displays both chapters)
    • -
  • John 3 - John 4 (displays both chapters)
    • -
  • - Jn 3:1-* (this will get all the verses in the chapter. the * char - can be used in verse ranges, but not chapter ranges.) -
    • -
  • - H1234 (displays the strongs definition for the Hebrew # 1234) -
    • -
  • G1234 (displays the strongs definition for the Greek # 1234)
    • -
  • - Jesus (searches for "Jesus". all search terms assume boolean AND, - i.e. "Jesus Christ" assumes "Jesus AND Christ". A word without a number is - interpreted as search term). -
    • -
- We currently don't support ranges that cross book boundaries. If you search - for "John 12 - Romans 3" you will get an error. the second book name is - ignored. + +
+

How to search for a verse

+ To bring up a passage, just type in a reference, or use the verse picker + in the top right corner. Dynamic Bible will recognize most abbreviations + of books, and can handle ranges within a book. Here are a few examples to + get you started: -

Further Notes:

-
    -
  • - Multiple lookups can be made using a semicolon as a seperator, i.e. "Ruth - 1; g1234; spirit"). -
    • -
  • - All greek/hebrew cross references translations are taken from the 1933 - Websters version and are sometimes not the same as the KJV translation. -
    • -
  • - All source materials were taken from the - Zefania XML Bible Project - on SourceForge. -
    • -
  • - Any Errors and Omission you find would be appreciated. Please contact me - via www.jasonwall.org. -
    • -
+

Examples of Search Items:

+
    +
  • John 1
    displays whole chapter
    • +
  • John 3:16
    displays single verse
    • +
  • Jn 3:16
    handles abbreviation of John
    • +
  • + Jn 3:16-17
    displays verses starting with chapter 1 verse 3 + through chapter 1 vs 5 +
    • +
  • John 3:16-4:4
    • +
  • Jn 3-4
    displays both chapters
    • +
  • John 3 - John 4
    displays both chapters
    • +
  • + Jn 3:1-*
    this will get all the verses in the chapter. the * char + can be used in verse ranges, but not chapter ranges. +
    • +
  • + H1234
    displays the strongs definition for the Hebrew # 1234 +
    • +
  • + G1234
    displays the strongs definition for the Greek # 1234 +
    • +
  • + Jesus
    searches for "Jesus". all search terms assume boolean AND, + i.e. "Jesus Christ" assumes "Jesus AND Christ". A word without a number + is interpreted as search term. +
    • +
-

Visit Us Online

-

+ We currently don't support ranges that cross book boundaries. If you search + for "John 12 - Romans 3" you will get an error. the second book name is + ignored. + +

Further Notes:

+
    +
  • + Multiple lookups can be made using a semicolon as a seperator, i.e. + "Ruth 1; g1234; spirit". +
    • +
  • + All greek/hebrew cross references translations are taken from the 1933 + Websters version and are sometimes not the same as the KJV translation. +
    • +
  • + All source materials were taken from the + Zefania XML Bible Project + on SourceForge. +
    • +
  • + Any Errors and Omission you find would be appreciated. Please contact me + via www.jasonwall.org. +
    • +
+ +

Visit Us Online

www.dynamicbible.com hosts the online version of the web app. We are currently available on the Windows Platform - via the Electron app from atom.io and - on the + via the + Electron app from atom.io and on the Google Android Play store. We are working on an IOS distribution and will be releasing that soon. -

-

Book Names and Accepted Abbreviations

-
    -
  • Genesis: gen, ge, gn
    • -
  • Exodus: ex, exo, exod, exd
    • -
  • Leviticus: lev, le, levi, lv
    • -
  • Numbers: num, nu, numb, number
    • -
  • Deuteronomy: deut, de, dt, deu
    • -
  • Joshua: josh, jos
    • -
  • Judges: jud, jdg, judg
    • -
  • Ruth: ru
    • -
  • 1 Samuel: 1, i, 1st, first samuel, sa, sam, sml
    • -
  • 2 Samuel: 2, ii, 2nd, second, sec samuel, sa, sam, sml
    • -
  • 1 Kings: 1, i, 1st, first kings, king, kgs, kn, k, ki
    • -
  • 2 Kings: 2, ii, 2nd, second, sec kings, king, kgs, kn, k, ki
    • -
  • 1 Chronicles: 1, i, 1st, first chronicles, chron, ch, chr
    • -
  • - 2 Chronicles: 2, ii, 2nd, second, sec chronicles, chron, ch, chr -
    • -
  • Ezra: ezr
    • -
  • Nehemiah: neh, ne, nehamiah
    • -
  • Esther: est, es, esth
    • -
  • Job: jo, jb
    • -
  • Psalms: ps, psa, psalm, psm
    • -
  • Proverbs: prov, pr, pro, proverb, prv, prvbs
    • -
  • Ecclesiastes: eccl, ecc, eccles, ec, ecl, ecclesiaste
    • -
  • - Song of Solomon: , song of songs, sos, ss, son, so, song, songs -
    • -
  • Isaiah: is, isah, isai, ia
    • -
  • Jerimiah: jeremiah, jer, je, jere
    • -
  • Lamentations: lam, la, lamentation
    • -
  • Ezekiel: eze, ezk, ezek
    • -
  • Daniel: dan, dn, dl, da
    • -
  • Hosea: hos, ho
    • -
  • Joel: joe, jl
    • -
  • Amos: am, amo
    • -
  • Obadiah: oba, ob, obad
    • -
  • Jonah: jnh, jon
    • -
  • Micah: mic, mi
    • -
  • Nahum: nah, na
    • -
  • Habakkuk: hab, ha, habakuk
    • -
  • Zephaniah: zeph, zep
    • -
  • Haggia: hag, hg, haggai
    • -
  • Zechariah: zech, zch, zec
    • -
  • Malachi: mal
    • -
  • Matthew: mt, matt, mat
    • -
  • Mark: mrk, mk, mr
    • -
  • luke: lu, lke, luk, lk
    • -
  • John: jn, jhn
    • -
  • Acts: ac, act
    • -
  • Romans: rom, ro, rm, roman
    • -
  • - 1 Corinthians: 1, i, 1st, first corinthian, cor, corinthians, - corinth, corin, corth, corint -
    • -
  • - 2 Corinthians: 2, ii, 2nd, second, sec corinthian, cor, - corinthians, corinth, corin, corth, corint -
    • -
  • - Galatians: galatian, galations, gal, ga, gala, galation, galat -
    • -
  • Ephesians: eph, ep, ephes, ephe, ephs
    • -
  • Philippians: phi, phil, ph, philip
    • -
  • Colossians: col, co, colossian, colos, coloss
    • -
  • - 1 Thessalonians: 1, i, 1st, first thessalonians, the, thessa, - thessalonian, thes, thess, th -
    • -
  • - 2 Thessalonians: 2, ii, 2nd, second, sec thessalonians, the, - thessa, thessalonian, thes, thess, th -
    • -
  • 1 Timothy: 1, i, 1st, first timothy, tim, ti, timoth, tm
    • -
  • 2 Timothy: 2, ii, 2nd, second, sec timothy, tim, timoth, tm
    • -
  • Titus: tit
    • -
  • Philemon: phlmn, phl, phm, phile, philem
    • -
  • Hebrews: heb, he, hebrew
    • -
  • James: jam, ja, jas, jms, jame, jm
    • -
  • 1 Peter: 1, i, 1st, first peter, pe, pet, pete, pt, p
    • -
  • 2 Peter: 2, ii, 2nd, second, sec peter, pe, pet, pete, pt, p
    • -
  • 1 John: 1, i, 1st, first john, jn, jo
    • -
  • 2 John: 2, ii, 2nd, second, sec john, jn, jo
    • -
  • 3 John: 3, iii, 3rd, third john, jn, jo
    • -
  • Jude: ju
    • -
  • Revelation: rev, re, revelations, rv
    • -
-
+

Book Names and Accepted Abbreviations

+
    +
  • Genesis: gen, ge, gn
    • +
  • Exodus: ex, exo, exod, exd
    • +
  • Leviticus: lev, le, levi, lv
    • +
  • Numbers: num, nu, numb, number
    • +
  • Deuteronomy: deut, de, dt, deu
    • +
  • Joshua: josh, jos
    • +
  • Judges: jud, jdg, judg
    • +
  • Ruth: ru
    • +
  • 1 Samuel: 1, i, 1st, first samuel, sa, sam, sml
    • +
  • 2 Samuel: 2, ii, 2nd, second, sec samuel, sa, sam, sml
    • +
  • 1 Kings: 1, i, 1st, first kings, king, kgs, kn, k, ki
    • +
  • + 2 Kings: 2, ii, 2nd, second, sec kings, king, kgs, kn, k, ki +
    • +
  • 1 Chronicles: 1, i, 1st, first chronicles, chron, ch, chr
    • +
  • + 2 Chronicles: 2, ii, 2nd, second, sec chronicles, chron, ch, chr +
    • +
  • Ezra: ezr
    • +
  • Nehemiah: neh, ne, nehamiah
    • +
  • Esther: est, es, esth
    • +
  • Job: jo, jb
    • +
  • Psalms: ps, psa, psalm, psm
    • +
  • Proverbs: prov, pr, pro, proverb, prv, prvbs
    • +
  • Ecclesiastes: eccl, ecc, eccles, ec, ecl, ecclesiaste
    • +
  • + Song of Solomon: , song of songs, sos, ss, son, so, song, songs +
    • +
  • Isaiah: is, isah, isai, ia
    • +
  • Jerimiah: jeremiah, jer, je, jere
    • +
  • Lamentations: lam, la, lamentation
    • +
  • Ezekiel: eze, ezk, ezek
    • +
  • Daniel: dan, dn, dl, da
    • +
  • Hosea: hos, ho
    • +
  • Joel: joe, jl
    • +
  • Amos: am, amo
    • +
  • Obadiah: oba, ob, obad
    • +
  • Jonah: jnh, jon
    • +
  • Micah: mic, mi
    • +
  • Nahum: nah, na
    • +
  • Habakkuk: hab, ha, habakuk
    • +
  • Zephaniah: zeph, zep
    • +
  • Haggia: hag, hg, haggai
    • +
  • Zechariah: zech, zch, zec
    • +
  • Malachi: mal
    • +
  • Matthew: mt, matt, mat
    • +
  • Mark: mrk, mk, mr
    • +
  • luke: lu, lke, luk, lk
    • +
  • John: jn, jhn
    • +
  • Acts: ac, act
    • +
  • Romans: rom, ro, rm, roman
    • +
  • + 1 Corinthians: 1, i, 1st, first corinthian, cor, corinthians, + corinth, corin, corth, corint +
    • +
  • + 2 Corinthians: 2, ii, 2nd, second, sec corinthian, cor, + corinthians, corinth, corin, corth, corint +
    • +
  • + Galatians: galatian, galations, gal, ga, gala, galation, galat +
    • +
  • Ephesians: eph, ep, ephes, ephe, ephs
    • +
  • Philippians: phi, phil, ph, philip
    • +
  • Colossians: col, co, colossian, colos, coloss
    • +
  • + 1 Thessalonians: 1, i, 1st, first thessalonians, the, thessa, + thessalonian, thes, thess, th +
    • +
  • + 2 Thessalonians: 2, ii, 2nd, second, sec thessalonians, the, + thessa, thessalonian, thes, thess, th +
    • +
  • 1 Timothy: 1, i, 1st, first timothy, tim, ti, timoth, tm
    • +
  • + 2 Timothy: 2, ii, 2nd, second, sec timothy, tim, timoth, tm +
    • +
  • Titus: tit
    • +
  • Philemon: phlmn, phl, phm, phile, philem
    • +
  • Hebrews: heb, he, hebrew
    • +
  • James: jam, ja, jas, jms, jame, jm
    • +
  • 1 Peter: 1, i, 1st, first peter, pe, pet, pete, pt, p
    • +
  • + 2 Peter: 2, ii, 2nd, second, sec peter, pe, pet, pete, pt, p +
    • +
  • 1 John: 1, i, 1st, first john, jn, jo
    • +
  • 2 John: 2, ii, 2nd, second, sec john, jn, jo
    • +
  • 3 John: 3, iii, 3rd, third john, jn, jo
    • +
  • Jude: ju
    • +
  • Revelation: rev, re, revelations, rv
    • +
+
+ diff --git a/src/src/app/components/help-modal/help-modal.component.scss b/src/src/app/components/help-modal/help-modal.component.scss index 0eaad663..9da0d656 100644 --- a/src/src/app/components/help-modal/help-modal.component.scss +++ b/src/src/app/components/help-modal/help-modal.component.scss @@ -13,6 +13,15 @@ .content { margin-top: 12px; - max-height: 80vh; overflow-y: scroll; + font-size: var(--card-font-size); + font-family: var(--card-font-family); + line-height: calc(var(--card-font-size) + 0.68rem); +} + +.paragraph-heading { + font-family: var(--card-heading-font-family); + font-weight: 600; + margin-bottom: 1em; + margin-top: 1em; } diff --git a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts index 6cf6c6d9..38a21729 100644 --- a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts +++ b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts @@ -1,4 +1,4 @@ -import { EventEmitter, Component, Output } from '@angular/core'; +import { Component } from '@angular/core'; import { AppService } from 'src/app/services/app.service'; import { MatDialogRef } from '@angular/material/dialog'; import { Book, BibleReference } from 'src/app/common/bible-reference'; diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss index e3e7c572..61b59442 100644 --- a/src/src/styles/app.scss +++ b/src/src/styles/app.scss @@ -183,3 +183,21 @@ p { .mat-icon-button { line-height: inherit !important; } +.mat-dialog-container { + padding: 0 !important; +} +.mat-dialog-content { + padding: 12px !important; + margin: 0 !important; +} + +@media screen and (max-width: 500px) { + .cdk-overlay-pane { + max-width: 95vw !important; + max-height: 95vh !important; + } + + .mat-dialog-content { + max-height: 85vh !important; + } +} From 4bbc50cf37417aaec6cf231c2ff24cc99466ead1 Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Wed, 3 Mar 2021 14:35:32 -0500 Subject: [PATCH 6/6] fix strongs modal --- .../components/strongs/modal/strongs-modal.component.html | 1 + .../components/strongs/modal/strongs-modal.component.scss | 3 --- src/src/styles/app.scss | 7 +++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/src/app/components/strongs/modal/strongs-modal.component.html b/src/src/app/components/strongs/modal/strongs-modal.component.html index 3fa4b72a..54b4b447 100644 --- a/src/src/app/components/strongs/modal/strongs-modal.component.html +++ b/src/src/app/components/strongs/modal/strongs-modal.component.html @@ -16,6 +16,7 @@ +