From 54aa15e1be9ba91b8e1faab18d83091523bba1ef Mon Sep 17 00:00:00 2001 From: Markus Fisch Date: Tue, 9 Jul 2024 19:11:35 +0200 Subject: [PATCH] Set maximum brightness when showing a barcode To make scanning from screen easier. --- .../binaryeye/fragment/BarcodeFragment.kt | 23 +++++++++++++++++++ .../android/binaryeye/os/ScreenBrightness.kt | 22 ++++++++++++++++++ .../binaryeye/preference/Preferences.kt | 10 ++++++++ app/src/main/res/values-bg/strings.xml | 3 +++ app/src/main/res/values-bn/strings.xml | 3 +++ app/src/main/res/values-cs/strings.xml | 3 +++ app/src/main/res/values-da/strings.xml | 3 +++ app/src/main/res/values-de/strings.xml | 3 +++ app/src/main/res/values-es/strings.xml | 3 +++ app/src/main/res/values-fa/strings.xml | 3 +++ app/src/main/res/values-fr/strings.xml | 3 +++ app/src/main/res/values-hu/strings.xml | 3 +++ app/src/main/res/values-in/strings.xml | 3 +++ app/src/main/res/values-it/strings.xml | 3 +++ app/src/main/res/values-ja/strings.xml | 3 +++ app/src/main/res/values-ka/strings.xml | 3 +++ app/src/main/res/values-ko/strings.xml | 3 +++ app/src/main/res/values-nl/strings.xml | 3 +++ app/src/main/res/values-pl/strings.xml | 5 +++- app/src/main/res/values-pt-rBR/strings.xml | 3 +++ app/src/main/res/values-ru-rRU/strings.xml | 3 +++ app/src/main/res/values-tr/strings.xml | 3 +++ app/src/main/res/values-uk/strings.xml | 3 +++ app/src/main/res/values-vi/strings.xml | 3 +++ app/src/main/res/values-zh-rCN/strings.xml | 3 +++ app/src/main/res/values-zh-rTW/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ app/src/main/res/xml-v11/preferences.xml | 7 ++++++ app/src/main/res/xml-v33/preferences.xml | 7 ++++++ app/src/main/res/xml/preferences.xml | 7 ++++++ 30 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 app/src/main/kotlin/de/markusfisch/android/binaryeye/os/ScreenBrightness.kt diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt index 751ea8eb..b6e90a80 100644 --- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt +++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt @@ -17,6 +17,7 @@ import android.widget.EditText import de.markusfisch.android.binaryeye.R import de.markusfisch.android.binaryeye.app.db import de.markusfisch.android.binaryeye.app.hasWritePermission +import de.markusfisch.android.binaryeye.app.prefs import de.markusfisch.android.binaryeye.content.copyToClipboard import de.markusfisch.android.binaryeye.content.shareFile import de.markusfisch.android.binaryeye.content.shareText @@ -26,6 +27,8 @@ import de.markusfisch.android.binaryeye.graphics.COLOR_WHITE import de.markusfisch.android.binaryeye.io.addSuffixIfNotGiven import de.markusfisch.android.binaryeye.io.toSaveResult import de.markusfisch.android.binaryeye.io.writeExternalFile +import de.markusfisch.android.binaryeye.os.getScreenBrightness +import de.markusfisch.android.binaryeye.os.setScreenBrightness import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets import de.markusfisch.android.binaryeye.widget.ConfinedScalingImageView @@ -55,6 +58,8 @@ class BarcodeFragment : Fragment() { private lateinit var barcode: Barcode<*> private lateinit var addToHistoryItem: MenuItem + private var currentBrightness = -1f; + override fun onCreate(state: Bundle?) { super.onCreate(state) setHasOptionsMenu(true) @@ -136,6 +141,24 @@ class BarcodeFragment : Fragment() { Colors.entries[getInt(COLORS)] ) + override fun onResume() { + super.onResume() + if (prefs.brightenScreen) { + activity?.let { + currentBrightness = it.getScreenBrightness() + it.setScreenBrightness(1f); + } + } + } + + override fun onPause() { + super.onPause() + if (currentBrightness > -1f) { + activity?.setScreenBrightness(currentBrightness); + currentBrightness = -1f + } + } + override fun onDestroyView() { super.onDestroyView() parentJob.cancel() diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/os/ScreenBrightness.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/os/ScreenBrightness.kt new file mode 100644 index 00000000..1784e2c1 --- /dev/null +++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/os/ScreenBrightness.kt @@ -0,0 +1,22 @@ +package de.markusfisch.android.binaryeye.os + +import android.app.Activity +import android.view.WindowManager + +fun Activity.getScreenBrightness(): Float { + val layoutParams = window.attributes + return if (layoutParams.screenBrightness == WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE) { + android.provider.Settings.System.getInt( + contentResolver, + android.provider.Settings.System.SCREEN_BRIGHTNESS + ) / 255.0f + } else { + layoutParams.screenBrightness + } +} + +fun Activity.setScreenBrightness(brightness: Float) { + val layoutParams = window.attributes + layoutParams.screenBrightness = brightness + window.attributes = layoutParams +} diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt index 42bf42df..9fb255bf 100644 --- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt +++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt @@ -215,6 +215,11 @@ class Preferences { apply(EXPAND_ESCAPE_SEQUENCES, value) field = value } + var brightenScreen = false + set(value) { + apply(BRIGHTEN_SCREEN, value) + field = value + } fun init(context: Context) { preferences = PreferenceManager.getDefaultSharedPreferences(context) @@ -335,6 +340,10 @@ class Preferences { EXPAND_ESCAPE_SEQUENCES, expandEscapeSequences ) + brightenScreen = preferences.getBoolean( + BRIGHTEN_SCREEN, + brightenScreen + ) } private fun addFormatsOnUpdate( @@ -434,5 +443,6 @@ class Preferences { private const val LAST_MARGIN = "last_margin" private const val FREE_ROTATION = "free_rotation" private const val EXPAND_ESCAPE_SEQUENCES = "expand_escape_sequences" + private const val BRIGHTEN_SCREEN = "brighten_screen" } } diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f4f84aff..bfed1ba0 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -138,6 +138,9 @@ Неуспешно свързване с Bluetooth устройство. Неуспешно изпращане до Bluetooth устройство. Успешно Bluetooth изпращане. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Наистина ли искате да премахнете това сканиране? Наистина ли искате да премахнете всички сканирания? Наистина ли искате да премахнете избраните сканирания? diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 62b7a448..9331b3b1 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. আসলেই এটা মুছবে? আসলেই সব মুছবে? আসলেই নির্বাচিত সব মুছবে? diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d4a34e85..eb1122df 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -140,6 +140,9 @@ Nelze se připojit k zařízení Bluetooth. Nelze odesílat na zařízení Bluetooth. Odesílání přes Bluetooth se zdařilo. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Opravdu odstranit sken? Opravdu odstranit všechny skeny? Opravdu odstranit zvolené skeny? diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d58c7a3b..4090b709 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Vil du virkelig fjerne scanningen? Vil du virkelig fjerne alle scanninger? Vil du virkelig fjerne valgte scanninger? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9f8e3e6d..abcea819 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -138,6 +138,9 @@ Es kann leider keine Verbindung zum Bluetooth-Gerät hergestellt werden Senden zum Bluetooth-Gerät fehlgeschlagen Erfolgreich zum Bluetooth-Gerät gesendet + Generation + Bildschrim aufhellen + Helligkeit auf Maximum stellen um das Scannen eines Barcodes vom Bildschirm zu verbessern. Code wirklich entfernen? Alle Codes entfernen? Alle ausgewählten Codes entfernen? diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f0dcb8ee..cf448516 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -138,6 +138,9 @@ No se pudo conectar a un dispositivo bluetooth. No se pudo enviar a un dispositivo bluetooth. Envío bluetooth completado. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. ¿Eliminar el escaneo seleccionado? ¿Eliminar todos los escaneos? ¿Eliminar los escaneos seleccionados? diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 68f33c40..73dba587 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. برای برداشتن پویش مطمئنید؟ برای برداشتن همهٔ پویش‌ها مطمئنید؟ برای برداشتن پویش‌های برگزیده شده مطمئنید؟ diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f987e427..33189188 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -138,6 +138,9 @@ Impossible de se connecter à l\'appareil Bluetooth. Impossible d\'envoyer à l\'appareil Bluetooth. Envoi Bluetooth réussi. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Supprimer le scan ? Supprimer tous les scans ? Supprimer les scans sélectionnés ? diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b943a17a..d8d9fb67 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Valóban eltávolítja a beolvasást? Valóban eltávolítja az összes beolvasását? Valóban eltávolítja a kijelölt beolvasásokat? diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 9a822146..9d0b332d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -137,6 +137,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Yakin menghapus pindaian? Yakin menghapus semua pindaian? Yakin menghapus pindaian yang dipilih? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 41a7e2ad..762083f3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -138,6 +138,9 @@ Impossibile connettersi al dispositivo Bluetooth. Impossibile inviare al dispositivo Bluetooth. Invio via Bluetooth riuscito. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Vuoi rimuovere la scansione? Vuoi rimuovere tutte le scansioni? Vuoi rimuovere le scansioni selezionate? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cb38fcf8..c299cc4d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -137,6 +137,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. このスキャン履歴を削除しても宜しいですか？ 全てのスキャン履歴を削除しても宜しいですか？ 選択されたスキャン履歴を削除しても宜しいですか？ diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index d657b162..e9843182 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. ნამდვილად გსურთ სკანირების წაშლა? ნამდვილად გსურთ ყველაფრის წაშლა? ნამდვილად გსურთ შერჩეული შტრიხ-კოდების წაშლა? diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2ae84aed..8124f421 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -137,6 +137,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Really remove scan? Really remove all scans? Really remove selected scans? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 63ead381..deea2365 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -138,6 +138,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Scan echt verwijderen? Alle scans echt verwijderen? Geselecteerde scans verwijderen? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a8f6efd6..34b53830 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -161,6 +161,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Skopiuj hasło do schowka Hasło skopiowane do schowka Sugerowana cena @@ -205,4 +208,4 @@ Metoda fazy 2 Network suggestions Usuń sugestię - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0a7aeb1c..4df4cbad 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -139,6 +139,9 @@ Não foi possível conectar com o dispositivo Bluetooth. Não foi possível enviar para o dispositivo Bluetooth. Envio Bluetooth com sucesso. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Deseja excluir esta digitalização? Deseja excluir todas as digitalizações? Deseja excluir as digitalizações selecionadas? diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index a706c602..f1c0f2b8 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -140,6 +140,9 @@ Невозможно подключиться к bluetooth-устройству. Невозможно отправить на bluetooth-устройство. Успешно отправлено по bluetooth. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Удалить сканирование? Удалить все сканирования? Удалить выбранные штрих-коды? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 979a213a..b696eb48 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -138,6 +138,9 @@ Bluetooth aygıtına bağlanılamadı. Bluetooth aygıtına gönderilemedi. Bluetooth aygıtına gönderildi. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Tarama gerçekten silinsin mi? Tüm taramalar gerçekten silinsin mi? Seçili taramalar gerçekten silinsin mi? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ce205425..0aae465c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -139,6 +139,9 @@ Неможливо підключитися до пристрою Bluetooth. Неможливо надіслати на пристрій Bluetooth. Успішно надіслано через Bluetooth. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Дійсно видалити сканування? Дійсно видалити всі сканування? Дійсно видалити вибрані сканування? diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6df00f88..83146c52 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -137,6 +137,9 @@ Could not connect to bluetooth device. Could not send to bluetooth device. Successful bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Thật sự xoá lần quét này? Thật sự xoá tất cả các lần quét? Thật sự xoá các lần quét được chọn? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f44ba455..49dfa912 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -137,6 +137,9 @@ 无法连接蓝牙设备。 无法将结果发送至蓝牙设备。 已通过蓝牙发送。 + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. 确定删除记录？ 确定删除全部记录？ 确定删除所选记录？ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8faad098..88a189b2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -137,6 +137,9 @@ 無法連線到藍牙裝置 無法傳送到藍牙裝置 藍牙傳送完成 + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. 確定刪除記錄？ 確定要刪除所有掃描記錄？ 確定要刪除選擇的掃描記錄？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0e8efdd..60521f33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -138,6 +138,9 @@ Could not connect to Bluetooth device. Could not send to Bluetooth device. Successful Bluetooth send. + Generation + Brighten screen + Set brightness to maximum to enhance scanning a barcode from the screen. Really remove scan? Really remove all scans? Really remove selected scans? diff --git a/app/src/main/res/xml-v11/preferences.xml b/app/src/main/res/xml-v11/preferences.xml index 8cc9ac87..3776234b 100644 --- a/app/src/main/res/xml-v11/preferences.xml +++ b/app/src/main/res/xml-v11/preferences.xml @@ -150,6 +150,13 @@ android:title="@string/clear_network_suggestions" android:summary="@string/clear_network_suggestions_summary"/> + + + + + + diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 49f1d335..5ca744cf 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -145,6 +145,13 @@ android:title="@string/clear_network_suggestions" android:summary="@string/clear_network_suggestions_summary"/> + + +