Merge branch 'development' of https://github.com/Crazy-Marvin/Flashy …

…into development

.gitignore

@@ -22,6 +22,7 @@ out/
 # Gradle files
 .gradle/
 build/
+app/build/
 
 # Local configuration file (sdk path, etc)
 local.properties

README.md

@@ -6,7 +6,7 @@
 
 ### Simple & Privacy-Friendly Flashlight App
 
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Crazy-Marvin/Flashy/CI/development)](https://github.com/Crazy-Marvin/Flashy/actions)
+[![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/Crazy-Marvin/Flashy/ci.yml?branch=development)](https://github.com/Crazy-Marvin/Flashy/actions)
 [![License](https://img.shields.io/github/license/Crazy-Marvin/Flashy.svg)](https://github.com/Crazy-Marvin/Flashy/blob/development/LICENSE)
 [![Last commit](https://img.shields.io/github/last-commit/Crazy-Marvin/Flashy.svg?style=flat)](https://github.com/Crazy-Marvin/Flashy/commits)
 [![Releases](https://img.shields.io/github/downloads/Crazy-Marvin/Flashy/total.svg?style=flat)](https://github.com/Crazy-Marvin/Flashy/releases)

app/build.gradle

@@ -38,12 +38,12 @@ dependencies {
         exclude([group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk8"])
     }
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference:1.2.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.12.0'
     coreLibraryDesugaring ('com.android.tools:desugar_jdk_libs:2.0.4')
@@ -52,5 +52,5 @@ dependencies {
     implementation 'me.tankery.lib:circularSeekBar:1.4.2'
     //to resolve dependency conflicts
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4"
 }

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

@@ -3,7 +3,7 @@
     <string name="no_flashlight">Keine Taschenlampe</string>
     <string name="app_name">Flashy</string>
     <string name="flashlight">Taschenlampe</string>
-    <string name="cannot_access_camera">Kann nicht auf Kamera zugreifen. Wird sie von einer anderen App verwendet\?</string>
+    <string name="cannot_access_camera">Kann nicht auf Kamera zugreifen. Wird sie von einer anderen App verwendet?</string>
     <string name="maximize_screen_brightness">Volle Bildschirmhelligkeit</string>
     <string name="system_settings_permission_granted">Berechtigung erteilt. Sie können diese Meldung jetzt schließen.</string>
     <string name="settings">Einstellungen</string>

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

@@ -43,7 +43,7 @@
     <string name="feather_icons">Feather Icons</string>
     <string name="no_flash_on_device_screen_off_subtext">Sólo funciona cuando la aplicación está abierta</string>
     <string name="app_name">Flashy</string>
-    <string name="cannot_access_camera">No puedo acceder a la cámara, ¿está siendo utilizada por otra aplicación?</string>
+    <string name="cannot_access_camera">No se puede acceder a la cámara. ¿Está siendo utilizado por otra aplicación?</string>
     <string name="system_settings_permission_notice">Para cambiar el brillo de la pantalla a través del widget, es necesario conceder un permiso especial a la aplicación. Pulsa el botón de abajo para hacerlo.
 \n
 \nSalir sin conceder el permiso hará que no se añada el widget.</string>

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

@@ -46,4 +46,14 @@
     <string name="apache2">Licence Apache 2.0</string>
     <string name="gpl2_ce">Licence publique générale GNU, version 2, avec exception Classpath</string>
     <string name="kotlin">Kotlin</string>
+    <string name="no_flash_when_screen">Désactiver la lampe de poche en mode écran</string>
+    <string name="java">Java</string>
+    <string name="sos">SOS</string>
+    <string name="farnsworth_unit_length_error">La durée d\'une unité Farnsworth doit être plus longue qu\'une unité normale.</string>
+    <string name="learn_more_morse_timing">En savoir plus sur les délais dans le code Morse</string>
+    <string name="md3_subtext">Utiliser l\'apparence et les interactions conçues pour Android 12</string>
+    <string name="farnsworth_unit_length_explanation">La méthode Farnsworth permet de reconnaître les motifs sonores plus facilement en augmentant le délai entre les lettres et entre les mots, ce qui laisse plus de temps pour les identifier.
+\nUne unité Farnsworth est plus longue qu\'une unité de base.
+\nÉcrivez ci-contre la longueur voulue pour votre unité Farnsworth (plus longue qu\'une unité de base : %d millisecondes).
+\nLaissez vide pour utiliser la longueur d\'une unité de base augmentée de 25%.</string>
 </resources>

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

@@ -3,7 +3,7 @@
     <string name="app_name">Flashy</string>
     <string name="flashlight">Svjetiljka</string>
     <string name="no_camera">Nema kamere</string>
-    <string name="cannot_access_camera">Nije moguće pristupiti kameri. Koristi li ju jedna druga aplikacija\?</string>
+    <string name="cannot_access_camera">Nije moguće pristupiti kameri. Koristi li ju jedna druga aplikacija?</string>
     <string name="light">Svijetla</string>
     <string name="about">Informacije o</string>
     <string name="version_license">Verzija %s · Apache licenca 2.0</string>

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

@@ -7,7 +7,7 @@
     <string name="md3">Material Design 3</string>
     <string name="no_flash_when_screen">Išjunkite žibintuvėlio ekrano režimą</string>
     <string name="app_name">Flashy</string>
-    <string name="cannot_access_camera">Kamera nepasiekiama, ar ją naudoja kita programa\?</string>
+    <string name="cannot_access_camera">Kamera nepasiekiama, ar ją naudoja kita programa?</string>
     <string name="maximize_screen_brightness">Maksimaliai padidinti ekrano ryškumą</string>
     <string name="system_settings_permission_granted">Leidimas suteiktas. Dabar galite išeiti iš šio lango.</string>
     <string name="settings">Nustatymai</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -1,4 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Flashy</string>
+    <string name="follow_system">Følg systemet</string>
+    <string name="dark">Mørk</string>
+    <string name="light">Lys</string>
+    <string name="about">Om</string>
+    <string name="contribute">Bidra</string>
+    <string name="feather_icons">Fjærikoner</string>
+    <string name="words_per_min_error">Ugyldig antall ord</string>
+    <string name="sos">SOS</string>
+    <string name="turn_on_sos_now">Skru på SOS nå</string>
+    <string name="words_per_min">Ord per minutt</string>
+    <string name="no_flash_on_device_screen_off_subtext">Virker kun når programmet er åpent</string>
+    <string name="flashlight">Lommelykt</string>
+    <string name="no_camera">Mangler kamera</string>
+    <string name="grant_permission">Innvilg tilgang</string>
+    <string name="maximize_screen_brightness">Maksimer skjermlysstyrke</string>
+    <string name="appearance">Utseende</string>
+    <string name="theme">Drakt</string>
+    <string name="general">Generelt</string>
+    <string name="settings">Innstillinger</string>
+    <string name="source_code">Kildekode</string>
+    <string name="translate">Oversettelse</string>
+    <string name="dev">Utvikler</string>
+    <string name="report_problem">Rapporter problemer</string>
+    <string name="oss_licenses">Frie lisenser</string>
+    <string name="no_flashlight">Mangler lommelykt</string>
+    <string name="use_screen">Bruk skjerm</string>
+    <string name="version_license">Versjon %s · Apache 2.0-lisens</string>
+    <string name="no_app_can_handle">Ingen installerte programmer kan utføre denne handlingen.</string>
+    <string name="stroboscope_interval">Stroboskop-intervall</string>
+    <string name="farnsworth_unit_length">Farnsworth-enhetslengde</string>
+    <string name="use_farnsworth">Bruk Farnsworth-tidsinndeling</string>
+    <string name="md3_subtext">Bruk utseende og adferd fra Android 12</string>
+    <string name="farnsworth_unit_length_error">Farnsworth-enhetsvarighet må være lengre enn en normal enhet</string>
+    <string name="learn_more_morse_timing">Lær mer om Morsekodetidsinndeling</string>
+    <string name="no_flash_on_device_screen_off">Skru av lommelykt når enhetsskjerm slås av</string>
+    <string name="cannot_access_camera">Får ikke tilgang til kameraet. Er det i bruk av et annet program?</string>
+    <string name="system_settings_permission_granted">Tilgang innvilget. Du kan forlate denne skjermen nå.</string>
+    <string name="system_settings_permission_notice">For å endre skjermlysstyrke gjennom miniprogrammet må du innvilge programmet en spesialtilgang. Trykk på knappen nedenfor for å gjøre dette.
+\n
+\nÅ avslutte uten tilgangen medfører at miniprogrammet ikke blir lagt til.</string>
+    <string name="no_flash_when_screen">Skru av lommelykt i skjermmodus</string>
+    <string name="md_icons">Ikoner i materiell design</string>
+    <string name="words_per_min_explanation">Ord per minutt er hvor mange ganger forvalgsordet «Paris» kan sendes per minutt.
+\nDesto høyere hverdi, desto kortere lengde på hver «dit».
+\nMerk deg at denne innstillingen ikke tar hensyn til Farnsworth-tidsinnstilling.
+\nSkriv in ønsket verdi nedenfor.</string>
+    <string name="farnsworth_unit_length_explanation">Farnsworth-tidsinnstilling gjenkjenner lydmønsterne enklere ved å øke oppholdet mellom tegn og ord for å gi mer gjenkjennelsestid.
+\nEn Farnsworth-enhet er lengre enn en grunnenhet.
+\nSkriv inn ønsket lengde på Farnsworth-enhet nedenfor (må være høyere enn en grunnenhet: %d millisekunder).
+\nLa stå tomt for å bruke lengden for grunnenheten tillagt 25 prosent.</string>
 </resources>

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

@@ -1,4 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Flashy</string>
+    <string name="flashlight">Latarka</string>
+    <string name="no_camera">Brak aparatu</string>
+    <string name="cannot_access_camera">Nie można uzyskać dostępu do aparatu. Czy jest on używany przez inną aplikację?</string>
+    <string name="grant_permission">Udziel uprawnienia</string>
+    <string name="settings">Ustawienia</string>
+    <string name="general">Ogólne</string>
+    <string name="appearance">Wygląd</string>
+    <string name="theme">Motyw</string>
+    <string name="light">Jasny</string>
+    <string name="dark">Ciemny</string>
+    <string name="follow_system">Zgodny z systemowym</string>
+    <string name="version_license">Wersja %s - Licencja Apache 2.0</string>
+    <string name="dev">Deweloper</string>
+    <string name="report_problem">Zgłoś problem</string>
+    <string name="oss_licenses">Licencje typu open source</string>
+    <string name="feather_icons">Zestaw ikon Feather</string>
+    <string name="md_icons">Ikony Material Design</string>
+    <string name="sos">SOS</string>
+    <string name="no_flashlight">Brak latarki</string>
+    <string name="use_screen">Użyj ekranu</string>
+    <string name="words_per_min">Słowa na minutę</string>
+    <string name="words_per_min_error">Nieprawidłowa ilość słów</string>
+    <string name="turn_on_sos_now">Wyłącz sygnał SOS</string>
+    <string name="contribute">Pomóż w rozwoju projektu</string>
+    <string name="about">O aplikacji</string>
+    <string name="translate">Pomóż w tłumaczeniu</string>
+    <string name="source_code">Kod źródłowy</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -3,7 +3,7 @@
     <string name="flashlight">Lanterna</string>
     <string name="no_camera">Sem câmera</string>
     <string name="app_name">Flashy</string>
-    <string name="cannot_access_camera">Não foi possível acessar a câmera, ela está sendo usada por outro app\?</string>
+    <string name="cannot_access_camera">Não foi possível acessar a câmera, ela está sendo usada por outro app?</string>
     <string name="maximize_screen_brightness">Maximizar o brilho da tela</string>
     <string name="grant_permission">Conceder permissão</string>
     <string name="android_jetpack">Android Jetpack</string>

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

@@ -29,7 +29,7 @@
     <string name="grant_permission">Дать разрешение</string>
     <string name="flashlight">Фонарик</string>
     <string name="no_camera">Нет камеры</string>
-    <string name="cannot_access_camera">Не удается получить доступ к камере, она используется другим приложением\?</string>
+    <string name="cannot_access_camera">Не удается получить доступ к камере, она используется другим приложением?</string>
     <string name="maximize_screen_brightness">Максимально увеличить яркость экрана</string>
     <string name="light">Светлая</string>
     <string name="no_flash_when_screen">Выключение фонарика в режиме экрана</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="cannot_access_camera">ᱠᱮᱢᱨᱟ ᱟᱫᱮᱨ ᱵᱟᱭ ᱜᱚᱱᱚᱜ ᱠᱟᱱᱟ, ᱱᱚᱶᱟ ᱫᱚ ᱮᱴᱟᱜ ᱮᱯ ᱮ ᱵᱮᱵᱷᱟᱨ ᱮᱫᱟ \?</string>
+    <string name="cannot_access_camera">ᱠᱮᱢᱨᱟ ᱟᱫᱮᱨ ᱵᱟᱭ ᱜᱚᱱᱚᱜ ᱠᱟᱱᱟ, ᱱᱚᱶᱟ ᱫᱚ ᱮᱴᱟᱜ ᱮᱯ ᱮ ᱵᱮᱵᱷᱟᱨ ᱮᱫᱟ ?</string>
     <string name="grant_permission">ᱦᱚᱠ ᱮᱢᱚᱜ ᱢᱮ</string>
     <string name="dark">ᱧᱩᱛ</string>
     <string name="maximize_screen_brightness">ᱥᱠᱨᱤᱱ ᱨᱮᱭᱟᱜ ᱡᱷᱟᱞᱠᱟᱣ ᱡᱟᱹᱥᱛᱤ ᱢᱮ</string>

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

@@ -2,7 +2,7 @@
 <resources>
     <string name="flashlight">El feneri</string>
     <string name="no_camera">Kamera yok</string>
-    <string name="cannot_access_camera">Kameraya erişilemiyor, acaba başka bir uygulama tarafından mı kullanılıyor\?</string>
+    <string name="cannot_access_camera">Kameraya erişilemiyor. Başka bir uygulama tarafından mı kullanılıyor?</string>
     <string name="app_name">Göz Kamaştırıcı</string>
     <string name="grant_permission">İzin ver</string>
     <string name="maximize_screen_brightness">Ekran parlaklığını en üst düzeye çıkar</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -7,17 +7,17 @@
     <string name="apache2">Apache 许可证 2.0</string>
     <string name="gpl2_ce">GNU 通用公共许可证，版本 2，带有 Classpath 例外</string>
     <string name="use_screen">使用屏幕</string>
-    <string name="words_per_min_explanation">单词/分钟是指每分钟可以发送多少个标准单词“PARIS”。
+    <string name="words_per_min_explanation">单词/分钟指的是每分钟发送标准单词“PARIS”的个数。
 \n该值越高，每个“dit”的长度越短。
 \n请注意，此设置不考虑法恩斯沃斯时间。
-\n在下面输入您想要的数字。</string>
+\n请在下方输入期望值。</string>
     <string name="farnsworth_unit_length_explanation">法恩斯沃斯计时法通过增加字符和单词之间的间隔来给予更多的识别时间，从而使识别声音模式更容易。
 \n法恩斯沃斯单位比基本单位长。
 \n在下面输入您想要的法恩斯沃斯单位长度(必须大于基本单位：%d 毫秒)。
 \n留空，使用基本单位的长度加上额外的 25%。</string>
     <string name="flashlight">手电筒</string>
     <string name="no_camera">没有摄像头</string>
-    <string name="cannot_access_camera">无法访问摄像头，摄像头是否被其他应用程序使用？</string>
+    <string name="cannot_access_camera">无法访问摄像头。摄像头是否正被其他应用程序使用？</string>
     <string name="grant_permission">授予权限</string>
     <string name="maximize_screen_brightness">最大屏幕亮度</string>
     <string name="system_settings_permission_granted">授予许可。您现在可以退出此屏幕。</string>
@@ -48,4 +48,15 @@
     <string name="md3_subtext">使用 Android 12 的外观和感觉</string>
     <string name="no_flash_on_device_screen_off">关闭设备屏幕时，请关闭手电筒</string>
     <string name="no_flash_on_device_screen_off_subtext">只有当应用程序打开时才有效</string>
+    <string name="app_name">Flashy</string>
+    <string name="kotlin">Kotlin</string>
+    <string name="java">Java</string>
+    <string name="circular_seekbar">CircularSeekBar</string>
+    <string name="md_icons">Material Design 图标</string>
+    <string name="android_jetpack">Android Jetpack</string>
+    <string name="feather_icons">Feather 图标</string>
+    <string name="sos">SOS</string>
+    <string name="words_per_min">每分钟词数</string>
+    <string name="stroboscope_interval">频闪间隔</string>
+    <string name="md3">Material Design 3</string>
 </resources>

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

@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Flashy</string>
     <string name="flashlight">Flashlight</string>
     <string name="no_camera">No camera</string>
-    <string name="cannot_access_camera">Cannot access camera, is it being used by another app?</string>
+    <string name="cannot_access_camera">Cannot access the camera. Is it in use by another app?</string>
     <string name="grant_permission">Grant permission</string>
     <string name="maximize_screen_brightness">Maximize screen brightness</string>
     <string name="system_settings_permission_notice">To change screen brightness through the widget, a special permission needs to be granted to the app. Please press the button below to do so.\n\nExiting without granting the permission will cause the widget to not be added.</string>
@@ -26,7 +27,7 @@
     <string name="dev">Developer</string>
     <string name="oss_licenses">Open-source licenses</string>
     <string name="apache2" translatable="false">Apache License 2.0</string>
-    <string name="gpl2_ce" translatable="false" >GNU General Public License, version 2, with the Classpath Exception</string>
+    <string name="gpl2_ce" translatable="false">GNU General Public License, version 2, with the Classpath Exception</string>
     <string name="mit" translatable="false">MIT License</string>
     <string name="kotlin" translatable="false">Kotlin</string>
     <string name="java" translatable="false">Java</string>
@@ -52,4 +53,4 @@
     <string name="md3" translatable="false">Material Design 3</string>
     <string name="no_flash_on_device_screen_off">Turn off flashlight when turning off device screen</string>
     <string name="no_flash_on_device_screen_off_subtext">Only works when the app is open</string>
-</resources>
+</resources>

wear/src/main/res/values-sv/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Flashy</string>
-    <string name="to_turn_off_the_flash_light_tap_any_where">Tryck värt ni vill for å släcka ficklampan.</string>
+    <string name="to_turn_off_the_flash_light_tap_any_where">För att stänga av ficklampan tryck var som helst.</string>
 </resources>