diff --git a/app/src/main/java/net/bible/android/view/util/widget/ShareWidget.kt b/app/src/main/java/net/bible/android/view/util/widget/ShareWidget.kt index 4028fc4851..d33e78ea07 100644 --- a/app/src/main/java/net/bible/android/view/util/widget/ShareWidget.kt +++ b/app/src/main/java/net/bible/android/view/util/widget/ShareWidget.kt @@ -56,6 +56,7 @@ class ShareWidget(context: Context, attributeSet: AttributeSet?, val selection: toggleVersenumbers.isChecked = CommonUtils.settings.getBoolean("share_verse_numbers", true) advertise.isChecked = CommonUtils.settings.getBoolean("share_show_add", true) toggleShowReference.isChecked = CommonUtils.settings.getBoolean("share_show_reference", true) + toggleShowVerseText.isChecked = CommonUtils.settings.getBoolean("share_show_verse_text", true) toggleAbbreviateReference.isChecked = CommonUtils.settings.getBoolean("share_abbreviate_reference", true) toggleShowVersion.isChecked = CommonUtils.settings.getBoolean("share_show_version", true) toggleShowReferenceAtFront.isChecked = @@ -72,9 +73,11 @@ class ShareWidget(context: Context, attributeSet: AttributeSet?, val selection: toggleVersenumbers.setOnClickListener { updateWidgetState() } advertise.setOnClickListener { updateWidgetState() } toggleShowReference.setOnClickListener { updateWidgetState() } + toggleShowVerseText.setOnClickListener { updateWidgetState() } toggleAbbreviateReference.setOnClickListener { updateWidgetState() } toggleShowVersion.setOnClickListener { updateWidgetState() } toggleShowReferenceAtFront.setOnClickListener { updateWidgetState() } + toggleShowReference.setOnClickListener { updateWidgetState() } toggleNotes.setOnClickListener { updateWidgetState() } toggleShowSelectionOnly.setOnClickListener { updateWidgetState() } toggleShowEllipsis.setOnClickListener { updateWidgetState() } @@ -107,6 +110,7 @@ class ShareWidget(context: Context, attributeSet: AttributeSet?, val selection: setBoolean("share_verse_numbers", bindings.toggleVersenumbers.isChecked) setBoolean("share_show_add", bindings.advertise.isChecked) setBoolean("share_show_reference", bindings.toggleShowReference.isChecked) + setBoolean("share_show_verse_text", bindings.toggleShowVerseText.isChecked) setBoolean("share_abbreviate_reference", bindings.toggleAbbreviateReference.isChecked) setBoolean("share_show_version", bindings.toggleShowVersion.isChecked) setBoolean("show_notes", bindings.toggleNotes.isChecked) @@ -120,7 +124,12 @@ class ShareWidget(context: Context, attributeSet: AttributeSet?, val selection: bindings.toggleAbbreviateReference.isEnabled = bindings.toggleShowReference.isChecked bindings.toggleShowVersion.isEnabled = bindings.toggleShowReference.isChecked bindings.toggleShowReferenceAtFront.isEnabled = bindings.toggleShowReference.isChecked - bindings.toggleShowEllipsis.isEnabled = bindings.toggleShowSelectionOnly.isChecked + + bindings.toggleShowQuotes.isEnabled = bindings.toggleShowVerseText.isChecked + bindings.toggleVersenumbers.isEnabled = bindings.toggleShowVerseText.isChecked + bindings.toggleShowSelectionOnly.isEnabled = bindings.toggleShowVerseText.isChecked + bindings.toggleShowEllipsis.isEnabled = bindings.toggleShowVerseText.isChecked && bindings.toggleShowSelectionOnly.isChecked + } /** @@ -139,7 +148,8 @@ class ShareWidget(context: Context, attributeSet: AttributeSet?, val selection: showReferenceAtFront = bindings.toggleShowReferenceAtFront.isChecked, showSelectionOnly = bindings.toggleShowSelectionOnly.isChecked, showEllipsis = bindings.toggleShowEllipsis.isChecked, - showQuotes = bindings.toggleShowQuotes.isChecked + showQuotes = bindings.toggleShowQuotes.isChecked, + showVerseText = bindings.toggleShowVerseText.isChecked ) val isRtl = TextUtils.getLayoutDirectionFromLocale(Locale(selection.book.language.code)) == LayoutDirection.RTL diff --git a/app/src/main/java/net/bible/service/sword/SwordContentFacade.kt b/app/src/main/java/net/bible/service/sword/SwordContentFacade.kt index fd6c9fc9dc..2d2db0b62f 100644 --- a/app/src/main/java/net/bible/service/sword/SwordContentFacade.kt +++ b/app/src/main/java/net/bible/service/sword/SwordContentFacade.kt @@ -199,7 +199,8 @@ object SwordContentFacade { showVersion: Boolean = true, showSelectionOnly: Boolean = true, showEllipsis: Boolean = true, - showQuotes: Boolean = true + showQuotes: Boolean = true, + showVerseText: Boolean = true ): String { class VerseAndText(val verse: Verse, val text: String) @@ -259,6 +260,7 @@ object SwordContentFacade { val verseText = when { + !showVerseText -> {""} verseTexts.size == 1 -> { val end = startVerse.slice(endOffset until startVerse.length) val text = startVerse.slice(startOffset until min(endOffset, startVerse.length)) diff --git a/app/src/main/res/layout/share_verses.xml b/app/src/main/res/layout/share_verses.xml index fa4803cfe1..bd9a8d5120 100644 --- a/app/src/main/res/layout/share_verses.xml +++ b/app/src/main/res/layout/share_verses.xml @@ -62,10 +62,17 @@ android:layout_marginLeft="10dp" android:padding="7dip" android:text="@string/show_reference_at_front" /> + Shared using %s. Show reference Show at front of verse + Show verse text Abbreviate reference Version name Include version name diff --git a/app/src/test/java/net/bible/service/sword/SwordContentFacadeTest.kt b/app/src/test/java/net/bible/service/sword/SwordContentFacadeTest.kt index a62851c806..7dac36367e 100644 --- a/app/src/test/java/net/bible/service/sword/SwordContentFacadeTest.kt +++ b/app/src/test/java/net/bible/service/sword/SwordContentFacadeTest.kt @@ -172,7 +172,8 @@ class TestShare { showNotes: Boolean = true, showVersion: Boolean = true, showEllipsis: Boolean = true, - showQuotes: Boolean = true + showQuotes: Boolean = true, + showVerseText: Boolean = true ) { val book = Books.installed().getBook(initials) as SwordBook @@ -201,6 +202,7 @@ class TestShare { showNotes = showNotes, showVersion = showVersion, showEllipsis = showEllipsis, + showVerseText = showVerseText ) assertThat(text, equalTo(compareText)) @@ -378,4 +380,24 @@ class TestShare { showEllipsis = false, showNotes = false ) + + @Test + fun testShare13() = + testShare( + initials = "KJV", + verseRangeStr = "Ps.43.1", + offsetRange = 0..100, + showWholeVerse = false, + compareText = "Psalms 43:1 ", + advertiseApp = false, + showReference = true, + abbreviateReference = false, + showVersion = false, + showReferenceAtFront = true, + showVerseNumbers = false, + showQuotes = false, + showEllipsis = false, + showNotes = false, + showVerseText = false + ) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d7897868a7..7ce100841a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,23 +1,6 @@ -# -# Copyright (c) 2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors. -# -# This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible). -# -# AndBible 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, -# either version 3 of the License, or (at your option) any later version. -# -# AndBible 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. -# -# You should have received a copy of the GNU General Public License along with AndBible. -# If not, see http://www.gnu.org/licenses/. -# - -#Thu Sep 24 18:46:34 EEST 2020 +#Sat Jan 21 14:20:25 MMT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +zipStoreBase=GRADLE_USER_HOME