Skip to content

fix(android): show real error text, guard dynamic colour, scope lint #73

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

Merged
janakhpon merged 1 commit into from
Oct 14, 2026
Merged

fix(android): show real error text, guard dynamic colour, scope lint #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions apps/android/app/lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<lint>
<!-- Room's KSP output calls Room's own restricted APIs by design. Lint flags
it as RestrictedApi on every generated DAO; the hand-written code stays checked. -->
<issue id="RestrictedApi">
<ignore path="**/build/generated/**" />
</issue>
</lint>
4 changes: 3 additions & 1 deletion apps/android/app/src/main/java/dev/janakhpon/monocr/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.janakhpon.monocr.ui.theme

import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
Expand Down Expand Up @@ -65,7 +66,8 @@ fun MonOCRTheme(
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor -> {
// Dynamic colour needs Android 12 (API 31); the app supports API 24 and up.
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val ctx = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(ctx) else dynamicLightColorScheme(ctx)
}
Expand Down
6 changes: 3 additions & 3 deletions apps/android/app/src/main/res/values-mnw/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<string name="share_chooser_title">ပတိတ်ဖျေံ တင်လိခ်</string>
<string name="open_file_chooser_title">ပံက်ဖိုင်</string>
<string name="close">ကၟာတ်ရောၚ်။</string>
<string name="error_file_large">ဖိုင်ဇၞော်လောန်အာ (အောန်အိုတ် {max}MB)</string>
<string name="error_file_large">ဖိုင်ဇၞော်လောန်အာ (အောန်အိုတ် %1$dMB)</string>
<string name="error_file_type">ဖိုင်ဟွံဒး။ စကာ JPG, PNG, WEBP, PDF ညိ။</string>
<string name="error_ocr_failed">OCR ကၠောန်ဟွံဂွံ - {msg}</string>
<string name="error_engine_load">အေန်ဂျေၚ် OCR စကာဟွံဂွံ - {msg}</string>
<string name="error_ocr_failed">OCR ကၠောန်ဟွံဂွံ</string>
<string name="error_engine_load">အေန်ဂျေၚ် OCR စကာဟွံဂွံ</string>
<string name="error_timeout">အခိင်လောန်အာယျ။ စကာ ဗီုဍောတ်တ် ညိ။</string>
<string name="error_memory">memory ဟွံရုမ်ဂပ်။ ကၟာတ် app တၞဟ်တအ်ညိ။</string>
<string name="error_corrupt">ဗှ်ဗီုရုပ်ဖိုၚ်ဟွံဂွံ။ စကာဖိုင်တၞဟ်ညိ။</string>
Expand Down
6 changes: 3 additions & 3 deletions apps/android/app/src/main/res/values-my/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<string name="share_chooser_title">စာသား မျှဝေရန်</string>
<string name="open_file_chooser_title">ဖိုင်ဖွင့်ရန်</string>
<string name="close">ပိတ််မည်။</string>
<string name="error_file_large">ဖိုင် အရွယ်အစား ကြီးလွန်းသည် (အများဆုံး {max}MB)</string>
<string name="error_file_large">ဖိုင် အရွယ်အစား ကြီးလွန်းသည် (အများဆုံး %1$dMB)</string>
<string name="error_file_type">ဖိုင်အမျိုးအစား မှားယွင်းနေသည်။ JPG, PNG, WEBP, PDF သာ အသုံးပြုပါ။</string>
<string name="error_ocr_failed">OCR လုပ်ဆောင်မှု မအောင်မြင်ပါ - {msg}</string>
<string name="error_engine_load">OCR အင်ဂျင် အလုပ်မလုပ်ပါ - {msg}</string>
<string name="error_ocr_failed">OCR လုပ်ဆောင်မှု မအောင်မြင်ပါ</string>
<string name="error_engine_load">OCR အင်ဂျင် အလုပ်မလုပ်ပါ</string>
<string name="error_timeout">အချိန်ကြာမြင့်သွားပြီ။ ပိုမိုသေးငယ်သော သို့မဟုတ် ပိုမိုကြည်လင်သော ပုံကို စမ်းကြည့်ပါ။</string>
<string name="error_memory">မှတ်ဉာဏ် (Memory) မလုံလောက်ပါ။ အခြား App များကို ပိတ်ပြီး ပြန်စမ်းကြည့်ပါ။</string>
<string name="error_corrupt">ပုံဖိုင်ကို ဖတ်၍မရပါ။ အခြားအမျိုးအစားကို စမ်းကြည့်ပါ။</string>
Expand Down
6 changes: 3 additions & 3 deletions apps/android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<string name="share_chooser_title">Share extracted text</string>
<string name="open_file_chooser_title">Open saved file</string>
<string name="close">Close</string>
<string name="error_file_large">File is too large (max {max}MB)</string>
<string name="error_file_large">File is too large (max %1$dMB)</string>
<string name="error_file_type">Invalid file type. Use JPG, PNG, WEBP, or PDF.</string>
<string name="error_ocr_failed">OCR failed - {msg}</string>
<string name="error_engine_load">OCR Engine failed to load - {msg}</string>
<string name="error_ocr_failed">OCR failed</string>
<string name="error_engine_load">OCR Engine failed to load</string>
<string name="error_timeout">The request timed out. Try a smaller or clearer image.</string>
<string name="error_memory">Not enough memory. Close other apps and try again.</string>
<string name="error_corrupt">Could not read the image file. Try a different format.</string>
Expand Down
Loading