Ask the font only for the axis it has

Reported from a Xiaomi on Android 16: the naskh weight control does nothing.

Both bundled faces carry exactly one variable axis, wght 400-700, and nothing
else. The code asked for two. FontVariation.Settings(weight, style) sends ital
alongside wght, and a font with no italic axis is entitled to refuse the whole
request rather than the part it cannot honour. AOSP ignores the stray axis,
which is why this renders correctly on an emulator and not on the device.

When a platform does refuse it, nothing visibly fails. Each entry in the family
declares the weight it was asked for, so the text matches an entry claiming 700,
draws with 400 glyphs, and is never a candidate for synthetic bolding either —
the one fallback that would have covered it is ruled out by the declaration.
Every weight then looks identical, with no error anywhere.

So: request wght only.

The same declaration broke API 24 and 25 outright, where variable axes do not
exist at all. The comment claimed Android would synthesise the heavier weights
there; it would not, for the reason above. Below 26 the family is now a single
entry at its real weight, so asking for bold synthesises bold.

Measured on an API 30 emulator, same poem, only the preference changed: naskh
+42% ink at Bold, nastaliq +11%, and the two faces differ from each other, so
both files load and both respond. Whether it settles HyperOS is for the device
to say — this removes the cause I can see from here.

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

app/build.gradle.kts

@@ -16,7 +16,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.0"
 }
 
 android {
@@ -32,8 +32,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 = 6
+        versionName = "0.4.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/ganjoor/android/ui/PoemScreen.kt

@@ -111,7 +111,7 @@ fun PoemScreen(
     // foldable held open in portrait the page is already down to ~450dp, and a panel beside it
     // left the verse a couple of characters a line. Where it does not fit, the sheet is the
     // better answer: it covers the foot of the poem but leaves the lines whole.
-    val roomForPanel = wide && maxWidth - DictionaryPanelWidth >= MinPageMeasure
+    val roomForPanel = dictionaryFitsBeside(maxWidth, wide)
 
     Load(
         key = fullUrl,

app/src/main/java/com/ganjoor/android/ui/WordSheet.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.ganjoor.android.R
 import com.ganjoor.android.data.Definition
@@ -64,6 +65,21 @@ val DictionaryPanelWidth = 216.dp
  */
 val MinPageMeasure = 400.dp
 
+/**
+ * Whether the dictionary earns a column of its own beside a page [pageWidth] wide.
+ *
+ * Not a question about the window but about the page: by the time a poem is open the columns have
+ * already taken their room, and on a book-style foldable held open in portrait what is left is
+ * about 450dp. A panel beside that leaves the verse a couple of characters a line, so below
+ * [MinPageMeasure] the bottom sheet is used instead — it covers the foot of the poem but leaves
+ * every line whole.
+ *
+ * A pure function so the rule can be tested: the gesture that reaches it cannot be driven
+ * reliably, but the arithmetic behind it can.
+ */
+internal fun dictionaryFitsBeside(pageWidth: Dp, wide: Boolean): Boolean =
+    wide && pageWidth - DictionaryPanelWidth >= MinPageMeasure
+
 /** English prose inside an otherwise right-to-left sheet. */
 @Composable
 private fun LeftToRight(content: @Composable () -> Unit) {

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/DictionaryPanelFitTest.kt

@@ -0,0 +1,41 @@
+package com.ganjoor.android
+
+import androidx.compose.ui.unit.dp
+import com.ganjoor.android.ui.dictionaryFitsBeside
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+/**
+ * The rule that decides whether the dictionary opens beside the poem or as a sheet over it.
+ *
+ * Driving the gesture that reaches it — a tap landing on the glyphs of one Persian word — is not
+ * something adb does reliably, so the arithmetic is tested directly instead.
+ */
+class DictionaryPanelFitTest {
+
+    @Test
+    fun `a tablet has room beside the poem`() {
+        // 1280dp window, less the poets rail and two list columns, leaves the page about 900dp.
+        assertTrue(dictionaryFitsBeside(900.dp, wide = true))
+    }
+
+    @Test
+    fun `a foldable open in portrait does not`() {
+        // 700dp window, less the rail and the newest column, leaves about 450dp — and 450 less
+        // the 216dp panel is 234dp, which is a cramped phone column, not a measure for a verse.
+        assertFalse(dictionaryFitsBeside(450.dp, wide = true))
+    }
+
+    @Test
+    fun `a phone never gets the panel, however the page is measured`() {
+        assertFalse(dictionaryFitsBeside(420.dp, wide = false))
+        assertFalse(dictionaryFitsBeside(2000.dp, wide = false))
+    }
+
+    @Test
+    fun `the boundary is the panel plus the minimum measure`() {
+        assertTrue(dictionaryFitsBeside(616.dp, wide = true))   // 400 + 216, exactly
+        assertFalse(dictionaryFitsBeside(615.dp, wide = true))
+    }
+}

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/fa/changelogs/6.txt

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

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

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

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,8 @@ 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. |
 
 ## Checksums
 
@@ -22,6 +23,7 @@ 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
 ```
 
 Installing: `adb install -r releases/ganjoor-<version>.apk`. A phone holding a *debug* build has