Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,13 @@ private fun PdfInfos(
)
}

if (uiState.blackAndWhiteAsJpeg) {
Text(
stringResource(R.string.black_and_white_jpeg_hint),
style = MaterialTheme.typography.bodySmall,
)
}

if (uiState.isGenerating) {
Text(
text = stringResource(R.string.creating_export),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ data class ExportUiState(
val isGenerating: Boolean = false,
val progress: ExportProgress? = null,
val ocrActivation: Boolean? = null,
// The output format is JPEG and the document has black and white pages, which are smaller
// and sharper as PDF.
val blackAndWhiteAsJpeg: Boolean = false,
val isSaving: Boolean = false,
val result: ExportResult? = null,
val savedBundle: SavedBundle? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import org.fairscan.app.domain.jpegsToExport
import org.fairscan.app.domain.pagesToExport
import org.fairscan.app.ui.screens.settings.ExportFormat
import org.fairscan.app.ui.screens.settings.ExportFormat.PDF
import org.fairscan.imageprocessing.ColorMode
import java.io.File
import java.io.FileInputStream
import java.io.IOException
Expand Down Expand Up @@ -161,13 +162,16 @@ class ExportViewModel(container: AppContainer, val imageRepository: ImageReposit

preparationJob = launch {
val ocrActivation = if (exportFormat == PDF) ocrLanguageString.isNotEmpty() else null
val blackAndWhiteAsJpeg = exportFormat == ExportFormat.JPEG &&
currentPageKeys.any { it.colorMode == ColorMode.BLACK_AND_WHITE }
_uiState.update {
ExportUiState(
filename = it.filename,
format = exportFormat,
isGenerating = true,
progress = ExportProgress(0, pageCount),
ocrActivation = ocrActivation,
blackAndWhiteAsJpeg = blackAndWhiteAsJpeg,
)
}
val onProgress: (Int) -> Unit = { completedPages ->
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">تطبيق بسيط ومحترم لمسح مستنداتك ضوئيًا.</string>
<string name="apply">تطبيق</string>
<string name="back">ارجع</string>
<string name="black_and_white_jpeg_hint">الصفحات بالأبيض والأسود أصغر حجمًا وأكثر وضوحًا بصيغة PDF.</string>
<string name="camera_permission_denied">رُفض إذن الوصول إلى الكاميرا</string>
<string name="camera_permission_rationale">يتطلب التطبيق الوصول إلى الكاميرا لمسح المستندات ضوئيًا. تُخزن الصور الملتقطة على هذا الجهاز فقط، وسيتم حذفها عند إغلاق المسح الحالي.</string>
<string name="cancel">ألغِ</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Jednoduchá a respektující aplikace pro skenování vašich dokumentů</string>
<string name="apply">Použít</string>
<string name="back">Zpět</string>
<string name="black_and_white_jpeg_hint">Černobílé stránky jsou v PDF menší a ostřejší.</string>
<string name="camera_permission_denied">Byl odepřen přístup k fotoaparátu</string>
<string name="camera_permission_rationale">Aby bylo možné skenovat dokumenty, tato aplikace potřebuje přístup k fotoaparátu. Nasnímané obrázky jsou ukládány pouze do tohoto zařízení a budou smazány, když ukončíte aktuální sken.</string>
<string name="cancel">Zrušit</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Eine einfache und respektvolle App zum Scannen Ihrer Dokumente.</string>
<string name="apply">Anwenden</string>
<string name="back">Zurück</string>
<string name="black_and_white_jpeg_hint">Schwarzweiß-Seiten sind als PDF kleiner und schärfer.</string>
<string name="camera_permission_denied">Kamerazugriff wurde verweigert</string>
<string name="camera_permission_rationale">Die App benötigt Zugriff auf die Kamera, um Dokumente zu scannen. Aufgenommene Bilder werden nur auf diesem Gerät gespeichert und beim Schließen des aktuellen Scans gelöscht.</string>
<string name="cancel">Abbrechen</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Una aplicación sencilla y respetuosa para escanear tus documentos.</string>
<string name="apply">Aplicar</string>
<string name="back">Atrás</string>
<string name="black_and_white_jpeg_hint">Las páginas en blanco y negro son más pequeñas y nítidas en PDF.</string>
<string name="camera_permission_denied">Permiso de cámara denegado</string>
<string name="camera_permission_rationale">La aplicación necesita acceso a la cámara para escanear documentos. Las imágenes capturadas se guardan solo en este dispositivo y se eliminarán cuando cierres el escaneo actual.</string>
<string name="cancel">Cancelar</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<string name="app_tagline">Lihtsaltkasutatav ja viisakas rakendus dokumentide skaneerimiseks.</string>
<string name="apply">Rakenda</string>
<string name="back">Tagasi</string>
<string name="black_and_white_jpeg_hint">Mustvalged leheküljed on PDF-ina väiksemad ja teravamad.</string>
<string name="camera_permission_denied">Kaamera kasutamise õigused on puudu</string>
<string name="camera_permission_rationale">Et dokumentide skaneerimine toimiks, vajab see rakendus õigust kasutada kaamerat. Pildihõive käigus jäädvustatud pildid salvestuvad vaid siin selles seadmes ja kustutatakse töösoleva skaneerimise lõppedes.</string>
<string name="cancel">Katkesta</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<string name="app_tagline">Une application simple et respectueuse pour scanner vos documents.</string>
<string name="apply">Appliquer</string>
<string name="back">Retour</string>
<string name="black_and_white_jpeg_hint">Les pages en noir et blanc sont plus légères et plus nettes en PDF.</string>
<string name="camera_permission_denied">L\'autorisation d\'accès à la caméra a été refusée</string>
<string name="camera_permission_rationale">L’application a besoin d’accéder à l’appareil photo pour scanner des documents. Les images capturées sont enregistrées uniquement sur cet appareil et seront supprimées lorsque vous fermerez le scan en cours.</string>
<string name="cancel">Annuler</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-gl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Unha aplicación sinxela e respectuosa para escanear os teus documentos.</string>
<string name="apply">Aplicar</string>
<string name="back">Atrás</string>
<string name="black_and_white_jpeg_hint">As páxinas en branco e negro son máis pequenas e nítidas en PDF.</string>
<string name="camera_permission_denied">Permiso da cámara denegado</string>
<string name="camera_permission_rationale">A aplicación precisa acceso á cámara para escanear documentos. As imaxes capturadas gárdanse só neste dispositivo e eliminaranse ao pechar o escaneo actual.</string>
<string name="cancel">Cancelar</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Egy egyszerű, a felhasználót tiszteletben tartó dokumentum szkenner alkalmazás.</string>
<string name="apply">Alkalmaz</string>
<string name="back">Vissza</string>
<string name="black_and_white_jpeg_hint">A fekete-fehér oldalak PDF-ként kisebbek és élesebbek.</string>
<string name="camera_permission_denied">Kamerahozzáférés megtagadva</string>
<string name="camera_permission_rationale">Az alkalmazásnak a dokumentumok beolvasásához kamerahozzáférésre van szüksége. A rögzített képek csak ezen az eszközön kerülnek tárolásra, és törlődnek, amikor bezárod a folyamatban lévő szkennelést.</string>
<string name="cancel">Mégse</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Aplikasi sederhana dan aman untuk memindai dokumen Anda</string>
<string name="apply">Terapkan</string>
<string name="back">Kembali</string>
<string name="black_and_white_jpeg_hint">Halaman hitam putih lebih kecil dan lebih tajam sebagai PDF.</string>
<string name="camera_permission_denied">Izin penggunaan kamera ditolak</string>
<string name="camera_permission_rationale">Aplikasi ini memerlukan akses kamera untuk memindai dokumen. Gambar yang diambil hanya disimpan di perangkat ini dan akan dihapus saat Anda menutup pemindaian saat ini.</string>
<string name="cancel">Batalkan</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Un\'app semplice e rispettosa per scansionare i tuoi documenti.</string>
<string name="apply">Applica</string>
<string name="back">Indietro</string>
<string name="black_and_white_jpeg_hint">Le pagine in bianco e nero sono più piccole e nitide in PDF.</string>
<string name="camera_permission_denied">Autorizzazione fotocamera negata</string>
<string name="camera_permission_rationale">L\'app richiede l\'accesso alla fotocamera per scansionare documenti. Le immagini catturate sono salvate solo in questo dispositivo e verranno eliminate quando chiudi la scansione corrente.</string>
<string name="cancel">Annulla</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">シンプルで安心なドキュメントスキャナーです。</string>
<string name="apply">適用</string>
<string name="back">戻る</string>
<string name="black_and_white_jpeg_hint">白黒ページは PDF のほうが小さく鮮明になります。</string>
<string name="camera_permission_denied">カメラの権限が拒否されました</string>
<string name="camera_permission_rationale">ドキュメントをスキャンするためにカメラへのアクセスが必要です。撮影した画像はこのデバイスにのみ保存され、現在のスキャンを閉じると削除されます。</string>
<string name="cancel">キャンセル</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-lv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
</plurals>
<string name="text_recognition_disabled">Teksta atpazīšana: atspējota</string>
<string name="back">Atpakaļ</string>
<string name="black_and_white_jpeg_hint">Melnbaltas lapas PDF formātā ir mazākas un asākas.</string>
<string name="delete">Dzēst</string>
<string name="support">Atbalsts</string>
<string name="version">Versija</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Um aplicativo simples e respeitoso para digitalizar seus documentos.</string>
<string name="apply">Aplicar</string>
<string name="back">Voltar</string>
<string name="black_and_white_jpeg_hint">Páginas em preto e branco ficam menores e mais nítidas em PDF.</string>
<string name="camera_permission_denied">Permissão da câmera negada</string>
<string name="camera_permission_rationale">O aplicativo precisa de acesso à câmera para digitalizar documentos. As imagens capturadas são armazenadas apenas neste dispositivo e serão excluídas quando você fechar a digitalização atual.</string>
<string name="cancel">Cancelar</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Простое и открытое приложение для сканирования Ваших документов.</string>
<string name="apply">Применить</string>
<string name="back">Назад</string>
<string name="black_and_white_jpeg_hint">Чёрно-белые страницы в PDF меньше и чётче.</string>
<string name="camera_permission_denied">В доступе к камере отказано</string>
<string name="camera_permission_rationale">Для сканирования документов приложению требуется доступ к камере. Отснятые изображения хранятся только на данном устройстве и удаляются по окончании текущего сканирования.</string>
<string name="cancel">Отмена</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">En enkel och respektfull app för att skanna dina dokument.</string>
<string name="apply">Använd</string>
<string name="back">Tillbaka</string>
<string name="black_and_white_jpeg_hint">Svartvita sidor blir mindre och skarpare som PDF.</string>
<string name="camera_permission_denied">Kamerabehörighet nekades</string>
<string name="camera_permission_rationale">Appen behöver åtkomst till kameran för att kunna skanna dokument. Tagna bilder lagras endast på den här enheten och raderas när du stänger den aktuella skanningen.</string>
<string name="cancel">Avbryt</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">Belgelerinizi taramak için basit ve saygılı bir uygulama.</string>
<string name="apply">Uygula</string>
<string name="back">Geri</string>
<string name="black_and_white_jpeg_hint">Siyah beyaz sayfalar PDF olarak daha küçük ve daha net olur.</string>
<string name="camera_permission_denied">Kamera izni reddedildi</string>
<string name="camera_permission_rationale">Uygulama, belgeleri taramak için kamera erişimi gerektirir. Yakalanan görüntüler yalnızca bu cihazda saklanır ve geçerli taramayı kapattığınızda silinir.</string>
<string name="cancel">İptal</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">一個簡單且尊重隱私的文件掃描應用程式。</string>
<string name="apply">套用</string>
<string name="back">返回</string>
<string name="black_and_white_jpeg_hint">黑白頁面匯出為 PDF 時更小、更清晰。</string>
<string name="camera_permission_denied">已拒絕相機權限</string>
<string name="camera_permission_rationale">此應用程式需要相機存取權限才能掃描文件。擷取的影像僅儲存在此裝置上,並會在您關閉目前掃描時刪除。</string>
<string name="cancel">取消</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_tagline">一个简单且克制的文档扫描应用</string>
<string name="apply">应用</string>
<string name="back">返回</string>
<string name="black_and_white_jpeg_hint">黑白页面导出为 PDF 时更小、更清晰。</string>
<string name="camera_permission_denied">相机权限被拒绝</string>
<string name="camera_permission_rationale">应用请求相机权限访问扫描文档。捕获的图像仅存储在此设备上,并且在关闭当前扫描时将被删除。</string>
<string name="cancel">取消</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<string name="apply">Apply</string>
<!-- Icon description for ← at the top-left -->
<string name="back">Back</string>
<!-- Export screen, only when the output format is JPEG and the document has black & white pages -->
<string name="black_and_white_jpeg_hint">Black &amp; white pages are smaller and sharper as PDF.</string>
<!-- Error message (as a toast) -->
<string name="camera_permission_denied">Camera permission was denied</string>
<!-- Appears on the Camera screen -->
Expand Down