From 2f84d03330e4f6bda978d45c1075ce6388f3e1b8 Mon Sep 17 00:00:00 2001 From: Luciogi <84625092+Luciogi@users.noreply.github.com> Date: Fri, 21 Apr 2023 22:21:02 +0500 Subject: [PATCH 1/3] [Hafs font] Fix verse count issue on Android 12<= and Android 13=> --- .../java/com/quranapp/android/utils/verse/VerseUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java b/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java index 47ad86d4..b77458d1 100644 --- a/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java +++ b/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java @@ -1,5 +1,6 @@ package com.quranapp.android.utils.verse; +import android.os.Build; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Typeface; @@ -109,7 +110,11 @@ private static CharSequence prepareVerseSerial( boolean shouldReverse, int verseTextSize ) { - CharSequence text = shouldReverse ? new StringBuilder(serialText).reverse().toString() : serialText; + 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 From f3c90ac0db4402593dd1d0093aab5986c69e8b94 Mon Sep 17 00:00:00 2001 From: faisalcodes Date: Mon, 24 Apr 2023 23:22:46 +0530 Subject: [PATCH 2/3] Work on dua --- app/src/main/assets/verses/type1/en/type1.json | 11 +++++++++++ app/src/main/assets/verses/type1/map.json | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 app/src/main/assets/verses/type1/en/type1.json create mode 100644 app/src/main/assets/verses/type1/map.json diff --git a/app/src/main/assets/verses/type1/en/type1.json b/app/src/main/assets/verses/type1/en/type1.json new file mode 100644 index 00000000..e2397ad2 --- /dev/null +++ b/app/src/main/assets/verses/type1/en/type1.json @@ -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" +} \ No newline at end of file diff --git a/app/src/main/assets/verses/type1/map.json b/app/src/main/assets/verses/type1/map.json new file mode 100644 index 00000000..78433d0c --- /dev/null +++ b/app/src/main/assets/verses/type1/map.json @@ -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" +} \ No newline at end of file From f79bf462f7a447eabdf404d312738245e7c1937e Mon Sep 17 00:00:00 2001 From: Faisal Khan Date: Tue, 25 Apr 2023 17:46:55 +0530 Subject: [PATCH 3/3] Cleanup --- .../reader_managers/ReaderVerseDecorator.kt | 5 +---- .../android/utils/verse/VerseUtils.java | 20 ++++++------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/quranapp/android/reader_managers/ReaderVerseDecorator.kt b/app/src/main/java/com/quranapp/android/reader_managers/ReaderVerseDecorator.kt index 5a23e500..8f370ee4 100644 --- a/app/src/main/java/com/quranapp/android/reader_managers/ReaderVerseDecorator.kt +++ b/app/src/main/java/com/quranapp/android/reader_managers/ReaderVerseDecorator.kt @@ -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 @@ -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 ) } @@ -111,7 +109,6 @@ class ReaderVerseDecorator(private val ctx: Context) { txtColor, verse, if (isKFQPCScript()) fontsArabicKFQPC[verse.pageNo] else fontQuranText, - savedScript == QuranScriptUtils.SCRIPT_UTHMANI, onClick ) diff --git a/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java b/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java index 3e490834..e8d1a08e 100644 --- a/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java +++ b/app/src/main/java/com/quranapp/android/utils/verse/VerseUtils.java @@ -4,7 +4,6 @@ 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; @@ -43,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 ""; @@ -64,9 +62,7 @@ public static CharSequence decorateVerse( return TextUtils.concat( arabicSS, " ", - prepareVerseSerial( - verse.endText, verseFont, shouldReverseSerial, verseTextSize - ) + prepareVerseSerial(verse.endText, verseFont, verseTextSize) ); } @@ -77,7 +73,6 @@ public static CharSequence decorateQuranPageVerse( int txtColor, Verse verse, Typeface verseFont, - boolean shouldReverseSerial, Runnable onClick ) { if (TextUtils.isEmpty(verse.arabicText)) { @@ -93,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; @@ -108,14 +103,11 @@ public static CharSequence decorateQuranPageVerse( private static CharSequence prepareVerseSerial( String serialText, Typeface serialFont, - boolean shouldReverse, int verseTextSize ) { - CharSequence text; - if (Build.VERSION.SDK_INT >= 33) - text = serialText; - else - text = new StringBuilder(serialText).reverse().toString(); + 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