Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hafs font] Fix verse count issue on Android 12<= and Android 13=> #247

Merged
merged 6 commits into from
Apr 25, 2023
Merged

[Hafs font] Fix verse count issue on Android 12<= and Android 13=> #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f84d03
[Hafs font] Fix verse count issue on Android 12<= and Android 13=>
Luciogi Apr 21, 2023
5280252
Merge branch 'master' into patch1
faisalcodes Apr 23, 2023
f3c90ac
Work on dua
faisalcodes Apr 24, 2023
4f43de6
Merge branch 'master' into patch1
faisalcodes Apr 25, 2023
520d2a4
Merge branch 'patch1' of https://github.com/Luciogi/QuranApp into Luc…
faisalcodes Apr 25, 2023
f79bf46
Cleanup
faisalcodes Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/assets/verses/type1/en/type1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"1": "Ease",
"2": "Faith",
"3": "Family",
"4": "Forgiveness",
"5": "Mercy",
"6": "Of the prophets and the pious",
"7": "Protection",
"8": "Provisions",
"9": "Steadfastness"
}
11 changes: 11 additions & 0 deletions app/src/main/assets/verses/type1/map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"1": "10:85,23:93-94,59:10",
"2": "1:6-7,3:193,14:38,14:40,17:81",
"3": "17:24,25:74,71:28",
"4": "40:7-9,60:5,66:8",
"5": "2:286,3:191,7:47,10:86,23:109,23:118",
"6": "2:129,2:250,7:23,7:89,7:126,12:101,14:41,18:10,20:25,20:26-28,21:83,21:87,26:83-89,28:24,29:30,60:4,66:11",
"7": "3:194,17:80,23:98,113:1-5,114:1-6",
"8": "2:201",
"9": "3:8,3:147"
}
5 changes: 1 addition & 4 deletions app/src/main/java/com/quranapp/android/reader_managers/ReaderVerseDecorator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import android.util.TypedValue
import android.widget.TextView
import com.quranapp.android.R
import com.quranapp.android.components.quran.subcomponents.Verse
import com.quranapp.android.utils.Log
import com.quranapp.android.utils.extensions.color
import com.quranapp.android.utils.extensions.getDimension
import com.quranapp.android.utils.extensions.getFont
Expand Down Expand Up @@ -97,8 +96,7 @@ class ReaderVerseDecorator(private val ctx: Context) {
return VerseUtils.decorateVerse(
verse,
if (isKFQPC) fontsArabicKFQPC[verse.pageNo] ?: Typeface.DEFAULT else fontQuranText,
verseTextSize,
savedScript == QuranScriptUtils.SCRIPT_UTHMANI
verseTextSize
)
}

Expand All @@ -111,7 +109,6 @@ class ReaderVerseDecorator(private val ctx: Context) {
txtColor,
verse,
if (isKFQPCScript()) fontsArabicKFQPC[verse.pageNo] else fontQuranText,
savedScript == QuranScriptUtils.SCRIPT_UTHMANI,
onClick
)

Expand Down
17 changes: 7 additions & 10 deletions app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quranapp.android.utils.verse;

import android.os.Build;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.os.Build;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
Expand Down Expand Up @@ -42,8 +42,7 @@ public abstract class VerseUtils {
public static CharSequence decorateVerse(
Verse verse,
Typeface verseFont,
int verseTextSize,
boolean shouldReverseSerial
int verseTextSize
) {
if (TextUtils.isEmpty(verse.arabicText)) {
return "";
Expand All @@ -63,9 +62,7 @@ public static CharSequence decorateVerse(
return TextUtils.concat(
arabicSS,
" ",
prepareVerseSerial(
verse.endText, verseFont, shouldReverseSerial, verseTextSize
)
prepareVerseSerial(verse.endText, verseFont, verseTextSize)
);
}

Expand All @@ -76,7 +73,6 @@ public static CharSequence decorateQuranPageVerse(
int txtColor,
Verse verse,
Typeface verseFont,
boolean shouldReverseSerial,
Runnable onClick
) {
if (TextUtils.isEmpty(verse.arabicText)) {
Expand All @@ -92,7 +88,7 @@ public static CharSequence decorateQuranPageVerse(
concat = TextUtils.concat(
arabicSS,
" ",
prepareVerseSerial(verse.endText, verseFont, shouldReverseSerial, -1)
prepareVerseSerial(verse.endText, verseFont, -1)
);
} else {
concat = arabicSS;
Expand All @@ -107,10 +103,11 @@ public static CharSequence decorateQuranPageVerse(
private static CharSequence prepareVerseSerial(
String serialText,
Typeface serialFont,
boolean shouldReverse,
int verseTextSize
) {
CharSequence text = shouldReverse ? new StringBuilder(serialText).reverse().toString() : serialText;
final CharSequence text;
if (Build.VERSION.SDK_INT >= 33) text = serialText;
else text = new StringBuilder(serialText).reverse().toString();

SpannableString verseNoSpannable = new SpannableString(text);
// Set the typeface to span over verse number text
Expand Down