From 23467a2248b9c5cebd666003ce55af4d1e5adf3e Mon Sep 17 00:00:00 2001 From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com> Date: Tue, 25 Apr 2023 12:31:26 +0300 Subject: [PATCH] android: lint fix and removed unused lib (#2235) --- apps/android/app/build.gradle | 2 +- .../simplex/app/views/helpers/CustomIcons.kt | 53 +------------------ .../chat/simplex/app/views/helpers/Util.kt | 2 +- .../simplex/app/views/helpers/VideoPlayer.kt | 2 +- .../app/src/main/res/values-cs/strings.xml | 2 - .../app/src/main/res/values-de/strings.xml | 3 -- .../app/src/main/res/values-es/strings.xml | 2 - .../app/src/main/res/values-fr/strings.xml | 2 - .../app/src/main/res/values-hi/strings.xml | 1 - .../app/src/main/res/values-it/strings.xml | 2 - .../app/src/main/res/values-ko/strings.xml | 4 +- .../app/src/main/res/values-nl/strings.xml | 2 - .../app/src/main/res/values-pl/strings.xml | 4 -- .../src/main/res/values-pt-rBR/strings.xml | 2 - .../app/src/main/res/values-ru/strings.xml | 2 - .../src/main/res/values-zh-rCN/strings.xml | 4 -- .../src/main/res/values-zh-rTW/strings.xml | 2 - 17 files changed, 5 insertions(+), 86 deletions(-) diff --git a/apps/android/app/build.gradle b/apps/android/app/build.gradle index f2d84c246c..0a256bbb99 100644 --- a/apps/android/app/build.gradle +++ b/apps/android/app/build.gradle @@ -119,7 +119,7 @@ dependencies { implementation 'androidx.fragment:fragment:1.4.1' implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2' - implementation "androidx.compose.material:material-icons-extended:$compose_version" + //implementation "androidx.compose.material:material-icons-extended:$compose_version" implementation "androidx.compose.ui:ui-util:$compose_version" implementation "androidx.navigation:navigation-compose:2.4.1" implementation "com.google.accompanist:accompanist-insets:0.23.0" diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt index 8a3458b89c..1ed7d3a954 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt @@ -1,62 +1,11 @@ package chat.simplex.app.views.helpers -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* +import androidx.compose.material.icons.materialIcon import androidx.compose.material.icons.materialPath -import androidx.compose.material.icons.outlined.PersonAdd -import androidx.compose.ui.graphics.* import androidx.compose.ui.graphics.vector.* -import androidx.compose.ui.unit.dp - -private inline fun materialIcon( - name: String, - block: ImageVector.Builder.() -> ImageVector.Builder -): ImageVector = ImageVector.Builder( - name = name, - defaultWidth = MaterialIconDimension.dp, - defaultHeight = MaterialIconDimension.dp, - viewportWidth = MaterialIconDimension, - viewportHeight = MaterialIconDimension -).block().build() - -/** - * Adds a vector path to this icon with Material defaults. - * - * @param fillAlpha fill alpha for this path - * @param strokeAlpha stroke alpha for this path - * @param pathFillType [PathFillType] for this path - * @param pathBuilder builder lambda to add commands to this path - */ -private inline fun ImageVector.Builder.materialPath( - fillAlpha: Float = 1f, - strokeAlpha: Float = 1f, - pathFillType: PathFillType = DefaultFillType, - pathBuilder: PathBuilder.() -> Unit -) = -// TODO: b/146213225 -// Some of these defaults are already set when parsing from XML, but do not currently exist - // when added programmatically. We should unify these and simplify them where possible. - path( - fill = SolidColor(Color.Black), - fillAlpha = fillAlpha, - stroke = null, - strokeAlpha = strokeAlpha, - strokeLineWidth = 1f, - strokeLineCap = StrokeCap.Butt, - strokeLineJoin = StrokeJoin.Bevel, - strokeLineMiter = 1f, - pathFillType = pathFillType, - pathBuilder = pathBuilder - ) - -// All Material icons (currently) are 24dp by 24dp, with a viewport size of 24 by 24. -@PublishedApi -internal const val MaterialIconDimension = 24f - val AccountCircleFilled: ImageVector get() { - Icons.Filled.Bolt if (_accountCircleFilled != null) { return _accountCircleFilled!! } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt index ccb00f4613..0a274d20b9 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt @@ -557,7 +557,7 @@ fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true val image = when { timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST) random -> mmr.frameAtTime - else -> mmr.getFrameAtIndex(0) + else -> mmr.getFrameAtTime(0) } mmr.release() return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt index db8f8ccc32..dc0744a752 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt @@ -86,7 +86,7 @@ class VideoPlayer private constructor( .build() .apply { // Repeat the same track endlessly - repeatMode = 1 + repeatMode = Player.REPEAT_MODE_ONE currentVolume = volume if (!soundEnabled) { volume = 0f diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/android/app/src/main/res/values-cs/strings.xml index fc9a29c6fd..6a4f0eed48 100644 --- a/apps/android/app/src/main/res/values-cs/strings.xml +++ b/apps/android/app/src/main/res/values-cs/strings.xml @@ -1037,13 +1037,11 @@ Zobrazit: ID databáze a možnost Izolace přenosu. Soubor bude přijat, jakmile váš kontakt dokončí nahrávání. - Přenos souboru bude zrušen. Pokud probíhá, bude zastaven. Smazat chat profil Smazat profil Heslo profilu Odkrýt chat profil Odkrýt profil - Zrušit přenos souboru\? Žádost o přijetí videa Současně lze odeslat pouze 10 videí Příliš mnoho videí! diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/android/app/src/main/res/values-de/strings.xml index 355ffe3729..34db0193f0 100644 --- a/apps/android/app/src/main/res/values-de/strings.xml +++ b/apps/android/app/src/main/res/values-de/strings.xml @@ -1118,8 +1118,6 @@ Migrationen: %s Das Bild wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist. Die Datei wird empfangen, sobald das Hochladen durch ihren Kontakt abgeschlossen ist. - Dateitransfer abbrechen\? - Der Dateitransfer wird abgebrochen. Falls er gerade abläuft, wird er angehalten. Chat-Profil löschen Profil löschen Verbergen des Profils aufheben @@ -1155,7 +1153,6 @@ Sperr-Modus ändern Passwort wurde nicht geändert! Entschlüsselungsfehler - Dauerhafter Entschlüsselungsfehler Fehler beim Laden der XFTP-Server Passworteingabe Passwort eingeben diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/android/app/src/main/res/values-es/strings.xml index 976b03d0eb..a2d32f0ff1 100644 --- a/apps/android/app/src/main/res/values-es/strings.xml +++ b/apps/android/app/src/main/res/values-es/strings.xml @@ -1038,8 +1038,6 @@ Mostrar opciones de desarrollador Ocultar: Mostrar: - ¿Cancelar el envío de archivos\? - El envío de archivos será cancelado. Si está en progreso se detendrá. Eliminar perfil de chat Contraseña del perfil Mostrar perfil de chat diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/android/app/src/main/res/values-fr/strings.xml index c46858dff4..3ccb23d11d 100644 --- a/apps/android/app/src/main/res/values-fr/strings.xml +++ b/apps/android/app/src/main/res/values-fr/strings.xml @@ -1041,8 +1041,6 @@ Dévoiler le profil Supprimer le profil de chat Supprimer le profil - Annuler le transfert de fichiers \? - Le transfert de fichiers sera annulé. S\'il est en cours, il sera interrompu. Mot de passe de profil Trop de vidéos ! Vidéo diff --git a/apps/android/app/src/main/res/values-hi/strings.xml b/apps/android/app/src/main/res/values-hi/strings.xml index 862ab03496..f75ce402b7 100644 --- a/apps/android/app/src/main/res/values-hi/strings.xml +++ b/apps/android/app/src/main/res/values-hi/strings.xml @@ -278,7 +278,6 @@ विकास करना आवाज़ बंद करना अपने संपर्कों को गायब होने वाले संदेश भेजने की अनुमति दें। - फ़ाइल स्थानांतरण रद्द करें\? ऑडियो और वीडियो कॉल अधिक सुधार जल्द ही आ रहे हैं! वीडियो प्राप्त करने के लिए कहा diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/android/app/src/main/res/values-it/strings.xml index 0e0df206e8..3c1c8728c5 100644 --- a/apps/android/app/src/main/res/values-it/strings.xml +++ b/apps/android/app/src/main/res/values-it/strings.xml @@ -1037,8 +1037,6 @@ L\'immagine verrà ricevuta quando il tuo contatto completerà l\'invio. la versione del database è più recente di quella dell\'app, ma nessuna migrazione downgrade per: %s Il file verrà ricevuto quando il tuo contatto completerà l\'invio. - Annullare il trasferimento di file\? - Il trasferimento di file verrà annullato. Se è in corso, verrà interrotto. Svela il profilo chat Svela profilo Elimina il profilo di chat diff --git a/apps/android/app/src/main/res/values-ko/strings.xml b/apps/android/app/src/main/res/values-ko/strings.xml index 603bb40575..62e3ca0fe2 100644 --- a/apps/android/app/src/main/res/values-ko/strings.xml +++ b/apps/android/app/src/main/res/values-ko/strings.xml @@ -294,7 +294,7 @@ 중복된 메시지 1일로 설정 자동 삭제되는 메시지 - 전체 크기가 %s인 %d개의 파일 + %d 개의 파일 총 크기 %s 다이렉트 이 채팅에서는 자동 삭제되는 메시지를 사용할 수 없어요. 이 그룹에서는 자동 삭제되는 메시지를 사용할 수 없어요. @@ -530,8 +530,6 @@ 이름 (선택 사항) 작동 방식 숨기기 : - 파일 전송을 취소할까요\? - 파일 전송이 취소될 거예요. 이미 전송이 시작되었다면 중지될 거예요. 보냄 %s(으)로 참여 그룹에 초대되었어요. diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/android/app/src/main/res/values-nl/strings.xml index aba28a6fe8..1439d7ae68 100644 --- a/apps/android/app/src/main/res/values-nl/strings.xml +++ b/apps/android/app/src/main/res/values-nl/strings.xml @@ -1036,8 +1036,6 @@ Verbergen: Ontwikkelaars opties tonen EXPERIMENTEEL - Bestand overdracht annuleren\? - Bestand overdracht wordt geannuleerd. Als het bezig is, wordt het gestopt. Verwijder profiel Profiel wachtwoord Chat profiel zichtbaar maken diff --git a/apps/android/app/src/main/res/values-pl/strings.xml b/apps/android/app/src/main/res/values-pl/strings.xml index 0af6bb4b43..6924ef1724 100644 --- a/apps/android/app/src/main/res/values-pl/strings.xml +++ b/apps/android/app/src/main/res/values-pl/strings.xml @@ -140,7 +140,6 @@ Usuń dla mnie Usunąć wiadomość członka\? edytowana - Transfer plików zostanie anulowany. Jeśli jest w toku, zostanie zatrzymany. Dla wszystkich dołącz jako %s wysyłanie nie powiodło się @@ -937,7 +936,6 @@ Dobre dla baterii. Usługa w tle sprawdza nowe wiadomości co 10 minut. Możesz przegapić połączenia i pilne wiadomości. Zarówno Ty, jak i Twój kontakt możecie wysyłać wiadomości głosowe. Według profilu czatu (domyślnie) lub połączenia (BETA). - Anulować transfer plików\? Nie można zaprosić kontaktów! Wyczyść weryfikację Potwierdź swoje poświadczenia @@ -1102,14 +1100,12 @@ Natychmiast Prosimy o jego zapamiętanie lub bezpieczne przechowywanie - nie ma możliwości odzyskania utraconego pinu! Błąd odszyfrowania - Trwały błąd odszyfrowywania Zły hash wiadomości Zły identyfikator wiadomości Hash poprzedniej wiadomości jest inny. Identyfikator następnej wiadomości jest nieprawidłowy (mniejszy lub równy poprzedniej). \nMoże się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skompromitowane. Nie udało się odszyfrować %1$d wiadomości. - Nie udało się odszyfrować %1$d wiadomości i nie będą one pokazane. Ten błąd jest trwały dla tego połączenia, proszę o ponowne połączenie. %1$d pominiętych wiadomości. Może się to zdarzyć, gdy Ty lub Twoje połączenie użyło starej kopii zapasowej bazy danych. diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/android/app/src/main/res/values-pt-rBR/strings.xml index ed4dde2302..4adb03c202 100644 --- a/apps/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/apps/android/app/src/main/res/values-pt-rBR/strings.xml @@ -779,8 +779,6 @@ Novidades Chamadas de áudio e vídeo Proteja seus perfis de chat com uma senha! - Cancelar transferência de arquivo\? - A transferência do arquivo será cancelada. Se estiver em andamento, será interrompida. Este texto está disponível nas configurações Escanear código Hosts Onion não serão usados. diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/android/app/src/main/res/values-ru/strings.xml index f674b75e7c..a4df902c8a 100644 --- a/apps/android/app/src/main/res/values-ru/strings.xml +++ b/apps/android/app/src/main/res/values-ru/strings.xml @@ -1116,8 +1116,6 @@ разная миграция в приложении/базе данных: %s / %s Откатить версию и открыть чат Предупреждение: Вы можете потерять какие то данные! - Прекратить передачу файла\? - Передача файла будет прекращена. Если она в процессе, она будет остановлена. ID базы данных и опция Отдельные транспортные сессии. Показать опции для девелоперов Удалить профиль чата diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/android/app/src/main/res/values-zh-rCN/strings.xml index 18bca161b8..2ebcaddde6 100644 --- a/apps/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rCN/strings.xml @@ -1040,10 +1040,8 @@ 删除个人资料 个人资料密码 取消隐藏聊天资料 - 取消文件传输？ 删除聊天资料 取消隐藏个人资料 - 文件传输将被取消。文件传输将被终止如果它正在进行中。 同一时间只能发送10个视频 过多视频！ 视频 @@ -1108,12 +1106,10 @@ 此错误对于此连接是永久性的，请重新连接。 当您或您的连接使用旧数据库备份时，可能会发生这种情况。 解密错误 - 永久解密错误 请向开发者报告。 上一条消息的散列不同。 下一条消息的 ID 不正确（小于或等于上一条）。 \n它可能是由于某些错误或连接被破坏才发生。 - %1$d 消息解密失败并且不会显示。 没有空格！ 停止文件 停止发送文件？ diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/android/app/src/main/res/values-zh-rTW/strings.xml index 86e43d4be9..c4e8727a53 100644 --- a/apps/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/apps/android/app/src/main/res/values-zh-rTW/strings.xml @@ -1037,8 +1037,6 @@ 檔案將會在你的聯絡人完成上傳後接收。 實驗性 升級和開始對話 - 取消傳輸檔案？ - 檔案傳遞將會取消。若是在傳遞檔案中，亦會暫停。 顯示開發者選項 刪除資料 取消隱藏聊天資料