Release 0.4.1

One fix, reported from a Xiaomi on Android 16: the font weight control did
nothing. Both bundled faces carry a single variable axis, wght, and the app was
asking for two — a font with no italic axis may refuse the whole request rather
than the part it cannot honour, and on a platform that does, every weight drew
at Regular with no error to show for it. The same declaration had quietly broken
the heavier weights on Android 7.0 and 7.1 as well.

A patch release, not a minor one: nothing else changed.

README.md and releases/README.md were written by tools/update_release_docs.py
rather than by hand, which is what it is for — and ReleaseDocsTest now has
something real to check, since the version, the archived APK and the checksum
all moved together.

The 0.4.0 row also gets its real commit in place of HEAD.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

README.md

@@ -13,6 +13,15 @@ An Android reader for [Ganjoor](https://ganjoor.net), the open archive of Persia
 240 poets and ~135,000 poems, laid out for comfortable long-form reading in Persian, Urdu
 and Arabic script, online or fully offline.
 
+### ⬇ [Download ganjoor-0.4.1.apk](releases/ganjoor-0.4.1.apk)
+
+Android 7.0 and up · 31.7 MB · [older releases](releases/) · `sha256 6c85da41…ce357615daa`
+
+Android will call the developer unknown and offer to install anyway — it says that about every
+app installed outside a store. Allow installs from your browser once and it will go through.
+Every release is signed with the same key, so a new one upgrades the last without losing your
+bookmarks. [Build it yourself](#build) instead if you would rather.
+
 Jetpack Compose, Material 3, `minSdk 24`. No account, no tracking, no server of its own.
 
 ## Reading

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.PathSensitivity
 import java.util.Properties
 
 plugins {
@@ -16,7 +17,7 @@ val keystoreProperties = Properties().apply {
 
 // A delivered file should say what it is without being opened.
 base {
-    archivesName = "ganjoor-0.3.0"
+    archivesName = "ganjoor-0.4.1"
 }
 
 android {
@@ -32,8 +33,8 @@ android {
         // Pre-1.0 while the app is still being shaped. versionCode only ever climbs: F-Droid
         // refuses an update that does not, and one changelog file per code lives in
         // fastlane/metadata/android/*/changelogs/.
-        versionCode = 5
-        versionName = "0.3.0"
+        versionCode = 7
+        versionName = "0.4.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -75,6 +76,14 @@ android {
     }
 }
 
+// ReleaseDocsTest reads these, so a change to either has to re-run the tests. Without this
+// Gradle sees only Kotlin sources, calls the task up to date, and a README that has fallen
+// behind the build sails through green.
+tasks.withType<Test>().configureEach {
+    inputs.file(rootProject.file("README.md")).withPathSensitivity(PathSensitivity.RELATIVE)
+    inputs.file(rootProject.file("releases/README.md")).withPathSensitivity(PathSensitivity.RELATIVE)
+}
+
 dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.activity.compose)

app/src/main/java/com/ganjoor/android/ui/theme/Type.kt

@@ -1,12 +1,12 @@
 package com.ganjoor.android.ui.theme
 
+import android.os.Build
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.PlatformTextStyle
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontVariation
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.TextUnit
@@ -15,24 +15,40 @@ import com.ganjoor.android.R
 import com.ganjoor.android.ui.ReadingFont
 
 /**
- * Both files are variable fonts with a `wght` axis, registered at four weights so a reader can
- * thicken the text — thin naskh strokes wash out on a lit screen, especially in the dark themes.
+ * Both files are variable fonts, registered at four weights so a reader can thicken the text —
+ * thin naskh strokes wash out on a lit screen, especially in the dark themes.
  *
- * Real axis interpolation needs API 26+; on 24 and 25 the variation settings are ignored and
- * Android falls back to synthesising the heavier weights, which still darkens the text.
+ * Only `wght` is asked for, and deliberately: both files carry that one axis and nothing else.
+ * `FontVariation.Settings(weight, style)` would also send `ital`, and a font with no italic axis
+ * is entitled to refuse the whole request rather than the part it cannot honour. A platform that
+ * does so leaves every weight drawing at 400 — and silently, because each entry here declares the
+ * weight it was asked for, so the text is never a candidate for synthetic bolding either.
  */
 @OptIn(ExperimentalTextApi::class)
 private fun variable(resId: Int, weight: FontWeight) = Font(
     resId = resId,
     weight = weight,
-    variationSettings = FontVariation.Settings(weight, FontStyle.Normal),
+    variationSettings = FontVariation.Settings(FontVariation.weight(weight.weight)),
 )
 
 private val weights =
     listOf(FontWeight.Normal, FontWeight.Medium, FontWeight.SemiBold, FontWeight.Bold)
 
-val Naskh = FontFamily(weights.map { variable(R.font.noto_naskh_arabic, it) })
-val Nastaliq = FontFamily(weights.map { variable(R.font.noto_nastaliq_urdu, it) })
+/**
+ * Variable axes need API 26. Below that the settings above are dropped, and declaring four
+ * weights of the same file would make the heavier ones unreachable: Android would match the
+ * entry claiming 700, draw it at 400, and skip synthetic bolding because the entry said it was
+ * already bold. One entry at its real weight instead, so asking for bold actually synthesises it.
+ */
+private fun scriptFamily(resId: Int): FontFamily =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        FontFamily(weights.map { variable(resId, it) })
+    } else {
+        FontFamily(Font(resId, FontWeight.Normal))
+    }
+
+val Naskh = scriptFamily(R.font.noto_naskh_arabic)
+val Nastaliq = scriptFamily(R.font.noto_nastaliq_urdu)
 
 /**
  * The English UI only. Libron is a reading serif (OFL, github.com/nicoverbruggen/libron) and

app/src/test/java/com/ganjoor/android/ReleaseDocsTest.kt

@@ -0,0 +1,78 @@
+package com.ganjoor.android
+
+import java.io.File
+import java.security.MessageDigest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * The download the README offers must be the release the build actually produces.
+ *
+ * A README that advertises last version is worse than one that says nothing: someone follows the
+ * link, installs an old build, and has no way to know. tools/update_release_docs.py keeps these in
+ * step; this is what makes forgetting to run it a failed build rather than a quiet wrong answer.
+ */
+class ReleaseDocsTest {
+
+    private val root: File =
+        generateSequence(File(System.getProperty("user.dir")!!)) { it.parentFile }
+            .first { File(it, "settings.gradle.kts").exists() }
+
+    private fun read(path: String) = File(root, path).readText()
+
+    private fun sha256(file: File): String =
+        MessageDigest.getInstance("SHA-256").digest(file.readBytes())
+            .joinToString("") { "%02x".format(it) }
+
+    private val declaredVersion: String by lazy {
+        Regex("versionName\\s*=\\s*\"([^\"]+)\"")
+            .find(read("app/build.gradle.kts"))!!
+            .groupValues[1]
+    }
+
+    @Test
+    fun `the README offers the version the build declares`() {
+        val offered = Regex("### . \\[Download ganjoor-([^\\]]+)\\.apk]")
+            .find(read("README.md"))
+            ?.groupValues?.get(1)
+        assertEquals(
+            "README.md offers a different version than app/build.gradle.kts declares — " +
+                "run tools/update_release_docs.py",
+            declaredVersion,
+            offered,
+        )
+    }
+
+    @Test
+    fun `the APK the README links to is archived`() {
+        val apk = File(root, "releases/ganjoor-" + declaredVersion + ".apk")
+        assertTrue(apk.name + " is linked from README.md but not in releases/", apk.exists())
+    }
+
+    @Test
+    fun `the README short checksum matches the archived APK`() {
+        val short = Regex("`sha256 ([0-9a-f]+)…([0-9a-f]+)`")
+            .find(read("README.md"))!!
+            .groupValues
+        val full = sha256(File(root, "releases/ganjoor-" + declaredVersion + ".apk"))
+        assertTrue(
+            "README.md's checksum does not match releases/ganjoor-" + declaredVersion + ".apk",
+            full.startsWith(short[1]) && full.endsWith(short[2]),
+        )
+    }
+
+    @Test
+    fun `every checksum in releases matches the APK beside it`() {
+        val listed = Regex("^([0-9a-f]{64})  (ganjoor-.+\\.apk)$", RegexOption.MULTILINE)
+            .findAll(read("releases/README.md"))
+            .map { it.groupValues[1] to it.groupValues[2] }
+            .toList()
+        assertTrue("no checksums found in releases/README.md", listed.isNotEmpty())
+        listed.forEach { (digest, name) ->
+            val apk = File(root, "releases/" + name)
+            assertTrue(name + " is listed in releases/README.md but missing", apk.exists())
+            assertEquals(name + " does not match its listed checksum", digest, sha256(apk))
+        }
+    }
+}

fastlane/metadata/android/en-US/changelogs/6.txt

@@ -0,0 +1,19 @@
+Tablets and unfolded foldables now read in columns: the poets on the right, then
+a column for each level of the open book, and the poem in whatever room is left.
+Each column scrolls on its own and narrows as you read, so the poem keeps the
+middle. A button in the top bar folds them away.
+
+Where there is room, a couplet's two hemistichs sit on one line, as Ganjoor sets
+them on a desktop. Each couplet now sits in a soft card.
+
+The dictionary and the reading settings open beside the poem rather than over
+it, so nothing you are reading is covered.
+
+Pages fill in where they load instead of blanking the screen, and Home and the
+reading settings stay reachable while they do.
+
+Tapping a word no longer carries the comma or question mark after it into the
+lookup.
+
+A reading keeps playing when you scroll down the poem, and a seek bar moves it
+back and forth.

fastlane/metadata/android/en-US/changelogs/7.txt

@@ -0,0 +1,10 @@
+The font weight control now works on every device.
+
+Both bundled faces carry one variable axis, wght, and nothing else — but the app
+asked for two, sending an italic axis alongside it. A font with no italic axis
+may refuse the whole request rather than the part it cannot honour, and on a
+platform that does, every weight drew at Regular with nothing to show for it.
+Reported on Android 16.
+
+On Android 7.0 and 7.1, where variable fonts do not exist at all, the heavier
+weights were unreachable for a related reason. They now work there too.

fastlane/metadata/android/fa/changelogs/6.txt

@@ -0,0 +1,17 @@
+تبلت‌ها و گوشی‌های تاشوی باز حالا ستونی خوانده می‌شوند: شاعران در سمت راست، سپس
+یک ستون برای هر لایهٔ کتاب باز، و شعر در هر فضایی که می‌ماند. هر ستون جداگانه
+پیمایش می‌شود و با خواندن باریک‌تر می‌شود تا شعر میانه را نگه دارد. دکمه‌ای در
+نوار بالا آن‌ها را جمع می‌کند.
+
+هر جا جا باشد، دو مصرع یک بیت در یک سطر می‌نشینند، همان‌گونه که گنجور روی رایانه
+می‌چیند. هر بیت اکنون در کارتی ملایم می‌نشیند.
+
+لغت‌نامه و تنظیمات خواندن کنار شعر باز می‌شوند، نه رویش، تا چیزی از آنچه
+می‌خوانید پوشیده نشود.
+
+صفحه‌ها همان‌جا که بار می‌شوند پر می‌شوند و صفحه سفید نمی‌ماند؛ خانه و تنظیمات
+خواندن در همان حال هم در دسترس‌اند.
+
+ضربه بر یک واژه دیگر ویرگول یا علامت پرسش پس از آن را به جست‌وجو نمی‌برد.
+
+خوانش با پیمایش شعر قطع نمی‌شود، و نواری تازه آن را پس و پیش می‌برد.

fastlane/metadata/android/fa/changelogs/7.txt

@@ -0,0 +1,9 @@
+تنظیم ضخامت قلم اکنون روی همهٔ دستگاه‌ها کار می‌کند.
+
+هر دو قلم همراه برنامه تنها یک محور متغیر دارند، wght، و بس — اما برنامه دو
+محور می‌خواست و محور ایتالیک را هم می‌فرستاد. قلمی که محور ایتالیک ندارد می‌تواند
+کل درخواست را نپذیرد، نه فقط بخشی را که از عهده‌اش برنمی‌آید؛ روی چنین سیستمی هر
+ضخامتی با همان حالت معمولی کشیده می‌شد. این مورد روی اندروید ۱۶ گزارش شد.
+
+روی اندروید ۷٫۰ و ۷٫۱ که اصلاً قلم متغیر ندارند، ضخامت‌های بیشتر به دلیلی
+نزدیک به همین در دسترس نبودند. آنجا هم درست شد.

fastlane/metadata/android/ur/changelogs/6.txt

@@ -0,0 +1,17 @@
+ٹیبلٹ اور کھلے فولڈ ایبل اب ستونوں میں پڑھے جاتے ہیں: شعرا دائیں طرف، پھر کھلی
+کتاب کی ہر سطح کے لیے ایک ستون، اور باقی جگہ میں کلام۔ ہر ستون الگ سکرول ہوتا ہے
+اور پڑھتے وقت تنگ ہو جاتا ہے تاکہ کلام درمیان میں رہے۔ اوپر کی پٹی کا ایک بٹن
+انہیں سمیٹ دیتا ہے۔
+
+جہاں گنجائش ہو، شعر کے دونوں مصرعے ایک ہی سطر میں آتے ہیں، جیسے گنجور کمپیوٹر پر
+دکھاتا ہے۔ ہر شعر اب ایک ہلکے کارڈ میں بیٹھتا ہے۔
+
+لغت نامہ اور مطالعے کی ترتیبات کلام کے ساتھ کھلتی ہیں، اُس پر نہیں، تاکہ جو آپ
+پڑھ رہے ہیں وہ ڈھکا نہ جائے۔
+
+صفحات وہیں بھرتے ہیں جہاں لوڈ ہوتے ہیں، خالی اسکرین نہیں آتی؛ ہوم اور مطالعے کی
+ترتیبات اُس دوران بھی دستیاب رہتی ہیں۔
+
+کسی لفظ پر ٹیپ اب اُس کے بعد والا کوما یا سوالیہ نشان ساتھ نہیں لے جاتی۔
+
+سکرول کرنے پر تلاوت بند نہیں ہوتی، اور ایک نئی سیک بار اُسے آگے پیچھے کرتی ہے۔

fastlane/metadata/android/ur/changelogs/7.txt

@@ -0,0 +1,9 @@
+فونٹ کی موٹائی کا انتخاب اب ہر آلے پر کام کرتا ہے۔
+
+ایپ کے ساتھ آنے والے دونوں فونٹس میں صرف ایک متغیر محور ہے، wght، اور بس — مگر
+ایپ دو مانگ رہی تھی اور ساتھ اٹالک محور بھی بھیج رہی تھی۔ جس فونٹ میں اٹالک محور
+نہ ہو وہ پورا مطالبہ رد کر سکتا ہے، نہ کہ صرف وہ حصہ جو وہ پورا نہیں کر سکتا؛ ایسے
+نظام پر ہر موٹائی عام ہی کی طرح بنتی رہی۔ یہ اینڈرائیڈ ۱۶ پر رپورٹ ہوا۔
+
+اینڈرائیڈ ۷٫۰ اور ۷٫۱ پر، جہاں متغیر فونٹ ہوتے ہی نہیں، زیادہ موٹائیاں اسی سے
+ملتی جلتی وجہ سے ناقابلِ رسائی تھیں۔ وہاں بھی اب درست ہے۔

metadata/com.ganjoor.android.yml

@@ -0,0 +1,35 @@
+# F-Droid metadata for Ganjoor for Android.
+#
+# This file is not read by the app or the build; it is the recipe F-Droid's build
+# server uses, kept here so it travels with the source it describes. To submit or
+# update the listing, copy it into a fork of gitlab.com/fdroid/fdroiddata as
+# metadata/com.ganjoor.android.yml and open a merge request.
+#
+# F-Droid builds from source and signs with their own key, which is why the
+# release build must succeed with no keystore present — see app/build.gradle.kts.
+
+Categories:
+  - Reading
+License: MIT
+AuthorName: Muhammad Anas Rashid
+SourceCode: https://github.com/anas-rashid/ganjoorandroid
+IssueTracker: https://github.com/anas-rashid/ganjoorandroid/issues
+Changelog: https://github.com/anas-rashid/ganjoorandroid/releases
+
+AutoName: گنجور
+
+RepoType: git
+Repo: https://github.com/anas-rashid/ganjoorandroid.git
+
+Builds:
+  - versionName: 0.4.0
+    versionCode: 6
+    commit: v0.4.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 0.4.0
+CurrentVersionCode: 6

releases/README.md

@@ -12,7 +12,9 @@ from source and signs with its own key, so these are for direct installation onl
 | 0.2.0 | 2 | `d92445f` | Share a poem, couplet or selection; look a word up from any app's selection menu; the optional AI assistant. |
 | 0.2.1 | 3 | `ec05989` | Assistant answers in the page rather than over it, a visible chevron for each couplet's actions, and answers remembered so scrolling doesn't re-ask. |
 | 0.2.2 | 4 | `d7568d1` | Credits Material Symbols for the glyphs, and states the terms around the optional assistant. |
-| 0.3.0 | 5 | `HEAD` | Pin poets to the home screen: three views (pinned, Ganjoor's order, alphabetical), as cards or a list, with a download control on each row. |
+| 0.3.0 | 5 | `5d12a1c` | Pin poets to the home screen: three views (pinned, Ganjoor's order, alphabetical), as cards or a list, with a download control on each row. |
+| 0.4.0 | 6 | `270c28c` | Columns on tablets and unfolded foldables; the dictionary and reading settings beside the poem rather than over it; couplets in cards, two hemistichs to a line where there is room; skeletons while pages load; a seek bar on recitations. |
+| 0.4.1 | 7 | `HEAD` | The font weight control works on every device: the app was asking the bundled faces for an italic axis they do not have, and a font may refuse the whole request rather than the part it cannot honour. |
 
 ## Checksums
 
@@ -22,6 +24,8 @@ from source and signs with its own key, so these are for direct installation onl
 5163554eb01845c131c31a9da7bdd748170bb9b5f82edaece754b4cf40b02b0c  ganjoor-0.2.1.apk
 e473269044710813d2cf4119de663fe180f887239df7bdb1ccee0239ef84fd3e  ganjoor-0.2.2.apk
 9c38d5cacf9e809c2189ba581f8aa6eb4072d4fa0316f00d66434461cf4b1459  ganjoor-0.3.0.apk
+1c64cefa0fb2b51bf73386460ec1b88bda3e20832fa6926c2f7f1fb863ab9fc7  ganjoor-0.4.0.apk
+6c85da41bf1416e34d6cb9c9eda9b4867e01b6793f21e476a6e3ece357615daa  ganjoor-0.4.1.apk
 ```
 
 Installing: `adb install -r releases/ganjoor-<version>.apk`. A phone holding a *debug* build has

tools/update_release_docs.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+"""
+Bring the download line in README.md and the checksum list in releases/README.md
+into step with whatever version app/build.gradle.kts declares.
+
+Run it after building and copying the signed APK into releases/:
+
+    ./gradlew :app:assembleRelease
+    cp app/build/outputs/apk/release/ganjoor-<v>-release.apk releases/ganjoor-<v>.apk
+    python3 tools/update_release_docs.py
+
+It reads the version from the build file rather than taking an argument, so the
+documentation can only ever describe the release the build actually produces.
+ReleaseDocsTest fails if either file falls behind, so forgetting this is caught
+rather than shipped.
+"""
+import hashlib
+import pathlib
+import re
+import sys
+
+ROOT = pathlib.Path(__file__).resolve().parent.parent
+
+
+def version() -> str:
+    build = (ROOT / "app/build.gradle.kts").read_text(encoding="utf-8")
+    m = re.search(r'versionName\s*=\s*"([^"]+)"', build)
+    if not m:
+        sys.exit("could not find versionName in app/build.gradle.kts")
+    return m.group(1)
+
+
+def main() -> None:
+    v = version()
+    apk = ROOT / "releases" / f"ganjoor-{v}.apk"
+    if not apk.exists():
+        sys.exit(f"{apk.relative_to(ROOT)} is missing — build and copy it in first")
+
+    digest = hashlib.sha256(apk.read_bytes()).hexdigest()
+    megabytes = apk.stat().st_size / 1_000_000
+
+    # README.md — the download heading and the line of facts under it.
+    readme = ROOT / "README.md"
+    text = readme.read_text(encoding="utf-8")
+    text, n = re.subn(
+        r"### ⬇ \[Download ganjoor-[^\]]+\]\(releases/ganjoor-[^)]+\)",
+        f"### ⬇ [Download ganjoor-{v}.apk](releases/ganjoor-{v}.apk)",
+        text,
+        count=1,
+    )
+    if n != 1:
+        sys.exit("could not find the download heading in README.md")
+    short = f"{digest[:8]}…{digest[-11:]}"
+    text, n = re.subn(
+        r"Android 7\.0 and up · [^·]+· \[older releases\]\(releases/\) · `sha256 [^`]+`",
+        f"Android 7.0 and up · {megabytes:.1f} MB · [older releases](releases/) · `sha256 {short}`",
+        text,
+        count=1,
+    )
+    if n != 1:
+        sys.exit("could not find the download facts line in README.md")
+    readme.write_text(text, encoding="utf-8")
+
+    # releases/README.md — one checksum line per archived APK, in version order.
+    index = ROOT / "releases" / "README.md"
+    listing = index.read_text(encoding="utf-8")
+    line = f"{digest}  ganjoor-{v}.apk"
+    if line not in listing:
+        # replace an existing line for this version, or append to the block
+        existing = re.search(rf"^[0-9a-f]{{64}}  ganjoor-{re.escape(v)}\.apk$", listing, re.M)
+        if existing:
+            listing = listing[: existing.start()] + line + listing[existing.end():]
+        else:
+            last = None
+            for last in re.finditer(r"^[0-9a-f]{64}  ganjoor-[^\n]+$", listing, re.M):
+                pass
+            if not last:
+                sys.exit("could not find the checksum block in releases/README.md")
+            listing = listing[: last.end()] + "\n" + line + listing[last.end():]
+        index.write_text(listing, encoding="utf-8")
+
+    print(f"{v}  {megabytes:.1f} MB  {digest}")
+    print("README.md and releases/README.md are in step")
+
+
+if __name__ == "__main__":
+    main()