Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tuskyapp/develop' 

# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	fastlane/metadata/android/pt-BR/changelogs/58.txt
#	fastlane/metadata/android/pt-BR/changelogs/61.txt
#	fastlane/metadata/android/pt-BR/changelogs/72.txt
This commit is contained in:
kyori19 2022-03-08 08:03:21 +09:00
parent d809514003 1b380f07f5
commit 1abe28943c
16 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
View File

@ -231,7 +231,7 @@ class TimelineFragment :
}
})
lifecycleScope.launch {
viewLifecycleOwner.lifecycleScope.launch {
viewModel.statuses.collectLatest { pagingData ->
adapter.submitData(pagingData)
}
@ -285,7 +285,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)

9
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt
View File

@ -73,7 +73,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 ->

11
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/EmptyTimelinePagingSource.kt Normal file
View File

@ -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<Int, TimelineStatusWithAccount>() {
override fun getRefreshKey(state: PagingState<Int, TimelineStatusWithAccount>): Int? = null
override suspend fun load(params: LoadParams<Int>): LoadResult<Int, TimelineStatusWithAccount> = LoadResult.Page(emptyList(), null, null)
}

6
app/src/main/res/values-ar/strings.xml
View File

@ -545,4 +545,10 @@
<string name="drafts_failed_loading_reply">فشل في تحميل معلومات الرد</string>
<string name="duration_indefinite">غير محددة</string>
<string name="limit_notifications">وضع حد لإشعارات الخيط الزمني</string>
<string name="duration_14_days">14 يومًا</string>
<string name="duration_30_days">30 يومًا</string>
<string name="duration_60_days">60 يومًا</string>
<string name="duration_90_days">90 يومًا</string>
<string name="duration_180_days">180 يومًا</string>
<string name="duration_365_days">365 يومًا</string>
</resources>

8
app/src/main/res/values-fr/strings.xml
View File

@ -531,6 +531,12 @@
<string name="pref_title_confirm_favourites">Demander confirmation avant de mettre en favoris</string>
<string name="drafts_toot_reply_removed">Le message auquel répondait ce brouillon a été supprimé</string>
<string name="drafts_toot_failed_to_send">Échec d’envoi du pouet !</string>
<string name="follow_requests_info">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.</string>
<string name="follow_requests_info">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.</string>
<string name="drafts_failed_loading_reply">Échec du chargement des informations de réponse</string>
<string name="duration_30_days">30 jours</string>
<string name="duration_60_days">60 jours</string>
<string name="duration_90_days">90 jours</string>
<string name="duration_365_days">365 jours</string>
<string name="duration_14_days">14 jours</string>
<string name="duration_180_days">180 jours</string>
</resources>

6
app/src/main/res/values-gd/strings.xml
View File

@ -534,4 +534,10 @@
<string name="action_delete_conversation">Sguab às an còmhradh</string>
<string name="action_unbookmark">Thoir an comharra-lìn air falbh</string>
<string name="pref_title_confirm_favourites">Ceall còmhradh dearbhaidh mus dèid post ’na annsachd</string>
<string name="duration_30_days">30 latha</string>
<string name="duration_90_days">90 latha</string>
<string name="duration_180_days">180 latha</string>
<string name="duration_365_days">365 latha</string>
<string name="duration_14_days">14 làithean</string>
<string name="duration_60_days">60 latha</string>
</resources>

6
app/src/main/res/values-is/strings.xml
View File

@ -512,4 +512,10 @@
<string name="pref_title_confirm_favourites">Birta staðfestingarglugga áður en sett er í eftirlæti</string>
<string name="dialog_delete_conversation_warning">Eyða þessu samtali\?</string>
<string name="action_delete_conversation">Eyða samtali</string>
<string name="duration_30_days">30 dagar</string>
<string name="duration_60_days">60 dagar</string>
<string name="duration_90_days">90 dagar</string>
<string name="duration_180_days">180 dagar</string>
<string name="duration_365_days">365 dagar</string>
<string name="duration_14_days">14 dagar</string>
</resources>

14
app/src/main/res/values-no-rNB/strings.xml
View File

@ -39,7 +39,7 @@
<string name="title_drafts">Kladder</string>
<string name="title_licenses">Lisenser</string>
<string name="status_username_format">\@%s</string>
<string name="status_boosted_format">%s boosted</string>
<string name="status_boosted_format">%s boostet</string>
<string name="status_sensitive_media_title">Sensitivt innhold</string>
<string name="status_media_hidden_title">Media skjult</string>
<string name="status_sensitive_media_directions">Klikk for å vise</string>
@ -194,7 +194,7 @@
<string name="pref_status_text_size">Størrelse på statustekst</string>
<string name="notification_follow_name">Nye følgere</string>
<string name="notification_follow_description">Varsler om nye følgere</string>
<string name="notification_boost_name">Boosts</string>
<string name="notification_boost_name">Booster</string>
<string name="notification_boost_description">Varsler når tootene dine blir boostet</string>
<string name="notification_favourite_name">Favoritter</string>
<string name="notification_favourite_description">Varsler når tootene dine blir favorisert</string>
@ -314,8 +314,8 @@
<item quantity="other">&lt;b&gt;%1$s&lt;/b&gt; Favoritter</item>
</plurals>
<plurals name="reblogs">
<item quantity="one">&lt;b&gt;%s&lt;/b&gt; Boost</item>
<item quantity="other">&lt;b&gt;%s&lt;/b&gt; Boosts</item>
<item quantity="one"><b>%s</b> Boost</item>
<item quantity="other"><b>%s</b> Booster</item>
</plurals>
<string name="title_reblogged_by">Boostet av</string>
<string name="title_favourited_by">Favorisert av</string>
@ -512,4 +512,10 @@
<string name="action_delete_conversation">Slett samtale</string>
<string name="action_unbookmark">Slett bokmerke</string>
<string name="pref_title_confirm_favourites">Vis bekreftelsesdialog når favoritt skal legges til</string>
<string name="duration_30_days">30 dager</string>
<string name="duration_60_days">60 dager</string>
<string name="duration_90_days">90 dager</string>
<string name="duration_180_days">180 dager</string>
<string name="duration_365_days">365 dager</string>
<string name="duration_14_days">14 dager</string>
</resources>

2
app/src/main/res/values-oc/strings.xml
View File

@ -334,7 +334,7 @@
<string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
<plurals name="favs">
<item quantity="one"><b>%1$s</b> Favorit</item>
<item quantity="other"><b>3%1$s</b>4 Favorits</item>
<item quantity="other"><b>%1$s</b> Favorits</item>
</plurals>
<plurals name="reblogs">
<item quantity="one"><b>%s</b> partatge</item>

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

@ -47,7 +47,7 @@
<string name="notification_favourite_format">%s favoritou teu toot</string>
<string name="notification_follow_format">%s te seguiu</string>
<string name="report_username_format">Denunciar @%s</string>
<string name="report_comment_hint">Comentários adicionais aqui</string>
<string name="report_comment_hint">Mais comentários\?</string>
<string name="action_quick_reply">Resposta rápida</string>
<string name="action_reply">Responder</string>
<string name="action_reblog">Dar boost</string>
@ -517,4 +517,6 @@
<string name="dialog_delete_conversation_warning">Excluir esta conversa\?</string>
<string name="action_delete_conversation">Excluir conversa</string>
<string name="dialog_delete_list_warning">Deseja excluir a lista %s\?</string>
<string name="action_unbookmark">Remover favorito</string>
<string name="pref_title_confirm_favourites">Mostrar janela de confirmação antes de favoritar</string>
</resources>

6
app/src/main/res/values-uk/strings.xml
View File

@ -534,4 +534,10 @@
<string name="action_delete_conversation">Видалити бесіду</string>
<string name="action_unbookmark">Вилучити закладку</string>
<string name="pref_title_confirm_favourites">Запитувати підтвердження перед додаванням до вподобаних</string>
<string name="duration_14_days">14 днів</string>
<string name="duration_30_days">30 днів</string>
<string name="duration_60_days">60 днів</string>
<string name="duration_90_days">90 днів</string>
<string name="duration_180_days">180 днів</string>
<string name="duration_365_days">365 днів</string>
</resources>

8
app/src/main/res/values-vi/strings.xml
View File

@ -289,7 +289,7 @@
<string name="filter_addition_dialog_title">Thêm bộ lọc</string>
<string name="pref_title_thread_filter_keywords">Chủ đề</string>
<string name="pref_title_public_filter_keywords">Thế giới</string>
<string name="load_more_placeholder_text">xem tiếp</string>
<string name="load_more_placeholder_text">tiếp tục đọc</string>
<string name="replying_to">Trả lời @%s</string>
<string name="title_media">Media</string>
<string name="pref_title_alway_open_spoiler">Luôn hiện nội dung bị ẩn</string>
@ -501,4 +501,10 @@
<string name="action_delete_conversation">Xóa thảo luận</string>
<string name="pref_title_confirm_favourites">Xác nhận trước khi thích</string>
<string name="action_unbookmark">Bỏ lưu</string>
<string name="duration_14_days">14 ngày</string>
<string name="duration_30_days">30 ngày</string>
<string name="duration_60_days">60 ngày</string>
<string name="duration_90_days">90 ngày</string>
<string name="duration_180_days">180 ngày</string>
<string name="duration_365_days">365 ngày</string>
</resources>

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

@ -526,4 +526,10 @@
<string name="action_delete_conversation">删除对话</string>
<string name="pref_title_confirm_favourites">收藏前显示确认对话框</string>
<string name="action_unbookmark">删除书签</string>
<string name="duration_30_days">30 天</string>
<string name="duration_60_days">60 天</string>
<string name="duration_90_days">90 天</string>
<string name="duration_180_days">180 天</string>
<string name="duration_14_days">14 天</string>
<string name="duration_365_days">365 天</string>
</resources>

1
fastlane/metadata/android/gd/short_description.txt Normal file
View File

@ -0,0 +1 @@
Cliant do dh’iomadh cunntas san lìonra sòisealta Mastodon

1
fastlane/metadata/android/gd/title.txt Normal file
View File

@ -0,0 +1 @@
Tusky

8
fastlane/metadata/android/pt-BR/changelogs/87.txt Normal file
View File

@ -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