zaphar/dynamicbible
1
0
Fork 0
mirror of https://gitlab.com/walljm/dynamicbible.git synced 2025-07-23 15:30:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'db-21-fix-annoyances' into 'main'

Browse Source 
DB-21: fix annoyances

See merge request walljm/dynamicbible!14
This commit is contained in:
Jason Wall 2021-03-03 19:50:04 +00:00
commit e6e83d103f
8 changed files with 211 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/res/values/strings.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">dynamicbible</string>
<string name="title_activity_main">dynamicbible</string>
<string name="app_name">Dynamic Bible</string>
<string name="title_activity_main">Dynamic Bible</string>
<string name="package_name">walljm.dynamicbible</string>
<string name="custom_url_scheme">walljm.dynamicbible</string>
<string name="server_client_id">200739882604-i4mk6rp4mcb8n590j5kc8i6bncpm5bo1.apps.googleusercontent.com</string>

312
src/src/app/components/help-modal/help-modal.component.html
View File

@ -7,168 +7,176 @@
</button>
</span>
</mat-toolbar>
<div class="content">
<h2>How to search for a verse</h2>
<p>
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:
</p>
<h3>Examples of Search Items:</h3>
<ul>
<li><b>John 1</b> (displays whole chapter)</li>
<li><b>John 3:16</b> (displays single verse)</li>
<li><b>Jn 3:16</b> (handles abbreviation of John)</li>
<li>
<b>Jn 3:16-17</b> (displays verses starting with chapter 1 verse 3 through
chapter 1 vs 5)
</li>
<li><b>John 3:16-4:4</b></li>
<li><b>Jn 3-4</b> (displays both chapters)</li>
<li><b>John 3 - John 4</b> (displays both chapters)</li>
<li>
<b>Jn 3:1-*</b> (this will get all the verses in the chapter. the * char
can be used in verse ranges, but not chapter ranges.)
</li>
<li>
<b>H1234</b> (displays the strongs definition for the Hebrew # 1234)
</li>
<li><b>G1234</b> (displays the strongs definition for the Greek # 1234)</li>
<li>
<b>Jesus</b> (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).
</li>
</ul>
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.
<mat-dialog-content>
<div class="content">
<h3 class="paragraph-heading">How to search for a verse</h3>
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:
<h3>Further Notes:</h3>
<ul>
<li>
Multiple lookups can be made using a semicolon as a seperator, i.e. "Ruth
1; g1234; spirit").
</li>
<li>
All greek/hebrew cross references translations are taken from the 1933
Websters version and are sometimes not the same as the KJV translation.
</li>
<li>
All source materials were taken from the
<a href="http://sourceforge.net/projects/zefania-sharp/"
>Zefania XML Bible Project</a
>
on SourceForge.
</li>
<li>
Any Errors and Omission you find would be appreciated. Please contact me
via <a href="http://www.jasonwall.org/">www.jasonwall.org</a>.
</li>
</ul>
<h3 class="paragraph-heading">Examples of Search Items:</h3>
<ul>
<li><b>John 1</b><br />displays whole chapter</li>
<li><b>John 3:16</b><br />displays single verse</li>
<li><b>Jn 3:16</b><br />handles abbreviation of John</li>
<li>
<b>Jn 3:16-17</b><br />displays verses starting with chapter 1 verse 3
through chapter 1 vs 5
</li>
<li><b>John 3:16-4:4</b></li>
<li><b>Jn 3-4</b><br />displays both chapters</li>
<li><b>John 3 - John 4</b><br />displays both chapters</li>
<li>
<b>Jn 3:1-*</b><br />this will get all the verses in the chapter. the * char
can be used in verse ranges, but not chapter ranges.
</li>
<li>
<b>H1234</b><br />displays the strongs definition for the Hebrew # 1234
</li>
<li>
<b>G1234</b><br />displays the strongs definition for the Greek # 1234
</li>
<li>
<b>Jesus</b><br />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.
</li>
</ul>
<h3>Visit Us Online</h3>
<p>
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.
<h3 class="paragraph-heading">Further Notes:</h3>
<ul>
<li>
Multiple lookups can be made using a semicolon as a seperator, i.e.
"Ruth 1; g1234; spirit".
</li>
<li>
All greek/hebrew cross references translations are taken from the 1933
Websters version and are sometimes not the same as the KJV translation.
</li>
<li>
All source materials were taken from the
<a href="http://sourceforge.net/projects/zefania-sharp/"
>Zefania XML Bible Project</a
>
on SourceForge.
</li>
<li>
Any Errors and Omission you find would be appreciated. Please contact me
via <a href="http://www.jasonwall.org/">www.jasonwall.org</a>.
</li>
</ul>
<h3 class="paragraph-heading">Visit Us Online</h3>
<a href="http://www.dynamicbible.com">www.dynamicbible.com</a> hosts the
online version of the web app. We are currently available on the
<a
href="https://bitbucket.org/walljm/dynamicbible/downloads/DynamicBible-3.1.0.zip"
>Windows Platform</a
>
via the <a href="http://electron.atom.io/">Electron app from atom.io</a> and
on the
via the
<a href="http://electron.atom.io/">Electron app from atom.io</a> and on the
<a href="https://play.google.com/store/apps/details?id=walljm.dynamicbible"
>Google Android Play store</a
>. We are working on an IOS distribution and will be releasing that soon.
</p>
<h3>Book Names and Accepted Abbreviations</h3>
<ul>
<li><b>Genesis</b>: gen, ge, gn</li>
<li><b>Exodus</b>: ex, exo, exod, exd</li>
<li><b>Leviticus</b>: lev, le, levi, lv</li>
<li><b>Numbers</b>: num, nu, numb, number</li>
<li><b>Deuteronomy</b>: deut, de, dt, deu</li>
<li><b>Joshua</b>: josh, jos</li>
<li><b>Judges</b>: jud, jdg, judg</li>
<li><b>Ruth</b>: ru</li>
<li><b>1 Samuel</b>: 1, i, 1st, first samuel, sa, sam, sml</li>
<li><b>2 Samuel</b>: 2, ii, 2nd, second, sec samuel, sa, sam, sml</li>
<li><b>1 Kings</b>: 1, i, 1st, first kings, king, kgs, kn, k, ki</li>
<li><b>2 Kings</b>: 2, ii, 2nd, second, sec kings, king, kgs, kn, k, ki</li>
<li><b>1 Chronicles</b>: 1, i, 1st, first chronicles, chron, ch, chr</li>
<li>
<b>2 Chronicles</b>: 2, ii, 2nd, second, sec chronicles, chron, ch, chr
</li>
<li><b>Ezra</b>: ezr</li>
<li><b>Nehemiah</b>: neh, ne, nehamiah</li>
<li><b>Esther</b>: est, es, esth</li>
<li><b>Job</b>: jo, jb</li>
<li><b>Psalms</b>: ps, psa, psalm, psm</li>
<li><b>Proverbs</b>: prov, pr, pro, proverb, prv, prvbs</li>
<li><b>Ecclesiastes</b>: eccl, ecc, eccles, ec, ecl, ecclesiaste</li>
<li>
<b>Song of Solomon</b>: , song of songs, sos, ss, son, so, song, songs
</li>
<li><b>Isaiah</b>: is, isah, isai, ia</li>
<li><b>Jerimiah</b>: jeremiah, jer, je, jere</li>
<li><b>Lamentations</b>: lam, la, lamentation</li>
<li><b>Ezekiel</b>: eze, ezk, ezek</li>
<li><b>Daniel</b>: dan, dn, dl, da</li>
<li><b>Hosea</b>: hos, ho</li>
<li><b>Joel</b>: joe, jl</li>
<li><b>Amos</b>: am, amo</li>
<li><b>Obadiah</b>: oba, ob, obad</li>
<li><b>Jonah</b>: jnh, jon</li>
<li><b>Micah</b>: mic, mi</li>
<li><b>Nahum</b>: nah, na</li>
<li><b>Habakkuk</b>: hab, ha, habakuk</li>
<li><b>Zephaniah</b>: zeph, zep</li>
<li><b>Haggia</b>: hag, hg, haggai</li>
<li><b>Zechariah</b>: zech, zch, zec</li>
<li><b>Malachi</b>: mal</li>
<li><b>Matthew</b>: mt, matt, mat</li>
<li><b>Mark</b>: mrk, mk, mr</li>
<li><b>luke</b>: lu, lke, luk, lk</li>
<li><b>John</b>: jn, jhn</li>
<li><b>Acts</b>: ac, act</li>
<li><b>Romans</b>: rom, ro, rm, roman</li>
<li>
<b>1 Corinthians</b>: 1, i, 1st, first corinthian, cor, corinthians,
corinth, corin, corth, corint
</li>
<li>
<b>2 Corinthians</b>: 2, ii, 2nd, second, sec corinthian, cor,
corinthians, corinth, corin, corth, corint
</li>
<li>
<b>Galatians</b>: galatian, galations, gal, ga, gala, galation, galat
</li>
<li><b>Ephesians</b>: eph, ep, ephes, ephe, ephs</li>
<li><b>Philippians</b>: phi, phil, ph, philip</li>
<li><b>Colossians</b>: col, co, colossian, colos, coloss</li>
<li>
<b>1 Thessalonians</b>: 1, i, 1st, first thessalonians, the, thessa,
thessalonian, thes, thess, th
</li>
<li>
<b>2 Thessalonians</b>: 2, ii, 2nd, second, sec thessalonians, the,
thessa, thessalonian, thes, thess, th
</li>
<li><b>1 Timothy</b>: 1, i, 1st, first timothy, tim, ti, timoth, tm</li>
<li><b>2 Timothy</b>: 2, ii, 2nd, second, sec timothy, tim, timoth, tm</li>
<li><b>Titus</b>: tit</li>
<li><b>Philemon</b>: phlmn, phl, phm, phile, philem</li>
<li><b>Hebrews</b>: heb, he, hebrew</li>
<li><b>James</b>: jam, ja, jas, jms, jame, jm</li>
<li><b>1 Peter</b>: 1, i, 1st, first peter, pe, pet, pete, pt, p</li>
<li><b>2 Peter</b>: 2, ii, 2nd, second, sec peter, pe, pet, pete, pt, p</li>
<li><b>1 John</b>: 1, i, 1st, first john, jn, jo</li>
<li><b>2 John</b>: 2, ii, 2nd, second, sec john, jn, jo</li>
<li><b>3 John</b>: 3, iii, 3rd, third john, jn, jo</li>
<li><b>Jude</b>: ju</li>
<li><b>Revelation</b>: rev, re, revelations, rv</li>
</ul>
</div>
<h3 class="paragraph-heading">Book Names and Accepted Abbreviations</h3>
<ul>
<li><b>Genesis</b>: gen, ge, gn</li>
<li><b>Exodus</b>: ex, exo, exod, exd</li>
<li><b>Leviticus</b>: lev, le, levi, lv</li>
<li><b>Numbers</b>: num, nu, numb, number</li>
<li><b>Deuteronomy</b>: deut, de, dt, deu</li>
<li><b>Joshua</b>: josh, jos</li>
<li><b>Judges</b>: jud, jdg, judg</li>
<li><b>Ruth</b>: ru</li>
<li><b>1 Samuel</b>: 1, i, 1st, first samuel, sa, sam, sml</li>
<li><b>2 Samuel</b>: 2, ii, 2nd, second, sec samuel, sa, sam, sml</li>
<li><b>1 Kings</b>: 1, i, 1st, first kings, king, kgs, kn, k, ki</li>
<li>
<b>2 Kings</b>: 2, ii, 2nd, second, sec kings, king, kgs, kn, k, ki
</li>
<li><b>1 Chronicles</b>: 1, i, 1st, first chronicles, chron, ch, chr</li>
<li>
<b>2 Chronicles</b>: 2, ii, 2nd, second, sec chronicles, chron, ch, chr
</li>
<li><b>Ezra</b>: ezr</li>
<li><b>Nehemiah</b>: neh, ne, nehamiah</li>
<li><b>Esther</b>: est, es, esth</li>
<li><b>Job</b>: jo, jb</li>
<li><b>Psalms</b>: ps, psa, psalm, psm</li>
<li><b>Proverbs</b>: prov, pr, pro, proverb, prv, prvbs</li>
<li><b>Ecclesiastes</b>: eccl, ecc, eccles, ec, ecl, ecclesiaste</li>
<li>
<b>Song of Solomon</b>: , song of songs, sos, ss, son, so, song, songs
</li>
<li><b>Isaiah</b>: is, isah, isai, ia</li>
<li><b>Jerimiah</b>: jeremiah, jer, je, jere</li>
<li><b>Lamentations</b>: lam, la, lamentation</li>
<li><b>Ezekiel</b>: eze, ezk, ezek</li>
<li><b>Daniel</b>: dan, dn, dl, da</li>
<li><b>Hosea</b>: hos, ho</li>
<li><b>Joel</b>: joe, jl</li>
<li><b>Amos</b>: am, amo</li>
<li><b>Obadiah</b>: oba, ob, obad</li>
<li><b>Jonah</b>: jnh, jon</li>
<li><b>Micah</b>: mic, mi</li>
<li><b>Nahum</b>: nah, na</li>
<li><b>Habakkuk</b>: hab, ha, habakuk</li>
<li><b>Zephaniah</b>: zeph, zep</li>
<li><b>Haggia</b>: hag, hg, haggai</li>
<li><b>Zechariah</b>: zech, zch, zec</li>
<li><b>Malachi</b>: mal</li>
<li><b>Matthew</b>: mt, matt, mat</li>
<li><b>Mark</b>: mrk, mk, mr</li>
<li><b>luke</b>: lu, lke, luk, lk</li>
<li><b>John</b>: jn, jhn</li>
<li><b>Acts</b>: ac, act</li>
<li><b>Romans</b>: rom, ro, rm, roman</li>
<li>
<b>1 Corinthians</b>: 1, i, 1st, first corinthian, cor, corinthians,
corinth, corin, corth, corint
</li>
<li>
<b>2 Corinthians</b>: 2, ii, 2nd, second, sec corinthian, cor,
corinthians, corinth, corin, corth, corint
</li>
<li>
<b>Galatians</b>: galatian, galations, gal, ga, gala, galation, galat
</li>
<li><b>Ephesians</b>: eph, ep, ephes, ephe, ephs</li>
<li><b>Philippians</b>: phi, phil, ph, philip</li>
<li><b>Colossians</b>: col, co, colossian, colos, coloss</li>
<li>
<b>1 Thessalonians</b>: 1, i, 1st, first thessalonians, the, thessa,
thessalonian, thes, thess, th
</li>
<li>
<b>2 Thessalonians</b>: 2, ii, 2nd, second, sec thessalonians, the,
thessa, thessalonian, thes, thess, th
</li>
<li><b>1 Timothy</b>: 1, i, 1st, first timothy, tim, ti, timoth, tm</li>
<li>
<b>2 Timothy</b>: 2, ii, 2nd, second, sec timothy, tim, timoth, tm
</li>
<li><b>Titus</b>: tit</li>
<li><b>Philemon</b>: phlmn, phl, phm, phile, philem</li>
<li><b>Hebrews</b>: heb, he, hebrew</li>
<li><b>James</b>: jam, ja, jas, jms, jame, jm</li>
<li><b>1 Peter</b>: 1, i, 1st, first peter, pe, pet, pete, pt, p</li>
<li>
<b>2 Peter</b>: 2, ii, 2nd, second, sec peter, pe, pet, pete, pt, p
</li>
<li><b>1 John</b>: 1, i, 1st, first john, jn, jo</li>
<li><b>2 John</b>: 2, ii, 2nd, second, sec john, jn, jo</li>
<li><b>3 John</b>: 3, iii, 3rd, third john, jn, jo</li>
<li><b>Jude</b>: ju</li>
<li><b>Revelation</b>: rev, re, revelations, rv</li>
</ul>
</div>
</mat-dialog-content>

11
src/src/app/components/help-modal/help-modal.component.scss
View File

@ -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;
}

1
src/src/app/components/settings/settings.component.html
View File

@ -170,3 +170,4 @@
</mat-list-item>
</ng-template>
</mat-nav-list>
<br /><br />

1
src/src/app/components/strongs/modal/strongs-modal.component.html
View File

@ -16,6 +16,7 @@
</mat-toolbar>
</div>
<mat-dialog-content class="content">
<br />
<app-strongs
[data]="cardItem.data"
(onOpenPassage)="openPassage($event)"

3
src/src/app/components/strongs/modal/strongs-modal.component.scss
View File

@ -12,16 +12,13 @@
}
.content {
max-height: 75vh;
max-width: 800px;
font-size: var(--card-font-size);
font-family: var(--card-font-family);
line-height: calc(var(--card-font-size) + 0.5rem);
}
mat-toolbar {
margin: -24px -24px 12px -24px;
padding: 0px 16px 0px 16px;
width: auto;
}

2
src/src/app/components/verse-picker-modal/verse-picker-modal.component.ts
View File

@ -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';

41
src/src/styles/app.scss
View File

@ -41,7 +41,6 @@ body {
color: #777;
}
.card-title {
font-size: 1.5rem;
font-family: "Roboto Condensed";
@ -49,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;
}
}
@ -70,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;
@ -173,3 +174,33 @@ a {
p {
font-size: var(--card-font-size);
}
// overrides
.mat-button-focus-overlay {
background-color: transparent !important;
}
.mat-icon-button {
line-height: inherit !important;
}
.mat-dialog-container {
padding: 0 !important;
}
.mat-dialog-content {
padding: 0 12px !important;
margin: 0 !important;
}
.mat-dialog-title {
margin: 0 0 2px !important;
}
@media screen and (max-width: 500px) {
.cdk-overlay-pane {
max-width: 95vw !important;
max-height: 95vh !important;
}
.mat-dialog-content {
max-height: 95vh !important;
}
}