diff --git a/.gitignore b/.gitignore index b1161f6..722bada 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ out/ # Gradle files .gradle/ build/ +app/build/ # Local configuration file (sdk path, etc) local.properties diff --git a/README.md b/README.md index 16c7161..3b725b8 100644 --- a/README.md +++ b/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) diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/build.gradle b/app/build.gradle index 4d32683..1d5c45e 100644 --- a/app/build.gradle +++ b/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" } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 231ee6e..fcffa50 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3,7 +3,7 @@ Keine Taschenlampe Flashy Taschenlampe - Kann nicht auf Kamera zugreifen. Wird sie von einer anderen App verwendet\? + Kann nicht auf Kamera zugreifen. Wird sie von einer anderen App verwendet? Volle Bildschirmhelligkeit Berechtigung erteilt. Sie können diese Meldung jetzt schließen. Einstellungen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 801a888..3a193c9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -43,7 +43,7 @@ Feather Icons Sólo funciona cuando la aplicación está abierta Flashy - No puedo acceder a la cámara, ¿está siendo utilizada por otra aplicación? + No se puede acceder a la cámara. ¿Está siendo utilizado por otra aplicación? 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. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ad705c7..489a87b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,4 +46,14 @@ Licence Apache 2.0 Licence publique générale GNU, version 2, avec exception Classpath Kotlin + Désactiver la lampe de poche en mode écran + Java + SOS + La durée d\'une unité Farnsworth doit être plus longue qu\'une unité normale. + En savoir plus sur les délais dans le code Morse + Utiliser l\'apparence et les interactions conçues pour Android 12 + 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%. \ No newline at end of file diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 3f97ccd..845e260 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -3,7 +3,7 @@ Flashy Svjetiljka Nema kamere - Nije moguće pristupiti kameri. Koristi li ju jedna druga aplikacija\? + Nije moguće pristupiti kameri. Koristi li ju jedna druga aplikacija? Svijetla Informacije o Verzija %s · Apache licenca 2.0 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c148ba7..de86bcc 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -7,7 +7,7 @@ Material Design 3 Išjunkite žibintuvėlio ekrano režimą Flashy - Kamera nepasiekiama, ar ją naudoja kita programa\? + Kamera nepasiekiama, ar ją naudoja kita programa? Maksimaliai padidinti ekrano ryškumą Leidimas suteiktas. Dabar galite išeiti iš šio lango. Nustatymai diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index d78cb6f..6c62d73 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -1,4 +1,54 @@ Flashy + Følg systemet + Mørk + Lys + Om + Bidra + Fjærikoner + Ugyldig antall ord + SOS + Skru på SOS nå + Ord per minutt + Virker kun når programmet er åpent + Lommelykt + Mangler kamera + Innvilg tilgang + Maksimer skjermlysstyrke + Utseende + Drakt + Generelt + Innstillinger + Kildekode + Oversettelse + Utvikler + Rapporter problemer + Frie lisenser + Mangler lommelykt + Bruk skjerm + Versjon %s · Apache 2.0-lisens + Ingen installerte programmer kan utføre denne handlingen. + Stroboskop-intervall + Farnsworth-enhetslengde + Bruk Farnsworth-tidsinndeling + Bruk utseende og adferd fra Android 12 + Farnsworth-enhetsvarighet må være lengre enn en normal enhet + Lær mer om Morsekodetidsinndeling + Skru av lommelykt når enhetsskjerm slås av + Får ikke tilgang til kameraet. Er det i bruk av et annet program? + Tilgang innvilget. Du kan forlate denne skjermen nå. + 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. + Skru av lommelykt i skjermmodus + Ikoner i materiell design + 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. + 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. \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d78cb6f..3abb827 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,4 +1,31 @@ Flashy + Latarka + Brak aparatu + Nie można uzyskać dostępu do aparatu. Czy jest on używany przez inną aplikację? + Udziel uprawnienia + Ustawienia + Ogólne + Wygląd + Motyw + Jasny + Ciemny + Zgodny z systemowym + Wersja %s - Licencja Apache 2.0 + Deweloper + Zgłoś problem + Licencje typu open source + Zestaw ikon Feather + Ikony Material Design + SOS + Brak latarki + Użyj ekranu + Słowa na minutę + Nieprawidłowa ilość słów + Wyłącz sygnał SOS + Pomóż w rozwoju projektu + O aplikacji + Pomóż w tłumaczeniu + Kod źródłowy \ 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 b62c9bc..ea72ac4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -3,7 +3,7 @@ Lanterna Sem câmera Flashy - Não foi possível acessar a câmera, ela está sendo usada por outro app\? + Não foi possível acessar a câmera, ela está sendo usada por outro app? Maximizar o brilho da tela Conceder permissão Android Jetpack diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5c80be5..3685ba6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -29,7 +29,7 @@ Дать разрешение Фонарик Нет камеры - Не удается получить доступ к камере, она используется другим приложением\? + Не удается получить доступ к камере, она используется другим приложением? Максимально увеличить яркость экрана Светлая Выключение фонарика в режиме экрана diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml index 2347528..c8365a8 100644 --- a/app/src/main/res/values-sat/strings.xml +++ b/app/src/main/res/values-sat/strings.xml @@ -1,6 +1,6 @@ - ᱠᱮᱢᱨᱟ ᱟᱫᱮᱨ ᱵᱟᱭ ᱜᱚᱱᱚᱜ ᱠᱟᱱᱟ, ᱱᱚᱶᱟ ᱫᱚ ᱮᱴᱟᱜ ᱮᱯ ᱮ ᱵᱮᱵᱷᱟᱨ ᱮᱫᱟ \? + ᱠᱮᱢᱨᱟ ᱟᱫᱮᱨ ᱵᱟᱭ ᱜᱚᱱᱚᱜ ᱠᱟᱱᱟ, ᱱᱚᱶᱟ ᱫᱚ ᱮᱴᱟᱜ ᱮᱯ ᱮ ᱵᱮᱵᱷᱟᱨ ᱮᱫᱟ ? ᱦᱚᱠ ᱮᱢᱚᱜ ᱢᱮ ᱧᱩᱛ ᱥᱠᱨᱤᱱ ᱨᱮᱭᱟᱜ ᱡᱷᱟᱞᱠᱟᱣ ᱡᱟᱹᱥᱛᱤ ᱢᱮ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 051f7e9..d7ba5be 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2,7 +2,7 @@ El feneri Kamera yok - Kameraya erişilemiyor, acaba başka bir uygulama tarafından mı kullanılıyor\? + Kameraya erişilemiyor. Başka bir uygulama tarafından mı kullanılıyor? Göz Kamaştırıcı İzin ver Ekran parlaklığını en üst düzeye çıkar diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4b4f1bd..366fe67 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -7,17 +7,17 @@ Apache 许可证 2.0 GNU 通用公共许可证,版本 2,带有 Classpath 例外 使用屏幕 - 单词/分钟是指每分钟可以发送多少个标准单词“PARIS”。 + 单词/分钟指的是每分钟发送标准单词“PARIS”的个数。 \n该值越高,每个“dit”的长度越短。 \n请注意,此设置不考虑法恩斯沃斯时间。 -\n在下面输入您想要的数字。 +\n请在下方输入期望值。 法恩斯沃斯计时法通过增加字符和单词之间的间隔来给予更多的识别时间,从而使识别声音模式更容易。 \n法恩斯沃斯单位比基本单位长。 \n在下面输入您想要的法恩斯沃斯单位长度(必须大于基本单位:%d 毫秒)。 \n留空,使用基本单位的长度加上额外的 25%。 手电筒 没有摄像头 - 无法访问摄像头,摄像头是否被其他应用程序使用? + 无法访问摄像头。摄像头是否正被其他应用程序使用? 授予权限 最大屏幕亮度 授予许可。您现在可以退出此屏幕。 @@ -48,4 +48,15 @@ 使用 Android 12 的外观和感觉 关闭设备屏幕时,请关闭手电筒 只有当应用程序打开时才有效 + Flashy + Kotlin + Java + CircularSeekBar + Material Design 图标 + Android Jetpack + Feather 图标 + SOS + 每分钟词数 + 频闪间隔 + Material Design 3 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 047267a..63be254 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,9 @@ + Flashy Flashlight No camera - Cannot access camera, is it being used by another app? + Cannot access the camera. Is it in use by another app? Grant permission Maximize screen brightness 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. @@ -26,7 +27,7 @@ Developer Open-source licenses Apache License 2.0 - GNU General Public License, version 2, with the Classpath Exception + GNU General Public License, version 2, with the Classpath Exception MIT License Kotlin Java @@ -52,4 +53,4 @@ Material Design 3 Turn off flashlight when turning off device screen Only works when the app is open - + \ No newline at end of file diff --git a/wear/src/main/res/values-sv/strings.xml b/wear/src/main/res/values-sv/strings.xml index cab444f..68a6e1a 100644 --- a/wear/src/main/res/values-sv/strings.xml +++ b/wear/src/main/res/values-sv/strings.xml @@ -1,5 +1,5 @@ Flashy - Tryck värt ni vill for å släcka ficklampan. + För att stänga av ficklampan tryck var som helst. \ No newline at end of file