diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..97626ba45
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index a288604fe..badc3694a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,10 @@
+
+
+
+
diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle
index 556aa98c7..155913d34 100644
--- a/Alkitab/build.gradle
+++ b/Alkitab/build.gradle
@@ -17,8 +17,8 @@ android {
applicationId 'yuku.alkitab.debug'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 14000264
- versionName '4.4.0-beta4'
+ versionCode 14000265
+ versionName '4.4.0-beta5'
multiDexEnabled true
}
buildTypes {
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
index 020974b7e..7cb857bc9 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java
@@ -851,6 +851,8 @@ boolean loadSplitVersion(final MVersion mv) {
activeSplitVersionId = mv.getVersionId();
splitHandleButton.setLabel2(getSplitHandleVersionName(mv, version) + " \u25bc");
+ configureTextAppearancePanelForSplitVersion();
+
return true;
} catch (Throwable e) { // so we don't crash on the beginning of the app
Log.e(TAG, "Error opening split version", e);
@@ -864,6 +866,16 @@ boolean loadSplitVersion(final MVersion mv) {
}
}
+ private void configureTextAppearancePanelForSplitVersion() {
+ if (textAppearancePanel != null) {
+ if (activeSplitVersion == null) {
+ textAppearancePanel.clearSplitVersion();
+ } else {
+ textAppearancePanel.setSplitVersion(activeSplitVersionId, activeSplitVersion.getLongName());
+ }
+ }
+ }
+
String getSplitHandleVersionName(MVersion mv, Version version) {
String shortName = version.getShortName();
if (shortName != null) {
@@ -1339,7 +1351,7 @@ public void onWindowFocusChanged(final boolean hasFocus) {
void setShowTextAppearancePanel(boolean yes) {
if (yes) {
if (textAppearancePanel == null) { // not showing yet
- textAppearancePanel = new TextAppearancePanel(this, getLayoutInflater(), overlayContainer, new TextAppearancePanel.Listener() {
+ textAppearancePanel = new TextAppearancePanel(this, overlayContainer, new TextAppearancePanel.Listener() {
@Override public void onValueChanged() {
applyPreferences();
}
@@ -1350,6 +1362,7 @@ public void onCloseButtonClick() {
textAppearancePanel = null;
}
}, REQCODE_textAppearanceGetFonts, REQCODE_textAppearanceCustomColors);
+ configureTextAppearancePanelForSplitVersion();
textAppearancePanel.show();
}
} else {
@@ -1383,23 +1396,27 @@ void openVersionsDialog() {
void openSplitVersionsDialog() {
S.openVersionsDialog(this, true, activeSplitVersionId, mv -> {
if (mv == null) { // closing split version
- activeSplitVersion = null;
- activeSplitVersionId = null;
- closeSplitDisplay();
+ disableSplitVersion();
} else {
boolean ok = loadSplitVersion(mv);
if (ok) {
openSplitDisplay();
displaySplitFollowingMaster();
} else {
- activeSplitVersion = null;
- activeSplitVersionId = null;
- closeSplitDisplay();
+ disableSplitVersion();
}
}
});
}
+ void disableSplitVersion() {
+ activeSplitVersion = null;
+ activeSplitVersionId = null;
+ closeSplitDisplay();
+
+ configureTextAppearancePanelForSplitVersion();
+ }
+
void openSplitDisplay() {
if (splitHandleButton.getVisibility() == View.VISIBLE) {
return; // it's already split, no need to do anything
@@ -1585,7 +1602,7 @@ int display(int chapter_1, int verse_1, boolean uncheckAllVerses) {
{ // main
this.uncheckVersesWhenActionModeDestroyed = false;
try {
- boolean ok = loadChapterToVersesView(lsSplit0, S.activeVersion, this.activeBook, chapter_1, current_chapter_1, uncheckAllVerses);
+ boolean ok = loadChapterToVersesView(lsSplit0, S.activeVersion, S.activeVersionId, this.activeBook, chapter_1, current_chapter_1, uncheckAllVerses);
if (!ok) return 0;
} finally {
this.uncheckVersesWhenActionModeDestroyed = true;
@@ -1639,7 +1656,7 @@ private void displaySplitFollowingMaster(int verse_1) {
} else {
this.uncheckVersesWhenActionModeDestroyed = false;
try {
- loadChapterToVersesView(lsSplit1, activeSplitVersion, splitBook, this.chapter_1, this.chapter_1, true);
+ loadChapterToVersesView(lsSplit1, activeSplitVersion, activeSplitVersionId, splitBook, this.chapter_1, this.chapter_1, true);
} finally {
this.uncheckVersesWhenActionModeDestroyed = true;
}
@@ -1648,7 +1665,7 @@ private void displaySplitFollowingMaster(int verse_1) {
}
}
- static boolean loadChapterToVersesView(VersesView versesView, Version version, Book book, int chapter_1, int current_chapter_1, boolean uncheckAllVerses) {
+ static boolean loadChapterToVersesView(VersesView versesView, Version version, String versionId, Book book, int chapter_1, int current_chapter_1, boolean uncheckAllVerses) {
final SingleChapterVerses verses = version.loadChapterText(book, chapter_1);
if (verses == null) {
return false;
@@ -1661,7 +1678,7 @@ static boolean loadChapterToVersesView(VersesView versesView, Version version, B
int nblock = version.loadPericope(book.bookId, chapter_1, pericope_aris, pericope_blocks, max);
boolean retainSelectedVerses = (!uncheckAllVerses && chapter_1 == current_chapter_1);
- versesView.setDataWithRetainSelectedVerses(retainSelectedVerses, Ari.encode(book.bookId, chapter_1, 0), pericope_aris, pericope_blocks, nblock, verses);
+ versesView.setDataWithRetainSelectedVerses(retainSelectedVerses, Ari.encode(book.bookId, chapter_1, 0), pericope_aris, pericope_blocks, nblock, verses, version, versionId);
return true;
}
@@ -1771,14 +1788,14 @@ void openBookmarkDialog(final long _id) {
}
@Override
- public void onBookmarkAttributeClick(final int ari) {
+ public void onBookmarkAttributeClick(final Version version, final String versionId, final int ari) {
final List markers = S.getDb().listMarkersForAriKind(ari, Marker.Kind.bookmark);
if (markers.size() == 1) {
openBookmarkDialog(markers.get(0)._id);
} else {
final MaterialDialog dialog = new MaterialDialog.Builder(IsiActivity.this)
.title(R.string.edit_bookmark)
- .adapter(new MultipleMarkerSelectAdapter(markers, Marker.Kind.bookmark), (materialDialog, view, which, text) -> {
+ .adapter(new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.bookmark), (materialDialog, view, which, text) -> {
openBookmarkDialog(markers.get(which)._id);
materialDialog.dismiss();
})
@@ -1794,16 +1811,15 @@ void openNoteDialog(final long _id) {
startActivityForResult(NoteActivity.createEditExistingIntent(_id), REQCODE_edit_note_1);
}
-
@Override
- public void onNoteAttributeClick(final int ari) {
+ public void onNoteAttributeClick(final Version version, final String versionId, final int ari) {
final List markers = S.getDb().listMarkersForAriKind(ari, Marker.Kind.note);
if (markers.size() == 1) {
openNoteDialog(markers.get(0)._id);
} else {
final MaterialDialog dialog = new MaterialDialog.Builder(IsiActivity.this)
.title(R.string.edit_note)
- .adapter(new MultipleMarkerSelectAdapter(markers, Marker.Kind.note), (materialDialog, view, which, text) -> {
+ .adapter(new MultipleMarkerSelectAdapter(version, versionId, markers, Marker.Kind.note), (materialDialog, view, which, text) -> {
openNoteDialog(markers.get(which)._id);
materialDialog.dismiss();
})
@@ -1816,10 +1832,14 @@ public void onNoteAttributeClick(final int ari) {
}
class MultipleMarkerSelectAdapter extends EasyAdapter {
+ final Version version;
+ final float textSizeMult;
final List markers;
final Marker.Kind kind;
- public MultipleMarkerSelectAdapter(final List markers, final Marker.Kind kind) {
+ public MultipleMarkerSelectAdapter(final Version version, final String versionId, final List markers, final Marker.Kind kind) {
+ this.version = version;
+ this.textSizeMult = S.getDb().getPerVersionSettings(versionId).fontSizeMultiplier;
this.markers = markers;
this.kind = kind;
}
@@ -1853,16 +1873,16 @@ public void bindView(final View view, final int position, final ViewGroup parent
lDate.setText(getString(R.string.create_edited_modified_time, Sqlitil.toLocaleDateMedium(addTime), Sqlitil.toLocaleDateMedium(modifyTime)));
}
- Appearances.applyMarkerDateTextAppearance(lDate);
+ Appearances.applyMarkerDateTextAppearance(lDate, textSizeMult);
}
final int ari = marker.ari;
- final String reference = S.activeVersion.reference(ari);
+ final String reference = version.reference(ari);
final String caption = marker.caption;
if (kind == Marker.Kind.bookmark) {
lCaption.setText(caption);
- Appearances.applyMarkerTitleTextAppearance(lCaption);
+ Appearances.applyMarkerTitleTextAppearance(lCaption, textSizeMult);
lSnippet.setVisibility(View.GONE);
@@ -1879,9 +1899,9 @@ public void bindView(final View view, final int position, final ViewGroup parent
} else if (kind == Marker.Kind.note) {
lCaption.setText(reference);
- Appearances.applyMarkerTitleTextAppearance(lCaption);
+ Appearances.applyMarkerTitleTextAppearance(lCaption, textSizeMult);
lSnippet.setText(caption);
- Appearances.applyTextAppearance(lSnippet);
+ Appearances.applyTextAppearance(lSnippet, textSizeMult);
}
view.setBackgroundColor(S.applied.backgroundColor);
@@ -1894,7 +1914,7 @@ public int getCount() {
}
@Override
- public void onProgressMarkAttributeClick(final int preset_id) {
+ public void onProgressMarkAttributeClick(final Version version, final String versionId, final int preset_id) {
final ProgressMark progressMark = S.getDb().getProgressMarkByPresetId(preset_id);
ProgressMarkRenameDialog.show(IsiActivity.this, progressMark, new ProgressMarkRenameDialog.Listener() {
@@ -1911,7 +1931,7 @@ public void onDeleted() {
}
@Override
- public void onHasMapsAttributeClick(final int ari) {
+ public void onHasMapsAttributeClick(final Version version, final String versionId, final int ari) {
String locale = null;
if (this == lsSplit0.getAttributeListener()) {
@@ -1955,9 +1975,9 @@ public void onClick(final Type type, final int arif, final Object source) {
// TODO setSourceVersion here is not restored when dialog is restored
if (source == lsSplit0) { // use activeVersion
- dialog.setSourceVersion(S.activeVersion);
+ dialog.setSourceVersion(S.activeVersion, S.activeVersionId);
} else if (source == lsSplit1) { // use activeSplitVersion
- dialog.setSourceVersion(activeSplitVersion);
+ dialog.setSourceVersion(activeSplitVersion, activeSplitVersionId);
}
FragmentManager fm = getSupportFragmentManager();
@@ -2124,6 +2144,28 @@ public void onClick(final Type type, final int arif, final Object source) {
menuAddNote.setVisible(contiguous);
menuCompare.setVisible(single);
+ // just "copy" or ("copy primary" "copy secondary" "copy both")
+ // same with "share".
+ final MenuItem menuCopy = menu.findItem(R.id.menuCopy);
+ final MenuItem menuCopySplit0 = menu.findItem(R.id.menuCopySplit0);
+ final MenuItem menuCopySplit1 = menu.findItem(R.id.menuCopySplit1);
+ final MenuItem menuCopyBothSplits = menu.findItem(R.id.menuCopyBothSplits);
+ final MenuItem menuShare = menu.findItem(R.id.menuShare);
+ final MenuItem menuShareSplit0 = menu.findItem(R.id.menuShareSplit0);
+ final MenuItem menuShareSplit1 = menu.findItem(R.id.menuShareSplit1);
+ final MenuItem menuShareBothSplits = menu.findItem(R.id.menuShareBothSplits);
+
+ final boolean split = activeSplitVersion != null;
+
+ menuCopy.setVisible(!split);
+ menuCopySplit0.setVisible(split);
+ menuCopySplit1.setVisible(split);
+ menuCopyBothSplits.setVisible(split);
+ menuShare.setVisible(!split);
+ menuShareSplit0.setVisible(split);
+ menuShareSplit1.setVisible(split);
+ menuShareBothSplits.setVisible(split);
+
// show selected verses
if (single) {
mode.setSubtitle(R.string.verse_select_one_verse_selected);
@@ -2177,11 +2219,22 @@ public void onClick(final Type type, final int arif, final Object source) {
final int itemId = item.getItemId();
switch (itemId) {
- case R.id.menuCopy: { // copy, can be multiple
- String[] t = prepareTextForCopyShare(selected, reference, false);
- if (activeSplitVersion != null) {
+ case R.id.menuCopy:
+ case R.id.menuCopySplit0:
+ case R.id.menuCopySplit1:
+ case R.id.menuCopyBothSplits: { // copy, can be multiple verses
+ final String[] t;
+
+ if (itemId == R.id.menuCopy || itemId == R.id.menuCopySplit0 || itemId == R.id.menuCopyBothSplits) {
+ t = prepareTextForCopyShare(selected, reference, false);
+ } else { // menuCopySplit1
+ t = prepareTextForCopyShare(selected, reference, true);
+ }
+
+ if (itemId == R.id.menuCopyBothSplits && activeSplitVersion != null) { // put guard on activeSplitVersion
appendSplitTextForCopyShare(t);
}
+
final String textToCopy = t[0];
final String textToSubmit = t[1];
@@ -2210,11 +2263,22 @@ public void onFinally() {
}
});
} return true;
- case R.id.menuShare: {
- String[] t = prepareTextForCopyShare(selected, reference, false);
- if (activeSplitVersion != null) {
+ case R.id.menuShare:
+ case R.id.menuShareSplit0:
+ case R.id.menuShareSplit1:
+ case R.id.menuShareBothSplits: { // share, can be multiple verses
+ final String[] t;
+
+ if (itemId == R.id.menuShare || itemId == R.id.menuShareSplit0 || itemId == R.id.menuShareBothSplits) {
+ t = prepareTextForCopyShare(selected, reference, false);
+ } else { // menuShareSplit1
+ t = prepareTextForCopyShare(selected, reference, true);
+ }
+
+ if (itemId == R.id.menuShareBothSplits && activeSplitVersion != null) { // put guard on activeSplitVersion
appendSplitTextForCopyShare(t);
}
+
final String textToShare = t[0];
final String textToSubmit = t[1];
@@ -2568,9 +2632,7 @@ public void cSplitVersion_checkedChange(final SwitchCompat cSplitVersion, final
cSplitVersion.setChecked(false); // do it later, at the version chooser dialog
openSplitVersionsDialog();
} else {
- activeSplitVersion = null;
- activeSplitVersionId = null;
- closeSplitDisplay();
+ disableSplitVersion();
}
}
@@ -2580,6 +2642,7 @@ public void bProgressMarkList_click() {
if (S.getDb().countAllProgressMarks() > 0) {
final ProgressMarkListDialog dialog = new ProgressMarkListDialog();
dialog.show(getSupportFragmentManager(), "dialog_progress_mark_list");
+ leftDrawer.closeDrawer();
} else {
new AlertDialogWrapper.Builder(this)
.setMessage(R.string.pm_activate_tutorial)
@@ -2595,11 +2658,15 @@ public void bProgress_click(final int preset_id) {
@Override
public void bCurrentReadingClose_click() {
+ App.trackEvent("left_drawer_current_reading_close_click");
+
CurrentReading.clear();
}
@Override
public void bCurrentReadingReference_click() {
+ App.trackEvent("left_drawer_current_reading_verse_reference_click");
+
final int[] aris = CurrentReading.get();
if (aris == null) {
return;
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/S.java b/Alkitab/src/main/java/yuku/alkitab/base/S.java
index ccfd60b94..e261d5c24 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/S.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/S.java
@@ -80,15 +80,15 @@ public static void calculateAppliedValuesBasedOnPreferences() {
//# configure text color, red text color, bg color, and verse color
{
if (Preferences.getBoolean(Prefkey.is_night_mode, false)) {
- applied.fontColor = Preferences.getInt(App.context.getString(R.string.pref_textColor_night_key), App.context.getResources().getInteger(R.integer.pref_textColor_night_default));
- applied.backgroundColor = Preferences.getInt(App.context.getString(R.string.pref_backgroundColor_night_key), App.context.getResources().getInteger(R.integer.pref_backgroundColor_night_default));
- applied.verseNumberColor = Preferences.getInt(App.context.getString(R.string.pref_verseNumberColor_night_key), App.context.getResources().getInteger(R.integer.pref_verseNumberColor_night_default));
- applied.fontRedColor = Preferences.getInt(App.context.getString(R.string.pref_redTextColor_night_key), App.context.getResources().getInteger(R.integer.pref_redTextColor_night_default));
+ applied.fontColor = Preferences.getInt(R.string.pref_textColor_night_key, R.integer.pref_textColor_night_default);
+ applied.backgroundColor = Preferences.getInt(R.string.pref_backgroundColor_night_key, R.integer.pref_backgroundColor_night_default);
+ applied.verseNumberColor = Preferences.getInt(R.string.pref_verseNumberColor_night_key, R.integer.pref_verseNumberColor_night_default);
+ applied.fontRedColor = Preferences.getInt(R.string.pref_redTextColor_night_key, R.integer.pref_redTextColor_night_default);
} else {
- applied.fontColor = Preferences.getInt(App.context.getString(R.string.pref_textColor_key), App.context.getResources().getInteger(R.integer.pref_textColor_default));
- applied.backgroundColor = Preferences.getInt(App.context.getString(R.string.pref_backgroundColor_key), App.context.getResources().getInteger(R.integer.pref_backgroundColor_default));
- applied.verseNumberColor = Preferences.getInt(App.context.getString(R.string.pref_verseNumberColor_key), App.context.getResources().getInteger(R.integer.pref_verseNumberColor_default));
- applied.fontRedColor = Preferences.getInt(App.context.getString(R.string.pref_redTextColor_key), App.context.getResources().getInteger(R.integer.pref_redTextColor_default));
+ applied.fontColor = Preferences.getInt(R.string.pref_textColor_key, R.integer.pref_textColor_default);
+ applied.backgroundColor = Preferences.getInt(R.string.pref_backgroundColor_key, R.integer.pref_backgroundColor_default);
+ applied.verseNumberColor = Preferences.getInt(R.string.pref_verseNumberColor_key, R.integer.pref_verseNumberColor_default);
+ applied.fontRedColor = Preferences.getInt(R.string.pref_redTextColor_key, R.integer.pref_redTextColor_default);
}
// calculation of backgroundColor brightness. Used somewhere else.
diff --git a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
index 3fbeb21ff..c28b71355 100644
--- a/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
+++ b/Alkitab/src/main/java/yuku/alkitab/base/ac/MarkerListActivity.java
@@ -41,6 +41,7 @@
import yuku.alkitab.debug.R;
import yuku.alkitab.model.Label;
import yuku.alkitab.model.Marker;
+import yuku.alkitab.model.Version;
import yuku.alkitab.util.Ari;
import yuku.alkitabintegration.display.Launcher;
import yuku.devoxx.flowlayout.FlowLayout;
@@ -87,7 +88,9 @@ public class MarkerListActivity extends BaseActivity {
long filter_labelId;
int hiliteColor;
-
+ Version version = S.activeVersion;
+ String versionId = S.activeVersionId;
+ float textSizeMult = S.getDb().getPerVersionSettings(versionId).fontSizeMultiplier;
public static Intent createIntent(Context context, Marker.Kind filter_kind, long filter_labelId) {
Intent res = new Intent(context, MarkerListActivity.class);
@@ -285,7 +288,7 @@ public FilterResult process(@Nullable final String payload) {
final SearchEngine.ReadyTokens rt = tokens == null || tokens.length == 0 ? null : new SearchEngine.ReadyTokens(tokens);
- final List filteredMarkers = filterEngine(allMarkers, filter_kind, rt);
+ final List filteredMarkers = filterEngine(version, allMarkers, filter_kind, rt);
final FilterResult res = new FilterResult();
res.query = query;
@@ -479,8 +482,8 @@ void sort(String column, boolean ascending, int columnId) {
} else if (filter_kind == Marker.Kind.highlight) {
final int ari = marker.ari;
final Highlights.Info info = Highlights.decode(marker.caption);
- final String reference = S.activeVersion.referenceWithVerseCount(ari, marker.verseCount);
- final String rawVerseText = S.activeVersion.loadVerseText(ari);
+ final String reference = version.referenceWithVerseCount(ari, marker.verseCount);
+ final String rawVerseText = version.loadVerseText(ari);
final VerseRenderer.FormattedTextResult ftr = new VerseRenderer.FormattedTextResult();
if (rawVerseText != null) {
@@ -505,7 +508,7 @@ void sort(String column, boolean ascending, int columnId) {
* The real work of filtering happens here.
* @param rt Tokens have to be already lowercased.
*/
- public static List filterEngine(List allMarkers, Marker.Kind filter_kind, @Nullable SearchEngine.ReadyTokens rt) {
+ public static List filterEngine(Version version, List allMarkers, Marker.Kind filter_kind, @Nullable SearchEngine.ReadyTokens rt) {
final List res = new ArrayList<>();
if (rt == null) {
@@ -523,7 +526,7 @@ public static List filterEngine(List allMarkers, Marker.Kind fil
}
// try the verse text!
- String verseText = S.activeVersion.loadVerseText(marker.ari);
+ String verseText = version.loadVerseText(marker.ari);
if (verseText != null) { // this can be null! so beware.
String verseText_lc = verseText.toLowerCase(Locale.getDefault());
if (SearchEngine.satisfiesTokens(verseText_lc, rt)) {
@@ -535,7 +538,6 @@ public static List filterEngine(List allMarkers, Marker.Kind fil
return res;
}
-
class MarkerListAdapter extends EasyAdapter {
List filteredMarkers = new ArrayList<>();
SearchEngine.ReadyTokens rt;
@@ -577,14 +579,14 @@ public void bindView(final View view, final int position, final ViewGroup parent
}
}
- Appearances.applyMarkerDateTextAppearance(lDate);
+ Appearances.applyMarkerDateTextAppearance(lDate, textSizeMult);
}
final int ari = marker.ari;
- final String reference = S.activeVersion.referenceWithVerseCount(ari, marker.verseCount);
+ final String reference = version.referenceWithVerseCount(ari, marker.verseCount);
final String caption = marker.caption;
- final String rawVerseText = S.activeVersion.loadVerseText(ari);
+ final String rawVerseText = version.loadVerseText(ari);
final CharSequence verseText;
if (rawVerseText == null) {
verseText = getString(R.string.generic_verse_not_available_in_this_version);
@@ -596,10 +598,10 @@ public void bindView(final View view, final int position, final ViewGroup parent
if (filter_kind == Marker.Kind.bookmark) {
lCaption.setText(currentlyUsedFilter != null ? SearchEngine.hilite(caption, rt, hiliteColor) : caption);
- Appearances.applyMarkerTitleTextAppearance(lCaption);
+ Appearances.applyMarkerTitleTextAppearance(lCaption, textSizeMult);
CharSequence snippet = currentlyUsedFilter != null ? SearchEngine.hilite(verseText, rt, hiliteColor) : verseText;
- Appearances.applyMarkerSnippetContentAndAppearance(lSnippet, reference, snippet);
+ Appearances.applyMarkerSnippetContentAndAppearance(lSnippet, reference, snippet, textSizeMult);
final List