Advance version number to 1.56.1

To allow small codes to be small on screen.

This makes it easier to use a generated barcode in place of a small
printed barcode. There are scanners out there that expect a barcode
to be of a certain (small) size.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 1.56.1
+* Allow pinching a barcode to its generated size
+* Fix view/frame transformation matrix
+* Fix handling of tab characters
+* Update Indonesian translation
+* Update Russian translation
+
 ## 1.56.0
 * Add an action item to lock/unlock free rotation
 * Support setting fore and background colors when creating barcodes

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 106
-		versionName '1.56.0'
+		versionCode 109
+		versionName '1.56.1'
 	}
 
 	signingConfigs {
@@ -66,5 +66,5 @@ dependencies {
 	implementation "com.android.support:preference-v14:$support_version"
 	implementation 'com.github.markusfisch:CameraView:1.9.1'
 	implementation 'com.github.markusfisch:ScalingImageView:1.4.0'
-	implementation 'com.github.markusfisch:zxing-cpp:v1.4.0.7'
+	implementation 'com.github.markusfisch:zxing-cpp:v1.4.0.8'
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt

@@ -25,6 +25,7 @@ import de.markusfisch.android.binaryeye.widget.ConfinedScalingImageView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.zxingcpp.ZxingCpp
 import de.markusfisch.android.zxingcpp.ZxingCpp.Format
+import kotlin.math.min
 import kotlinx.coroutines.*
 import java.io.File
 import java.io.FileOutputStream
@@ -86,7 +87,10 @@ class BarcodeFragment : Fragment() {
 		imageView.setImageBitmap(bitmap)
 		imageView.post {
 			// Make sure to invoke this after ScalingImageView.onLayout().
-			imageView.minWidth /= 2f
+			imageView.minWidth = min(
+				imageView.minWidth / 2f,
+				barcode.size.toFloat()
+			)
 		}
 
 		view.findViewById<View>(R.id.share).setOnClickListener {

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/Mapping.kt

@@ -19,10 +19,10 @@ fun Rect.setFrameRoi(
 ) {
 	Matrix().apply {
 		// Map ROI from view coordinates to frame coordinates.
-		setScale(1f / viewRect.width(), 1f / viewRect.height())
+		setTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
+		postScale(1f / viewRect.width(), 1f / viewRect.height())
 		postRotate(-frameMetrics.orientation.toFloat(), .5f, .5f)
 		postScale(frameMetrics.width.toFloat(), frameMetrics.height.toFloat())
-		postTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
 		val frameRoiF = RectF()
 		val viewRoiF = RectF(
 			viewRoi.left.toFloat(),

app/src/main/res/values-in/strings.xml

@@ -14,22 +14,22 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; koreksi)</string>
 	<string name="error_correction_level_q" formatted="false">Kuartil (~25&#37; koreksi)</string>
 	<string name="error_correction_level_h" formatted="false">Tinggi (~30&#37; koreksi)</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">Muka dan latar belakang</string>
+	<string name="colors_black_on_white">Hitam di atas putih</string>
+	<string name="colors_white_on_black">Putih di atas hitam</string>
+	<string name="colors_black_on_transparent">Hitam di atas tansparan</string>
+	<string name="colors_white_on_transparent">Putih di atas tansparan</string>
+	<string name="sequence_size">Ukuran sekuens</string>
+	<string name="sequence_index">Indeks sekuens</string>
+	<string name="sequence_id">ID Sekuens</string>
 	<string name="gtin_issue_number">Nomor pindaian</string>
 	<string name="gtin_country">Kemungkinan negara pembuat</string>
 	<string name="gtin_price">Harga yang disarankan</string>
 	<string name="gtin_add_on">Ekstensi UPC EAN</string>
-	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="barcode_version_number">Versi</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modul)</string>
 	<string name="toggle_flash">Nyala/matikan blitz</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Galat nyala/matikan blitz</string>
 	<string name="share">Bagikan</string>
 	<string name="share_as">Bagikan sebagai?</string>
 	<string name="copy_to_clipboard">Salin ke clipboard</string>
@@ -50,16 +50,16 @@
 	<string name="info">Info</string>
 	<string name="switch_camera">Ganti kamera</string>
 	<string name="bulk_mode">Pindai tanpa henti</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_summary">Selalu mulai pemindaian tanpa henti.</string>
+	<string name="bulk_mode_delay">Tundaan antara pemindaian tanpa henti</string>
+	<string name="restrict_format">Batasi format</string>
+	<string name="remove_restriction">Hapus pembatasan</string>
+	<string name="scan_format">Pindai %s</string>
+	<string name="quarter_second">Seperempat detik</string>
+	<string name="half_second">Setengah detik</string>
+	<string name="a_second">Satu detik</string>
+	<string name="two_seconds">Dua detik</string>
+	<string name="five_seconds">Lima detik</string>
 	<string name="history">Riwayat</string>
 	<string name="preferences">Preferensi</string>
 	<string name="scan_category">Pemindaian</string>
@@ -69,15 +69,15 @@
 	<string name="follow_system_settings">Ikuti pengaturan sistem</string>
 	<string name="show_crop_handle">Tampilkan pembatas pemotongan</string>
 	<string name="show_crop_handle_summary">Batasi pemindaian ke batas area tertentu.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Format barcode</string>
 	<string name="zoom_by_swiping">Geser ke atas/bawah untuk memperbesar</string>
 	<string name="zoom_by_swiping_summary">Geser layar kamera ke atas atau ke bawah untuk mengontrol perbesaran gambar.</string>
 	<string name="auto_rotate">Kenali barcode vertikal 1D</string>
 	<string name="auto_rotate_summary">Otomatis putar frame kamera mengenali barcode vertikal 1D. Tergantung pada perangkat, mungkin akan berpengaruh pada performa.</string>
 	<string name="try_harder">Optimalkan akurasi pembaca</string>
 	<string name="try_harder_summary">Aktifkan opsi ini untuk kode yang susah dibaca. Akan berpengaruh pada performa.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="show_toast_in_bulk_mode">Tampilkan data dalam mode tanpa henti</string>
+	<string name="show_toast_in_bulk_mode_summary">Tampilkan data secara singkat saat memindai tanpa henti.</string>
 	<string name="vibrate">Bergetar saat mendeteksi</string>
 	<string name="vibrate_summary">Aktifkan opsi ini jika anda ingin perangkat anda bergetar ketika kode berhasil dipindai.</string>
 	<string name="use_history">Simpan riwayat pemindaian</string>
@@ -92,29 +92,29 @@
 	<string name="show_meta_data_summary">Tampilkan data tambahan tentang barcode yang dipindai.</string>
 	<string name="show_hex_dump">Tampilkan hex dump</string>
 	<string name="show_hex_dump_summary">Tampilkan hex dump dari konten hasil pemindaian.</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="show_recreation">Tampilkan barcode yang dibuat ulang</string>
+	<string name="show_recreation_summary">Buat ulang dan tampilkan barcode dari isi konten jika memungkinkan.</string>
+	<string name="close_automatically">Kembali setelah Salin/Berbagi</string>
+	<string name="close_automatically_summary">Otomatis kembali ke layar pemindaian setelah menyalin atau berbagi isi konten.</string>
+	<string name="default_search_engine">Buka data tak dikenal di</string>
+	<string name="always_ask">Selalu tanya</string>
 	<string name="open_with_url">Buka data tak dikenal dengan URL</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="clear_network_suggestions">Hapus saran jaringan</string>
+	<string name="clear_network_suggestions_summary">Hapus semua saran jaringan yang sebelumnya disediakan oleh aplikasi ini.</string>
+	<string name="really_remove_all_networks">Yakin menghapus semua jaringan?</string>
+	<string name="clear_network_suggestions_success">Saran jaringan dihapus</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Tidak ada yang perlu dihapus</string>
 	<string name="send_category">Penerusan</string>
-	<string name="send_scan_active">Forward scans</string>
-	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
+	<string name="send_scan_active">Teruskan pemindaian</string>
+	<string name="send_scan_active_summary">Aktifkan penerusan pemindaian ke URL berikut</string>
 	<string name="send_scan_url">Kirim setiap pindaian ke URL</string>
 	<string name="send_scan_type">Tipe permintaan untuk setiap pindaian</string>
 	<string name="send_type_get_add_content">GET dan tambahkan konten</string>
 	<string name="send_type_get_query_string">GET dengan kueri lema lengkap</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
-	<string name="test_url">Test URL</string>
+	<string name="send_type_external_browser">Buka di peramban eksternal</string>
+	<string name="test_url">URL Tes</string>
 	<string name="really_remove_scan">Yakin menghapus pindaian?</string>
 	<string name="really_remove_all_scans">Yakin menghapus semua pindaian?</string>
 	<string name="really_remove_selected_scans">Yakin menghapus pindaian yang dipilih?</string>
@@ -156,21 +156,21 @@
 	<string name="export_database">Ekspor basis data SQLite</string>
 	<string name="saved_in_downloads">Simpan di dalam unduhan</string>
 	<string name="rotate_image_cw">Putar gambar searah jarum jam</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
+	<string name="toggle_free_rotation">Nyala/matikan rotasi bebas</string>
 	<string name="pick_file">Pilih berkas gambar</string>
 	<string name="pick_code_to_scan">Pilih kode untuk dipindai</string>
 	<string name="shortcut_decode">Pindai barcode</string>
 	<string name="shortcut_encode">Buat barcode</string>
 	<string name="shortcut_preferences">Pengaturan</string>
 	<string name="background_request_failed">Permintaan latar belakang gagal</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="entry_type">Tipe</string>
+	<string name="wifi_network">Jaringan Wi-Fi</string>
+	<string name="wifi_ssid">Nama</string>
+	<string name="wifi_type">Tipe otentikasi</string>
+	<string name="wifi_password">Sandi</string>
+	<string name="wifi_hidden">Jaringan tersembunyi</string>
+	<string name="wifi_eap">Metode EAP</string>
+	<string name="wifi_anonymous_identity">Identitas anonim</string>
+	<string name="wifi_identity">Identitas</string>
+	<string name="wifi_phase2">Metode fase 2</string>
 </resources>

app/src/main/res/values-ru-rRU/strings.xml

@@ -17,11 +17,11 @@
 	<string name="error_correction_level_m" formatted="false">Средний (≈15&#37; исправлений)</string>
 	<string name="error_correction_level_q" formatted="false">Квартиль (≈25&#37; исправлений)</string>
 	<string name="error_correction_level_h" formatted="false">Высокий (≈30&#37; исправлений)</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
+	<string name="colors">Цвета</string>
+	<string name="colors_black_on_white">Чёрный на белом</string>
+	<string name="colors_white_on_black">Белый на чёрном</string>
+	<string name="colors_black_on_transparent">Чёрный на прозрачном</string>
+	<string name="colors_white_on_transparent">Белый на прозрачном</string>
 	<string name="sequence_size">Размер последовательности</string>
 	<string name="sequence_index">Индекс последовательности</string>
 	<string name="sequence_id">Идентификатор последовательности</string>
@@ -159,7 +159,7 @@
 	<string name="export_database">База данных SQLite</string>
 	<string name="saved_in_downloads">Сохранено в загрузках</string>
 	<string name="rotate_image_cw">Повернуть изображение по часовой стрелке</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
+	<string name="toggle_free_rotation">Переключить свободный поворот</string>
 	<string name="pick_file">Открыть файл с изображением</string>
 	<string name="pick_code_to_scan">Выберите штрих-код для сканирования</string>
 	<string name="shortcut_decode">Сканировать штрих-код</string>