From 841373e94700a65594b5f194a550e22949cb8380 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sun, 6 Mar 2022 17:40:24 +0100 Subject: [PATCH 01/11] fix various timeline related crashes (#2369) * fix various timeline related crashes * fix ktlint --- .../tusky/components/timeline/TimelineFragment.kt | 8 ++++++-- .../timeline/viewmodel/CachedTimelineViewModel.kt | 9 ++++++++- .../timeline/viewmodel/EmptyTimelinePagingSource.kt | 11 +++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/EmptyTimelinePagingSource.kt diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt index 258cbff94..da7535849 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt @@ -217,7 +217,7 @@ class TimelineFragment : } }) - lifecycleScope.launch { + viewLifecycleOwner.lifecycleScope.launch { viewModel.statuses.collectLatest { pagingData -> adapter.submitData(pagingData) } @@ -271,7 +271,11 @@ class TimelineFragment : private fun setupRecyclerView() { binding.recyclerView.setAccessibilityDelegateCompat( ListStatusAccessibilityDelegate(binding.recyclerView, this) { pos -> - adapter.peek(pos) + if (pos in 0 until adapter.itemCount) { + adapter.peek(pos) + } else { + null + } } ) binding.recyclerView.setHasFixedSize(true) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt index f4bbabe4b..26691bf5c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt @@ -70,7 +70,14 @@ class CachedTimelineViewModel @Inject constructor( override val statuses = Pager( config = PagingConfig(pageSize = LOAD_AT_ONCE), remoteMediator = CachedTimelineRemoteMediator(accountManager, api, db, gson), - pagingSourceFactory = { db.timelineDao().getStatuses(accountManager.activeAccount!!.id) } + pagingSourceFactory = { + val activeAccount = accountManager.activeAccount + if (activeAccount == null) { + EmptyTimelinePagingSource() + } else { + db.timelineDao().getStatuses(activeAccount.id) + } + } ).flow .map { pagingData -> pagingData.map { timelineStatus -> diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/EmptyTimelinePagingSource.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/EmptyTimelinePagingSource.kt new file mode 100644 index 000000000..5fd13dfb0 --- /dev/null +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/EmptyTimelinePagingSource.kt @@ -0,0 +1,11 @@ +package com.keylesspalace.tusky.components.timeline.viewmodel + +import androidx.paging.PagingSource +import androidx.paging.PagingState +import com.keylesspalace.tusky.db.TimelineStatusWithAccount + +class EmptyTimelinePagingSource : PagingSource() { + override fun getRefreshKey(state: PagingState): Int? = null + + override suspend fun load(params: LoadParams): LoadResult = LoadResult.Page(emptyList(), null, null) +} From 52933d00a8556d5b5c1b7eb278c46ffbad01b6d6 Mon Sep 17 00:00:00 2001 From: Jonathan Soares Date: Sun, 6 Mar 2022 13:40:46 +0000 Subject: [PATCH 02/11] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (462 of 462 strings) Co-authored-by: Jonathan Soares Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/pt_BR/ Translation: Tusky/Tusky --- app/src/main/res/values-pt-rBR/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6d1753dec..7a92ac71d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -47,7 +47,7 @@ %s favoritou teu toot %s te seguiu Denunciar @%s - Comentários adicionais aqui + Mais comentários\? Resposta rápida Responder Dar boost @@ -517,4 +517,6 @@ Excluir esta conversa\? Excluir conversa Deseja excluir a lista %s\? + Remover favorito + Mostrar janela de confirmação antes de favoritar \ No newline at end of file From a053490bdfb250ce929d1fee117ad1c61d5fafad Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Sun, 6 Mar 2022 13:40:46 +0000 Subject: [PATCH 03/11] Translated using Weblate (French) Currently translated at 100.0% (468 of 468 strings) Translated using Weblate (Occitan) Currently translated at 97.2% (455 of 468 strings) Translated using Weblate (Arabic) Currently translated at 98.9% (463 of 468 strings) Co-authored-by: ButterflyOfFire Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/ar/ Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/fr/ Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/oc/ Translation: Tusky/Tusky --- app/src/main/res/values-ar/strings.xml | 6 ++++++ app/src/main/res/values-fr/strings.xml | 8 +++++++- app/src/main/res/values-oc/strings.xml | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 74b01532e..7c9ab3aed 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -545,4 +545,10 @@ فشل في تحميل معلومات الرد غير محددة وضع حد لإشعارات الخيط الزمني + 14 يومًا + 30 يومًا + 60 يومًا + 90 يومًا + 180 يومًا + 365 يومًا \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 670f6cc71..950db9371 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -531,6 +531,12 @@ Demander confirmation avant de mettre en favoris Le message auquel répondait ce brouillon a été supprimé Échec d’envoi du pouet ! - Bien que votre compte ne soit pas verrouillé, l\'équipe de %1$s a pensé que vous voudriez valider manuellement les demandes de suivi provenant de ces comptes. + Bien que votre compte ne soit pas verrouillé, l’équipe de %1$s a pensé que vous voudriez valider manuellement les demandes de d’abonnement provenant de ces comptes. Échec du chargement des informations de réponse + 30 jours + 60 jours + 90 jours + 365 jours + 14 jours + 180 jours \ No newline at end of file diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 993b4da6f..32e4c9994 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -334,7 +334,7 @@ CC-BY-SA 4.0 %1$s Favorit - 3%1$s4 Favorits + %1$s Favorits %s partatge From 7efafe7cb434ac55ca49b76108bf811f193d60ed Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 04/11] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (468 of 468 strings) Co-authored-by: Eric Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/zh_Hans/ Translation: Tusky/Tusky --- app/src/main/res/values-zh-rCN/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f222d8a14..4c0cecb63 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -526,4 +526,10 @@ 删除对话 收藏前显示确认对话框 删除书签 + 30 天 + 60 天 + 90 天 + 180 天 + 14 天 + 365 天 \ No newline at end of file From f14e9e80d05c9d78e386185e9f3f5f575337ebd1 Mon Sep 17 00:00:00 2001 From: Vegard Skjefstad Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 05/11] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (468 of 468 strings) Co-authored-by: Vegard Skjefstad Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/nb_NO/ Translation: Tusky/Tusky --- app/src/main/res/values-no-rNB/strings.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml index 3e2ce8ee8..f7a4d6a6e 100644 --- a/app/src/main/res/values-no-rNB/strings.xml +++ b/app/src/main/res/values-no-rNB/strings.xml @@ -39,7 +39,7 @@ Kladder Lisenser \@%s - %s boosted + %s boostet Sensitivt innhold Media skjult Klikk for å vise @@ -194,7 +194,7 @@ Størrelse på statustekst Nye følgere Varsler om nye følgere - Boosts + Booster Varsler når tootene dine blir boostet Favoritter Varsler når tootene dine blir favorisert @@ -314,8 +314,8 @@ <b>%1$s</b> Favoritter - <b>%s</b> Boost - <b>%s</b> Boosts + %s Boost + %s Booster Boostet av Favorisert av @@ -512,4 +512,10 @@ Slett samtale Slett bokmerke Vis bekreftelsesdialog når favoritt skal legges til + 30 dager + 60 dager + 90 dager + 180 dager + 365 dager + 14 dager \ No newline at end of file From 75ef1ae11d04c1a168c79f41fe697796a9ae3b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=E1=BB=93=20Nh=E1=BA=A5t=20Duy?= Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 06/11] Translated using Weblate (Vietnamese) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (468 of 468 strings) Co-authored-by: Hồ Nhất Duy Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/vi/ Translation: Tusky/Tusky --- app/src/main/res/values-vi/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2b4143a13..1f82c3bd4 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -289,7 +289,7 @@ Thêm bộ lọc Chủ đề Thế giới - xem tiếp + tiếp tục đọc Trả lời @%s Media Luôn hiện nội dung bị ẩn @@ -501,4 +501,10 @@ Xóa thảo luận Xác nhận trước khi thích Bỏ lưu + 14 ngày + 30 ngày + 60 ngày + 90 ngày + 180 ngày + 365 ngày \ No newline at end of file From 4646685e0ac1317352f4fa5b57481ded6fd3d585 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 07/11] Translated using Weblate (Gaelic) Currently translated at 100.0% (468 of 468 strings) Co-authored-by: GunChleoc Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/gd/ Translation: Tusky/Tusky --- app/src/main/res/values-gd/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index 2dd5c4b95..56576a155 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -534,4 +534,10 @@ Sguab às an còmhradh Thoir an comharra-lìn air falbh Ceall còmhradh dearbhaidh mus dèid post ’na annsachd + 30 latha + 90 latha + 180 latha + 365 latha + 14 làithean + 60 latha \ No newline at end of file From c0b8a6f92a66a4f8f8347a6559fee1f78c1457a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 08/11] Translated using Weblate (Icelandic) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (468 of 468 strings) Co-authored-by: Sveinn í Felli Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/is/ Translation: Tusky/Tusky --- app/src/main/res/values-is/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 6d240c64b..262064d34 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -512,4 +512,10 @@ Birta staðfestingarglugga áður en sett er í eftirlæti Eyða þessu samtali\? Eyða samtali + 30 dagar + 60 dagar + 90 dagar + 180 dagar + 365 dagar + 14 dagar \ No newline at end of file From 98a2bc381dda90b6499934e9e26e61ff5c7cb887 Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Sun, 6 Mar 2022 13:40:47 +0000 Subject: [PATCH 09/11] Translated using Weblate (Ukrainian) Currently translated at 100.0% (468 of 468 strings) Co-authored-by: Ihor Hordiichuk Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky/uk/ Translation: Tusky/Tusky --- app/src/main/res/values-uk/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fc73d1b5e..0a684c9f7 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -534,4 +534,10 @@ Видалити бесіду Вилучити закладку Запитувати підтвердження перед додаванням до вподобаних + 14 днів + 30 днів + 60 днів + 90 днів + 180 днів + 365 днів \ No newline at end of file From 7f1a184de9922aa1cf2e2af171f69b62c0a001c8 Mon Sep 17 00:00:00 2001 From: Jonathan Soares Date: Thu, 3 Mar 2022 15:40:45 +0000 Subject: [PATCH 10/11] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (15 of 15 strings) Translation: Tusky/Tusky description Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky-app/pt_BR/ --- fastlane/metadata/android/pt-BR/changelogs/58.txt | 6 +++--- fastlane/metadata/android/pt-BR/changelogs/61.txt | 2 +- fastlane/metadata/android/pt-BR/changelogs/72.txt | 6 +++--- fastlane/metadata/android/pt-BR/changelogs/87.txt | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 fastlane/metadata/android/pt-BR/changelogs/87.txt diff --git a/fastlane/metadata/android/pt-BR/changelogs/58.txt b/fastlane/metadata/android/pt-BR/changelogs/58.txt index b6902754c..f3659695c 100644 --- a/fastlane/metadata/android/pt-BR/changelogs/58.txt +++ b/fastlane/metadata/android/pt-BR/changelogs/58.txt @@ -1,12 +1,12 @@ Tusky v6.0 -- Filtros de timeline movidos para "Preferências da conta" e vai sincronizar com servidor +- Filtros de timeline movidos para "Preferências da conta" sincronizando com servidor - Agora você pode ter uma hashtag personalizada como aba - Suporte a edição de listas - O compositor vai sugerir emojis personalizados ao digitar - Nova configuração de tema "seguir tema do sistema" - Acessibilidade da timeline melhorada -- Tusky agora vai ignorar notificações desconhecidas -- Nova opção: Idioma pessoal do Tusky +- Notificações desconhecidas serão ignoradas +- Nova opção: substituir o idioma do sistema por outro - Novas traduções: Tcheco e Esperanto - Muitas outras melhorias diff --git a/fastlane/metadata/android/pt-BR/changelogs/61.txt b/fastlane/metadata/android/pt-BR/changelogs/61.txt index 0bfbe98f7..cab6f1718 100644 --- a/fastlane/metadata/android/pt-BR/changelogs/61.txt +++ b/fastlane/metadata/android/pt-BR/changelogs/61.txt @@ -4,4 +4,4 @@ Tusky v7.0 - Novos botões para filtrar notificações e excluí-las - Exclua e rascunhe seus toots - Novo indicador que mostra na foto de perfil se uma conta é um robô (pode ser desativado nas preferências) -- Novas traduções: Norueguês Bokmål e Esloveno +- Novas traduções: Norueguês Bokmål e Esloveno. diff --git a/fastlane/metadata/android/pt-BR/changelogs/72.txt b/fastlane/metadata/android/pt-BR/changelogs/72.txt index 3fa55d5ad..392333466 100644 --- a/fastlane/metadata/android/pt-BR/changelogs/72.txt +++ b/fastlane/metadata/android/pt-BR/changelogs/72.txt @@ -2,9 +2,9 @@ Tusky v11.0 - Notificações de seguidores pendentes quando a conta está trancada! FINALMENTE, POVO! - Novas funcionalidades na aba de preferências: - - desativar gesto que alterna entre abas - - diálogo de confirmação antes de dar boost - - mostrar ou não prévia de links nas linhas alheias + * desativar gesto que alterna entre abas + * diálogo de confirmação antes de dar boost + * mostrar ou não prévia de links nas linhas alheias - Conversas agora podem ser silenciadas - Enquetes agora serão calculadas por número de votantes, o que facilitará o entendimento das enquetes de múltiplas opções - E algumas correções a mais diff --git a/fastlane/metadata/android/pt-BR/changelogs/87.txt b/fastlane/metadata/android/pt-BR/changelogs/87.txt new file mode 100644 index 000000000..afe184983 --- /dev/null +++ b/fastlane/metadata/android/pt-BR/changelogs/87.txt @@ -0,0 +1,8 @@ +Tusky v16.0 + +- A lógica de carregamento da linha do tempo foi completamente reescrita para ser mais rápida, menos bugada e mais fácil de manter. +- Tusky pode agora animar emojis personalizados no formato APNG & WebP Animated. +- Muitas correções de bugs +- Suporte para Android 11 +- Novas traduções: gaélico escocês, galego, ucraniano +- Traduções melhoradas From 9404f474f334db06136cab4a474d2f63346c4896 Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Thu, 3 Mar 2022 15:40:45 +0000 Subject: [PATCH 11/11] Translated using Weblate (Gaelic) Currently translated at 13.3% (2 of 15 strings) Translation: Tusky/Tusky description Translate-URL: https://"weblate.tusky.app"/projects/tusky/tusky-app/gd/ --- fastlane/metadata/android/gd/short_description.txt | 1 + fastlane/metadata/android/gd/title.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/gd/short_description.txt create mode 100644 fastlane/metadata/android/gd/title.txt diff --git a/fastlane/metadata/android/gd/short_description.txt b/fastlane/metadata/android/gd/short_description.txt new file mode 100644 index 000000000..e811ef873 --- /dev/null +++ b/fastlane/metadata/android/gd/short_description.txt @@ -0,0 +1 @@ +Cliant do dh’iomadh cunntas san lìonra sòisealta Mastodon diff --git a/fastlane/metadata/android/gd/title.txt b/fastlane/metadata/android/gd/title.txt new file mode 100644 index 000000000..0238ffc0a --- /dev/null +++ b/fastlane/metadata/android/gd/title.txt @@ -0,0 +1 @@ +Tusky