From d92fbced364d7109b797b203a6502b629240742b Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 10 Jun 2021 10:47:15 +0200 Subject: [PATCH] Fix avatar loading issues --- Habitica/build.gradle | 2 +- Habitica/res/values-de/strings.xml | 4 ++-- Habitica/res/values-en-rGB/strings.xml | 4 ++-- Habitica/res/values-es/strings.xml | 4 ++-- Habitica/res/values-fr/strings.xml | 4 ++-- Habitica/res/values-it/strings.xml | 6 ++---- Habitica/res/values-ja/strings.xml | 6 ++---- Habitica/res/values-pt-rBR/strings.xml | 4 ++-- Habitica/res/values-tr/strings.xml | 4 ++-- Habitica/res/values-uk/strings.xml | 4 ++-- Habitica/res/values-vi/strings.xml | 4 ++-- Habitica/res/values-zh-rTW/strings.xml | 4 ++-- Habitica/res/values-zh/strings.xml | 4 ++-- Habitica/res/values/strings.xml | 4 ++-- .../com/habitrpg/android/habitica/ui/AvatarView.kt | 14 ++++++-------- 15 files changed, 33 insertions(+), 39 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 4b8de8254..76a35fd5d 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -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" } diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml index 586f519e7..b8c942797 100644 --- a/Habitica/res/values-de/strings.xml +++ b/Habitica/res/values-de/strings.xml @@ -1025,9 +1025,9 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben. Einstiegsaufgaben ansehen Ausrüsten Unausrüsten - Du hast bereits alles, was Du für alle %s Haustiere benötigst. Bist Du Dir sicher, dass Du %d %ss kaufen willst\? + 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\? %d kaufen - Du brauchst nur %d %s um alle möglichen Haustiere zu schlüpfen. Bist Du Dir sicher, dass Du %d kaufen willst\? + 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\? Überschüssige Gegenstände Du hast Deine Einstiegsaufgaben erledigt! Falls Du noch mehr willst, sieh Dir Deine Erfolge an und beginne zu sammeln! diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 5d8b161a7..eb3fd6d5f 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -1042,9 +1042,9 @@ View Onboarding Tasks Equip Unequip - You already have everything you need for all %s pets. Are you sure you want to purchase %d %ss\? + You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %s3$s\? Purchase %d - You only need %d %s to hatch all possible pets. Are you sure you want to purchase %d\? + You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d\? Excess Items If you want even more, check out Achievements and start collecting! If you want even more, check out Achievements and start collecting! diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml index c22a49265..6f7e868a1 100644 --- a/Habitica/res/values-es/strings.xml +++ b/Habitica/res/values-es/strings.xml @@ -870,7 +870,7 @@ Aprende más Puntos de Experiencia Comprar %d - Solo necesitas %d %s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %d\? + Solo necesitas %1$d %2$s para eclosionar todas las mascotas posibles. ¿Estás seguro de que quieres comprar %3$d\? 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! Ver paquetes de Gemas 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. @@ -906,7 +906,7 @@ Aún necesitas un huevo %s para eclosionar esta mascota Equipar Desequipar - Ya tienes todo lo que necesitas para todas las mascotas %s. ¿Estás seguro de que quieres comprar %d %ss\? + Ya tienes todo lo que necesitas para todas las mascotas %1$s. ¿Estás seguro de que quieres comprar %2$d %3$ss\? Exceso de objetos ¡Has encontrado nuevos objetos! Ir a objetos diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 75e076bf1..81538269f 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -1047,9 +1047,9 @@ Voir les tâches d’intégration Équiper Déséquiper - Vous avez déjà tout le nécessaire pour tous les familiers %s. Voulez vous vraiment acheter %d %ss \? + Vous avez déjà tout le nécessaire pour tous les familiers %1$s. Voulez vous vraiment acheter %2$d %3$ss \? Acheter %d - Vous avez seulement besoin de %d %@s pour faire éclore tous les familiers possibles. Voulez-vous vraiment acheter %d \? + Vous avez seulement besoin de %1$d %2$ss pour faire éclore tous les familiers possibles. Voulez-vous vraiment acheter %3$d \? Objets en surplus Vous avez terminé vos tâches de démarrage ! Si vous en voulez plus, allez regarder vos succès et commencez à les collectionner ! diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml index 586989db4..a95af7729 100644 --- a/Habitica/res/values-it/strings.xml +++ b/Habitica/res/values-it/strings.xml @@ -1074,9 +1074,9 @@ Visualizza le attività introduttive Equipaggia Disequip - Hai già tutto il necessario per tutti gli animali %@. Sei sicuro di voler acquistare %d %ss\? + Hai già tutto il necessario per tutti gli animali %1$. Sei sicuro di voler acquistare %2$d %3$ss\? Acquista %d - Hai solo bisogno di %d %s per schiudere tutti i possibili animali. Sei sicuro di voler acquistare %d\? + Hai solo bisogno di %1$d %2$s per schiudere tutti i possibili animali. Sei sicuro di voler acquistare %3$d\? Articoli in eccesso Hai completato le attività introduttive! Se ne vuoi di più, dai un\'occhiata alle Medaglie ed inizia a collezionarle! @@ -1089,11 +1089,9 @@ Sblocca utente Blocca utente 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! - 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. 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! Visualizza pacchetti di gemme 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. - 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. 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! Limitazioni Come funziona diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml index 51b016043..c24b0a22b 100644 --- a/Habitica/res/values-ja/strings.xml +++ b/Habitica/res/values-ja/strings.xml @@ -1075,20 +1075,18 @@ 「初心者入門のタスク」を見る 装備 装備解除 - すでに%sペットは全て所有しています。本当に%d%ssを購入しますか？ + すでに%1$sペットは全て所有しています。本当に%2$d%3$ssを購入しますか？ %dを買う - 今孵せるペットに必要なのは%d%sだけです。本当に%dを購入しますか？ + 今孵せるペットに必要なのは%1$d%2$sだけです。本当に%3$dを購入しますか？ あまったアイテム 初心者入門のタスクを完了しました！ もっとほしいなら、実績を確認してコレクションをはじめましょう！ 新しいアイテムを見つけました！ 「アイテム」へ ジェムのセールが今年の秋の大祭に出没するために戻ってきました！いつもよりもジェムを多く手に入れるラストチャンスです。キャンペーンの間にジェムをストックしておきましょう！ - このキャンペーンは季節限定イベントの間のみの実施です。このイベントはの10月29日の21:00時 (12:00 UTC)に始まり、11月2日の09:00時(00:00 UTC)に終了します。キャンペーンの対象は自分へのジェムを購入したときにのみ適用されます。 9月22日から30日の間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！ ジェムセットを見る 秋の大祭も最高潮で、はじめてのジェムのセールを皆さんにお知らせするのに最高のタイミングだと我々は考えました！このセールでは、いつもと同じ値段で、いつもよりも多くのジェムが購入できます。 - このキャンペーンは季節限定イベントの間のみの実施です。このイベントはの9月の22日21:00時 (12:00 UTC)に始まり、9月30日の09:00時(00:00 UTC)に終了します。キャンペーンの対象は自分へのジェムを購入したときにのみ適用されます。 9月22日から30日の間、いつものようにジェムセットを買うだけであなたのアカウントにキャンペーンのジェムが贈られます。もっとジェムを使ったりシェアしたり新しい機能のリリースに備えてたくわえておいたりしましょう！ 制限事項 機能説明 diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml index a5588bbc2..63a86f87c 100644 --- a/Habitica/res/values-pt-rBR/strings.xml +++ b/Habitica/res/values-pt-rBR/strings.xml @@ -1038,9 +1038,9 @@ Ver Tarefas Iniciais Equipar Desequipar - Você já tem tudo o que precisa para todos os %s mascotes. Você tem certeza que quer comprar %d %ss\? + Você já tem tudo o que precisa para todos os %1$s mascotes. Você tem certeza que quer comprar %2$d %3$ss\? Comprar %d - Você só precisa %d %s para chocar todos os mascotes possíveis. Você tem certeza que quer comprar %d\? + Você só precisa %1$d %2$s para chocar todos os mascotes possíveis. Você tem certeza que quer comprar %3$d\? Itens em Excesso Você completou suas Tarefas Iniciais! Se você quiser ainda mais, confira suas Conquistas e comece a coletar! diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml index aba81917a..1a62b13c3 100644 --- a/Habitica/res/values-tr/strings.xml +++ b/Habitica/res/values-tr/strings.xml @@ -1020,9 +1020,9 @@ Yumurtadan Evcil Hayvan Çıkarıldı Bu evcil hayvanı tekrar yumurtadan çıkarmak için %s ve %s İksirine ihtiyacınız var İlk Katılım Görevlerini Görüntüleyin - Tüm %s evcil hayvanları için ihtiyacınız olan her şeye zaten sahipsiniz. %d %ss satın almak istediğinizden emin misiniz\? + 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\? %d satın al - Tüm olası evcil hayvanları yumurtadan çıkarmak için yalnızca %d %s gerekir. %d satın almak istediğinizden emin misiniz\? + 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\? Fazla Öğeler İlk Katılım Görevlerinizi tamamladınız! Çabalarınız karşılığında <b>5 Başarı</b> ve <font color = # EE9109><b>100 Altın</b></font> kazandınız. diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml index 6e5d71ce6..72a758347 100755 --- a/Habitica/res/values-uk/strings.xml +++ b/Habitica/res/values-uk/strings.xml @@ -1154,9 +1154,9 @@ Вам все ще потрібне %s зілля щоб вилупити цю тварину Вам все ще потрібне %s яйце щоб вилупити цю тварину Подивитись перші завдання - У вас вже є все для всіх %s тварин. Ви точно хочете заплатити %d %ss\? + У вас вже є все для всіх %1$s тварин. Ви точно хочете заплатити %2$d %3$ss\? Купити: %d - Вам потрібно тільки %d %s щоб вилупити всіх тварин. Ви дійсно хочет заплатити %d\? + Вам потрібно тільки %1$d %2$s щоб вилупити всіх тварин. Ви дійсно хочет заплатити %3$d\? Зайві предмети Ви виконали свої перші завдання! Хочет більше\? Подивіться список досягнень і почніть збирати колекцію! diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml index a39f85c7a..4680355ee 100755 --- a/Habitica/res/values-vi/strings.xml +++ b/Habitica/res/values-vi/strings.xml @@ -1041,9 +1041,9 @@ Xem Công việc Nhập môn Trang bị Giải đáp thắc mắc - 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\? + 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\? Mua %d - 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\? + 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\? Vật phẩm dư thừa Bạn đã hoàn thành những Công việc Nhập môn của bạn! 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! diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml index f7d93021d..db3a674e3 100644 --- a/Habitica/res/values-zh-rTW/strings.xml +++ b/Habitica/res/values-zh-rTW/strings.xml @@ -1041,9 +1041,9 @@ 查看新手任務 裝備 取消裝備 - 你已經有得到所有%s寵物所需的一切物品。你確定你要買%d個%s？ + 你已經有得到所有%s寵物所需的一切物品。你確定你要買%2$d個%3$s？ 買%d個 - 你只需要%d個%s即可孵化所有可得到的這種寵物。你確定你想要買%d個？ + 你只需要%d個%2$s即可孵化所有可得到的這種寵物。你確定你想要買%1$d個？ 完成任務有概率掉落寵物食品！這樣你就可以把寵物餵大長成坐騎啦！ 多餘物品 你完成了新手任務！ diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml index 47df58627..7aa2fb81e 100644 --- a/Habitica/res/values-zh/strings.xml +++ b/Habitica/res/values-zh/strings.xml @@ -1019,8 +1019,8 @@ 查看新手任务 装备 取消装备 - 你已经有得到所有%s宠物所需的一切物品。你确定你要买%d个%s？ - 你只需要%d个%s即可孵化所有可得到的这种宠物。你确定你想要买%d个？ + 你已经有得到所有%s宠物所需的一切物品。你确定你要买%2$d个%3$s？ + 你只需要%1$d个%2$s即可孵化所有可得到的这种宠物。你确定你想要买%3$d个？ 买%d个 多余物品 你完成了新手任务！ diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index a8828644a..88de15dec 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -1060,9 +1060,9 @@ If you want even more, check out Achievements and start collecting! You completed your OnboardingTasks! Excess Items - You only need %d %s to hatch all possible pets. Are you sure you want to purchase %d? + You only need %1$d %2$s to hatch all possible pets. Are you sure you want to purchase %3$d? Purchase %d - You already have everything you need for all %s pets. Are you sure you want to purchase %d %ss? + You already have everything you need for all %1$s pets. Are you sure you want to purchase %2$d %3$ss? Equip Unequip View Onboarding Tasks diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt index 44c183ec3..5b34e8187 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt @@ -109,7 +109,6 @@ class AvatarView : FrameLayout { } private fun showLayers(layerMap: Map) { - 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) {