sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix avatar loading issues

Browse source
This commit is contained in:
Phillip Thelen 2021-06-10 10:47:15 +02:00
parent dbea9ce516
commit d92fbced36
15 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -146,7 +146,7 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2964
versionCode 2971
versionName "3.3"
}

4
Habitica/res/values-de/strings.xml
View file

@ -1025,9 +1025,9 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
<string name="view_onboarding_tasks">Einstiegsaufgaben ansehen</string>
<string name="equip">Ausrüsten</string>
<string name="unequip">Unausrüsten</string>
<string name="excessItemsNoneLeft">Du hast bereits alles, was Du für alle %s Haustiere benötigst. Bist Du Dir sicher, dass Du %d %ss kaufen willst\?</string>
<string name="excessItemsNoneLeft">Du hast bereits alles, was Du für alle %1$s Haustiere benötigst. Bist Du Dir sicher, dass Du %2$d %3$ss kaufen willst\?</string>
<string name="purchaseX">%d kaufen</string>
<string name="excessItemsXLeft">Du brauchst nur %d %s um alle möglichen Haustiere zu schlüpfen. Bist Du Dir sicher, dass Du %d kaufen willst\?</string>
<string name="excessItemsXLeft">Du brauchst nur %1$d %2$s um alle möglichen Haustiere zu schlüpfen. Bist Du Dir sicher, dass Du %3$d kaufen willst\?</string>
<string name="excess_items">Überschüssige Gegenstände</string>
<string name="onboardingComplete_achievement_title">Du hast Deine Einstiegsaufgaben erledigt!</string>
<string name="onboardingCompleteDescription">Falls Du noch mehr willst, sieh Dir Deine Erfolge an und beginne zu sammeln!</string>

4
Habitica/res/values-en-rGB/strings.xml
View file

@ -1042,9 +1042,9 @@
<string name="view_onboarding_tasks">View Onboarding Tasks</string>
<string name="equip">Equip</string>
<string name="unequip">Unequip</string>
<string name="excessItemsNoneLeft">You already have everything you need for all %s pets. Are you sure you want to purchase %d %ss\?</string>
<string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %s3$s\?</string>
<string name="purchaseX">Purchase %d</string>
<string name="excessItemsXLeft">You only need %d %s to hatch all possible pets. Are you sure you want to purchase %d\?</string>
<string name="excessItemsXLeft">You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d\?</string>
<string name="excess_items">Excess Items</string>
<string name="onboardingComplete_achievement_title">If you want even more, check out Achievements and start collecting!</string>
<string name="onboardingCompleteDescription">If you want even more, check out Achievements and start collecting!</string>

4
Habitica/res/values-es/strings.xml
View file

@ -870,7 +870,7 @@
<string name="learn_more">Aprende más</string>
<string name="experience_points">Puntos de Experiencia</string>
<string name="purchaseX">Comprar %d</string>
<string name="excessItemsXLeft">Solo necesitas %d %s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %d\?</string>
<string name="excessItemsXLeft">Solo necesitas %1$d %2$s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %3$d\?</string>
<string name="spooky_promo_info_instructions">Entre el 29 de Octubre y el 2 de Noviembre, simplemente compra cualquier paquete de Gemas como de costumbre y tu cuenta será acreditada con la cantidad promocional de Gemas. ¡Más Gemas para gastar, compartir o guardar para cualquier evento futuro!</string>
<string name="view_gem_bundles">Ver paquetes de Gemas</string>
<string name="fall_promo_info_prompt">La Gala de Otoño está en pleno apogeo, así que pensamos que era el momento perfecto para presentar nuestra primera Venta de Gemas! Ahora obtendrás más gemas con cada compra como nunca antes.</string>
@ -906,7 +906,7 @@
<string name="suggest_pet_hatch_missing_egg">Aún necesitas un huevo %s para eclosionar esta mascota</string>
<string name="equip">Equipar</string>
<string name="unequip">Desequipar</string>
<string name="excessItemsNoneLeft">Ya tienes todo lo que necesitas para todas las mascotas %s. ¿Estás seguro de que quieres comprar %d %ss\?</string>
<string name="excessItemsNoneLeft">Ya tienes todo lo que necesitas para todas las mascotas %1$s. ¿Estás seguro de que quieres comprar %2$d %3$ss\?</string>
<string name="excess_items">Exceso de objetos</string>
<string name="first_drop_title">¡Has encontrado nuevos objetos!</string>
<string name="go_to_items">Ir a objetos</string>

4
Habitica/res/values-fr/strings.xml
View file

@ -1047,9 +1047,9 @@
<string name="view_onboarding_tasks">Voir les tâches d’intégration</string>
<string name="equip">Équiper</string>
<string name="unequip">Déséquiper</string>
<string name="excessItemsNoneLeft">Vous avez déjà tout le nécessaire pour tous les familiers %s. Voulez vous vraiment acheter %d %ss \?</string>
<string name="excessItemsNoneLeft">Vous avez déjà tout le nécessaire pour tous les familiers %1$s. Voulez vous vraiment acheter %2$d %3$ss \?</string>
<string name="purchaseX">Acheter %d</string>
<string name="excessItemsXLeft">Vous avez seulement besoin de %d %@s pour faire éclore tous les familiers possibles. Voulez-vous vraiment acheter %d \?</string>
<string name="excessItemsXLeft">Vous avez seulement besoin de %1$d %2$ss pour faire éclore tous les familiers possibles. Voulez-vous vraiment acheter %3$d \?</string>
<string name="excess_items">Objets en surplus</string>
<string name="onboardingComplete_achievement_title">Vous avez terminé vos tâches de démarrage !</string>
<string name="onboardingCompleteDescription">Si vous en voulez plus, allez regarder vos succès et commencez à les collectionner !</string>

6
Habitica/res/values-it/strings.xml
View file

@ -1074,9 +1074,9 @@
<string name="view_onboarding_tasks">Visualizza le attività introduttive</string>
<string name="equip">Equipaggia</string>
<string name="unequip">Disequip</string>
<string name="excessItemsNoneLeft">Hai già tutto il necessario per tutti gli animali %@. Sei sicuro di voler acquistare %d %ss\?</string>
<string name="excessItemsNoneLeft">Hai già tutto il necessario per tutti gli animali %1$. Sei sicuro di voler acquistare %2$d %3$ss\?</string>
<string name="purchaseX">Acquista %d</string>
<string name="excessItemsXLeft">Hai solo bisogno di %d %s per schiudere tutti i possibili animali. Sei sicuro di voler acquistare %d\?</string>
<string name="excessItemsXLeft">Hai solo bisogno di %1$d %2$s per schiudere tutti i possibili animali. Sei sicuro di voler acquistare %3$d\?</string>
<string name="excess_items">Articoli in eccesso</string>
<string name="onboardingComplete_achievement_title">Hai completato le attività introduttive!</string>
<string name="onboardingCompleteDescription">Se ne vuoi di più, dai un\'occhiata alle Medaglie ed inizia a collezionarle!</string>
@ -1089,11 +1089,9 @@
<string name="unblock_user">Sblocca utente</string>
<string name="block_user">Blocca utente</string>
<string name="spooky_promo_info_prompt">La vendita di Gemme è tornata per infestare la fine del Gala Autunnale di quest\'anno! Questa è l\'ultima possibilità per ottenere più gemme che mai, quindi fanne scorta finché dura!</string>
<string name="spooky_promo_info_limitations">Questa promozione si applica solo durante l\'evento a tempo limitato. Questo evento inizia il 29 ottobre alle 14:00 ora italiana (12:00 UTC) e terminerà il 3 novembre alle 2:00 di mattina ora italiana (00:00 UTC). L\'offerta promozionale è disponibile solo se acquisti Gemme per te stesso.</string>
<string name="spooky_promo_info_instructions">Tra il 29 ottobre e il 2 novembre acquista semplicemente un pacchetto di gemme e sul tuo account verrà accreditato l\'importo promozionale di gemme. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
<string name="view_gem_bundles">Visualizza pacchetti di gemme</string>
<string name="fall_promo_info_prompt">Il Gala Autunnale è in pieno svolgimento, quindi abbiamo pensato che fosse il momento perfetto per presentare la nostra prima vendita di Gemme in assoluto! Ora otterrai più gemme ogni acquisto più che mai.</string>
<string name="fall_promo_info_limitations">Questa promozione si applica solo durante l\'evento a tempo limitato. Questo evento inizia il 22 settembre alle 14:00 ora italiana (12:00 UTC) e terminerà il 1 ottobre alle 2:00 di mattina ora italiana (00:00 UTC). L\'offerta promozionale è disponibile solo se acquisti Gemme per te stesso.</string>
<string name="fall_promo_info_instructions">Tra il 22 e il 30 settembre, acquista semplicemente un pacchetto di gemme e sul tuo account verrà accreditato l\'importo promozionale di gemme. Più gemme da spendere, condividere o risparmiare per eventuali oggetti futuri!</string>
<string name="limitations">Limitazioni</string>
<string name="how_it_works">Come funziona</string>

6
Habitica/res/values-ja/strings.xml
View file

@ -1075,20 +1075,18 @@
<string name="view_onboarding_tasks">「初心者入門のタスク」を見る</string>
<string name="equip">装備</string>
<string name="unequip">装備解除</string>
<string name="excessItemsNoneLeft">すでに%sペットは全て所有しています。本当に%d%ssを購入しますか？</string>
<string name="excessItemsNoneLeft">すでに%1$sペットは全て所有しています。本当に%2$d%3$ssを購入しますか？</string>
<string name="purchaseX">%dを買う</string>
<string name="excessItemsXLeft">今孵せるペットに必要なのは%d%sだけです。本当に%dを購入しますか？</string>
<string name="excessItemsXLeft">今孵せるペットに必要なのは%1$d%2$sだけです。本当に%3$dを購入しますか？</string>
<string name="excess_items">あまったアイテム</string>
<string name="onboardingComplete_achievement_title">初心者入門のタスクを完了しました！</string>
<string name="onboardingCompleteDescription">もっとほしいなら、実績を確認してコレクションをはじめましょう！</string>
<string name="first_drop_title">新しいアイテムを見つけました！</string>
<string name="go_to_items">「アイテム」へ</string>
<string name="spooky_promo_info_prompt">ジェムのセールが今年の秋の大祭に出没するために戻ってきました！いつもよりもジェムを多く手に入れるラストチャンスです。キャンペーンの間にジェムをストックしておきましょう！</string>
<string name="spooky_promo_info_limitations">このキャンペーンは季節限定イベントの間のみの実施です。このイベントはの10月29日の21:00時 (12:00 UTC)に始まり、11月2日の09:00時(00:00 UTC)に終了します。キャンペーンの対象は自分へのジェムを購入したときにのみ適用されます。</string>
<string name="spooky_promo_info_instructions">9月22日から30日の間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
<string name="view_gem_bundles">ジェムセットを見る</string>
<string name="fall_promo_info_prompt">秋の大祭も最高潮で、はじめてのジェムのセールを皆さんにお知らせするのに最高のタイミングだと我々は考えました！このセールでは、いつもと同じ値段で、いつもよりも多くのジェムが購入できます。</string>
<string name="fall_promo_info_limitations">このキャンペーンは季節限定イベントの間のみの実施です。このイベントはの9月の22日21:00時 (12:00 UTC)に始まり、9月30日の09:00時(00:00 UTC)に終了します。キャンペーンの対象は自分へのジェムを購入したときにのみ適用されます。</string>
<string name="fall_promo_info_instructions">9月22日から30日の間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！</string>
<string name="limitations">制限事項</string>
<string name="how_it_works">機能説明</string>

4
Habitica/res/values-pt-rBR/strings.xml
View file

@ -1038,9 +1038,9 @@
<string name="view_onboarding_tasks">Ver Tarefas Iniciais</string>
<string name="equip">Equipar</string>
<string name="unequip">Desequipar</string>
<string name="excessItemsNoneLeft">Você já tem tudo o que precisa para todos os %s mascotes. Você tem certeza que quer comprar %d %ss\?</string>
<string name="excessItemsNoneLeft">Você já tem tudo o que precisa para todos os %1$s mascotes. Você tem certeza que quer comprar %2$d %3$ss\?</string>
<string name="purchaseX">Comprar %d</string>
<string name="excessItemsXLeft">Você só precisa %d %s para chocar todos os mascotes possíveis. Você tem certeza que quer comprar %d\?</string>
<string name="excessItemsXLeft">Você só precisa %1$d %2$s para chocar todos os mascotes possíveis. Você tem certeza que quer comprar %3$d\?</string>
<string name="excess_items">Itens em Excesso</string>
<string name="onboardingComplete_achievement_title">Você completou suas Tarefas Iniciais!</string>
<string name="onboardingCompleteDescription">Se você quiser ainda mais, confira suas Conquistas e comece a coletar!</string>

4
Habitica/res/values-tr/strings.xml
View file

@ -1020,9 +1020,9 @@
<string name="hatch_pet">Yumurtadan Evcil Hayvan Çıkarıldı</string>
<string name="suggest_pet_hatch_again_missing_both">Bu evcil hayvanı tekrar yumurtadan çıkarmak için %s ve %s İksirine ihtiyacınız var</string>
<string name="view_onboarding_tasks">İlk Katılım Görevlerini Görüntüleyin</string>
<string name="excessItemsNoneLeft">Tüm %s evcil hayvanları için ihtiyacınız olan her şeye zaten sahipsiniz. %d %ss satın almak istediğinizden emin misiniz\?</string>
<string name="excessItemsNoneLeft">Tüm %1$s evcil hayvanları için ihtiyacınız olan her şeye zaten sahipsiniz. %2$d %3$ss satın almak istediğinizden emin misiniz\?</string>
<string name="purchaseX">%d satın al</string>
<string name="excessItemsXLeft">Tüm olası evcil hayvanları yumurtadan çıkarmak için yalnızca %d %s gerekir. %d satın almak istediğinizden emin misiniz\?</string>
<string name="excessItemsXLeft">Tüm olası evcil hayvanları yumurtadan çıkarmak için yalnızca %1$d %2$s gerekir. %3$d satın almak istediğinizden emin misiniz\?</string>
<string name="excess_items">Fazla Öğeler</string>
<string name="onboardingComplete_achievement_title">İlk Katılım Görevlerinizi tamamladınız!</string>
<string name="onboardingCompleteTitle">Çabalarınız karşılığında &lt;b&gt;5 Başarı&lt;/b&gt; ve &lt;font color = # EE9109&gt;&lt;b&gt;100 Altın&lt;/b&gt;&lt;/font&gt; kazandınız.</string>

4
Habitica/res/values-uk/strings.xml
View file

@ -1154,9 +1154,9 @@
<string name="suggest_pet_hatch_missing_potion">Вам все ще потрібне %s зілля щоб вилупити цю тварину</string>
<string name="suggest_pet_hatch_missing_egg">Вам все ще потрібне %s яйце щоб вилупити цю тварину</string>
<string name="view_onboarding_tasks">Подивитись перші завдання</string>
<string name="excessItemsNoneLeft">У вас вже є все для всіх %s тварин. Ви точно хочете заплатити %d %ss\?</string>
<string name="excessItemsNoneLeft">У вас вже є все для всіх %1$s тварин. Ви точно хочете заплатити %2$d %3$ss\?</string>
<string name="purchaseX">Купити: %d</string>
<string name="excessItemsXLeft">Вам потрібно тільки %d %s щоб вилупити всіх тварин. Ви дійсно хочет заплатити %d\?</string>
<string name="excessItemsXLeft">Вам потрібно тільки %1$d %2$s щоб вилупити всіх тварин. Ви дійсно хочет заплатити %3$d\?</string>
<string name="excess_items">Зайві предмети</string>
<string name="onboardingComplete_achievement_title">Ви виконали свої перші завдання!</string>
<string name="onboardingCompleteDescription">Хочет більше\? Подивіться список досягнень і почніть збирати колекцію!</string>

4
Habitica/res/values-vi/strings.xml
View file

@ -1041,9 +1041,9 @@
<string name="view_onboarding_tasks">Xem Công việc Nhập môn</string>
<string name="equip">Trang bị</string>
<string name="unequip">Giải đáp thắc mắc</string>
<string name="excessItemsNoneLeft">Bạn đã có mọi thứ bạn cần cho tất cả %s thú cưng. Bạn có chắc muốn mua %d %ss\?</string>
<string name="excessItemsNoneLeft">Bạn đã có mọi thứ bạn cần cho tất cả %1$s thú cưng. Bạn có chắc muốn mua %2$d %3$ss\?</string>
<string name="purchaseX">Mua %d</string>
<string name="excessItemsXLeft">Bạn chỉ cần %d %s để ấp tất cả thú cưng mà bạn có thể. Bạn có chắc muốn mua %d\?</string>
<string name="excessItemsXLeft">Bạn chỉ cần %1$d %2$s để ấp tất cả thú cưng mà bạn có thể. Bạn có chắc muốn mua %3$d\?</string>
<string name="excess_items">Vật phẩm dư thừa</string>
<string name="onboardingComplete_achievement_title">Bạn đã hoàn thành những Công việc Nhập môn của bạn!</string>
<string name="onboardingCompleteDescription">Nếu bạn muốn nhiều hơn nữa, xem Thành tựu và bắt đầu sưu tập!</string>

4
Habitica/res/values-zh-rTW/strings.xml
View file

@ -1041,9 +1041,9 @@
<string name="view_onboarding_tasks">查看新手任務</string>
<string name="equip">裝備</string>
<string name="unequip">取消裝備</string>
<string name="excessItemsNoneLeft">你已經有得到所有%s寵物所需的一切物品。你確定你要買%d個%s？</string>
<string name="excessItemsNoneLeft">你已經有得到所有%s寵物所需的一切物品。你確定你要買%2$d個%3$s？</string>
<string name="purchaseX">買%d個</string>
<string name="excessItemsXLeft">你只需要%d個%s即可孵化所有可得到的這種寵物。你確定你想要買%d個？</string>
<string name="excessItemsXLeft">你只需要%d個%2$s即可孵化所有可得到的這種寵物。你確定你想要買%1$d個？</string>
<string name="feedPet_description">完成任務有概率掉落寵物食品！這樣你就可以把寵物餵大長成坐騎啦！</string>
<string name="excess_items">多餘物品</string>
<string name="onboardingComplete_achievement_title">你完成了新手任務！</string>

4
Habitica/res/values-zh/strings.xml
View file

@ -1019,8 +1019,8 @@
<string name="view_onboarding_tasks">查看新手任务</string>
<string name="equip">装备</string>
<string name="unequip">取消装备</string>
<string name="excessItemsNoneLeft">你已经有得到所有%s宠物所需的一切物品。你确定你要买%d个%s？</string>
<string name="excessItemsXLeft">你只需要%d个%s即可孵化所有可得到的这种宠物。你确定你想要买%d个？</string>
<string name="excessItemsNoneLeft">你已经有得到所有%s宠物所需的一切物品。你确定你要买%2$d个%3$s？</string>
<string name="excessItemsXLeft">你只需要%1$d个%2$s即可孵化所有可得到的这种宠物。你确定你想要买%3$d个？</string>
<string name="purchaseX">买%d个</string>
<string name="excess_items">多余物品</string>
<string name="onboardingComplete_achievement_title">你完成了新手任务！</string>

4
Habitica/res/values/strings.xml
View file

@ -1060,9 +1060,9 @@
<string name="onboardingCompleteDescription">If you want even more, check out Achievements and start collecting!</string>
<string name="onboardingComplete_achievement_title">You completed your OnboardingTasks!</string>
<string name="excess_items">Excess Items</string>
<string name="excessItemsXLeft">You only need %d %s to hatch all possible pets. Are you sure you want to purchase %d?</string>
<string name="excessItemsXLeft">You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d?</string>
<string name="purchaseX">Purchase %d</string>
<string name="excessItemsNoneLeft">You already have everything you need for all %s pets. Are you sure you want to purchase %d %ss?</string>
<string name="excessItemsNoneLeft">You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %3$ss?</string>
<string name="equip">Equip</string>
<string name="unequip">Unequip</string>
<string name="view_onboarding_tasks">View Onboarding Tasks</string>

14
Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
View file

@ -109,7 +109,6 @@ class AvatarView : FrameLayout {
}
private fun showLayers(layerMap: Map<LayerType, String>) {
if (imageViewHolder.isNotEmpty()) return
var i = 0
currentLayers = layerMap
@ -129,6 +128,9 @@ class AvatarView : FrameLayout {
imageViewHolder[layerNumber]
}
if (imageView.tag == layerName) continue
imageView.tag = layerName
imageView.load(DataBindingUtils.BASE_IMAGE_URL + DataBindingUtils.getFullFilename(layerName)) {
allowHardware(false)
target({}, {
@ -397,11 +399,10 @@ class AvatarView : FrameLayout {
if (oldUser != null) {
val newLayerMap = getLayerMap(avatar, false)
val equals = currentLayers != null && currentLayers == newLayerMap
val equals = currentLayers == newLayerMap
if (!equals) {
imageViewHolder.clear()
numberLayersInProcess.set(0)
invalidate()
}
}
@ -428,10 +429,7 @@ class AvatarView : FrameLayout {
// draw only when user is set
if (avatar?.isValid() != true) return
// request image layers if not yet processed
if (imageViewHolder.size == 0) {
showLayers(layerMap)
}
showLayers(layerMap)
}
override fun invalidateDrawable(drawable: Drawable) {