From 44d374bf786f9b5a9036eb8f36a936efeda3635a Mon Sep 17 00:00:00 2001 From: Hokuto Joel Ide Date: Wed, 8 Jul 2026 19:39:41 +0900 Subject: [PATCH 1/2] Fix landscape reading safe area --- .../kotlin/org/gnit/bible/app/screens/ReadingScreen.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/shared/src/commonMain/kotlin/org/gnit/bible/app/screens/ReadingScreen.kt b/app/shared/src/commonMain/kotlin/org/gnit/bible/app/screens/ReadingScreen.kt index 251f1fb0..419af48c 100644 --- a/app/shared/src/commonMain/kotlin/org/gnit/bible/app/screens/ReadingScreen.kt +++ b/app/shared/src/commonMain/kotlin/org/gnit/bible/app/screens/ReadingScreen.kt @@ -9,13 +9,18 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.MaterialTheme @@ -213,6 +218,7 @@ fun BibleReadingArea( .fillMaxSize() .statusBarsPadding() .navigationBarsPadding() + .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)) .padding(innerPadding) .padding(top = topChromePadding, bottom = bottomChromePadding) .clipToBounds() From d38d6c91b9f7bc6db392eddad15d3b3908a3c194 Mon Sep 17 00:00:00 2001 From: Hokuto Joel Ide Date: Wed, 8 Jul 2026 20:54:41 +0900 Subject: [PATCH 2/2] Fix build issue regarding gradle file tracking --- app/androidApp/build.gradle.kts | 11 +++++++++++ app/shared/build.gradle.kts | 1 + gradle.properties | 1 + 3 files changed, 13 insertions(+) diff --git a/app/androidApp/build.gradle.kts b/app/androidApp/build.gradle.kts index e61b6c81..d637b814 100644 --- a/app/androidApp/build.gradle.kts +++ b/app/androidApp/build.gradle.kts @@ -88,3 +88,14 @@ android { targetCompatibility = JavaVersion.VERSION_11 } } + +val cleanStaleMergedComposeAssets = tasks.register("cleanStaleMergedComposeAssets") { + delete(layout.buildDirectory.dir("intermediates/assets")) +} + +tasks.matching { + it.name.startsWith("merge", ignoreCase = true) && + it.name.endsWith("Assets", ignoreCase = true) +}.configureEach { + dependsOn(cleanStaleMergedComposeAssets) +} diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts index dd7e9484..24dddde0 100644 --- a/app/shared/build.gradle.kts +++ b/app/shared/build.gradle.kts @@ -344,6 +344,7 @@ tasks.matching { it.name.contains("Assets", ignoreCase = true) }.configureEach { dependsOn(cleanBblAppGeneratedAndroidAssets) + doNotTrackState("Generated Compose resource assets include many embedded pack files; Gradle output snapshotting can exhaust file descriptors.") } dependencies { diff --git a/gradle.properties b/gradle.properties index fed45889..5fe5d5e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,7 @@ kotlin.native.jvmArgs=-Xmx12G org.gradle.jvmargs=-Xmx12G -Dfile.encoding=UTF-8 org.gradle.configuration-cache=true org.gradle.caching=true +org.gradle.vfs.watch=false kotlin.mpp.applyDefaultHierarchyTemplate=false #Android android.nonTransitiveRClass=true