sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-23 22:27:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix various issues

Browse source
This commit is contained in:
Phillip Thelen 2019-06-25 17:32:11 -04:00
parent 07d8f1c3e3
commit 4454c70d34
31 changed files with 118 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Habitica/AndroidManifestTesting.xml
View file

@ -125,16 +125,6 @@
<action android:name="android.intent.action._BOOT_COMPLETED"/>
</intent-filter>
</receiver>
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.habitrpg.android.habitica.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" />
</provider>
</application>
</manifest>

11
Habitica/build.gradle
View file

@ -104,7 +104,6 @@ dependencies {
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
testImplementation 'org.robolectric:robolectric:3.8'
testImplementation 'org.robolectric:shadows-multidex:3.8'
testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
testImplementation 'org.mockito:mockito-core:2.8.9'
testImplementation 'org.powermock:powermock-api-mockito2:1.7.0'
testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.7.0'
@ -114,11 +113,11 @@ dependencies {
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
//Push Notifications
implementation 'com.google.firebase:firebase-core:16.0.9'
implementation 'com.google.firebase:firebase-messaging:18.0.0'
implementation 'com.google.firebase:firebase-config:17.0.0'
implementation 'com.google.firebase:firebase-perf:17.0.2'
implementation 'com.google.android.gms:play-services-auth:16.0.1'
implementation 'com.google.firebase:firebase-core:17.0.0'
implementation 'com.google.firebase:firebase-messaging:19.0.1'
implementation 'com.google.firebase:firebase-config:18.0.0'
implementation 'com.google.firebase:firebase-perf:18.0.1'
implementation 'com.google.android.gms:play-services-auth:17.0.0'
implementation 'io.realm:android-adapters:3.1.0'
implementation(project(':seeds-sdk')) {
exclude group: 'com.google.android.gms'

14
Habitica/res/values-bg/strings.xml
View file

@ -300,21 +300,17 @@
<string name="use_animal">Използване</string>
<string name="feed">Хранене</string>
<string name="hatch_with">Излюпване на любимец с %s</string>
<string name="hatched_pet_title">Вие излюпихте %s!</string>
<string name="hatched_pet_title">Вие излюпихте %1$s %2$s!</string>
<string name="evolved_pet_title">Вие опитомихте %s. Да се качваме!</string>
<string name="close">Затваряне</string>
<string name="share">Споделяне</string>
<string name="notification_pet_fed">Вие нахранихте своя(та/то) %s!</string>
<string name="notification_purchase">Вие закупихте %s</string>
<string name="notification_purchase_reward">Вие закупихте награда</string>
<string name="sectionpets">Обикновени</string>
<string name="sectionpremiumPets">Магическа отвара</string>
<string name="sectionquestPets">Мисия</string>
<string name="sectionspecialPets">Редки</string>
<string name="sectionmounts">Обикновени</string>
<string name="sectionpremiumMounts">Магическа отвара</string>
<string name="sectionquestMounts">Мисия</string>
<string name="sectionspecialMounts">Редки</string>
<string name="sectiondrop">Обикновени</string>
<string name="sectionpremium">Магическа отвара</string>
<string name="sectionquest">Мисия</string>
<string name="sectionspecial">Редки</string>
<string name="world_quest">Световна мисия</string>
<string name="inn_description">Нуждаете се от почивка? Идете в странноприемницата на Даниел, за да спрете някои от по-трудните механики на Хабитика:\n\n
• Пропуснатите ежедневни задачи няма да Ви нараняват;\n

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

@ -268,9 +268,7 @@
<string name="wear_costume">Kostüm tragen</string>
<string name="equipped">Ausgerüstet</string>
<string name="quest_cancel_message">Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück.</string>
<string name="quest.invitation">Questeinladung</string>
<string name="quest_begin_message">Bist Du sicher? Nur %1$d von %2$d Party-Mitglieder nehmen an der Quest teil. Quests starten automatisch, wenn alle Spieler die Einladung angenommen oder abgelehnt haben.</string>
<string name="quest.invitation.text">Du wurdest eingeladen, an einer Quest teilzunehmen!</string>
<string name="ago_1day">vor einem Tag</string>
<string name="ago_days">vor %d Tagen</string>
<string name="ago_1Minute">Vor 1 Minute</string>
@ -300,21 +298,13 @@
<string name="use_animal">Nutzen</string>
<string name="feed">Füttern</string>
<string name="hatch_with">Haustier mit %s ausbrüten</string>
<string name="hatched_pet_title">Du hast ein %s ausgebrütet!</string>
<string name="hatched_pet_title">Du hast ein %1$s %2$s ausgebrütet!</string>
<string name="evolved_pet_title">Du hast %s gezähmt, auf geht\'s!</string>
<string name="close">Schließen</string>
<string name="share">Teilen</string>
<string name="notification_pet_fed">Du hast Dein/e/n %s gefüttert!</string>
<string name="notification_purchase">Du hast %s gekauft</string>
<string name="notification_purchase_reward">Du hast eine Belohnung gekauft</string>
<string name="sectionpets">Standard</string>
<string name="sectionpremiumPets">Magisches Schlüpfelixier</string>
<string name="sectionquestPets">Quest</string>
<string name="sectionspecialPets">Spezial</string>
<string name="sectionmounts">Standard</string>
<string name="sectionpremiumMounts">Magisches Schlüpfelixier</string>
<string name="sectionquestMounts">Quest</string>
<string name="sectionspecialMounts">Spezial</string>
<string name="world_quest">Weltenquest</string>
<string name="inn_description">Brauchst du eine Pause? Kehre in Daniels Gasthaus ein, um ein paar von Habiticas schwierigeren Spielmechaniken zu pausieren:\n\n
• Verpasste Tagesaufgaben fügen dir keinen Schaden zu\n

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

@ -289,7 +289,7 @@
<string name="use_animal">Use</string>
<string name="feed">Feed</string>
<string name="hatch_with">Hatch pet with %s</string>
<string name="hatched_pet_title">You hatched a %s!</string>
<string name="hatched_pet_title">You hatched a %1$s %2$s!</string>
<string name="close">Close</string>
<string name="share">Share</string>
<string name="notification_pet_fed">You fed your %s!</string>

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

@ -300,17 +300,17 @@
<string name="use_animal">Usar</string>
<string name="feed">Alimentar</string>
<string name="hatch_with">Criar mascota con %s</string>
<string name="hatched_pet_title">¡Ha nacido un/a %s!</string>
<string name="hatched_pet_title">¡Ha nacido un/a %1$s %2$s!</string>
<string name="evolved_pet_title">Has domado %s, ¡vamos a dar un paseo!</string>
<string name="close">Cerrar</string>
<string name="share">Compartir</string>
<string name="notification_pet_fed">¡Tu %s ha comido!</string>
<string name="notification_purchase">Has comprado %s</string>
<string name="notification_purchase_reward">Has obtenido una recompensa.</string>
<string name="sectionpets">Estandar</string>
<string name="sectionpremiumPets">Poción Mágica</string>
<string name="sectionquestPets">Misión</string>
<string name="sectionspecialPets">Raro</string>
<string name="sectiondrop">Estandar</string>
<string name="sectionpremium">Poción Mágica</string>
<string name="sectionquest">Misión</string>
<string name="sectionspecial">Raro</string>
<string name="sectionmounts">Estandar</string>
<string name="sectionpremiumMounts">Poción Mágica</string>
<string name="sectionquestMounts">Misión</string>

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

@ -300,21 +300,13 @@
<string name="use_animal">Utiliser</string>
<string name="feed">Nourrir</string>
<string name="hatch_with">Faire éclore le familier avec %s</string>
<string name="hatched_pet_title">Votre %s a éclos !</string>
<string name="hatched_pet_title">Votre %1$s %2$s a éclos !</string>
<string name="evolved_pet_title">Vous avez dompté %s, partez en promenade ensemble !</string>
<string name="close">Fermer</string>
<string name="share">Partager</string>
<string name="notification_pet_fed">Vous avez nourri votre %s !</string>
<string name="notification_purchase">Vous avez acheté %s</string>
<string name="notification_purchase_reward">Vous avez acheté une récompense</string>
<string name="sectionpets">Standard</string>
<string name="sectionpremiumPets">Potion magique</string>
<string name="sectionquestPets">Quête</string>
<string name="sectionspecialPets">Rare</string>
<string name="sectionmounts">Standard</string>
<string name="sectionpremiumMounts">Potion magique</string>
<string name="sectionquestMounts">Quête</string>
<string name="sectionspecialMounts">Rare</string>
<string name="world_quest">Quête mondiale</string>
<string name="inn_description">Besoin de repos ? Reposez vous à l\'Auberge de Daniel pour faire une pause des effets de jeu les plus compliqués :\n\n
• Les quotidiennes manquées ne vous infligeront pas de dégâts\n

10
Habitica/res/values-hr-rHR/strings.xml
View file

@ -302,17 +302,17 @@
<string name="use_animal">Koristi</string>
<string name="feed">Nahrani</string>
<string name="hatch_with">Izlegni ljubimca s %s</string>
<string name="hatched_pet_title">%s se izlegao/la!</string>
<string name="hatched_pet_title">%1$s %2$s se izlegao/la!</string>
<string name="evolved_pet_title">Pripitomio/la si %s, hajdemo jahati!</string>
<string name="close">Zatvori</string>
<string name="share">Podijeli</string>
<string name="notification_pet_fed">Nahranio/la si svoju/ga %s!</string>
<string name="notification_purchase">Kupio/la si %s</string>
<string name="notification_purchase_reward">Kupio/la si nagradu</string>
<string name="sectionpets">Standardni</string>
<string name="sectionpremiumPets">Čarobnih napitaka</string>
<string name="sectionquestPets">Pustolovni</string>
<string name="sectionspecialPets">Rijetki</string>
<string name="sectiondrop">Standardni</string>
<string name="sectionpremium">Čarobnih napitaka</string>
<string name="sectionquest">Pustolovni</string>
<string name="sectionspecial">Rijetki</string>
<string name="sectionmounts">Standardne</string>
<string name="sectionpremiumMounts">Čarobnih napitaka</string>
<string name="sectionquestMounts">Pustolovne</string>

10
Habitica/res/values-in/strings.xml
View file

@ -290,16 +290,16 @@
<string name="use_animal">Gunakan</string>
<string name="feed">Beri makan</string>
<string name="hatch_with">Tetaskan dengan %s</string>
<string name="hatched_pet_title">Kamu menetaskan seekor %s</string>
<string name="hatched_pet_title">Kamu menetaskan seekor %1$s %2$s</string>
<string name="close">Tutup</string>
<string name="share">Bagikan</string>
<string name="notification_pet_fed">Kamu memberi makan %s!</string>
<string name="notification_purchase">%s telah dibeli</string>
<string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
<string name="sectionpets">Standard</string>
<string name="sectionpremiumPets">Ramuan Ajaib</string>
<string name="sectionquestPets">Misi</string>
<string name="sectionspecialPets">Langka</string>
<string name="sectiondrop">Standard</string>
<string name="sectionpremium">Ramuan Ajaib</string>
<string name="sectionquest">Misi</string>
<string name="sectionspecial">Langka</string>
<string name="sectionmounts">Standard</string>
<string name="sectionpremiumMounts">Ramuan Ajaib</string>
<string name="sectionquestMounts">Misi</string>

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

@ -300,21 +300,13 @@
<string name="use_animal">Usa</string>
<string name="feed">Dai da mangiare</string>
<string name="hatch_with">Fai nascere un animale con %s</string>
<string name="hatched_pet_title">È nato un %s!</string>
<string name="hatched_pet_title">È nato un %1$s %2$s!</string>
<string name="evolved_pet_title">Hai domato %s, inizia a cavalcare!</string>
<string name="close">Chiudi</string>
<string name="share">Condividi</string>
<string name="notification_pet_fed">Hai dato da mangiare al tuo %s!</string>
<string name="notification_purchase">Hai comprato %s</string>
<string name="notification_purchase_reward">Hai comprato una ricompensa</string>
<string name="sectionpets">Base</string>
<string name="sectionpremiumPets">Pozione Magica</string>
<string name="sectionquestPets">Missione</string>
<string name="sectionspecialPets">Rari</string>
<string name="sectionmounts">Base</string>
<string name="sectionpremiumMounts">Pozione Magica</string>
<string name="sectionquestMounts">Missione</string>
<string name="sectionspecialMounts">Rare</string>
<string name="world_quest">World Quest</string>
<string name="inn_description">Bisogno di una pausa ? Riposati alla locanda di Daniel per mettere in pausa le meccaniche di gioco più difficili di Habitica:\n\n
• Le Daily non completate non faranno diminuire la tua salute\n

2
Habitica/res/values-iw/strings.xml
View file

@ -248,7 +248,7 @@
<string name="use_animal">השתמשו</string>
<string name="feed">האכילו</string>
<string name="hatch_with">הבקיעו חיית מחמד עם %s</string>
<string name="hatched_pet_title">הבקעתם %1s!</string>
<string name="hatched_pet_title">הבקעתם %1$s %2$s!</string>
<string name="close">סיגרו</string>
<string name="share">שתפו</string>
<string name="notification_pet_fed">האכלתם את ה %s שלכם!</string>

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

@ -301,17 +301,17 @@
<string name="use_animal">連れていく</string>
<string name="feed">えさをやる</string>
<string name="hatch_with">%s でペットをかえす</string>
<string name="hatched_pet_title">%sが生まれた!</string>
<string name="hatched_pet_title">%1$s %2$sが生まれた!</string>
<string name="evolved_pet_title">%sを手なずけた！さあ、乗ってみよう！</string>
<string name="close">閉じる</string>
<string name="share">共有する</string>
<string name="notification_pet_fed">%sにえさをやった!</string>
<string name="notification_purchase">%sを購入しました</string>
<string name="notification_purchase_reward">報酬をを購入しました</string>
<string name="sectionpets">ふつうの</string>
<string name="sectionpremiumPets">魔法の薬</string>
<string name="sectionquestPets">クエスト</string>
<string name="sectionspecialPets">レアな</string>
<string name="sectiondrop">ふつうの</string>
<string name="sectionpremium">魔法の薬</string>
<string name="sectionquest">クエスト</string>
<string name="sectionspecial">レアな</string>
<string name="sectionmounts">ふつうの</string>
<string name="sectionpremiumMounts">魔法の薬</string>
<string name="sectionquestMounts">クエスト</string>

10
Habitica/res/values-ko/strings.xml
View file

@ -297,16 +297,16 @@
<string name="use_animal">사용</string>
<string name="feed">먹이주기</string>
<string name="hatch_with">%s 으로 펫 부화</string>
<string name="hatched_pet_title">당신은 %s 를 부화시켰습니다!</string>
<string name="hatched_pet_title">당신은 %1$s %2$s 를 부화시켰습니다!</string>
<string name="close">닫기</string>
<string name="share">나누기</string>
<string name="notification_pet_fed">%s 에게 먹이를 줬습니다!</string>
<string name="notification_purchase">%s 를 구매했습니다</string>
<string name="notification_purchase_reward">보상을 구매했습니다</string>
<string name="sectionpets">기본 펫</string>
<string name="sectionpremiumPets">마법물약 펫</string>
<string name="sectionquestPets">퀘스트 펫</string>
<string name="sectionspecialPets">희귀 펫</string>
<string name="sectiondrop">기본 펫</string>
<string name="sectionpremium">마법물약 펫</string>
<string name="sectionquest">퀘스트 펫</string>
<string name="sectionspecial">희귀 펫</string>
<string name="sectionmounts">기본 탑승펫</string>
<string name="sectionpremiumMounts">마법 물약 탑승펫</string>
<string name="sectionquestMounts">퀘스트 탑승펫</string>

2
Habitica/res/values-lt/strings.xml
View file

@ -255,7 +255,7 @@
<string name="use_animal">Naudoti</string>
<string name="feed">Maitinti</string>
<string name="hatch_with">Užauginti gyvūną su %s</string>
<string name="hatched_pet_title">Užauginai %s!</string>
<string name="hatched_pet_title">Užauginai %1$s %2$s!</string>
<string name="close">Uždaryti</string>
<string name="share">Dalintis</string>
<string name="notification_pet_fed">Pašėrei savo %s!</string>

10
Habitica/res/values-nl/strings.xml
View file

@ -300,17 +300,17 @@
<string name="use_animal">Gebruik</string>
<string name="feed">Voeder</string>
<string name="hatch_with">Laat huisdier uitkomen met %s</string>
<string name="hatched_pet_title">Je hebt een %s laten uitkomen!</string>
<string name="hatched_pet_title">Je hebt een %1$s %2$s laten uitkomen!</string>
<string name="evolved_pet_title">Je hebt %s afgericht, laten we een ridje maken!</string>
<string name="close">Sluiten</string>
<string name="share">Delen</string>
<string name="notification_pet_fed">Je hebt je %s gevoederd!</string>
<string name="notification_purchase">Je hebt %s gekocht</string>
<string name="notification_purchase_reward">Je hebt een beloning gekocht</string>
<string name="sectionpets">Standaard</string>
<string name="sectionpremiumPets">Toverdrankje</string>
<string name="sectionquestPets">Queeste</string>
<string name="sectionspecialPets">Zeldzaam</string>
<string name="sectiondrop">Standaard</string>
<string name="sectionpremium">Toverdrankje</string>
<string name="sectionquest">Queeste</string>
<string name="sectionspecial">Zeldzaam</string>
<string name="sectionmounts">Standaard</string>
<string name="sectionpremiumMounts">Magisch Drankje</string>
<string name="sectionquestMounts">Queeste</string>

10
Habitica/res/values-pl/strings.xml
View file

@ -292,16 +292,16 @@
<string name="use_animal">Użyj</string>
<string name="feed">Nakarm</string>
<string name="hatch_with">Wykluj za pomocą %s</string>
<string name="hatched_pet_title">Wyklułeś/as %s!</string>
<string name="hatched_pet_title">Wyklułeś/as %1$s %2$s!</string>
<string name="close">Zamknij</string>
<string name="share">Podziel się</string>
<string name="notification_pet_fed">Nakarmiłeś/aś %s!</string>
<string name="notification_purchase">Kupiłeś %s</string>
<string name="notification_purchase_reward">Kupiłeś nagrodę</string>
<string name="sectionpets">Standardowe</string>
<string name="sectionpremiumPets">Eliksir Magiczny</string>
<string name="sectionquestPets">Misja</string>
<string name="sectionspecialPets">Rzadkie</string>
<string name="sectiondrop">Standardowe</string>
<string name="sectionpremium">Eliksir Magiczny</string>
<string name="sectionquest">Misja</string>
<string name="sectionspecial">Rzadkie</string>
<string name="sectionmounts">Standardowe</string>
<string name="sectionpremiumMounts">Eliksir Magiczny</string>
<string name="sectionquestMounts">Misja</string>

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

@ -300,17 +300,17 @@
<string name="use_animal">Usar</string>
<string name="feed">Alimentar</string>
<string name="hatch_with">Chocar mascote com %s</string>
<string name="hatched_pet_title">Você chocou um %s!</string>
<string name="hatched_pet_title">Você chocou um %1$s %2$s!</string>
<string name="evolved_pet_title">Você domou %s, vamos dar um passeio !</string>
<string name="close">Fechar</string>
<string name="share">Compartilhar</string>
<string name="notification_pet_fed">Você alimentou seu %s!</string>
<string name="notification_purchase">Você comprou %s</string>
<string name="notification_purchase_reward">Você comprou uma recompensa</string>
<string name="sectionpets">Base</string>
<string name="sectionpremiumPets">Poção Mágica</string>
<string name="sectionquestPets">Missão</string>
<string name="sectionspecialPets">Especial</string>
<string name="sectiondrop">Base</string>
<string name="sectionpremium">Poção Mágica</string>
<string name="sectionquest">Missão</string>
<string name="sectionspecial">Especial</string>
<string name="sectionmounts">Base</string>
<string name="sectionpremiumMounts">Poção Mágica</string>
<string name="sectionquestMounts">Missão</string>

10
Habitica/res/values-pt-rPT/strings.xml
View file

@ -283,16 +283,16 @@
<string name="use_animal">Usar</string>
<string name="feed">Alimentar</string>
<string name="hatch_with">Nascimento do animal com %s</string>
<string name="hatched_pet_title">Chocou um %s!</string>
<string name="hatched_pet_title">Chocou um %1$s %2$s!</string>
<string name="close">Fechar</string>
<string name="share">Partilhar</string>
<string name="notification_pet_fed">Alimentou o seu %s!</string>
<string name="notification_purchase">Comprou %s</string>
<string name="notification_purchase_reward">Comprou uma recompensa</string>
<string name="sectionpets">Padrão</string>
<string name="sectionpremiumPets">Porção Mágica</string>
<string name="sectionquestPets">Missão</string>
<string name="sectionspecialPets">Raro</string>
<string name="sectiondrop">Padrão</string>
<string name="sectionpremium">Porção Mágica</string>
<string name="sectionquest">Missão</string>
<string name="sectionspecial">Raro</string>
<string name="sectionmounts">Padrão</string>
<string name="sectionpremiumMounts">Porção Mágica</string>
<string name="sectionquestMounts">Missão</string>

10
Habitica/res/values-ru/strings.xml
View file

@ -298,17 +298,17 @@
<string name="use_animal">Использовать</string>
<string name="feed">Покормить</string>
<string name="hatch_with">Вылупить питомца с помощью %s</string>
<string name="hatched_pet_title">У вас вылупился %s!</string>
<string name="hatched_pet_title">У вас вылупился %1$s %2$s!</string>
<string name="evolved_pet_title">"Вы приручили %s, пора покататься! "</string>
<string name="close">Закрыть</string>
<string name="share">Поделиться</string>
<string name="notification_pet_fed">Вы покормили вашего %s!</string>
<string name="notification_purchase">Вы купили %s</string>
<string name="notification_purchase_reward">Вы купили награду</string>
<string name="sectionpets">Обычные</string>
<string name="sectionpremiumPets">Магический эликсир</string>
<string name="sectionquestPets">Квест</string>
<string name="sectionspecialPets">Редкие питомцы</string>
<string name="sectiondrop">Обычные</string>
<string name="sectionpremium">Магический эликсир</string>
<string name="sectionquest">Квест</string>
<string name="sectionspecial">Редкие питомцы</string>
<string name="sectionmounts">Основные скакуны</string>
<string name="sectionpremiumMounts">Магический эликсир</string>
<string name="sectionquestMounts">Квест</string>

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

@ -300,17 +300,17 @@
<string name="use_animal">Kullan</string>
<string name="feed">Besle</string>
<string name="hatch_with">Evcil hayvanı %s ile üret</string>
<string name="hatched_pet_title">%s ürettin!</string>
<string name="hatched_pet_title">%1$s %2$s ürettin!</string>
<string name="evolved_pet_title">Bir %s ehlileştirdin.</string>
<string name="close">Kapat</string>
<string name="share">Paylaş</string>
<string name="notification_pet_fed">%s besledin!</string>
<string name="notification_purchase">%s satın aldın</string>
<string name="notification_purchase_reward">Bir ödül satın aldın</string>
<string name="sectionpets">Standart</string>
<string name="sectionpremiumPets">Büyülü İksir </string>
<string name="sectionquestPets">Görev</string>
<string name="sectionspecialPets">Nadir</string>
<string name="sectiondrop">Standart</string>
<string name="sectionpremium">Büyülü İksir </string>
<string name="sectionquest">Görev</string>
<string name="sectionspecial">Nadir</string>
<string name="sectionmounts">Standart</string>
<string name="sectionpremiumMounts">Büyülü İksir </string>
<string name="sectionquestMounts">Görev</string>

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

@ -298,17 +298,17 @@
<string name="use_animal">用</string>
<string name="feed">餵</string>
<string name="hatch_with">用 %s 孵化寵物</string>
<string name="hatched_pet_title">你孵化了一隻 %s！</string>
<string name="hatched_pet_title">你孵化了一隻 %1$s %2$s！</string>
<string name="evolved_pet_title">你馴服了%s，讓我們騎上牠吧！</string>
<string name="close">關閉</string>
<string name="share">分享</string>
<string name="notification_pet_fed">你餵食了你的%s！</string>
<string name="notification_purchase">你購買了%s</string>
<string name="notification_purchase_reward">你購買了一個獎勵</string>
<string name="sectionpets">基本寵物</string>
<string name="sectionpremiumPets">神奇藥水寵物</string>
<string name="sectionquestPets">劇情任務寵物</string>
<string name="sectionspecialPets">稀有寵物</string>
<string name="sectiondrop">基本寵物</string>
<string name="sectionpremium">神奇藥水寵物</string>
<string name="sectionquest">劇情任務寵物</string>
<string name="sectionspecial">稀有寵物</string>
<string name="sectionmounts">基本坐騎</string>
<string name="sectionpremiumMounts">神奇藥水坐騎</string>
<string name="sectionquestMounts">劇情任務坐騎</string>

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

@ -302,17 +302,17 @@
<string name="use_animal">使用</string>
<string name="feed">喂食</string>
<string name="hatch_with">用%s孵化宠物</string>
<string name="hatched_pet_title">你孵化了一个 %s！</string>
<string name="hatched_pet_title">你孵化了一个 %1$s %2$s！</string>
<string name="evolved_pet_title">您驯服了%s，我们去骑一圈吧！</string>
<string name="close">关闭</string>
<string name="share">分享</string>
<string name="notification_pet_fed">你喂食了你的%s！</string>
<string name="notification_purchase">你购买了%s</string>
<string name="notification_purchase_reward">你购买了一个奖励</string>
<string name="sectionpets">基本宠物</string>
<string name="sectionpremiumPets">神奇药水宠物</string>
<string name="sectionquestPets">剧情任务宠物</string>
<string name="sectionspecialPets">稀有宠物</string>
<string name="sectiondrop">基本宠物</string>
<string name="sectionpremium">神奇药水宠物</string>
<string name="sectionquest">剧情任务宠物</string>
<string name="sectionspecial">稀有宠物</string>
<string name="sectionmounts">基本坐骑</string>
<string name="sectionpremiumMounts">神奇药水坐骑</string>
<string name="sectionquestMounts">剧情任务坐骑</string>

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

@ -329,7 +329,7 @@
<string name="use_animal">Use</string>
<string name="feed">Feed</string>
<string name="hatch_with">Hatch pet with %s</string>
<string name="hatched_pet_title">You hatched a %s!</string>
<string name="hatched_pet_title">You hatched a %1$s %2$s!</string>
<string name="evolved_pet_title">You have tamed %s, let\'s go for a ride!</string>
<string name="close">Close</string>
<string name="share">Share</string>

7
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt
View file

@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.helpers
import android.os.Bundle
import androidx.navigation.NavController
import androidx.navigation.NavDirections
import java.lang.IllegalArgumentException
import java.lang.ref.WeakReference
import java.util.*
@ -18,14 +19,18 @@ object MainNavigationController {
fun navigate(transactionId: Int, args: Bundle? = null) {
if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
lastNavigation = Date()
navController?.get()?.navigate(transactionId, args)
try {
navController?.get()?.navigate(transactionId, args)
} catch (_: IllegalArgumentException) {}
}
}
fun navigate(directions: NavDirections) {
if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) {
lastNavigation = Date()
try {
navController?.get()?.navigate(directions)
} catch (_: IllegalArgumentException) {}
}
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
View file

@ -209,7 +209,6 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
val egg = hatchingItem as Egg
hatchPetSubject.onNext(Pair(firstItem, egg))
}
fragment?.dismiss()
} else if (isFeeding) {
val event = FeedCommand()
event.usingPet = feedingPet
@ -217,7 +216,6 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection<OwnedItem>?, autoUpdate:
EventBus.getDefault().post(event)
fragment?.dismiss()
}
}
}
}

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
View file

@ -192,6 +192,7 @@ class ItemRecyclerFragment : BaseFragment() {
private fun hatchPet(potion: HatchingPotion, egg: Egg) {
compositeSubscription.add(this.inventoryRepository.hatchPet(egg, potion) {
dismiss()
val petWrapper = View.inflate(context, R.layout.pet_imageview, null) as? FrameLayout
val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.data.ApiClient
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.TaskRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.extensions.setScaledPadding
import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.SoundManager
@ -217,6 +218,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
recyclerView.setScaledPadding(context, 0, 0, 0, 48)
recyclerView.adapter = recyclerAdapter as? androidx.recyclerview.widget.RecyclerView.Adapter<*>
recyclerAdapter?.filter()

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
View file

@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.TaskFilterHelper
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
@ -37,6 +38,13 @@ class TasksFragment : BaseMainFragment() {
private var filterMenuItem: MenuItem? = null
override var user: User?
get() = super.user
set(value) {
super.user = value
viewFragmentsDictionary?.values?.forEach { it.user = value }
}
private val activeFragment: TaskRecyclerViewFragment?
get() = viewFragmentsDictionary?.get(viewPager?.currentItem)

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
View file

@ -87,7 +87,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
animateButtonTap()
true
}
addButton.setOnTouchListener { v, event ->
addButton.setOnTouchListener { _, event ->
if (event.action == MotionEvent.ACTION_DOWN) {
val animX = ObjectAnimator.ofFloat(addButton, "scaleX", 1f, 1.1f)
animX.duration = 100

10
Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
View file

@ -50,12 +50,10 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
HabitButtonWidgetProvider.class);
int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
for (int widgetId : allWidgetIds) {
Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
appWidgetManager.partiallyUpdateAppWidget(widgetId,
sizeRemoteViews(context, options, widgetId));
}
for (int widgetId : allWidgetIds) {
Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
appWidgetManager.partiallyUpdateAppWidget(widgetId,
sizeRemoteViews(context, options, widgetId));
}
// Build the intent to call the service

26
Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
View file

@ -4,6 +4,8 @@ import com.habitrpg.android.habitica.BuildConfig;
import com.habitrpg.android.habitica.models.inventory.Mount;
import com.habitrpg.android.habitica.models.inventory.Pet;
import com.habitrpg.android.habitica.models.user.Items;
import com.habitrpg.android.habitica.models.user.OwnedMount;
import com.habitrpg.android.habitica.models.user.OwnedPet;
import com.habitrpg.android.habitica.models.user.User;
import org.junit.Before;
@ -30,12 +32,12 @@ public class UserTest {
@Test
public void getPetsFoundCount_shouldReturnSumOfAllPetEntries() {
RealmList<Pet> pets = new RealmList<>();
pets.add(new Pet());
pets.add(new Pet());
pets.add(new Pet());
pets.add(new Pet());
pets.add(new Pet());
RealmList<OwnedPet> pets = new RealmList<>();
pets.add(new OwnedPet());
pets.add(new OwnedPet());
pets.add(new OwnedPet());
pets.add(new OwnedPet());
pets.add(new OwnedPet());
user.getItems().setPets(pets);
assertEquals(5, user.getPetsFoundCount());
@ -48,12 +50,12 @@ public class UserTest {
@Test
public void getMountsTamedCount_shouldReturnSumOfAllMountEntries() {
RealmList<Mount> mounts = new RealmList<>();
mounts.add(new Mount());
mounts.add(new Mount());
mounts.add(new Mount());
mounts.add(new Mount());
mounts.add(new Mount());
RealmList<OwnedMount> mounts = new RealmList<>();
mounts.add(new OwnedMount());
mounts.add(new OwnedMount());
mounts.add(new OwnedMount());
mounts.add(new OwnedMount());
mounts.add(new OwnedMount());
user.getItems().setMounts(mounts);
assertEquals(5, user.getMountsTamedCount());