diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml index c8bb120d4..b198315e3 100644 --- a/Habitica/AndroidManifestTesting.xml +++ b/Habitica/AndroidManifestTesting.xml @@ -115,7 +115,7 @@ android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> - + diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro index 038acf3b3..80cc5c85e 100644 --- a/Habitica/proguard-rules.pro +++ b/Habitica/proguard-rules.pro @@ -74,9 +74,6 @@ -dontwarn javax.** -dontwarn io.realm.** -#support library --keep class android.support.v7.widget.SearchView { *; } - #eventbus -keepclassmembers class ** { @org.greenrobot.eventbus.Subscribe ; diff --git a/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml b/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml deleted file mode 100644 index 1185bd5fe..000000000 --- a/Habitica/res/drawable-v21/bb_bottom_bar_item_container.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable-v21/ic_close_white_24dp.xml b/Habitica/res/drawable-v21/ic_close_white_24dp.xml deleted file mode 100644 index 4881cf5be..000000000 --- a/Habitica/res/drawable-v21/ic_close_white_24dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Habitica/res/drawable/bb_bottom_bar_top_shadow.xml b/Habitica/res/drawable/bb_bottom_bar_top_shadow.xml deleted file mode 100644 index fd78efcf7..000000000 --- a/Habitica/res/drawable/bb_bottom_bar_top_shadow.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/challenge_gem_remove_button.xml b/Habitica/res/drawable/challenge_gem_remove_button.xml index 6b0b2d3e5..c0816d931 100644 --- a/Habitica/res/drawable/challenge_gem_remove_button.xml +++ b/Habitica/res/drawable/challenge_gem_remove_button.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml index 4fe107bcd..1f440f35e 100644 --- a/Habitica/res/layout/activity_gift_gems.xml +++ b/Habitica/res/layout/activity_gift_gems.xml @@ -4,9 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/content_background"> - - - - - - \ No newline at end of file diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml index 52ddfd4ba..8ace229ee 100644 --- a/Habitica/res/layout/fragment_support_main.xml +++ b/Habitica/res/layout/fragment_support_main.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/Habitica/res/layout/no_notifications.xml b/Habitica/res/layout/no_notifications.xml index 1e14fd4cd..13ec53a0e 100644 --- a/Habitica/res/layout/no_notifications.xml +++ b/Habitica/res/layout/no_notifications.xml @@ -1,20 +1,13 @@ - - - + android:layout_weight="1" + android:orientation="vertical" + android:paddingLeft="@dimen/spacing_medium" + android:paddingTop="44dp" + android:paddingRight="@dimen/spacing_medium"> - - - diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml index cc63e3840..c0cb26661 100644 --- a/Habitica/res/layout/shop_header.xml +++ b/Habitica/res/layout/shop_header.xml @@ -1,7 +1,6 @@ - @@ -40,4 +39,4 @@ android:layout_marginBottom="4dp" style="@style/Body1" tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." /> - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/menu/menu_list_challenges.xml b/Habitica/res/menu/menu_list_challenges.xml index d826b3520..5ad31dec2 100644 --- a/Habitica/res/menu/menu_list_challenges.xml +++ b/Habitica/res/menu/menu_list_challenges.xml @@ -11,8 +11,7 @@ android:id="@+id/action_reload" android:icon="@drawable/ic_refresh_white" android:title="@string/action_refresh" - app:showAsAction="never" - android:actionViewClass="android.widget.ImageButton"/> + app:showAsAction="never" /> - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-be/strings.sidebar.xml b/Habitica/res/values-be/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-be/strings.sidebar.xml +++ b/Habitica/res/values-be/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-be/strings.tutorial.xml b/Habitica/res/values-be/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-be/strings.tutorial.xml +++ b/Habitica/res/values-be/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-be/strings.xml b/Habitica/res/values-be/strings.xml index e21d72c94..73d79c395 100755 --- a/Habitica/res/values-be/strings.xml +++ b/Habitica/res/values-be/strings.xml @@ -9,9 +9,7 @@ Актываваць напамін Наладзіць час напаміну - Вартасьць Рэдагаваць - Выдаліць Адмяніць Падлучыцца Зарэгістравацца @@ -21,14 +19,12 @@ Электронная пошта Пацьвердзіць пароль Выйсьці - Адрадзіцца Інфармацыя Ацаніце нашу прыладу Вы не падлучаныя да інтэрнэту. Ваша імя карыстальніка і/альбо пароль былі ўведзеныя не правільна. Захаваць - Што X дзён Панядзелак Аўторак Серада @@ -36,19 +32,13 @@ Пятніца Субота Нядзеля - Ура! Не адчайвайцеся! - Дадаць - Неўзабаве - Паскардзіцца на паведамленьне Набыць Чат Удзельнікі Звычкі Штодзённыя заданьні Узнагароды - Дакладна? - Вы напраўду хочаце выдаліць? Так Не Квэст @@ -56,7 +46,6 @@ Валасы Цішотка Скура - Зьвярыныя вушы Аснова Колер Барада @@ -72,10 +61,6 @@ Адмовіцца Пачаць квэст Адмяніць запрашэньне - Пакінуць квэст - Згадзіліся - Адмовіліся - Удзельнікі Ясна! Напомніць мне яшчэ раз Прапусьціць @@ -91,10 +76,7 @@ Гільдыя Выйсьці Далучыцца - Лідэр Каштоўныя камяні - Даслаць прыватнае паведамленьне - Паскардзіцца Выдаліць Імя Апісаньне diff --git a/Habitica/res/values-bg/strings.sidebar.xml b/Habitica/res/values-bg/strings.sidebar.xml index 4e20255b3..67dc9a364 100644 --- a/Habitica/res/values-bg/strings.sidebar.xml +++ b/Habitica/res/values-bg/strings.sidebar.xml @@ -6,7 +6,6 @@ Съобщения Кръчма Група - Купуване на диаманти Гилдии Предизвикателства Инвентар diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml index 3b1fb948c..c368b737f 100644 --- a/Habitica/res/values-bg/strings.xml +++ b/Habitica/res/values-bg/strings.xml @@ -373,9 +373,6 @@ За абонирането си получавате следните полезни неща: Състояние на абонамента Напускане на предизвикателството - Наистина ли искате да напуснете предизвикателството „%s“? - Премахване на задачите - Искате ли да премахнете задачите? Премахване Задържане Моите предизвикателства @@ -670,8 +667,6 @@ Изпращане на подаръка Сървър Подаръкът Ви беше изпратен! - Подареният от Вас абонамент беше изпратен, и Вие също получихте абонамент! - Подареният от Вас абонамент беше изпратен, и Вие също получихте абонамент. Откриване Щетите са спрени Известия diff --git a/Habitica/res/values-ca/strings.profile.xml b/Habitica/res/values-ca/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ca/strings.profile.xml +++ b/Habitica/res/values-ca/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ca/strings.sidebar.xml b/Habitica/res/values-ca/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ca/strings.sidebar.xml +++ b/Habitica/res/values-ca/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ca/strings.tutorial.xml b/Habitica/res/values-ca/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ca/strings.tutorial.xml +++ b/Habitica/res/values-ca/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ca/strings.xml b/Habitica/res/values-ca/strings.xml index 4e0b4744f..cfaf26383 100755 --- a/Habitica/res/values-ca/strings.xml +++ b/Habitica/res/values-ca/strings.xml @@ -4,17 +4,14 @@ Experiència Salut Mannà - No s\'han pogut carregar les preferències a partir de codi de barres Configuració - El teu servidor personalitzat ID d\'usuari El teu ID d\'usuari Token d\'API El teu token d\'API Idioma Canvia l\'idioma d\'Habitica - El teu codi QR Contacta\'m Compte Primer dia de la setmana @@ -23,7 +20,6 @@ Activar recordatori Establir hora de recordatori Inici del dia personalitzat - Personalitza l\'hora d\'inici del dia Notificacions automàtiques d\'usuari Notificacions automàtiques Configura les notificacions automàtiques @@ -36,9 +32,7 @@ La teva Missió ha començat Convidat a una Missió - Valor Editar - Eliminar Cancelar Iniciar sessió Registrar-se @@ -49,20 +43,15 @@ Confirmar contrasenya Tancar sessió Tanca la sessió del teu compte - Detalls del compte Benvingut - Reviure - Si us plau connectat a través de la aplicació abans d\'utilitzar un widget Informació Biblioteca - Historials de versions Habitica està disponible com a software de codi obert en Github Califica la nostra aplicació Envia\'ns els teus comentaris! Notificar un error Codi font - Error de connexió No estàs connectat a internet. Sembla que hi ha un problema amb el servidor. Torna-ho a intentar més tard. Error d\'autenticació @@ -73,7 +62,6 @@ Guardar Copiar Notes - Text Dificultat Etiquetes Trivial @@ -85,11 +73,7 @@ Negatiu ( - ) Llistat Recordatoris - Accions Atributs - Freqüència - Certs dies de la setmana - Cada X dies Dilluns Dimarts Dimecres @@ -97,23 +81,14 @@ Divendres Dissabte Diumenge - Hurra! No desesperis! T\'has quedat sense salut! Reomplir la salut i intentar un altre cop Filtrar - Imatge de perfil - %d PM - Has usat %1$s per %2$d de manà. Has emprat %1$s. Nou element de la llista - Afegir Utilitzant l\'habilitat - Pròximament - Estàs segur que vols denunciar aquest missatge per incomplir les normes? - Marcar missatge Es desbloqueja al nivell 11 - No estàs en un grup. Per unir-te a un grup, si us plau visita la pàgina web. M\'he oblidat de la contrasenya Reactiva les tasques diàries Pausa les tasques diàries @@ -126,8 +101,6 @@ Tasques diàries Tasques pendents Recompenses - Estàs segur? - Segur que vols esborrar-ho? Sí No Missió @@ -135,14 +108,12 @@ Cabell Samarreta Pell - Orelles d\'animals Base Color Barba Bigoti Flor Serrells - Res seleccionat Mida Prim Ample @@ -157,21 +128,13 @@ Començar Missió Cancel·lar Invitació Avortar Missió - Abandonar Missió - Pendent - Acceptat - Rebutjat - Participants Versió %1$s (%2$d) Ajuda & FAQ D\'acord! Recorda\'m altre cop No perdis de vista els teus objectius amb l\'ajuda dels teus amics. Doneu-vos suport mutu en la vida i en la batalla mentre milloreu junts! - Anterior Següent Saltar - Benvingut a Habitica, on avançar en el joc millorarà la teva vida real! Mentre aconsegueixes objectius del món real, desbloquejaràs equipament, mascotes, missions i més. - Benvingut Feina Exercici Escola @@ -199,26 +162,18 @@ Estudiar fins a dominar la tècnica Treballar en projecte creatiu Acabar projecte creatiu - Vols ajudar-nos a mantenir Habitica funcionant? Pots donar suport als desenvolupadors comprant gemmes! \n\nLes Gemmes et permeten comprar articles addicionals pel teu compte, incloent: \n\n - Fantàstics vestits per el teu personatge\n - Increïbles fons\n - Divertides missions que et recompensen amb mascotes\n - L\'habilitat de canviar de classe abans del nivell 100\n\nMoltes gràcies per ajudar-nos a fer Habitica el millor possible. El teu suport significa molt per nosaltres! Els meus Gremis Gremis Publics Gremi Abandonar Unir-se - Líder Gemmes - Envia PM - Marcar Eliminar Nom Descripció Privacitat Escriu Missatge - Publica Cercar Gremis - Caduca: %s - ratxa actual: %d - La tasca te data de caducitat Roba de batalla Vestit Cap @@ -232,8 +187,6 @@ Disfressa\'t Equipat Estàs segur que vols cancel·lar aquesta missió? No es recuperarà cap invitació acceptada. El propietari de la Missió mantindrà el rotlle de la Missió. - Invitació a una missió - T\'han invitat a participar en una missió! Avui Objectes Ous @@ -245,12 +198,8 @@ Has trobat una peça d\'equipament rar a l\'Armari: %s! Genial! Rebusques a l\'Armari i trobes %1$s %2$s. Què fa això aquí? Et baralles amb l\'Armari i ganes experiència. Va! - Obre l\'armari per rebre equipament especial, experiència o menjar! Peces d\'equipament restants: %d - Has trobat l\'última peça d\'equipament rar a l\'armari encantat. - L\'armari tindrà equipament nou a la primera setmana de cada mes. Fins aleshores, segueix fent clic per experiència i menjar! Ven (%d Or) Eclosione-ho amb una poció - Alimenta la mascota Eclosione-ho amb un ou Invitar grup Alimenta el %s amb: @@ -274,7 +223,6 @@ Els curadors són resistents al dany, i extenen aquella protecció a altres. Les tasques diàries fallades i els mals hàbits no els molesten massa, i tenen maneres de recuperar salut del fracàs. Juga com a curador si gaudeixes ajudant a altres al teu grup, o si la idea de burlar la Mort amb treball dur t\'inspira! Selecciona Classe No optar per res - No t\'identifiques amb cap classe? Vols escollir més tard? Pots no optar res - seràs un guerrer sense habilitats especials. Pots llegir sobre el sistema de classes més tard a la wiki i activar-les a qualsevol moment. Segur que vols ser un %s? Ara ets un %s! Tens un nou Equip de Batalla per defecte que pots canviar a Equipament. @@ -288,12 +236,9 @@ Invita usuaris existents Envia Invita amics - Si tens amics que ja utilitzen Habitica, invita\'ls amb la ID d\'usuari aquí. Si un amic es registra a Habitica a través del teu email, seran invitats a la teva colla automàticament! Afegir invitacions - ID d\'usuari Correu electrònic - Invita a la colla Compartir ús He arribat al nivell %d a Habitica millorant els meus hàbits de la vida real! He fet sortir de l\'ou a una mascota %1$s %2$s a Habitica completant les meves tasques de la vida real! @@ -301,42 +246,19 @@ Obrir a la play store Estàs segur que vols canviar de classe? Això et costarà 3 gemmes. Advertència: Ja no podràs comprar més equip per a la classe %s. - Missatge de %1$s - Líder: %1$s Confirmar Mercat Viatgers del Temps Botiga Estacional Desbloquejar convidant a amics - No tens suficient or - No necessites comprar una poció de salut - Comfirmar compra - Comprar %1$s per %2$s %3$s - gemma - rellotge de sorra - rellotges de sorra - or or Missatge copiat al porta-retalls - Copiar al porta-retalls - Modificar etiqueta Editar - Fet - Esborrar Estàs segur? Segur que vols esborrar-ho? - Modificar etiquetes - Filtrar per etiquetes - Fes que et convidin amb aquest codi QR - Codi QR guardat a - El teu codi QR - Descarrega - Envia un nou missatge Escull el receptor del missatge Continua - Escaneja el codi QR - Escriu l\'ID d\'usuari del receptor T\'han convidat a unir-te a una colla! Estadístiques d\'Habitica Afegir Tasca @@ -347,7 +269,6 @@ Has completat totes les teves tasques diàries. Ben fet! Habitica Marca l\'Hàbit Habitica Tasques Diaries - Habitica Afegir Tasca No s\'han trobat els serveis de Google Play. Comprar Comprar gemmes dóna suport als desenvolupadors i ajuda a que Habitica segueixi funcionant @@ -403,37 +324,23 @@ 12 mesos Estàs rebent aquests útils beneficis per haver-te subscrit: Estat de la subscripció - per %s - Detalls del Repte Abandonar Repte - Estàs segur que vols deixar el Repte \"%s\"? Els meus Reptes - Públic - Reptes Tasca Diària Hàbit Recompensa Tasca Pendent Oficial - Participant Repte - Ves al Repte Ara mateix no formes part de cap Repte! Uneix-te a un Repte per a afegir un selecte grup de tasques a la teva llista, i després competeix contra altres Habiticans per a guanyar fites i, fins i tot, gemmes! Ves a la pestanya \"Públic\" per a trobar els Reptes, creats per usuàris, que s\'adapten millor a tu! - Afegeix un Recordatori - Advertència - Obre la Configuració - Sembla que tens l\'opció de desenvolupador \\"No mantenir Activitats\\" activada. Actualment, aquesta opció causa problemes amb l\'applicació d\'habitica, així que et suggerim que la desactivis. - Preguntes Freqüents Especial Com que estàs subscrit a Habitica, pots comprar un cert nombre de Gemmes cada mes emprant Or. - queden %d Gemma Objecte Misteriós Cada mes, els subscriptors rebràn un objecte misteriós. Normalment es publica una setmana abans de la fi del mes. Obrir - Obres la capsa i hi trobes %s! Has guanyat un/a %1$s com a recompensa per a la teva devoció per millorar la teva vida. El pròxim premi es desbloquejarà d\'aquí a %1$d inicis de sessió diff --git a/Habitica/res/values-cs/strings.profile.xml b/Habitica/res/values-cs/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-cs/strings.profile.xml +++ b/Habitica/res/values-cs/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-cs/strings.sidebar.xml b/Habitica/res/values-cs/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-cs/strings.sidebar.xml +++ b/Habitica/res/values-cs/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-cs/strings.tutorial.xml b/Habitica/res/values-cs/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-cs/strings.tutorial.xml +++ b/Habitica/res/values-cs/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-cs/strings.xml b/Habitica/res/values-cs/strings.xml index fcc2b7abd..057605c66 100755 --- a/Habitica/res/values-cs/strings.xml +++ b/Habitica/res/values-cs/strings.xml @@ -4,19 +4,15 @@ Zkušenosti Zdraví Mana - Preference nebylo možné načíst z čárového kódu. Nastavení - Vlastní server Uživatelské ID Tvoje uživatelské ID API Token Tvůj API Token Jazyk Změnit jazyk v Habitica - Tvůj QR kód Kontaktovat mě - Došlo k chybě... Účet První den v týdnu První den v týdnu ve všech kalendářích @@ -24,7 +20,6 @@ Aktivovat připomínku Nastavit čas připomínky Vlastní začátek dne - Nastavit vlastní začátek dne Uživatelské oznámení Oznámen Nastav si notifikace @@ -37,13 +32,7 @@ Tvoje výprava začala Pozván na výpravu - Hodnota - Nový úkol - Nová odměna - Nový denní úkol - Nový zvyk Upravit - Smazat Zrušit Přihlásit Registrovat @@ -54,21 +43,8 @@ Heslo ještě jednou Odhlásit Odhlásit se z tvého účtu - Detaily účtu Vítej - Oživit - Nejdříve se připoj v aplikaci, než použiješ widget. - O nás - Knihovny - Historie verzí - Habitica je dostupná jako open source software na Github - Ohodnoťte tuto aplikaci - Napište nám svůj názor! - Ohlaste chybu - Zdrojový kód - Opakovat každý - Chyba připojení Nejste připojeni k internetu. Bylo přerušeno spojení se serverem Chyba přihlášení @@ -78,7 +54,6 @@ Uložit Zkopírovat Poznámky - Text Obtížnost Štítky Velmi lehké @@ -90,18 +65,7 @@ Záporné ( - ) Seznam Připomínky - Akce Vlastnosti - Síla - Inteligence - Obrana - Vnímání - Četnost - Některé dny v týdnu - Každých X dní - Shrnutí - Opakuje - Opakuje se Denně Týdně Měsíčně @@ -115,30 +79,17 @@ Pátek Sobota Neděle - Jupí! Nezoufejte! Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí--Ať se ti daří. Došlo ti zdraví! Doplnit zdraví & a zkusit to znovu Filtr - Profilový obrázek - %d MP - Použil/a jsi %1$s za %2$d many. použil jsi %1$s. nová položka v seznamu - Přidat Nezapomeň si zkontrolovat svoje úkoly Použití Dovednosti - Již Brzy - Jste si jisti, že chcete nahlásit tuto zprávu pro porušení pravidel? - Nahlásit zprávu Odemknutí na úrovni 11 - Nejsi ve skupině. Pro přidání se do skupiny, prosím, navštiv webovou stránku. Zapomenuté heslo - Odejít z hostince - Odpočinout si od tvých povinností - Koupit - Opustit Skupina Chat Členové @@ -146,8 +97,6 @@ Každodenní Úkoly Odměny - Určitě? - Určitě smazat? Ano Ne Skupinový cíl @@ -155,14 +104,12 @@ Vlasy Svršek Kůže - Zvířecí uši Zadní Barva Vousy Knír Květina Přední - Nic vybraného Velikost Štíhlý Široký @@ -172,22 +119,11 @@ Koupit Koupit sadu %s Termín do - Příjmout - Odmítnout - Začít úkol - Zrušit pozvánku - Vzdát úkol - Opustit úkol - Nevyřízené - Příjmuto - Odmítnuto - Účastníci Verze %1$s (%2$d) Pomoc & FAQ Rozumím! Připomenout později Vítej v - Habitica Pokrok ve hře Pokrok v životě Odemkni herní prvky plněním svých reálných úkolů. Získej brnění, mazlíčky, a mnohem více jako odměny za dosažení svých cílů. @@ -195,11 +131,8 @@ Najdi nové přátele Mějte přehled o svých cílech s pomocí svých přátel. Podporujte se navzájem v životě i v boji a zlepšujte se společně! Pojďme začít! - Předchozí Další Přeskočit - Vítejte v Habitice, kde postup ve hře zlepší Váš život! Dosažením cílů v reálném světě odemykejte brnění, mazlíčky, skupinové cíle a mnohem víc. - Vítej Takže, jak by jsi chtěl vypadat? Neboj se, tohle můžeš později změnit. Skvělé! Teď, na čem máš zájem pracovat po celou tuto cestu? Práce @@ -230,28 +163,19 @@ Vypracovat předlohu Pracovat na kreativním projektu Dokončit kreativní projekt - Chceš pomoci udržet Habiticu v provozu? Můžeš podpořit vývojáře koupí drahokamů!\n\nDrahokamy ti umožňují kupovat zábavné doplňky, včetně: \n\n - Parádní kostýmy pro tvého avatara\n - Úžasná pozadí\n - Zábavné skupinové cíle, které tě odmění mazlíčky\n - Možnost změnit své zaměření před úrovní 100\n\nMockrát děkujeme, že pomáháte Habitice být co možná nejlepší. Tvá podpora pro nás hodně znamená! Moje cechy Veřejné cechy Cech Odejít Připojit se - Vůdce Drahokamy - Kopírovat jako Úkol - Poslat soukromou zprávu. - Vlajka Smazat Jméno Popis Přidat nový Štítek Soukromí Napsat zprávu - Zveřejnit Hledat gildy - Do: %s - Momentální combo: %d - Úkol má termín Zbroj Kostým Hlava @@ -265,8 +189,6 @@ Obléct si kostým Nasazeno Jsi si jistý že chceš tento úkol zrušit? Všechy příjmuté žádosti budou ztraceny. Majitel úkolu si ponechá jeho svitek. - Pozvánka k úkolu - Byl jsi pozván k účasti v úkolu Před 1 dnem Před 1 minutou Před %dminutama @@ -283,12 +205,8 @@ Našel jsi kousek vzácného vybavení v Airmoire: %s! Super! Prohrabeš Armoire a nalézáš %1$s %2$s. Co to tu dělá? Biješ se s Airmoire a získáváš zkušenosti. Vem si je! - Otevři Airmoire aby jsi dostal buď speciální vybavení, zkušenosti, nebo jídlo! Zbývá ti %d částí vybavení - Našel jsi poslední kousek vzácného vybavení v čarovné Airmoire. - Airmoire bude mít každý první týden v měsíci nové vybavení. Do té doby, klikej a získávej zkušenosti a jídlo. Prodat (%dZlata) Vylíhnout pomocí lektvaru - Nakrmit mazlíčka Vylíhnout s vejcem Pozvat skupinu Nakrmit %s: @@ -299,16 +217,7 @@ Zavřít Sdílet Nakrmil jsi své zvíře %s - Koupil jsi %s Koupil jsi odměnu - Standardní - Magický lektvar - Výprava - Vzácný - Standardní - Magický lektvar - Výprava - Vzácný Celosvětový úkol Potřebuješ pauzu? Přihlaš se do Danielovy krčmy pro pozastavení některých z těžších herních mechanismů Habitici:\n\n • Nesplněný denní úkol ti neublíží\n @@ -327,7 +236,6 @@ Lékaři stojí proti poškození a přenáší jejich ochranu na ostatní. Vynechané denní úkoly a špatné návyky je nějak nevytrhnou a mají vždy možnosti jak si obnovit zdraví ze selhání. Hraj za lékaře když tě baví pomáhat ostatním ve tvé družině nebo tě myšlenka obelstění smrti pomocí těžké práce inspiruje! Vybrat třìdu Neúčastnit se - Nemůžeš být obtěžovám povoláním? chceš si vybrat později? Neúčastni se - bude bojovní bez žádných speciálních schopností. Můžeš si přečíst s systému povolání pozdějí na wiki a zapnout systém povolání kdykoli chceš Opravdu chceš být %s? Nyní jsi %s! Máš novou výchozí Bojovou výzbroj, kterou si můžeš změnit ve Vybavení! @@ -342,12 +250,9 @@ Pozvat existující uživatele Odeslat Pozvat přátele - Jestli máš přátele kteří již používají Habiticu, pozvi je pomocí uživatelského ID zde. Když se přítel připojí k Habitice pomocí tvého e-mailu automaticky budou pozvání do tvé družiny! Přidat pozvánky - Uživatelské ID E-mail - Pozvat do družiny Sdílet pomocí Získal jsem úroveň %d v Habitice díky zlepšování mých zvyků v reálném životě! Zrovna jsem vylíhl mazlíčka, %1$s %2$s , v Habitice pomocí dělání mých úkolů v reálném životě. @@ -355,8 +260,6 @@ Otevřít v obchodě Play Jsi si jist, že chceš změnit povolání? Stojí to 3 diamanty. Varování: Nadále si nebudeš moct koupit výbavu z %s povolání. - Zpráva od %1$s - Vůdce: %1$s Potvrdit Obchod Cestovatelé časem @@ -365,36 +268,15 @@ Odemčít pomocí pozvání přátel Odemkni pravidelným přihlašováním se do appky Habitica Odemkni vytvořením účtu - Nemáš dostatek Zlata - Nepotřebuješ si koupit lektvar zdraví. Koupeno %1$s - Potvrdit koupi - Koupit %1$s za %2$s %3$s - Diamant - Přesýpací hodiny - Přesýpací hodiny - Zlato Zlato Zpráva zkopírována do schránky - Zkopírovat do schránky - Upravit štítek Upravit - Hotovo - Smazat Jsi si jist? Opravdu to chceš vymazat? - Upravit štítky - Filtrovat pomocí štítků - Ať tě někdo pozve pomocí tohoto QR kódu - GR kód uložen v - Tvůj QR kód - Stáhnout - Odeslat novou zprávu Vyber příjemce zprávy Pokračovat - Skenovat QR kód - Zadej uživatelské ID příjemce Byl si pozván k družině! Habitica statistiky Přidat úkol @@ -406,7 +288,6 @@ Habitica Zvyky Habitica Denní úkoly Habitica Úkolníček - Habitica přidat úkol Služba Google play nebyla nalezena. Koupit Zakoupením drahokamů podpoříš vývojáře a pomůžeš Habitice dál fungovat @@ -457,48 +338,33 @@ 12 měsíců Za předplatné obdržuješ tyto užitečné benefity: Status předplatného - o %s - Detaily výzvy Opustit výzvu - Jsi si jistý, že chceš opustit výzvu \"%s\"? - Odstranit úkoly - Chceš odstranit úkoly? Odstranit Ponechat Moje výzvy - Veřejné - Výzvy Denně Zvyk Odměna Úkol Oficiální - Účastnící se Výzva - Varování Zprávy - Často kladené otázky Speciální Protože si předplácíš program Habitica, tak můžeš koupit několik drahokamů každý měsíc za zlaťáky. - %d zbývá Drahokam Záhadný předmět Každý měsíc předplatitelé získají záhadný předmět. Ten je obvykle vypuštěn kolem posledního týdne v měsíci. Otevřít - Otevřel jsi krabici a našel jsi %s! Získal jsi %1$s jako odměnu za tvoje odhodlání zlepšit si svůj život. Tvá další odměna se odemkne za %1$d přihlášení čeká na schválení Filtry Hotovo - Skupinové úkoly nemohou být upravovány. - Nemůžeš upravit tento úkol Skupiny Všechny Žádné Vlastněno Nevlastněno - Nová\nHra Přihlásit se pomocí Facebooku Přihlásit se pomocí Google Zpět @@ -561,6 +427,6 @@ Limit 25 drahokamů Objev ještě více předmětů v Habitica s 2x větším denním limitem na kořist. Získáš královského fialového Zajdalena jako mazlíčka, jakmile se staneš novým/ou předplatitelem/kou. - Staň se předplatitelem/kou nyní a získej tuto sadu: %@, a každý měsíc obdržíš nové předměty! + Staň se předplatitelem/kou nyní a získej tuto sadu: %s, a každý měsíc obdržíš nové předměty! Staň se předplatitelem/kou nyní a získej exkluzivní sadu a každý měsíc obdržíš nové předměty! \ No newline at end of file diff --git a/Habitica/res/values-da/strings.profile.xml b/Habitica/res/values-da/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-da/strings.profile.xml +++ b/Habitica/res/values-da/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-da/strings.sidebar.xml b/Habitica/res/values-da/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-da/strings.sidebar.xml +++ b/Habitica/res/values-da/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-da/strings.tutorial.xml b/Habitica/res/values-da/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-da/strings.tutorial.xml +++ b/Habitica/res/values-da/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-da/strings.xml b/Habitica/res/values-da/strings.xml index 5bcbabe49..20f09897b 100755 --- a/Habitica/res/values-da/strings.xml +++ b/Habitica/res/values-da/strings.xml @@ -12,9 +12,7 @@ Din API Nøgle Sprog Skift Habiticas sprog - Din QR Kode Kontakt mig - Der opstod en fejl... Konto Første dag af ugen Første dag af ugen i alle kalendere @@ -22,7 +20,6 @@ Aktiver Påmindelser Sæt Påmidelses Tid Brugerdefineret Dagstart - Sæt Brugerdefineret Dagstart Bruger Push-Notifikationer Push-Notifikationer Ændre dine push-notifikationer indstillinger @@ -35,13 +32,7 @@ Din quest er startet Inviteret til Quest - Værdi - Ny To Do - Ny Belønning - Ny Daglig Opgave - Ny Vane Ret - Slet Afbryd Log ind Registrer @@ -52,21 +43,15 @@ Bekræft kodeord Log ud Log ud af din konto - Konto Detaljer Velkommen - Genopliv - Forbind venligst gennem applikationen før du bruger en widget Om Biblioteker - Udgave Historie Habitica er tilgængelig som open source software på GitHub Bedøm vores App Send us Feedback! Rapportér en fejl Kilde Kode - Gentag Hver - Forbindelsesfejl Du er ikke forbundet til internettet. Der er problemer med serveren. Prøv igen senere. Godkendelsesfejl @@ -76,7 +61,6 @@ Gem Kopier Noter - Tekst Sværhedsgrad Tags Triviel @@ -88,14 +72,7 @@ Negativ ( - ) Tjekliste Påmindelser - Handlinger Attributter - Frekvens - På specifikke ugedage - Hver X dage - Resumé - Gentagelser - Gentages På Daglig Ugentlig Månedlig @@ -109,23 +86,14 @@ Fredag Lørdag Søndag - Hurra! Frygt ikke! Du løb tør for liv! Genfyld Liv & Prøv igen Filter - Profil Billede - %d MP - Du har brugt %1$s til %2$d mana. Du har brugt %1$s. nyt tjekliste punkt - Tilføj Brug Evne - Kommer Snart - Er du sikker på, at du vil rapporterer denne overtrædelse? - Anmeld Besked Låses op for ved niv. 11 - Du er ikke i en gruppe. For at blive medlem af en gruppe, gå venligst til hjemmesiden. Glemt kodeord Genaktiver dine Daglige Sæt dine Daglige på pause @@ -138,8 +106,6 @@ Daglige To Do\'s Belønninger - Er du sikker? - Vil du virkelig slette? Ja Nej Quest @@ -147,14 +113,12 @@ Hår Trøje Hud - Dyre-øre Base Farve Skæg Overskæg Blomst Pandehår - Intet sæt Størrelse Tynd Bred @@ -169,24 +133,16 @@ Start Quest Aflys Invitation Afbryd Quest - Forlad Quest - Afventer - Accepteret - Afvist - Deltagere Version %1$s (%2$d) Hjælp & OSS Forstået! Påmind mig igen Velkommen til - Habitica Fremskridt i spillet Fremskridt i livet Lad os starte! - Tidligere Næste Spring over - Velkommen Arbejde Motion Liv @@ -213,19 +169,13 @@ Offentlige klaner Klan Forlad - Leder Ædelsten - Send PM - Anmeld Slet Navn Beskrivelse Privatliv Skriv besked Søg efter klaner - Due: %s - nuværende stribe: %d - Opgaven har en forfaldsdato Kampudstyr Kostume Hoved @@ -236,8 +186,6 @@ Skjold Våben Bær Kostume - Quest Invitation - Du er blevet inviteret til, at deltage i en quest! I dag Ting Æg @@ -278,24 +226,13 @@ Er du sikker på, at du vil fravælge? Ændre din Klasse Aktiver Klassesystem - Bruger ID E-mail Åben i play store - Besked fra %1$s - Leder: %1$s Bekræft Marked Tidsrejsende - Ikke nok Guld - Du behøver ikke at købe en en livseliksir - ædelsten - timeglas - timeglas - guld guld Ret - Færdig - Slet Er du sikker? Vil du virkelig slette? @@ -306,7 +243,6 @@ Tilføj Belønning Habitica Daglige Opgaver Habitica To Do Liste - Habitica Tilføj Opgave Køb +%d Mystisk Timeglas @@ -325,35 +261,21 @@ 12 måneder Du modtager følgende fordele for dit abonnement: Abonnement status - Udfordrings-detaljer Forlad Udfordring - Er du sikker på, at du vil forlade Udfordringen \"%s\"? Mine Udfordringer - Offentlig - Udfordringer Daglig Vane Belønning To Do Officiel - Deltager Udfordring - Gå til Udfordring - Tilføj påmindelse - Advarsel - Åben Indstillinger - Ofte Stillede Spørgsmål Special Fordi du abonnere på Habitica, kan du købe et antal Ædelsten hver måned ved at bruge Guld. - %d tilbage Ædelsten Mystisk Vare Hver måned modtager abonnenter en mystisk vare. Den er typisk frigivet ca. en uge før slutningen af måneden. Åben - Du åbner denne box og finder %s! Du har modtaget en/et %1$s som belønning for din hengivenhed til at forbedre dit liv. Din næste præmie vil åbne ved %1$d Check-ins afventer godkendelse - Gruppe opgave kan ikke redigeres. - Kan ikke redigere denne opgave diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml index 09765f579..851b3d4d6 100644 --- a/Habitica/res/values-de/strings.sidebar.xml +++ b/Habitica/res/values-de/strings.sidebar.xml @@ -6,7 +6,6 @@ Nachrichten Gasthaus Gruppe - Edelsteine & Abonnement Gilden Wettbewerbe Inventar diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml index b86056cd0..2ab6ff1c5 100644 --- a/Habitica/res/values-de/strings.xml +++ b/Habitica/res/values-de/strings.xml @@ -369,9 +369,6 @@ Du erhälst diese Vorteile für Dein Abonnement Abonnement Status Herausforderung abbrechen - Bist Du Dir sicher, dass Du die Herausforderung \"%s\" abbrechen willst\? - Aufgaben entfernen - Willst Du Deine Aufgaben wirklich entfernen\? Entfernen Behalten Meine Herausforderungen @@ -664,8 +661,6 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben. Geschenk abschicken Server Dein Geschenk wurde verschickt! - Du hast %s ein %s-monatiges Abo für Habitica geschickt und das gleiche Abo wurde Deinem Konto gutgeschrieben dank unserer \"Verschenke ein Abo und erhalte eins gratis\"-Aktion! - Du hast %s ein %s-monatiges Abo für Habitica geschickt. Entdecken Schaden pausiert Wichtige Ankündigungen @@ -706,7 +701,6 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben. Keine Internetverbindung. Quest abgeschlossen! Du nimmst nicht teil - Level %d Schließe Quest %d ab Freischalten durch Erreichen des Levels %d Freischalten durch Abschluss der Quest %d diff --git a/Habitica/res/values-el/strings.profile.xml b/Habitica/res/values-el/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-el/strings.profile.xml +++ b/Habitica/res/values-el/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-el/strings.sidebar.xml b/Habitica/res/values-el/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-el/strings.sidebar.xml +++ b/Habitica/res/values-el/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-el/strings.tutorial.xml b/Habitica/res/values-el/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-el/strings.tutorial.xml +++ b/Habitica/res/values-el/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-el/strings.xml b/Habitica/res/values-el/strings.xml index 5660b4783..9dbafbd71 100755 --- a/Habitica/res/values-el/strings.xml +++ b/Habitica/res/values-el/strings.xml @@ -6,16 +6,13 @@ Mana Ρυθμίσεις - Ο προσαρμοσμένος server σας Ταυτότητα Χρήστη Η Ταυτότητα Χρήστη σου API Token Το API Token σου Γλώσσα Άλλαξε τη γλώσσα του Habitica - Ο QR Κωδικός σου Επικοινώνησε μαζί μου - Προέκυψε ένα σφάλμα... Λογαριασμός Πρώτη Μέρα της Εβδομάδας Πρώτη Μέρα της Εβδομάδας σε όλα τα ημερολόγια @@ -23,7 +20,6 @@ Ενεργοποίηση Υπενθύμισης Όρισε Ώρα Υπενθύμισης Προσαρμοσμένη Έναρξη Μέρας - Όρισε Προσαρμένη Ώρα Έναρξης Μέρας Ειδοποιήσεις Χρήστη Ειδοποιήσεις Όρισε τις ρυθμίσεις ειδοποιήσεων @@ -36,13 +32,7 @@ Η Αποστολή σου ξεκίνησε Πρόσκληση σε Αποστολή - Αξία - Νέα Να-Κάνω - Νέα Ανταμοιβή - Νέα Ημερήσια - Νέα Συνήθεια Επεξεργασία - Διαγραφή Ακύρωση Είσοδος Εγγραφή @@ -53,21 +43,15 @@ Επιβεβαίωσε τον κωδικό Αποσύνδεση Αποσυνδέσου από το λογαριασμό σου - Στοιχεία Λογαριασμού Καλώς ήρθες - Αναγέννηση - Παρακαλώ συνδέσου μέσω της εφαρμογής πρωτού χρησιμοποιήσεις το widget Σχετικά Βιβλιοθήκες - Ιστορικό έκδοσης Η Habitica είναι διαθέσιμη ως λογισμικό ανοικτού κώδικα στο Github Βαθμολόγησε την εφαρμογή μας Στείλτε μας τα Σχόλιά σας! Ανάφερε ένα σφάλμα Πηγαίος Κώδικας - Επανάληψη Κάθε - Σφάλμα Σύνδεσης Δεν είσαι συνδεδεμένος στο Διαδίκτυο Φαίνεται να υπάρχει πρόβλημα με τον διακομιστή. Προσπάθησε αργότερα. Σφάλμα Πιστοποίησης @@ -77,7 +61,6 @@ Αποθήκευση Αντιγραφή Σημειώσεις - Κείμενο Δυσκολία Ετικέτες Ασήμαντο @@ -89,18 +72,7 @@ Αρνητικό (-) Λίστα Υπενθυμίσεις - Δράσεις Χαρακτηριστικά - Ισχύς - Ευφυΐα - Κράση - Φρόνηση - Συχνότητα - Συγκεκριμένες Μέρες της Εβδομάδας - Κάθε Χ μέρες - Σύνοψη - Επαναλήψεις - Επαναλαμβάνεται Ημερήσια Εβδομαδιαία Μηνιαία @@ -115,23 +87,14 @@ Σάββατο Κυριακή Έφτασες στο επίπεδο %1$d! - Huzzah! Μην απελπίζεσαι! Ξέμεινες από Ζωή! Γέμισε Ζωή & Προσπάθησε Ξανά Φίλτρα - Εικόνα Προφίλ - %dΠΜ - Χρησιμοποίησες %1$s για %2$d πόντους μαγείας. Χρησιμοποίησες %1$s. νέο αντικείμενο λίστας - Πρόσθεσε Ρίχνεις το Ξόρκι - Έρχεται Σύντομα - Είσαι σίγουρος/η ότι θέλεις να αναφέρεις αυτό το μήνυμα για παραβίαση των όρων χρήσης; - Αναφορά Μηνύματος Στο επίπεδο 11 - Δεν ανήκεις σε μία παρέα. Για να μπεις σε μία, επισκέψου την ιστοσελίδα. Ξέχασα τον Κωδικό Αγοράζω Απόρριψη @@ -140,8 +103,6 @@ Μέλη Συνήθειες Ανταμοιβές - Είσαι σίγουρος; - Θες πραγματικά να διαγραφείς? Ναι Όχι Αποστολή @@ -149,14 +110,12 @@ Μαλλιά Πουκάμισο Δέρμα - Αυτιά ζώου Βάση Χρώμα Γενειάδα Μουστάκι Λουλούδι Αφέλειες - Δεν έχει οριστεί Μέγεθος Αδύνατος Φόντο @@ -169,24 +128,19 @@ Έναρξη Αποστολής Ακύρωση Πρόσκλησης Διακοπή Αποστολής - Έξοδος από την Αποστολή - Συμμετέχοντες Έκδοση %1$s (%2$d) Βοήθεια &Συχνές Ερωτήσεις Κατάλαβα! Υπενθύμισε μου ξανά Καλωσόρισες στο - Habitica Πρόοδος στο παιχνίδι Πρόοδος στη ζωή Ξεκλείδωσε ενέργειες στο παιχνίδι με την ολοκλήρωση των πραγματικών σου υποχρεώσεων. Κέρδισε πανοπλίες, κατοικίδια, και πολλά άλλα σαν ανταμοιβή για την εκπλήρωση των στόχων σου. Πολέμησε τέρατα Κοινωνικοποιήσου Ας αρχίσουμε! - Προηγούμενο Επόμενο Παράκαμψε - Καλωσόρισες Εργασία Άσκηση Υγεία @@ -198,26 +152,18 @@ Διάβασμα/Αναβολή Πλύσιμο Πιάτων Οργάνωση ντουλάπας - Θες να μας βοηθήσεις να κρατήσουμε το Habitica ζωντανό? Μπορείς να υποστηρίξεις τους developers αγοράζοντας πετράδια!\n\nΜε τα πετράδια μπορείς να αγοράσεις διασκεδαστικά πράγματα για το λογαριασμό σου, όπως: \n\n - Ωραία κουστούμια για το avatar σου\n - Μαγευτικά φόντα\n - Διασκεδαστικές αποστολές που σε ανταμείβουν με αυγά κατοικίδιων\n - Τη δυνατότητα να αλλάξεις κλάση πριν το επίπεδο 100\n\nΣας ευχαριστούμε πολύ που μας βοηθάτε να κάνουμε το Habitica το καλλίτερο που μπορεί να γίνει. Η βοήθειά σας σημαίνει πολλά για εμάς! Οι Συντεχνίες μου Δημόσιες Συντεχνίες Συντεχνία Αποχώρηση - Αρχηγός Πετράδια - Αποστολή ΠΜ - Σημαία Διαγραφή Όνομα Περιγραφή Προσθήκη νέας ετικέτας Ιδιωτικότητα Εγγραφή Μηνύματος - Ανάρτηση Ψάξε για Συντεχνίες - Λήγει:%s - τρέχον σερί: %d - Η Υποχρέωση έχει Ημερομηνία Λήξης Εξοπλισμός Μάχης Κουστούμι Κεφάλι @@ -230,8 +176,6 @@ Όπλο Εφαρμογή Κουστουμιού Φορεμένο - Πρόσκληση σε Αποστολή - Σας έχουν προσκαλέσει σε μια αποστολή! πριν 1 ημ. πριν %dημ. πριν 1 μήνα @@ -282,16 +226,12 @@ Αν έχετε φίλους που παίζουν ήδη το Habitica, καλέστε τους με το όνομα χρήστη τους εδώ. Αν κάποιος φίλος σου εγγραφεί στο Habitica μέσω του email σου, θα ενταχθεί αυτόματα στη συντροφιά σου! Προσθήκη Προσκλήσεων - Ταυτότητα Χρήστη Email - Προσκάλεσε στην παρέα Κοινή χρήση Έφτασα στο επίπεδο %d στο Habitica βελτιώνοντας τις συνήθειες μου στην πραγματική ζωή! Μόλις απέκτησα ένα %1$s %2$s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων! Μόλις κέρδισα ένα υποζύγιο%s στο Habitica με την ολοκλήρωση πραγματικών μου υποχρεώσεων! Άνοιγμα στο play store - Μήνυμα από τον %1$s - Αρχηγός: %1$s Επιβεβαίωση Αγορά Χρονοταξιδευτές @@ -299,37 +239,18 @@ Δεν έχεις μηνύματα. Μπορείς να στείλεις νέο μήνυμα σε ένα χρήστη από τα μηνύματα δημόσιας συνομιλίας του! Ξεκλειδώνει με το να εισέρχεσαι στο Habitica τακτικά Ξεκλειδώνει με τη δημιουργία λογαριασμού - Το χρυσό δεν επαρκεί - Δεν χρειάζεσαι φίλτρο υγείας %1$s Αγοράστηκε - Επιβεβαίωση αγοράς - Αγόρασε %1$s για %2$s %3$s - πετράδι - κλεψύδρα - κλεψύδρες - Χρυσάφι Χρυσάφι - Επεξεργασία Ετικέτας Επεξεργασία - Ολοκληρώθηκε - Διαγραφή Είσαι σίγουρος; Θες πραγματικά να διαγραφείς? - Επεξεργασία Ετικετών - Φίλτρο κατά Ετικέτα - Ο κωδικός QR αποθηκεύτηκε στο - Ο QR κωδικός σου - Κατέβασε - Στείλε καινούριο μήνυμα Επέλεξε Παραλήπτη του Μηνύματος Συνέχεια - Σάρωση κωδικού QR Στατιστικά του Habitica Προσθήκη Υποχρέωσης Προσθήκη Συνήθειας Προσθήκη Ανταμοιβής - Habitica Πρόσθεσε Υποχρέωση Οι υπηρεσίες Google play δεν βρέθηκαν. Αγορά Αποστολές που σε ανταμείβουν με αυγά κατοικίδιων @@ -352,17 +273,11 @@ 3 μήνες 6 μήνες 12 μήνες - κατά %s Οι Προκλήσεις μου - Δημόσιο - Προκλήσεις Συνήθεια Ανταμοιβή Επίσημο - Προσθήκη Υπενθύμισης - Προειδοποίηση Μηνύματα - Συχνές Ερωτήσεις Πετράδι Κέρδισες ένα %1$s σαν ανταμοιβή για την αφοσίωση στη βελτίωση της ζωής σου. Φίλτρα @@ -372,15 +287,12 @@ Τοποθεσία Υποχρεώσεις Δημιουργία Πρόκλησης - Επεξεργασία Περιγραφή (προαιρετικό) Τίτλος νέας Πρόκλησης - Σύστημα Έναρξη νέας Αποστολής Περιγραφή Συντροφιάς Καλωσόρισες Πίσω Η Μέρα μου ξεκινά - Το υπόλοιπό σου: Διαθέσιμο μέχρι %s Μηνιαία Πετράδια: Απομένουν %1$d/%2$d Μηνιαία Πετράδια: Απομένουν %d @@ -419,7 +331,6 @@ Φρόνηση Τοποθέτησε πόντους με βάση την κατηγορία Ισχύς, Ευφυΐας, Κράσης, Φρόνησης σε σχέση με τις υποχρεώσεις που ολοκλήρωσες. Χωρίς Κλάση - %d πόντοι Χρήσιμοι Σύνδεσμοι Δες τις Συχνές Ερωτήσεις Αναφορά Σφάλματος @@ -431,10 +342,6 @@ Daniel ο ξενοδόχος Matt ο Θηριοδαμαστής Παίξε το Habitica σε μια Συντροφιά - Άνοιξε την ιστοσελίδα για να δημιουργήσεις μια συντροφιά - Συμπληρώθηκε το Μηνιαίο Όριο Πετραδιών - Μήνυμα συνομιλίας - %s επιθέσεις! Ian ο Οδηγός Αποστολών Αναφορά Απάντηση @@ -452,13 +359,11 @@ Τελευταία είσοδος Σύνολο εισόδων Δύο χεριών - Επιβεβαίωση Όνομα Χρήστη Είσαι σίγουρος για την επιβεβαίωση του τρέχον ονόματος χρήστη; Ακύρωση Επιβεβαίωση Όνομα Χρήστη Το Όνομα Χρήστη δεν Επιβεβαιώθηκε Το Όνομα Χρήστη Επιβεβαιώθηκε - \@%s ・Επίπεδο %d Πώς να σε φωνάζουμε? Τα Ονόματα Εμφάνισης πρέπει να είναι από 1 μέχρι 30 χαρακτήρες Αντάμειψε τον εαυτό σου diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml index d8b4680b4..a8d9aa77c 100644 --- a/Habitica/res/values-en-rGB/strings.sidebar.xml +++ b/Habitica/res/values-en-rGB/strings.sidebar.xml @@ -5,7 +5,6 @@ Social Tavern Party - Gems & Subscription Guilds Challenges Inventory diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 94da98eba..ccfcf5c92 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -342,9 +342,6 @@ You get these benefits for being a Subscriber Subscription Status Leave Challenge - Are you sure you want to leave the Challenge “%s”? - Remove tasks - Do you want to remove the tasks? Remove Keep My Challenges @@ -675,8 +672,6 @@ Send Gift Server Your gift was sent! - You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion! - You sent %s a %s-month Habitica subscription. Discover Damage paused Important Announcements @@ -882,7 +877,6 @@ Unlock by finishing Quest %d Unlock by reaching level %d Finish Quest %d - Level %d You are not participating Quest completed! You sent %s some gems. diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml index f2a664b86..1fd93801b 100644 --- a/Habitica/res/values-es/strings.sidebar.xml +++ b/Habitica/res/values-es/strings.sidebar.xml @@ -6,7 +6,6 @@ Mensajes Taberna Equipo - Gemas y Suscripción Gremios Desafíos Inventario diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml index be0c5e840..0bdd38a64 100644 --- a/Habitica/res/values-es/strings.xml +++ b/Habitica/res/values-es/strings.xml @@ -372,9 +372,6 @@ Siendo suscriptor, obtienes estos beneficios. Estado de Suscripción Abandonar Desafío - ¿Seguro que quieres abandonar el Desafio \"%s\"? - Eliminar tareas - ¿Quieres eliminar las tareas? Eliminar Mantener Mis Desafíos @@ -670,8 +667,6 @@ Enviar Regalo Servidor ¡Tu regalo se envió! - Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta. - Tu suscripción regalo ha sido enviada y tu suscripción ha sido aplicada a tu cuenta. Descubre Daño pausado optar por no diff --git a/Habitica/res/values-fi/strings.profile.xml b/Habitica/res/values-fi/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-fi/strings.profile.xml +++ b/Habitica/res/values-fi/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-fi/strings.sidebar.xml b/Habitica/res/values-fi/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-fi/strings.sidebar.xml +++ b/Habitica/res/values-fi/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-fi/strings.tutorial.xml b/Habitica/res/values-fi/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-fi/strings.tutorial.xml +++ b/Habitica/res/values-fi/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-fi/strings.xml b/Habitica/res/values-fi/strings.xml index e0fd46352..44644f01f 100755 --- a/Habitica/res/values-fi/strings.xml +++ b/Habitica/res/values-fi/strings.xml @@ -4,17 +4,14 @@ Kokemuspisteet Terveys Voima - Asetuksien lataus epäonnistui Asetukset - Asiakaspalvelu Käyttäjän tunnistus Käyttäjäkoodisi API Valtuutus Api valtuutuksesi Kieli Vaihda Habitica-sovelluksen kieli - QR-koodisi Yhteystiedot Tili Viikon ensimmäinen päivä @@ -23,7 +20,6 @@ Aktivoi muistutus Aseta aika muistutukselle Mukautettu päivän alkamisaika - Aseta mukautettu päivän alkamisaika Käyttäjän Push-ilmoitukset Push-ilmoitukset Säädä Push-ilmoitusasetuksiasi @@ -33,9 +29,7 @@ Seikkailusi on alkanut Kutsuttu seikkailulle - Arvo Muokkaa - Poista Peruuta Kirjaudu Rekisteröidy @@ -46,20 +40,15 @@ Vahvista salasana Kirjaudu ulos Kirjaudu ulos tililtäsi - Tilin tiedot Tervetuloa - Herätä henkiin - Käytä widgettejä aplikaation kautta Tietoja Info-osiot - Versiohistoria Habitica on löydettävissä avoimen koodin ohjelmana Githubista. Arvostele sovelluksemme Lähetä meille palautetta! Raportoi virheistä Lähdekoodi - Yhteyshäiriö Internetyhteytesi ei toimi Serverissä näyttäisi olevan ongelma. Yritä myöhemmin uudestaan. Authentication Error @@ -69,7 +58,6 @@ Tallenna Kopioi Huomiot - Teksti Vaikeustaso Tägit Triviaali @@ -81,11 +69,7 @@ Negatiivinen Tarkistuslista Muistutukset - Toiminnot Ominaisuudet - Tapahtumatiheys - Tiettyinä päivinä viikossa - Joka X päivä Maanantai Tiistai Keskiviikko @@ -93,23 +77,14 @@ Perjantai Lauantai Sunnuntai - Hienoa! Älä masennu! Menetit terveytesi! Täydennä terveys & Yritä uudelleen Suodatin - Profiilikuva - %d VP - Olet käyttänyt %1$s %2$d voimastasi. Käytit %1$s. Uusi asia muistilistaan - Lisää Taidon käyttö - Tulossa pian - Oletko varma, että haluat raportoida käytösrikkeen? - Merkitse viesti Avautuu tasolla 11 - Et kuulu vielä ryhmään. Liittyminen ryhmään tapahtuu nettisivuston kautta. Unohdin salasanan Uudelleenaktivoi päivittäiset Pysäytä päivittäiset @@ -121,8 +96,6 @@ Tavat Päivittäiset tehtävät Palkinnot - Oletko varma? - Haluatko todella poistaa? Kyllä Ei Seikkailu @@ -130,14 +103,12 @@ Hiukset Paita Iho - Eläinkorvat Pohja Väri Parta Viikset Kukka Saparot - Riisuttu Koko Hoikka Roteva @@ -152,20 +123,12 @@ Aloita seikkailu Peru kutsu Keskeytä seikkailu - Luovu seikkailusta - Odottaa - Hyväksytty - Hylätty - Osallistujat Apua & UKK Selvä! Muistuta myöhemmin Ystävien avulla voit pysyä asettamissasi tavoitteissa. Kannustakaa toisianne niin elämässä kuin vastustajia vastaan taistellessa, niin kehitytte yhdessä! - Taaksepäin Seuraava Ohita - Tervetuloa Habiticaan, jossa elämäsi paranee samalla kun etenet pelissä! Kun onnistut oikean elämän tavoitteissasi, niin samalla sinulle avautuu pelissä tarvikkeita, lemmikkejä ja paljon muuta. - Tervetuloa Työ Harjoitus Koulu @@ -193,26 +156,18 @@ Hio taitojasi Tee jotain luovaa Sain luovan projektin valmiiksi - Haluatko, että Habitica pysyy käynnissä? Voit tukea tuotteen kehitystä ostamalla timantteja!\n\nTimateilla voit osaa kaikkea hauskaa pelissä, esimerkiksi: \n\n - Upeita asusteita hahmollesi\n - Hienoja taustoja\n - Hauskoja seikkailuja, joista palkintona lemmikkien munia\n - Mahdollisuus vaihtaa hahmoluokkaasi ennen tasoa 100\n\nIsot kiitokset kun autat meitä tekemään Habiticasta paremman. Tukesi on meille tärkeää! Minun killat Julkiset killat Kilta Poistu Liity - Johtaja Jalokivet - Lähetä YV - Valinta Poista Nimi Kuvaus Yksityisyys Kirjoita viesti - Lähetä Hae kiltoja - Pvm: %s - nykyinen putki: %d - Tehtävällä on valmistumispäivämäärä Taisteluvarustus Asu Pää @@ -226,8 +181,6 @@ Pue asu Tarvikkeet Haluatko varmasti perua tämän seikkailun? Kaikki hyväksytyt kutsut hävitetään. Seikkailun omistaja pitää seikkailukäärön hallussaan. - Seikkailukutsu - Sinut on kutsuttu osallistumaan jahtiin! tänään Esineet Munat @@ -235,7 +188,6 @@ Seikkailut Lemmikit Ratsut - Syötä lemmikille Käytä Ruoki Sulje @@ -251,23 +203,14 @@ Lähetä Kutsu kavereita Lisää kutsuja - Käyttäjätunnus Sähköposti - Kutsu seurueeseen Jaa käyttäen Avaa Play-kaupassa Vahvista Kauppa Aikamatkailijat - Ei tarpeeksi Kultaa - Vahvista ostos - jalokivi - tiimalasi - tiimalasit - kulta kulta Kopioitu leikepöydälle - Kopioi leikepöydälle Tue Habitica-palvelua käytä diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml index 16b582413..78f658f60 100644 --- a/Habitica/res/values-fr/strings.sidebar.xml +++ b/Habitica/res/values-fr/strings.sidebar.xml @@ -6,7 +6,6 @@ Messages Auberge Équipe - Gemmes et abonnement Guildes Défis Inventaire diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 3124b420d..da2773509 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -372,9 +372,6 @@ Vous avez ces bonus grâce à votre abonnement Etat de l\'abonnement Quitter le défi - Voulez-vous vraiment quitter le défi \"%s\" ? - Supprimer les tâches - Voulez-vous supprimer les tâches ? Supprimer Conserver Mes défis @@ -671,8 +668,6 @@ Offrir Serveur Votre cadeau a été envoyé ! - Votre abonnement offert a été envoyé, et votre abonnement a été rattaché à votre compte ! - Votre abonnement offert a été envoyé, et votre abonnement a été rattaché à votre compte. Ne pas choisir Cela va définitivement supprimer votre compte, et il ne pourra pas être restauré ! Les gemmes sur votre compte ou celles dépensées ne seront pas remboursées. Si vous confirmez définitivement, tapez DELETE dans le champ ci-dessous. Découvrir @@ -874,7 +869,6 @@ 17 Déc jusqu\'au 6 Jan Quête terminée ! Vous ne participez pas - Niveau %d Finir la quête %d Débloqué en atteignant le niveau %d Débloqué en finissant la quête %d diff --git a/Habitica/res/values-he/strings.profile.xml b/Habitica/res/values-he/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-he/strings.profile.xml +++ b/Habitica/res/values-he/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hi/strings.profile.xml b/Habitica/res/values-hi/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hi/strings.profile.xml +++ b/Habitica/res/values-hi/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hi/strings.sidebar.xml b/Habitica/res/values-hi/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hi/strings.sidebar.xml +++ b/Habitica/res/values-hi/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hi/strings.tutorial.xml b/Habitica/res/values-hi/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hi/strings.tutorial.xml +++ b/Habitica/res/values-hi/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hi/strings.xml b/Habitica/res/values-hi/strings.xml index 48aa946cc..fe4cecbe8 100755 --- a/Habitica/res/values-hi/strings.xml +++ b/Habitica/res/values-hi/strings.xml @@ -4,10 +4,8 @@ अनुभव स्वास्थ्य माना - बारकोड से प्राथमिकताओं को लोड नहीं किया जा सका परिस्थितियां - आपका अनुकूलित परिसेवक उपयोगकर्ता आईडी आपकी उपयोगकर्ता आईडी एपीआई टोकन @@ -15,7 +13,6 @@ भाषा हैबीटिका की भाषा बदलें मुझसे संपर्क करें - एक समस्या हुई... खाता सप्ताह का पहला दिन सभी कैलेंडरों में सप्ताह का पहला दिन diff --git a/Habitica/res/values-hr-rHR/strings.sidebar.xml b/Habitica/res/values-hr-rHR/strings.sidebar.xml index fa0ad28d0..00cdcc9a9 100644 --- a/Habitica/res/values-hr-rHR/strings.sidebar.xml +++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml @@ -6,7 +6,6 @@ Poruke Krčma Družina - Dragulji & Pretplata Cehovi Izazovi Inventar diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml index bf0e98564..116f30e1b 100644 --- a/Habitica/res/values-hr-rHR/strings.xml +++ b/Habitica/res/values-hr-rHR/strings.xml @@ -374,9 +374,6 @@ Za Pretplatu dobivaš ove korisne prednosti: Status Pretplate Napusti Izazov - Jesi li siguran/na da želiš napustiti Izazov \"%s\"? - Ukloni zadatke - Želiš li ukloniti zadatke? Ukloni Zadrži Moji Izazovi @@ -671,8 +668,6 @@ Pošalji poklon Server Tvoj poklon je poslan! - Tvoj poklon je poslan i tvoja pretplata je aktivirana na tvom računu. - Tvoj poklon je poslan i tvoja pretplata je aktivirana na tvom računu. Otkrij Šteta je pauzirana diff --git a/Habitica/res/values-hu/strings.profile.xml b/Habitica/res/values-hu/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hu/strings.profile.xml +++ b/Habitica/res/values-hu/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hu/strings.sidebar.xml b/Habitica/res/values-hu/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hu/strings.sidebar.xml +++ b/Habitica/res/values-hu/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hu/strings.tutorial.xml b/Habitica/res/values-hu/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-hu/strings.tutorial.xml +++ b/Habitica/res/values-hu/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-hu/strings.xml b/Habitica/res/values-hu/strings.xml index e51529037..990d8d4b7 100755 --- a/Habitica/res/values-hu/strings.xml +++ b/Habitica/res/values-hu/strings.xml @@ -4,19 +4,15 @@ Tapasztalat Életerő Mana - A beállításokat nem tudtuk leolvasni a vonalkódról Beállítások - Az egyéni szervered Felhasználói azonosító A felhasználói azonosítód API kulcs API kulcsod Nyelv A Habitica nyelvének megváltoztatása - A QR kódod Kapcsolat - Hiba történt... Fiók A hét első napja A hét első napja minden naptárban @@ -24,7 +20,6 @@ Emlékeztető aktiválása Emlékeztető idejének megadása Egyéni napkezdés - Egyéni napkezdés idejének beállítssa Felhasználói felugró értesítések Felugró értesítések Felugró értesítések beállítása @@ -37,13 +32,7 @@ A küldetésed elkezdődött. Meghívva egy küldetésre - Érték - Új tennivaló - Új jutalom - Új napi feladat - Új szokás Szerkesztés - Törlés Mégse Bejelentkezés Regisztráció @@ -54,21 +43,15 @@ Jelszó megerősítése Kijelentkezés Kijelentkezés a fiókodból - Fiók adatai Üdvözlünk - Újraéledés - Kapcsolódj az alkalmazáson keresztül, egy widget használata előtt Rólunk Könyvtárak - Előző verziók A Habitica elérhető, mint nyílt forráskódú szoftver a Githubon Értékeld az alkalmazást! Küldj visszajelzést! Hibajelentés Forráskód - Ismétlés minden - Kapcsolódási hiba Nem kapcsolódtál az internethez. Valamilyen probléma van a szerverrel. Próbáld újra később! Hitelesítési hiba @@ -78,7 +61,6 @@ Mentés Másolás Jegyzetek - Szöveg Nehézség Címkék Triviális @@ -90,18 +72,7 @@ Negatív ( - ) Feladatlista Emlékeztetők - Akciók Tulajdonságok - Erő - Intelligencia - Szívósság - Észlelés - Gyakoriság - A hét bizonyos napjain - X naponta - Összefoglalás - Ismétlődik - Ismétlődik minden Naponta Hetente Havonta @@ -117,25 +88,16 @@ Vasárnap Elérted a %1$d. szintet! A valós céljaid elvégzésével szintet léptél, és teljesen felgyógyultál! - Hurrá! Ne ess kétségbe! Elvesztettél egy szintet, az aranyad és egy darab felszerelési tárgyat, de mindet visszaszerezheted kemény munkával! Sok sikert, menni fog! Elfogyott az életerőd! Töltsd fel az életerődet és próbáld újra Szűrő - Profilkép - %d MP - %1$s-t használtál %2$d manáért. %1$s-t használtál. új feladat hozzáadása - Hozzáadás Ne felejtsd el leellenőrizni a napi feladataidat Varázslat használata - Hamarosan - Biztosan jelenteni szeretnéd ezt az üzenetet szabálysértés miatt? - Üzenet megjelölése A 11. Szintnél feloldódik - Nem vagy egy csapat tagja. Ha be szeretnél lépni egy csapatba, látogasd meg a weboldalt. Elfelejtett Jelszó A napi feladataid reaktiválása A napi feladataid szüneteltetése @@ -148,8 +110,6 @@ Napi feladatok Tennivalók Jutalmak - Biztos vagy benne? - Biztosan törölni szeretnél? Igen Nem Küldetés @@ -157,14 +117,12 @@ Haj Póló Bőr - Állatfülek Alap Szín Szakáll Bajusz Virág Frufru - Nincs kiválasztva Méret Vékony Testes @@ -176,22 +134,14 @@ Küldetés elkezdése Meghívás Lemondása Küldetés megszakítása - Küldetés elhagyása - Függőben - Elfogadva - Elutasítva - Résztvevők %1$s (%2$d) verzió. Segítség & GYIK Megértettem! Emlékeztess újra Üdvözlünk - Habiticában! Kezdjük el! - Előző Következő Átugrás - Üdvözlünk Hogyan szeretnél kinézni? Ne aggódj, később tudsz ezen változtatni! Munka Testmozgás @@ -210,11 +160,7 @@ Egyesületek KIlépés Csatlakozás - Vezető Drágakövek - Lemásolás Tennivalóként - Üzenet küldése - Megjelölés Törlés Név Leírás @@ -253,39 +199,19 @@ E-mailben Küldés Barátok Meghívása - Felhasználói azonosító E-mail - Meghívás a Csapatba Megosztás ezzel Megnyitás a Play Áruházban Biztosan meg szeretnéd változtatni az osztályodat? Ez 3 drágakőbe fog kerülni. - Üzenet tőle: %1$s - Vezető: %1$s Megerősítés Piac Időutazók - Nincs elég aranyad! - Nincs szükséged életerő-ital vásárlására. - Vásárlás megerősítése - drágakő - homokóra - homokórák - arany arany - Címke szerkesztése Szerkesztés - Kész - Törlés Biztos vagy benne? Biztos, hogy törölni akarod? - Címkék szerkesztése - Szűrés címkék szerint - A QR kódod - Letöltés - Új üzenet küldése Folytatás - QR kód beolvasása Meghívtak, hogy csatlakozz egy csapathoz! Habitica statisztikák Feladat hozzáadása @@ -296,7 +222,6 @@ Az összes napi feladatodat teljesítetted! Szép munka! Habitica napi feladatok Habitica Tennivaló Lista - Habitica feladat hozzáadása Vásárlás Habitica támogatása Piac megnyitása @@ -308,15 +233,10 @@ Jelenlegi bónuszok Jelenlegi misztikus homokórák Inaktív - Kihívás részletei Kihívás elhagyása - Feladatok eltávoltása - Biztosan el akarod távolítani a feladatokat? Eltávolítás Megtartás Kihívásaim - Nyilvános - Kihívások Napi feladat Szokás Jutalom @@ -324,15 +244,9 @@ Hivatalos Kihívás Jelenleg nem veszel részt egy kihívásban sem. - Emlékeztető hozzáadása - Figyelmeztetés - Beállítások megnyitása - Gyakran Ismételt Kérdések Drágakő Szűrők Kész - A csoportos feladatokat nem tudod szerkeszteni. - Ezt a feladatot nem tudod szerkeszteni. Csoportok Mind Saját @@ -358,7 +272,6 @@ Mentés Feladatok Fogadó - Rendszer Függőben Elfogadva Visszautasítva diff --git a/Habitica/res/values-id/strings.profile.xml b/Habitica/res/values-id/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-id/strings.profile.xml +++ b/Habitica/res/values-id/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml index c67620fb4..c62b2c105 100644 --- a/Habitica/res/values-in/strings.sidebar.xml +++ b/Habitica/res/values-in/strings.sidebar.xml @@ -6,7 +6,6 @@ Pesan Kedai Minuman Party - Permata & Berlangganan Guild Tantangan Inventori diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml index 046bcc720..4787a04c1 100644 --- a/Habitica/res/values-in/strings.xml +++ b/Habitica/res/values-in/strings.xml @@ -353,9 +353,6 @@ Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut: Status Langganan Tinggalkan Tantangan - Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"? - Hapus tugas - Apakah kamu mau menghapus tugas ini? Hapus Simpan Tantangan Saya diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml index af02c7fef..2f508bc6d 100644 --- a/Habitica/res/values-it/strings.sidebar.xml +++ b/Habitica/res/values-it/strings.sidebar.xml @@ -6,7 +6,6 @@ Messaggi Taverna Squadra - Gemme e abbonamento Gilde Sfide Inventario diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml index 4caacec66..67d9cbc53 100644 --- a/Habitica/res/values-it/strings.xml +++ b/Habitica/res/values-it/strings.xml @@ -373,9 +373,6 @@ Otterrai questi vantaggi abbonandoti Stato abbonamento Abbandona sfida - Vuoi davvero abbandonare la sfida \"%s\"? - Rimuovi attività - Vuoi rimuovere le attività? Rimuovi Tieni Le mie sfide @@ -670,8 +667,6 @@ Invia un Regalo Server Il tuo regalo è stato inviato! - L\'abbonamento regalato è stato ricevuto e l\'abbonamento corrispondente applicato al tuo profilo. - L\'abbonamento regalato è stato ricevuto e l\'abbonamento corrispondente applicato al tuo profilo. Scopri Danni sospesi Notifiche diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml index 9a10bb13c..a218a2aa3 100644 --- a/Habitica/res/values-iw/strings.sidebar.xml +++ b/Habitica/res/values-iw/strings.sidebar.xml @@ -5,7 +5,6 @@ חברתי פונדק חבורה - קנה אבני חן גילדות אתגרים מלאי ציוד diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml index 97e1aff95..0ad3ee106 100644 --- a/Habitica/res/values-ja/strings.sidebar.xml +++ b/Habitica/res/values-ja/strings.sidebar.xml @@ -6,7 +6,6 @@ メッセージ キャンプ場 パーティー - ジェムの購入 ギルド チャレンジ 所持品 diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml index fe2ce9735..54886bf3c 100644 --- a/Habitica/res/values-ja/strings.xml +++ b/Habitica/res/values-ja/strings.xml @@ -371,9 +371,6 @@ 寄付会員になっているため、これらの特典を受けています 寄付の状況 チャレンジから抜ける - 本当にチャレンジ「%s」を抜けますか？ - タスクを削除 - タスクを削除しますか？ 削除する 残す マイチャレンジ @@ -678,8 +675,6 @@ %sの間 この操作であなたのアカウントは完全に削除され、決して復元はできません！ 貯めているジェム、使ったジェムは、返金できません。本当にアカウントを削除するなら、下のテキストボックスに DELETE と入力してください。 このプロモーションが開催されている間は、贈り物を送った後に自動的に同じ寄付会員特典を受けることができます。 - %s に %sヶ月分のHabitica寄付会員特典を送りました。そして、１つ贈って１つ無料で手に入れようキャンペーンによって、あなたのアカウントにも同じ寄付会員特典が適用されました！ - %s に %sヶ月分のHabitica寄付会員特典を送りました。 ダメージを一時停止する 大切なお知らせ 作成する diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml index ec8232f91..a3e717ba5 100644 --- a/Habitica/res/values-ko/strings.sidebar.xml +++ b/Habitica/res/values-ko/strings.sidebar.xml @@ -5,7 +5,6 @@ 소셜 주막 파티 - 보석 & 구독 길드 도전 인벤토리 diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml index 016f282d3..0b8100382 100644 --- a/Habitica/res/values-ko/strings.xml +++ b/Habitica/res/values-ko/strings.xml @@ -358,9 +358,6 @@ 정기구독을 함으로써 다음과 같은 혜택을 받고 있습니다: 구독상황 도전 그만두기 - 정말로 “%s” 도전을 그만 두시겠습니까? - 할일 제거 - 할일을 제거하고 싶으신가요? 제거하기 놔두기 나의 도전들 @@ -683,8 +680,6 @@ 선물하기 서버 선물이 전달되었습니다! - 하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다! - %s에게 %s-개월 Habitica 구독서비스가 전달되었습니다. 찾아보기 피해 동결 중 중대 발표 diff --git a/Habitica/res/values-land/bools.xml b/Habitica/res/values-land/bools.xml deleted file mode 100644 index a6b3daec9..000000000 --- a/Habitica/res/values-land/bools.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/Habitica/res/values-lt/strings.sidebar.xml b/Habitica/res/values-lt/strings.sidebar.xml index ac7caf850..326b41caa 100644 --- a/Habitica/res/values-lt/strings.sidebar.xml +++ b/Habitica/res/values-lt/strings.sidebar.xml @@ -5,7 +5,6 @@ Bendruomenė Smuklė Grupė - Pirkti Brangakmenius Gildijos Iššūkiai Inventorius diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml index a1087f858..8b38aad82 100644 --- a/Habitica/res/values-lt/strings.xml +++ b/Habitica/res/values-lt/strings.xml @@ -385,7 +385,4 @@ Prenumeratos būsena Palikite iššūkį - Ar tikrai norite palikti iššūkį „%s“\? - Pašalinkite užduotis - Ar norite pašalinti užduotis\? diff --git a/Habitica/res/values-nb-rNO/strings.profile.xml b/Habitica/res/values-nb-rNO/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-nb-rNO/strings.profile.xml +++ b/Habitica/res/values-nb-rNO/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-nb-rNO/strings.sidebar.xml b/Habitica/res/values-nb-rNO/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-nb-rNO/strings.sidebar.xml +++ b/Habitica/res/values-nb-rNO/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-nb-rNO/strings.tutorial.xml b/Habitica/res/values-nb-rNO/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-nb-rNO/strings.tutorial.xml +++ b/Habitica/res/values-nb-rNO/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml index 07443f6fe..99ee1a4da 100644 --- a/Habitica/res/values-nl/strings.sidebar.xml +++ b/Habitica/res/values-nl/strings.sidebar.xml @@ -6,7 +6,6 @@ Berichten Herberg Groep - Edelstenen & abonnement Gilden Uitdagingen Boedel diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml index 520dbd436..37dd013e8 100644 --- a/Habitica/res/values-nl/strings.xml +++ b/Habitica/res/values-nl/strings.xml @@ -372,9 +372,6 @@ Je krijgt deze voordelen door Abonnee te zijn Abonnementstatus Verlaat uitdaging - Weet je zeker dat je de uitdaging \"%s\" wilt verlaten? - Verwijder taken - Wil je de taken verwijderen? Verwijderen Houden Mijn uitdagingen @@ -787,7 +784,6 @@ 17 december tot 6 januari Beperkte gebeurtenis Je doet niet mee - Niveau %d Voltooi Quest %d Vrijspelen door level %d te behalen Vrijspelen door de Quest %d te voltooien diff --git a/Habitica/res/values-no/strings.xml b/Habitica/res/values-no/strings.xml index deae73df5..64d6c02d4 100755 --- a/Habitica/res/values-no/strings.xml +++ b/Habitica/res/values-no/strings.xml @@ -4,19 +4,15 @@ Erfaring Helsepoeng Magipoeng - Preferanser kunne ikke lastes inn fra strekkoden Innstillinger - Din egendefinerte server Bruker ID Din Bruker ID API Token Din API Token Språk Endre Habiticas språk - Din QR Kode Kontakt meg - En feil oppstod... Bruker Første dag i uken Første dag i uken i alle kalendere @@ -24,7 +20,6 @@ Aktiver Påminnelse Sett Tid For Påminnelse Egendefinert Starten På Dagen - Sett En Egendefinert Start På Dagen Bruker Push-Varslinger Push-Varslinger Sett dine instillinger for push-varslinger @@ -37,13 +32,7 @@ Ditt Oppdrag har Begynt Invitert til et Oppdrag - Verdi - Nytt Gjøremål - Ny Belønning - Nytt Daglig Gjøremål - Ny Vane Rediger - Slett Avbryt Logg inn Registrer deg @@ -54,21 +43,15 @@ Bekreft passord Logg ut Logg ut av din brukerkonto - Brukerdetaljer Velkommen - Gjennoppliv - Vær så snill å koble gjennom applikasjonen før du bruker en widget Om Biblioteker - Tidligere versjoner Habitica er tilgjengelig som et åpen-kilde program på Github Ranger appen vår Send oss Tilbakemeldinger! Rapporter en Feil Kildekode - Gjentas Hver - Tilknytningsfeil Du er ikke koblet til internett. Det ser ut som om det er et problem med serveren. Prøv igjen senere. Autentiseringsfeil @@ -78,7 +61,6 @@ Lagre Kopier Notater - Tekst Vanskelighetsgrad Merkelapper Triviell @@ -90,16 +72,7 @@ Negativ ( - ) Sjekkliste Påminnelser - Handlinger Egenskaper - Styrke - Visdom - Frekvens - På Speifikke Dager i Uka - Hver X Dag - Oppsummering - Gjentagelser - Gjentas På Daglig Ukentlig Månedlig @@ -113,23 +86,14 @@ Fredag Lørdag Søndag - Hurra! Ikke fortvil! Du gikk tom for Helsepoeng! Fyll på Helse amp; Prøv Igjen Filter - Profilbilde - %d MP - Du brukte %1$s for %2$d magipoeng. Du brukte %1$s. Nytt punkt i sjekkliste - Legg til Bruker Ferdighet - Kommer Snart - Er du sikker på at du vil rapportere denne meldingen for overtredelse? - Flagg Melding Låses opp i Nivå 11 - Du er ikke i en klan. For å bli med i en klan, besøk nettsiden. Glemt Passord Reaktiver dine Daglige Gjøremål Pause dine Daglige Gjøremål @@ -142,8 +106,6 @@ Daglige Gjøremål Gjøremål Belønninger - Er du sikker? - Vil du virkelig slette? Ja Nei Oppdrag @@ -151,14 +113,12 @@ Hår Skjorte Hud - Dyreører Grunn Farge Skjegg Bart Blomst Pannelugg - Ingenting satt Størrelse Tynn Bred @@ -173,17 +133,11 @@ Start Oppdrag Avslå Invitasjon Avbryt Oppdrag - Forlat Oppdrag - Venter - Akseptert - Avslått - Deltakere Versjon %1$s (%2$d) Hjelp & FAQ Den er grei! Minn meg igjen Velkommen til - Habitica Det er tid for å ha det gøy mens du får ting gjort. Bli med over %s andre som forbedrer livene sine med en oppgave om gangen. Fremskritt i spillet Fremskritt i livet @@ -192,11 +146,8 @@ Bli sosial Hold styr på målene dine med hjelp fra dine venner. Støtt hverandre i livet og i kamp når dere blir bedre sammen! Kom i gang! - Forrige Neste Hopp over - Velkommen til Habitica, hvor progresjon i spillet vil forbedre ditt virkelige liv! Når du oppnår mål i ditt virkelig liv, låser du opp utstyr, kjæledyr, oppdrag og mer. - Velkommen Så, hvordan vil du se ut? Ikke bekymre deg, du kan endre dette senere. Utmerket! Så, hva er du interessert i å jobbe med gjennom denne reisen? Jobb @@ -227,28 +178,19 @@ Studer en mester i håndverket Jobb på kreativt prosjekt Fullfør kreativt prosjekt - Vil du hjelpe oss å holde Habitica gående? Du kan støtte utviklerene ved å kjøpe juveler!\n\nJuveler lar deg kjøpe morsomme bonuser for avataren din, som inkluderer: \n\n - Kule kostymer for din figur\n - Heftige bakgrunner\n - Morsomme oppdrag som belønner deg med kjæredyrsegg\n - Muligheten å endre klasse før nivå 100\n\nTusen takk for at du hjelper oss gjøre Habitica så bra som mulig. Din støtte betyr masse for oss! Mine Laug Offentlige Laug Laug Forlat Bli med - Leder Juveler - Kopier som Gjøremål - Send PM - Flagg Slett Navn Beskrivelse Legg til ny Merkelapp Privatliv Skriv Melding - Post Søk etter laug - Forfall: %s - nåværende rekke: %d - Gjøremål har Forfallsdato Kamputstyr Kostyme Hode @@ -262,9 +204,7 @@ Bruk Kostyme Utstyrt Er du sikker på at du vil avbryte dette oppdraget? Alle aksepterte invitasjoner vil bli tapt. Eieren av oppdraget vil få beholde oppdragsrullen. - Oppdragsinvitasjon Er du sikker? Bare %1$d av dine %2$dklanmedlemmer har blitt med i dette oppdraget! Oppdraget starter automatisk når alle spillere har blitt med eller sa nei til invitasjonen. - Du har blitt invitert til å delta i et oppdrag! Idag Gjenstander Egg @@ -276,12 +216,8 @@ Du fant et stykke skjeldent Utstyr i Kabinettet: %s! Kjempemessig! Du ransaker Kabinettet og finner %1$s %2$s. Hva gjør den her? Du slåss med Kabinettet og får Erfaring. Ta den! - Åpne Kabinettet for å tilfeldig få spesielt Utstyr, Erfaring, eller mat! Utstyr som gjenstår: %d - Du har funnet den siste resten av skjeldent Utstyr i det Fortryllede Kabinettet. - Kabinettet vill ha nytt Utstyr den første uka hver måned. Frem til da, fortsett å trykke for Erfaring og Mat! Selg (%d Gull) Klekk med mikstur - Mat til kjæledyr Klekk med egg Inviter klan Mat %s med: @@ -292,16 +228,7 @@ Lukk Del Du matet din %s! - Du kjøpte %s Du kjøpte en premie - Standard - Magisk Eliksir - Oppdrag - Sjelden - Standard - Magisk Eliksir - Oppdrag - Sjelden Verdensoppdrag Du har ingen %s Nivå %d @@ -315,7 +242,6 @@ Helbredere er ugjennomtrengelige mot skade, og gir den beskyttelsen videre til andre. Glemte daglige oppgaver og dårlige vaner plager dem ikke mye, og de har måter å få bedre liv fra feiltrinn. Spill som Helbreder hvis du liker å hjelpe andre i Klanen din, eller om tanken på å lure døden gjennom hardt arbeid inspirerer deg! Velg Klasse Reserver Deg - Gidder du ikke bry deg med klasser? Vil du velge sener? Avslå - du vil bli en Kriger uten spesielle muligheter. Du kan lese mer om klassesystemet på wiki-en og aktivere klasser når du vil under Bruker -> Egenskaper. Er du sikker på at du vil være en %s? Du er nå en %s! Du har nytt standard stridsutstyr som du kan bytte til under Utstyr! @@ -329,12 +255,9 @@ Inviter Eksisterende Brukere Send Inviter Venner - Hvis du har venner som allerede bruker Habitica, så inviter dem med Bruker-ID her. Hvis en venn blir medlem av Habitica via din epost, så vil de automatisk bli invitert til din klan! Legg til invitasjoner - Bruker ID Epost - Inviter til Klan Del via Jeg kom til nivå %d i Habitica ved å forbedre mine vaner Jeg klekket akkurat et %1$s %2$s kjæledyr i Habitica ved å fullføre mine virkelige oppgaver! @@ -342,8 +265,6 @@ Åpne i Play Store Er du sikker på at du vil bytte klasse? Det vil koste deg 3 juveler. Advarsel: Du vil ikke lenger ha muligheten til å kjøpe utstyr fra %s klassen. - Melding fra %1$s - Leder: %1$s Bekreft Marked Tidsreisende @@ -351,36 +272,15 @@ Lås opp ved å invitere venner Lås opp ved å logge inn i Habitica ofte. Lås opp ved å lage en konto. - Ikke nok Gull - Du trenger ikke kjøpe helsemikstur Kjøpte %1$s - Godta kjøp - Kjøp %1$s for %2$s %3$s - juvel - timeglass - timeglass - gull gull Melding kopiert til utklippstavlen - Copier til utklippstavlen - Rediger Merkelapp Rediger - Ferdig - Slett Er du sikker? Vil du virkelig slette? - Rediger Merkelapper - Filtrer etter Merkelapper - Få noen til å invitere deg med denne QR Koden - QR kode lagret på - Din QR Kode - Last Ned - Send ny melding Velge Meldingsmottakeren Fortsett - Skann QR Kode - Tast mottakerens Bruker-ID Du har blitt invitert til en klan! Habitica Statistikk Legg til Oppgave @@ -392,7 +292,6 @@ Habitica Gjør Vane Habitica Daglige Gjøremål Habitica Liste over Gjøremål - Habitica Legg til Oppgave Google play tjenester kunne ikke bli funnet. Kjøp Ved å kjøpe juveler, så støtter du utviklerne og hjelper til med å holde Habitica i gang. @@ -448,54 +347,35 @@ 12 måneder Får å Abonnerer, så får du disse nyttige egenskapene: Abonnementstatus - av %s - Utfordring Detaljer Forlat Utfordring - Er du sikker på at du vil forlate Utfordringen \"%s\"? - Fjern oppgaver - Ønsker du å fjerne oppgavene? Fjern Behold Mine Utfordringer - Offentlig - Utfordringer Daglig Vane Belønning Gjøremål Offisiell - Deltakende Utfordring - Gå til Utfordring Du er ikke del av noen Utfordringer akkurat nå! Bli med på en utfordring for å legge til ferdig organiserte oppgaver til din egen liste. Da kan du kjempe med andre brukere for å vinne prestasjoner og til og med juveler! Klikk på \"Offentlig\" fanen for å finne en brukergenerert Utfordring som er best tilpasset dine behov! - Legg til Påminnelse - Advarsel - Åpne Innstillinger - Det virker som om du har utvikleralternativet \ \"Ikke behold Aktiviteter \\" aktiv. Foreløpig er dette alternativet som forårsaker problemer med habitica appen, så vi anbefaler at du deaktiverer den. - Ofte stilte spørsmål Spesiell Siden du abonnereer til Habitica, så kan du kjøpe et antall Juveler med Gull hver måned. - %d igjen Juvel Mysteriegjenstand Hver måned vil abonnenter motta en mysteriegjenstand. Dette blir som regel utgitt rundt en uke før slutten av måneden. Åpne - Du åpner esken og finner %s! Du hat fått en %1$s som en belønning for din dedikasjon til å forbedre livet ditt. Din neste premie låses opp etter %1$d Innlogginger venter på godkjenning Filtre Ferdig - Gruppeoppgaver can ikke bli redigert - Kan ikke endre denne oppgaven Grupper Alle Ingen Eid Ikke eid - Nytt\nSpill Logg inn med Facebook Logg inn med Google Tilbake @@ -539,17 +419,13 @@ Tittel til ny utfordring Eierforhold Vertshuset - System Start et nytt Oppdrag Forlat Klan Klanbeskrivelse - Er du sikker på at du vil avbryte dette oppdraget? Oppdraget avbrytes for alle i klanen og all fremskritt vil bli borte. Oppdragsrullen returneres til oppdragseier. - Er du sikker på av du vil forlate dette aktive oppdraget? All fremskritt du har gjort i oppdraget vil bli borte. %1$dDeltakere Velkommen Tilbake Utførte du noen av disse Daglige Gjøremålene i går: Start Dagen Min - Neste premie om %dinnlogginger Akseptert Ikke akseptert Deltakere @@ -560,7 +436,6 @@ k m b - Din balanse: Tilgjengelig til %s Månedlige juveler: %1$d/%2$d er igjen Månedlige juveler: %d er igjen @@ -583,7 +458,6 @@ Tilbakestill kontoen min Slett kontoen min Fare-sone - Bare glem det. Tilbakestilling av konto Sletting av konto Du må fullføre flere oppgaver før du kan få råd til denne gjenstanden. diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml index e0bdf86d2..08ea5d40b 100644 --- a/Habitica/res/values-pl/strings.sidebar.xml +++ b/Habitica/res/values-pl/strings.sidebar.xml @@ -6,7 +6,6 @@ Wiadomości Karczma Drużyna - Kup Klejnoty Gildie Wyzwania Ekwipunek diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml index ecd26f5fd..cdab434df 100644 --- a/Habitica/res/values-pl/strings.xml +++ b/Habitica/res/values-pl/strings.xml @@ -353,9 +353,6 @@ Za subskrypcję otrzymasz te użyteczne korzyści: Status Subskrypcji Opuść wyzwanie - Jesteś pewien, że chcesz opuścić wyzwanie “%s”? - Usuń zadania - Czy chcesz usunąć zadania\? Usuń Zachowaj Moje wyzwania diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml index c09b20263..47651e156 100644 --- a/Habitica/res/values-pt-rBR/strings.sidebar.xml +++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml @@ -6,7 +6,6 @@ Mensagens Taverna Grupo - Gemas & Inscrição Guildas Desafios Inventário diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml index 45df6395a..49d148d3d 100644 --- a/Habitica/res/values-pt-rBR/strings.xml +++ b/Habitica/res/values-pt-rBR/strings.xml @@ -372,9 +372,6 @@ Você obtém esses benefícios por ser um(a) assinante Status da Assinatura Sair do Desafio - Tem certeza que deseja sair do Desafio “%s”? - Remover tarefas - Você quer remover as tarefas? Remover Manter Meus Desafios @@ -902,7 +899,6 @@ Você não está conectado(a) à internet. Missão concluída! Você não está participando - Nível %d Terminar Missão %d Desbloqueie ao atingir o nível %d Desbloqueie ao terminar a Missão %d diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml index f5c7763e6..884ecc3da 100644 --- a/Habitica/res/values-pt-rPT/strings.sidebar.xml +++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml @@ -6,7 +6,6 @@ Mensagens Taberna Equipa - Comprar Gemas Guildas Desafios Inventário diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml index 8e3029e24..87fd09a37 100644 --- a/Habitica/res/values-pt-rPT/strings.xml +++ b/Habitica/res/values-pt-rPT/strings.xml @@ -322,8 +322,6 @@ 12 meses Estado da Subscrição Sair do Desafio - Remover tarefas - Deseja remover as tarefas? Remover Manter Os Meus Desafios diff --git a/Habitica/res/values-ro/strings.profile.xml b/Habitica/res/values-ro/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ro/strings.profile.xml +++ b/Habitica/res/values-ro/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ro/strings.sidebar.xml b/Habitica/res/values-ro/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ro/strings.sidebar.xml +++ b/Habitica/res/values-ro/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ro/strings.tutorial.xml b/Habitica/res/values-ro/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-ro/strings.tutorial.xml +++ b/Habitica/res/values-ro/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml index cca10f6b7..d9ebb4b01 100755 --- a/Habitica/res/values-ro/strings.xml +++ b/Habitica/res/values-ro/strings.xml @@ -4,19 +4,15 @@ Experienţă Sănătate Mana - Preferințele nu au putut fi încărcate din codul de bare Setari - Serverul dvs. personalizat Nume Utilizator Numele tau de utilizator Token API Tokenul tau API Limba Schimbă limba în Habitica - Codul tau QR Contacteaza-ma - A aparut o eroare… Cont Prima zi a saptamanii Prima zi a saptamanii in toate calendarele @@ -24,7 +20,6 @@ Activați Memento Setați ora pentru memento Ziua de pornire personalizată - Setează-ți o oră personalizată de început a zilei Utilizează Notificări Push Notificări Push Setează-ți notificările push @@ -37,13 +32,7 @@ Expediția ta a inceput Invitat în Expediție - Valoare - Nou To-Do - Răsplată noua - Sarcină Zilnică Noua - Obicei Nou Editare - Șterge Anulare Autentificare Inregistrare @@ -54,21 +43,15 @@ Confrimare parolă Deconectare Deconectați-vă din cont - Detalii cont Bun venit - Renaște - Conectați-vă prin intermediul aplicației înainte de a utiliza un widget Despre Biblioteci - Istoricul versiunilor Habitica este disponibil ca software open source pe Github Evaluați aplicația noastră Trimiteți-ne feedback! Raporteaza o eroare Cod sursă - Repetați fiecare - Eroare de conexiune Nu sunteți conectat(ă) la internet. Se pare că există o problemă cu serverul. Încercați mai târziu. Eroare de autentificare @@ -78,7 +61,6 @@ Salvează Copiază undefined - Text Dificultate Etichete Banal @@ -90,18 +72,7 @@ Negativ ( - ) Listă de verificare Mementouri - Acțiuni Atribute - Forță - Inteligență - Constituție - Percepție - Frecvență - În anumite zile ale săptămânii - La fiecare X Zile - Rezumat - Repetiții - Se repetă pe Zilnic Săptămânal Lunar @@ -115,23 +86,14 @@ Vineri Sâmbătă Duminică - Huzzah! Nu dispera! Ai rămas fără Viață Reumple-ți Viața & Încearcă din Nou Filtru - Imagine de profil - %dPM - Ai folosit %1$s pentru %2$d mana Ai folosit %1$s. obiect nou în checklist - Adaugă Folosind abilitatea - In curând - Sigur doriți să raportați acest mesaj pentru încălcarea regulilor? - Marchează mesajul Deblocați la nivelul 11 - Nu ești într-o ceată. Pentru a te alătura uneia, te rugăm să vizitezi site-ul. Parolă uitată Reactivează-ți Cotidienele Pune pauză Cotidienelor tale @@ -144,8 +106,6 @@ Sarcini Zilnice De-Făcut Recompense - Esti sigur? - Chiar vrei să ștergi? Da Nu Expediție @@ -153,14 +113,12 @@ Păr Tricou Piele - Urechi Animal Bază Culoare Barbă Mustață Floare Breton - Nimic setat Mărime Suplu Mare @@ -175,17 +133,11 @@ Incepe expediția Anulează Invitația Abandonează Expediția - Părăsește Expediția - Iminent - Acceptat - Respins - Participanți Versiunea %1$s (%2$d) Ajutor & FAQ Am înțeles! Reamintește-mi Bine ai venit la - Habitica E timpul să te distrezi în timp ce îți rezolvi activitățile. Alătură-te celor peste %s alți jucători care-și îmbunătățesc viața cu fiecare sarcină executată. Progres în joc Progresul în viață @@ -194,11 +146,8 @@ Fii social Păstrează-ți țelurile sub control cu ajutorul prietenilor. Sprijiniți-vă unii pe ceilalți în viață și în bătălii, îmbunătățindu-vă împreună! Să începem! - Anterior Următor Ocolire - Bine ai venit la Habitica, unde avansând în joc îți va îmbunătăți viața reală! Cu cât îți îndeplinești scopurile din lumea reală, cu atât vei debloca mai mult echipament, mai multe animale de companie, expediții, și altele. - Bun venit! Așadar, cum ai vrea să arăți? Nu-ți face griji, poți modifica asta mai târziu. Grozav! Acum, la ce ai vrea să lucrezi în timpul acestei călătorii? Muncă @@ -229,28 +178,19 @@ Studiază un o meserie Lucrează la un proiect de creativitate Finalizează proiectul de creativitate - Vrei să menții Habitica funcțională? Îi poți susține pe developeri cumpărând nestemate!\n\nNestematele îți permit să cumperi lucruri extra amuzante pentru contul tău, incluzând: \n\n - Costume cool pentru avatarul tău\n - Background-uri super\n - Expediții distractive care te recompensează cu ouă de animale de companie\n - Abilitatea de a-ți schimba clasa înainte de nivelul 100\n\nMulțumim foarte mult pentru că ne ajuți să menținem Habitica pe cât de bună poate să fie. Susținerea ta înseamnă mult pentru noi! Breslele mele Bresle publice Breaslă Părăsește Alătură-te - Lider Nestemate - Copiază ca lucru De-Făcut - Trimite Mesaj Privat - Steag Șterge Nume Descriere Adaugă Etichetă nouă Intimitate Scrie Mesaj - Postează Caută bresle - Termen: %s - Șir curent: %d - Sarcina are Dată Limită Echipament de Luptă Costum Cap @@ -264,9 +204,7 @@ Poartă Costum Echipat Ești sigur că vrei să anulezi această expediție? Toate invitațiile acceptate vor fi pierdute. Posesorul aventurii va păstra răvașul expediției. - Invitație în Expediție Ești sigur? Doar %1$d din %2$d dintre membrii cetei tale s-au alăturat acestei expediții! Expedițiile încep automat atunci când toți jucătorii se alătură sau refuză invitația. - Ai fost invitat să participi într-o expediție! Astăzi Obiecte Ouă @@ -278,12 +216,8 @@ Ai găsit o piesă rară de Echipament în Cufăr: %s! Super! Scotocești prin Cufăr și găsești %1$s %2$s. Ce caută asta aici? Te lupți împotriva cufărului și primești Experiență. Ia-o! - Deschide cufărul pentru a primi aleator Echipament special, Experiență, sau hrană! Piese de Echipament rămase: %d - Ai găsit ultima piesă rară de Echipament în Cufărul Fermecat - Cufărul va conține Echipament nou în prima săptămână din fiecare lună. Până atunci, apasă pentru Experiență și Hrană! Vinde (%d Aur) Eclozează cu o poțiune - Hrănește animalul de companie Eclozează cu un ou Invită ceata Hrănește %s cu: @@ -295,16 +229,7 @@ Închide Distribuie Ți-ai hrănit %s! - Ai achiziționat %s Ai achiziționat o recompensă - Standard - Poțiune Magică - Expediție - Rar - Standard - Poțiune Magică - Expediție - Rar Expediție Globală Ai nevoie de o pauză? Cazează-te în Hanul lui Daniel pentru a pune pauză unora din atributele dificile ale jocului:\n\n • Cotidienele ratate nu te vor deteriora\n @@ -323,7 +248,6 @@ Vracii sunt protejați împotriva loviturilor și aplică această protecție și altora. Cotidienele ratate și obiceiurile proaste nu îi deranjează așa mult și au modalități de recuperare a sănătății în caz de eșec. Fă-te Vraci dacă îți face plăcere să-i ajuți pe alții din echipa ta sau dacă te inspiră ideea de a trișa Moartea prin muncă asiduă! Selectează-ți Clasa Alege să nu iei parte - Nu te interesează clasele? Vrei să alegi mai târziu? Alege să nu participi - vei fi un luptător fără abilități speciale. Poți citi despre sistemul de clase mai târziu pe wiki și poți activa clasele oricând. Ești sigur că vrei să fii %s? De acum ești %s! Acum ai Echipament de Luptă de bază, pe care îl poți schimba de la Echipament! @@ -338,12 +262,9 @@ Invită Utilizatori existenți Trimite Invită Prieteni - Dacă ai prieteni care utilizează deja Habitica, invită-i prin ID-ul de Utilizator de aici. Dacă un prieten se alătura Habitica prin intermediul email-ului tău, aceștia vor fi automat invitați în ceata ta! Adaugă Invitații - ID Utilizator Email - Invită în Ceată Distribuie utilizând Am ajuns la nivelul %d în Habitica îmbunătățindu-mi obicieiurile din viața reală! Tocmai am eclozat un %1$s%2$s ca animal de companie în Habitica, completându-mi sarcinile din viața reala! @@ -351,8 +272,6 @@ Deschide Play Store Ești sigur că vrei să-ți schimbi clasa? Te va costa 3 nestemate. Atenție: Nu vei mai putea cumpăra echipament din clasa %s. - Mesaj de la %1$s - Lider: %1$s Confirmă Târg Călătorii în Timp @@ -361,36 +280,15 @@ Deblochează invitând prieteni Deblochează logându-te în Habitica regulat Deblochează creând un cont nou - Aur insuficient - Nu este necesar să cumperi o poțiune de viață Ai cumpărat %1$s - Confirmă achiziția - Cumpără %1$s pentru %2$s %3$s - nestemată - clepsidră - clepsidre - aur aur Mesaj copiat în Clipboard - Copiază în clipboard - Editează Eticheta Editează - Gata - Șterge Ești sigur(ă)? Ești sigur(ă) că vrei să ștergi? - Editează Etichetele - Filtrează în funcție de Etichetă - Ajută pe cineva să te invite prin acest Cod QR - Cod QR salvat la - Codul tău QR - Download - Trimite mesaj nou Alege un Destinatar Continuă - Scanează Codul QR - Introdu ID-ul de Utilizator al Destinatarului Ai fost invitat să te alături unei cete! Status Habitica Adaugă Sarcină @@ -402,7 +300,6 @@ Habitica Respectă Obiceiul Cotidiene Habitica Habitica Listă De-Făcut - Habitica Adaugă Sarcină Serviciile play Google nu au putut fi găsite. Cumpără Cumpărând nestemate îi ajuți pe developeri și ajuți să păstrezi Habitica funcțională @@ -458,55 +355,36 @@ 12 luni Pentru că te-ai abonat primești următoarele beneficii utile: Statusul abonamentului - cu %s - Detaliile Provocării Părăsește Provocarea - Ești sigur că vrei să părăsești Provocarea ”%s”? - Elimină sarcini - Dorești să elimini sarcinile? Elimină Păstrează Provocările mele - Public - Provocări Zilnic Obicei Recompensă De-Făcut Oficial - Participând Provocare - Mergi la Provocare Nu faci parte din nicio Provocare acum! Alătură-te unei Provocări pentru a adăuga un set special ales de sarcini listei tale, apoi intră în competiție împotriva altor Habiticans pentru a câștiga realizări și chiar nestemate! Apasă pe tab-ul ”Public” pentru a găsi Provocările create de utilizatori care sunt cele mai potrivite pentru tine! - Adaugă Memento - Atenție - Deschide Setările - Se pare că ai la dispoziție opțiunea de Developer \“Don\'t keep Activities\” activă. Momentan, această opțiune cauzează probleme cu aplicația Habitica, și sugerăm așadar dezactivarea ei. Mesaje - Întrebări Frecvente Special Datorită faptului că ești abonat la Habitica, poți cumpăra un anumit număr de Nestemate în fiecare lună, folosind Aur. - %d rămase Nestemată Obiect Misterios În fiecare lună, abonații vor primi un obiect misterios. Acesta apare de regulă cu aproximativ o săptămână înainte de finalul lunii. Deschide - Deschizi cutia și găsești %s! Ai obținut un/o %1$s ca recompensă pentru devotamentul tău de a-ți îmbunătăți viața. Următorul tău premiu se deblochează în %1$d Check-In-uri așteaptă acceptul Filtre Gata - Sarcinile de grup nu pot fi editate. - Nu poți edita această sarcină Grupuri Toate Niciuna Deținut Nedeținut - Joc\nNou Logare cu Facebook Logare cu Google Înapoi @@ -551,18 +429,14 @@ Titlul noii Provocări Proprietate Han - Sistem Începe o nouă Expediție Părăsește Ceata Descrierea Cetei - Ești sigur că vrei să abandonezi această misiune? O va abandona pentru toată lumea din ceata ta, iar progresul de până acum va fi pierdut. Răvașul Expediției va reveni deținătorului. - Ești sigur(ă) că vrei să părăsești această expediție în desfășurare? Tot progresul expediției va fi pierdut. %1$d Participanți Bine ai Revenit Bifează Cotidienele făcute ieri: Începe Ziua Ești sigur că vrei să părăsești această Ceată? - Următorul Premiu în %d Check-In-uri În așteptare Acceptat Refuzat @@ -574,7 +448,6 @@ k m mld - Soldul tău: Valabil până la %s Nestemate Lunare: %1$d/%2$d Rămase Nestemate Lunare: %d Rămase @@ -598,7 +471,6 @@ resetează-mi contul șterge-mi contul Zona de Pericol - Nu mai contează Contul se resetează Contul se șterge Trebuie să mai completezi sarcini înainte să-ți permiți acest obiect! @@ -632,7 +504,6 @@ Modifică-ți opțiunile de autentificare. Schimbă Parola Schimbă Adresa de Email - Schimbă Numele de Logare Schimbă Nivelul Personajului Alocă Automat Puncte @@ -663,8 +534,6 @@ Fără Clasă Acest obiect este disponibil doar unei anumite clase.\nÎți poți modifica clasa din Setări. Poți achiziționa doar echipament pentru clasa ta actuală - %d puncte - Toogle Emojis Bine ai venit la Han! Ia un scaun pentru a purta o discuție, sau ia o pauză de la sarcinile tale. Cazează-te în Han Ghidurile Comunității @@ -679,18 +548,12 @@ Deschize sertarul de navigație Închide sertarul de navigație Căpcăunul Global - Arta Căpcăunului Arta Căpcăunului Descrierea Căpcăunului Global Lovituri Furioase: %d/%d - Lovitura nu a avut încă loc!\nCăpcăunul Șef se va enerva și îl va ataca pe unul dintre negustorii noștri prietenoși atunci când bara sa de furie se umple. Ține pasul cu Activitățile tale Zilnice pentru a încerca să previi asta! Lovitură iminentă Ce este o Lovitură Furioasă? - Există 3 potențiale Lovituri Furioase - Măsurătoarea se umple atunci când Habiticanii nu-și îndeplinesc Activitățile Zilnice. Dacă se umple complet, DysHearener-ul va dezlănțui atacul său cutremurător asupra unuia dintre negustori, așa că ar trebui să te asiguri că-ți îndeplinești sarcinile! - Lovitura nu a avut încă loc! %s a fost Atacat! - %s este Distrus! Dragul nostru %s a fost devastat atunci când %s a distrus %s. Îndeplinește-ți sarcinile rapid pentru a înfrânge monstrul și a ajuta la reconstrucție! Magazinul de Expediții Alex Negustorul @@ -701,20 +564,15 @@ Pleacă în expediții împreună cu prieteni sau singur. Luptă împotriva monștrilor, crează Provocări, și ajută-te să rămâi responsabil cu ajutorul Cetelor. Joacă Habitica într-o Ceată Vrei să te alături unei cete? - Deschide site-ul pentru a crea o ceată ID copiat în clipboard Ai cumpărat toate Nestematele pe care le poți cumpăra luna aceasta. Mai multe vor fi puse la dispuziție în primele trei zile ale fiecărei luni. Mulțumim pentru abonare! - Limită lunară de Nestemate Atinsă - Mesaje în Chat Ce este un Căpcăun Global? - Un Căpcăun Șef este un eveniment special la care toată comunitatea conlucrează pentru a înfrânge un monstru puternic cu sarcinile lor!\nCompletează sarcini pentru a deteriora Căpcăunul\nCăpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori!\nPoți continua să lupți împotriva Căpcăunilor din Expediții, iar deteriorarea va fi aplicată ambilor\nMergi la Tavernă pentru a vedea progresul Căpcăunului și atacurile lui Furioase Un Căpcăun Șef este un eveniment special în cadrul căruia toată comunitatea lucrează împreună pentru a răpune un monstru cu ajutorul sarcinilor lor! Completează sarcini pentru a deteriora Căpcăunul Căpcăunul nu îți va afecta viața pentru sarcini ratate, dar Furia lui va crește. Dacă instrumentul de măsură se umple, Căpcăunul îl va ataca pe unul din negustori! Poți continua cu Expediții normale împotriva Căpcăunilor, deteriorarea se va aplica ambelor Mergi în Tavernă să vezi progresul Căpcăunului și atacurile Furioase Răpune Căpcăunul pentru a primi recompense speciale și pentru a salva Habitica de Teroarea lui %s! - %s atacuri! Ian Ghidul Expedițiilor Vrăjitoarea Sezonului Atac furios: diff --git a/Habitica/res/values-ru/strings.sidebar.xml b/Habitica/res/values-ru/strings.sidebar.xml index a17df2a26..2b30094e6 100644 --- a/Habitica/res/values-ru/strings.sidebar.xml +++ b/Habitica/res/values-ru/strings.sidebar.xml @@ -6,7 +6,6 @@ Сообщения Таверна Команда - Покупка самоцветов Гильдии Испытания Инвентарь diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml index 8112ba43f..66a872378 100644 --- a/Habitica/res/values-ru/strings.xml +++ b/Habitica/res/values-ru/strings.xml @@ -364,9 +364,6 @@ Как подписчик вы получаете эти полезные преимущества: Статус подписки Покинуть испытание - Вы уверены, что хотите покинуть испытание “%s”? - Удалить задачи - Вы уверены, что хотите удалить задачи? Удалить Оставить Мои испытания @@ -669,8 +666,6 @@ Отправить подарок Сервер Ваш подарок отправлен! - Вы отправили %s месячную подписку Habitica %s, и эта же подписка была применена к вашей учетной записи для нашей акции «Подарок один, получите один»! - Вы отправили %s один %s-месячную подписку Habitica. Обнаруживать Сегодня Подарите подписку и получите такую же бесплатно прямо сейчас! @@ -700,7 +695,6 @@ Переключиться на вид списка Квест завершён! Вы не принимаете участие - Уровень %d Подарить подписку Акция Участник группового тарифа diff --git a/Habitica/res/values-sv/strings.tutorial.xml b/Habitica/res/values-sv/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-sv/strings.tutorial.xml +++ b/Habitica/res/values-sv/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml index ace35c582..544fbb0b3 100755 --- a/Habitica/res/values-sv/strings.xml +++ b/Habitica/res/values-sv/strings.xml @@ -4,19 +4,15 @@ Erfarenhet Hälsa Mana - Preferenser kunde inte laddas ner från streckkoden Inställningar - Din beställningsserver Användar-ID Ditt användar-ID API Token Din API Token Språk Ändra Habiticas språk - Din QR-kod Kontakta mig - Ett fel har inträffat... Konto Veckans första dag Veckans första dag i alla kalendrar @@ -24,7 +20,6 @@ Aktivera påminnelse Ställ in tid för påminnelse Anpassad startdag - Välj anpassad starttid för dag Användarens pop-up-notifikationer Pop-up-notifikationer Ändra dina push-notifikationsinställningar @@ -37,13 +32,7 @@ Ditt uppdrag har påbörjats Inbjudan till uppdrag - Värde - Ny att-göra - Ny Belöning - Ny daglig uppgift - Ny vana Redigera - Radera Avbryt Logga in Registrera dig @@ -54,21 +43,8 @@ Godkänn lösenord Logga ut Logga ut från ditt konto - Kontoinformation Välkommen - Återuppliva - Var god anslut genom applikationen innan du använder en widget - Om - Bibliotek - Versionhistorik - Habitica finns tillgängligt som open source program på Github - Betygsätt vår app - Skicka oss feedback - Rapportera en bugg - Källkod - Upprepa varje - Anslutningsfel Du är inte ansluten till internet. Det verkar vara ett problem med servern. Försök igen senare. Autentiseringsfel @@ -78,7 +54,6 @@ Spara Kopiera Anteckningar - Text Svårighetsgrad Taggar Trivial @@ -90,18 +65,7 @@ Negativ ( - ) Checklista Påminnelser - Handlingar Egenskaper - Styrka - Intelligens - Tålighet - Uppmärksamhet - Frekvens - På särskilda dagar i veckan - Varje X dagar - Sammanfattning - Repeterar - Repeterar på Dagligen Veckovis Månadsvis @@ -115,28 +79,15 @@ Fredag Lördag Söndag - Hurra! Förtvivla inte! Din hälsa tog slut! Ladda upp hälsan &amp ; Försök igen Filter - Profilbild - %d MP - Du använde %1$s för %2$d mana. Du använde %1$s nytt checklisteobjekt - Lägg till Använder en färdighet - Kommer snart - Är du säker på att du vill rapportera det här meddelandet som olämpligt? - Flagga meddelande Låses upp vid level 11 - Du är inte med i något sällskap. För att gå med i ett, besök hemsidan. Glömt lösenord - Återaktivera dina dagliga uppgifter - Pausa dina dagliga uppgifter - Köp - Avfärda Sällskap Chatt Medlemmar @@ -144,8 +95,6 @@ Dagliga uppgifter Att-göra Belöningar - Är du säker? - Vill du verkligen radera? Ja Nej Uppdrag @@ -153,14 +102,12 @@ Hår Tröja Hud - Djuröron Bas Färg Skägg Mustach Blomma Lugg - Inget valt Storlek Smal Bred @@ -170,22 +117,11 @@ Köp Köp set %s Förfallodatum - Acceptera - Avböj - Starta uppdrag - Avbryt inbjudning - Avbryt uppdrag - Lämna uppdrag - Väntar - Accepterade - Avböjde - Deltagare Version %1$s (%2$d) Hjälp & FAQ Jag fattar! Påminn mig igen Välkommen till - Habitica Det är dags att ha kul medans du gör saker. Anslut dig till över %s andra som förbättrar sitt liv en uppgift i taget. Framgång i spelet Framgång i livet @@ -194,11 +130,8 @@ Bli social Håll koll på dina mål med hjälp av dina vänner. Stötta varandra i livet och i strider och förbättras tillsammans! Sätt igång! - Tillbaka Nästa Hoppa över - Välkommen till Habitica, här får framsteg i spelet dig förbättra ditt verkliga liv! Allteftersom du uppnår dina mål kommer du låsa upp utsustning, husdjur, uppdrag och mer. - Välkommen Så, hur vill du se ut? Ingen fara, du kan alltid ändra detta senare. Underbart! Nu så, vad är du intresserad av att jobba på genom den här resan? Arbete @@ -229,28 +162,19 @@ Studera en mästare inom hantverket Arbeta på ett kreativt projekt Slutför ett kreativt projekt - Vill du hjälpa oss att hålla i gång Habitica? Du kan stötta utvecklarna genom att köpa juveler!\n\nFör juveler kan du köpa roliga saker till ditt konto, bland annat: \n\n - coola kostymer för din avatar\n - Snygga bakgrunder\n - Kul uppdrag som belönar dig med husdjursägg\n - Förmågan att ändra din klass innan du når level 100\n\nTack så mycket för att du hjälper oss att göra Habitica bättre. Ditt stöd betyder mycket för oss! Mina gillen Allmänna gillen Gille Lämna Gå med - Ledare Juveler - Kopiera som en att-göra - Skicka PM - Flagga Radera Namn Beskrivning Lägg till tagg Privat Skriv meddelande - Skicka Sök efter gillen - Infaller om: %s - Nuvarande följd: %d - Uppgiften har ett förfallodatum Stridsutrustning Kostym Huvud @@ -264,9 +188,7 @@ Använd klädsel Utrustad Är du säker på att du vill avbryta det här uppdraget? Alla accepterade inbjudningar kommer försvinna. Ägaren av uppdraget kommer återfå uppdragsskriftrullen. - Uppdragsinbjudning Är du säker? Bara %1$d av dina %2$d sällskapsmedlemmar har gått med i detta uppdrag! Uppdrag startar automatiskt när alla spelare har accepterat eller avvisat inbjudan. - Du har bjudits in att delta i ett uppdrag! Idag Objekt Ägg @@ -278,12 +200,8 @@ Du hittade ovanlig utrustning i vapenskåpet: %s! Fantastiskt! Du krafsar runt i vapenskåpet och hittar %1$s %2$s. Vad gör den här? Du brottas med vapenskåpet och får erfarenhet. Touché! - Öppna vapenskåpet för att slumpmässigt få specialutrsutning, erfarenhet eller mat! Utrustning kvar att hitta: %d - Du har hittat den sista ovanliga utrustningen i det förtrollade vapenskåpet. - Vapenskåpet kommer ha ny utrustning under den första veckan av varje månad. Tills dess, fortsätt klicka för erfarenhet och mat! Sälj (%d Guld) Kläck med kläckningsdryck - Mata husdjur med Kläck med ägg Bjud in sällskap Mata %s med: @@ -294,16 +212,7 @@ Stäng Dela Du matade din %s! - Du köpte %s Du köpte en belöning - Standard - Magisk Dryck - Uppdrag - Sällsynt - Standard - Magisk Dryck - Uppdrag - Sällsynt Världsuppdrag Du har inga %s Lvl %d @@ -317,7 +226,6 @@ Helare är ogenomträngliga för skada och delar med sig av skyddet till andra. Missade dagliga uppgifter och dåliga vanor påverkar dem inte så mycket, och de har sätt att återställa hälsan efter misslyckanden. Spela som helare om du gillar att hjälpa andra i ditt sällskap eller om tanken på att lura döden genom hårt arbete inspirerar dig! Välja klass Välj bort - Vill du inte bekymra dig om klasser? Vill du välja senare? Välj bort - du kommer att vara en krigare utan speciella egenskaper. Du kan läsa mer om klasssystemet senare på wikin och sätta igång klasser när som helst. Är du säker på att du vill vara en %s? Du är nu en %s! Du har ny standard Stridsutrustning som du kan ändra under Utrustning! @@ -332,12 +240,9 @@ Bjud in existerande användare Skicka Bjud in vänner - Om du har vänner som redan använder Habitica, bjud in dem med användar ID här. Om vänner går med i Habitica via ditt mail kommer de automatiskt att bjudas in till ditt sällskap. Lägg till inbjudningar - Användar ID Mail - Bjud in till sällskap Dela användning Jag kom till level %d i Habitica genom att förbättra mina vanor i verkliga livet! Jag kläckte just ett %1$s %2$s husdjur i Habitica genom att slutföra mina uppgifter! @@ -345,8 +250,6 @@ Öppna i Play Store Är du säker på att du vill ändra din klass? Det kommer kosta 3 juveler. Varning: Du kommer inte längre kunna köpa utrustning från %s klassen. - Meddelande från %1$s - Ledare: %1$s Godkänn Affären Tidsresande @@ -355,36 +258,15 @@ Lås upp genom att bjuda in vänner Lås upp genom att logga in på Habitica regelbundet Lås upp genom att skapa ett konto - Du har inte tillräckligt med guld - Du behöver inte köpa någon hälsodryck Köpt %1$s - Slutför köp - Köp %1$s för %2$s %3$s - Juvel - Timglas - Timglas - Guld guld Meddelandet kopierades till anslagstavlan - Kopiera till anslagstavlan - Ändra tagg Ändra - Klar - Radera Är du säker? Vill du verkligen radera? - Ändra taggar - Filtrera efter taggar - Någon kan bjuda in dig med den här QR-koden - QR-kod sparad i - Din QR-kod - Ladda ned - Skicka nytt meddelande Välj mottagare Fortsätt - Skanna QR kod - Skriv in mottagares användar ID Du har bjudits in till ett sällskap! Habitica statisktik Lägg till uppgift @@ -396,15 +278,7 @@ Habitica gör vana Habitica daglig utmaning Habitica Att Göra-lista - Habitica lägg till uppgift Google play services kunde inte hittas. - Köp - Att köpa ädelstenar stöttar utvecklarna och hjälper till att hålla Habitica igång - Ädelstenar låter dig köpa roligt extramaterial till ditt konto, bland annat: - Coola dräkter till din avatar - Häftiga bakgrunder - Uppdrag som belönar dig med husdjursägg - Möjligheten att ändra klass före level 100 Stöd Habitica använd Får du inte rätt fynd? Kolla in Marknaden! @@ -418,23 +292,15 @@ Tillhör utmaningen Har påminnelse Har tag - Att abonnera stöttar utvecklarna och hjälper till att hålla Habitica igång Bli en prenumerant och du får de här användbara fördelarna: - Köp ädelstenar med guld - Månadens exklusiva föremål - Hämta ytterligare historik - Dagliga fynd-chanser dubblerade Abonnemang Återkommer varje %s Prenumerera - Köpmannen Alex kommer nu sälja juveler till dig för 20 guld vardera!\n\nHans månatliga leveranser är till en början begränsade till 25 Juveler per månad, men kan öka baserat på tiden du har prenumrerat.\n\nBegränsningen ökar med 5 Juveler för varje tre månaders period av kontinuerligt abonnemang, till ett maximum utav 50 Juveler per månad! +%d Mystiskt timglas Betalningsmetod Prenumeration Aktiv Avbryt prenumeration - Vill du inte längre prenumerera? Du hittar alternativet i \"Mina Appar\" sektionen i Google Play Store. - Vill du inte längre prenumerera? P.g.a din betalningsmetod kan du bara avsluta din prenumeration genom hemsidan. Klicka på knappen under för att öppna sidan i din webbläsare! Besök Habiticas hemsida Aktuella bonusar Köpta månader @@ -449,52 +315,34 @@ 12 månader För att du Prenumererar så får du dessa användbara fördelar: Prenumerationsstatus - av %s - Utmaningsdetaljer Lämna utmaning - Är du säker på att du vill lämna Utmaning \"%s\"? - Ta bort uppgifter - Vill du ta bort uppgifterna? Ta bort Behåll Mina utmaningar - Publik - Utmaningar Daglig Vana Belöning To-Do Officiell - Deltar Utmaning - Gå till utmaning Du är inte med i några utmaningar! - Lägg till påminnelse - Varning - Öppna inställningar Meddelanden - Vanliga frågor Speciell För att du prenumererar på Habitica så kan du köpa ett antal Diamanter varje månad för Guld. - %d kvar Juvel Mysteriskt Objekt Varje månad får prenumeranter ett mysteriskt objekt. Den är oftast utgiven ungefär en vecka innan slutet av månaden. Öppna - Du öppnade lådan och hittade %s! Du fick en %1$s som belöning för din hängivenhet till att förbättra ditt liv. Ditt nästa pris låses upp vid %1$d incheckningar Väntar på godkännande Filter Klart - Gruppuppgifter kan inte redigeras. - Kan inte redigera den här uppgiften Grupper Alla Inga Äger Äger inte - Nytt\nSpel Logga in med Facebook Logga in med Google Bakåt @@ -537,18 +385,14 @@ Ny titel för utmaning Ägarskap Stuga - System Starta ett nytt quest Lämna party Party-beskrivning - Är du säker på att du vill avbryta detta uppdrag? Det kommer avbrytas för alla i ditt sällskap och alla framsteg kommer att gå förlorade. Uppdragsskriftrullen kommer att bli returneras till ägaren. - Är du säker på att du vill lämna det aktiva uppdraget? Alla dina uppdragsframsteg kommer att förloras. %1$d deltagare Välkommen tillbaka Gjorde du dina dailies igår: Starta min dag Är du säker på att du vill lämna partyt? - Nästa pris vid %d incheckningar Väntar Accepterade Nekade @@ -560,7 +404,6 @@ k m b - Ditt saldo: Tillgänglig till %s Månadsvisa Diamanter: %1$d/%2$d Kvarstående Månadsvisa Diamanter: %d Kvarstående @@ -583,7 +426,6 @@ återställ mitt konto radera mitt konto Farozon - Glöm det Återställer Konto Raderar Konto Du måste slutföra fler uppgifter innan du har råd med detta objekt! @@ -613,7 +455,6 @@ Ändra dina autentisering alternativ. Ändra Lösenord Ändra Email-address - Ändra inloggningsnamn Ändra Karaktärs-nivå Fördela Poäng Automatiskt @@ -642,13 +483,10 @@ Klasslös Detta objekt är bara tillgängligt för en specifik klass. Du kan ändra din klass på Inställningar. Du kan bara köpa utrustning för din nuvarande klass - %d poäng - Växla Emojis På & Av Visa FAQ Rapportera en bugg Personal och Moderatorer Världsboss - %s är förtvivlad! Köpmannen Alex Värden Daniel Djurmästare Matt diff --git a/Habitica/res/values-th/strings.profile.xml b/Habitica/res/values-th/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-th/strings.profile.xml +++ b/Habitica/res/values-th/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-th/strings.sidebar.xml b/Habitica/res/values-th/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-th/strings.sidebar.xml +++ b/Habitica/res/values-th/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-th/strings.tutorial.xml b/Habitica/res/values-th/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-th/strings.tutorial.xml +++ b/Habitica/res/values-th/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-th/strings.xml b/Habitica/res/values-th/strings.xml index dd8b0ec3c..beaf86d60 100755 --- a/Habitica/res/values-th/strings.xml +++ b/Habitica/res/values-th/strings.xml @@ -9,7 +9,6 @@ ตั้งเวลาแจ้งเตือน แก้ไข - ลบ ยกเลิก ลงชื่อเข้าใช้งาน สมัครสมาชิก @@ -27,7 +26,6 @@ ง่าย ปานกลาง ยาก - ทุก X วัน จันทร์ อังคาร พุธ @@ -35,11 +33,8 @@ ศุกร์ เสาร์ อาทิตย์ - เร็วๆนี้ ลืมรหัสผ่าน รางวัล - คุณแน่ใจแล้วใช่ไหม? - คุณแน่ใจที่จะลบใช่ไหม? ใช่ ไม่ ภารกิจ diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml index eb70d4be0..2d3b02453 100644 --- a/Habitica/res/values-tr/strings.sidebar.xml +++ b/Habitica/res/values-tr/strings.sidebar.xml @@ -6,7 +6,6 @@ Mesajlar Taverna Takım - Elmas Satın Al Loncalar Mücadeleler Envanter diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml index d6a44e044..9da48a6dc 100644 --- a/Habitica/res/values-tr/strings.xml +++ b/Habitica/res/values-tr/strings.xml @@ -372,9 +372,6 @@ Abone Olarak bu faydalardan yararlanıyorsun: Abonelik Durumu Mücadeleden Ayrıl - \"%s\" Mücadelesinden ayrılmak istediğine emin misin\? - İşleri sil - İşleri silmek istiyor musun\? Sil Tut Benim Mücadelelerim @@ -675,8 +672,6 @@ Aşağıdan hediye etmek istediğin aboneliği seç! Bu satın alım otomatik olarak yenilenmeyecek. Sunucu Hediyen gönderildi! - Bir Hediye Et Bir Kazan promosyonuyla %s \'e/a %s-month Habitica aboneliği yolladın ve aynı abonelik sizin hesabınıza da uygulandı! - %s \'e/a %s-month Habitica üyeliği gönderdin. Keşfet Hasar Durduruldu Önemli Duyurular diff --git a/Habitica/res/values-uk/strings.profile.xml b/Habitica/res/values-uk/strings.profile.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-uk/strings.profile.xml +++ b/Habitica/res/values-uk/strings.profile.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-uk/strings.sidebar.xml b/Habitica/res/values-uk/strings.sidebar.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-uk/strings.sidebar.xml +++ b/Habitica/res/values-uk/strings.sidebar.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-uk/strings.tutorial.xml b/Habitica/res/values-uk/strings.tutorial.xml index a6b3daec9..3a0906840 100644 --- a/Habitica/res/values-uk/strings.tutorial.xml +++ b/Habitica/res/values-uk/strings.tutorial.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml index da355aaa4..78d94803f 100755 --- a/Habitica/res/values-uk/strings.xml +++ b/Habitica/res/values-uk/strings.xml @@ -4,19 +4,15 @@ Досвід Здоров’я Мана - Налаштування не завантажуються зі штрих-коду Налаштування - Ваш нестандартний сервер ID користувача Ваш ID користувача Токен API Ваш токен API  Мова Змінити мову Habitica - Ваш QR-код Напишіть мені - Сталася помилка Акаунт Перший день тижня Перший день тижня у всіх календарях @@ -24,7 +20,6 @@ Активувати нагадувач Встановити час нагадувача Власний початок дня - Встановити власний початок дня Користувацькі примусові сповіщення Примусові сповіщення Налаштуйте ваші примусові сповіщення @@ -37,13 +32,7 @@ Розпочався ваш квест Запрошення до квесту - Цінність - Нова задача - Нова нагорода - Нове щоденне - Нова звичка Редагувати - Видалити Скасувати Увійти Зареєструватися @@ -54,21 +43,15 @@ Підтвердити пароль Вийти Вийти з вашого акаунта - Відомості про акаунт Вітаємо - Відродити - Будь ласка, підключіться через застосунок перед використанням віджету. Про Бібліотеки - Історія версій Habitica доступна як програмне забезпечення з відкритим кодом на Github Оцініть наш застосунок Надішліть нам відгук! Повідомте про баґ Код - Повторювати кожні - Помилка підключення Ви не підключені до Інтернету. Схоже, є проблема на сервері. Спробуйте знову пізніше. Помилка автентифікації @@ -90,16 +73,6 @@ Підзавдання Нагадування Характеристики - Сила - Інтелект - Витривалість - Пильність - Частота - У певні дні тижня - Кожні X днів - Підсумок - Повтори - Повтори по Щоденно Щотижня Щомісяця @@ -113,23 +86,14 @@ П’ятниця Субота Неділя - Ура! Не впадайте у відчай! У вас закінчилося здоров’я! Поповнити здоров’я і спробувати знову Фільтр - Зображення профілю - %d мани - Ви використали %1$s мани з %2$d. Ви використали %1$s. нове підзавдання - Додати Використання навички - Незабаром - Ви дійсно бажаєте поскаржитися на це повідомлення? - Поскаржитися на повідомлення Розблоковується на рівні 11 - Ви не в гурті. Щоби приєднатися до гурту, відвідайте веб-сайт. Забутий пароль Відновити щоденні Призупинити щоденні @@ -142,8 +106,6 @@ Щоденні Задачі Нагороди - Ви впевнені? - Ви дійсно хочете видалити? Так Ні Квест @@ -151,14 +113,12 @@ Волосся Сорочка Шкіра - Тваринні вуха Основа Колір Борода Вуса Квітка Хвостик - Нічого не встановлено Розмір Худий Повний @@ -173,17 +133,11 @@ Почати квест Скасувати запрошення Скасувати квест - Залишити квест - У черзі - Прийнято - Відхилено - Учасники Версія %1$s (%2$d) Допомога і ЧаПи Зрозуміло! Нагадати пізніше Вітаємо у - Habitica diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml index fecececaf..09064770d 100755 --- a/Habitica/res/values-vi/strings.xml +++ b/Habitica/res/values-vi/strings.xml @@ -4,19 +4,15 @@ Điểm Kinh nghiệm Máu Mana - Không thể tải Prefs từ mã vạch Cài Đặt - Server Tự Tạo Của Bạn ID Người Chơi ID Người Chơi của Bạn Mã API Mã API của Bạn Ngôn Ngữ Thay đổi Ngôn Ngữ của Habitica - Mã QR Của Bạn Liên hệ với tôi - Đã xảy ra lỗi... Tài Khoản Ngày Đầu tiên trong Tuần Ngày Đầu tiên trong Tuần trên tất cả các lịch @@ -24,7 +20,6 @@ Kích hoạt Nhắc Nhở Thiết lập Thời gian Nhắc nhở Tùy chỉnh Ngày Bắt đầu - Đặt thời gian ngày tùy chỉnh bắt đầu Sử dụng thông báo đẩy Thông báo Đẩy Thiếp lập Cài đặt Thông báo Đẩy của bạn @@ -37,13 +32,7 @@ Quest của bạn đã Bắt đầu Đã mời tham gia Quest - Giá trị - Việc Cần Làm mới - Phần Thưởng mới - Công Việc Hằng Ngày mới - Thói Quen mới Chỉnh sửa - Xóa Hủy Đăng nhập Đăng ký @@ -54,20 +43,8 @@ Xác nhận mật khẩu Đăng xuất Thoát tài khoản của bạn - Chi tiết Tài khoản Chào Mừng - Hồi sinh - Về chúng tôi - Thư viện - Lịch sử phiên bản - Habitica là một phần mềm mã nguồn mở trên Github - Đánh giá Ứng dụng của chúng tôi - Phản hồi cho chúng tôi! - Báo lỗi - Mã Nguồn - Lặp lại mỗi - Lỗi Kết nối Không có kết nối Internet. Mất kết nối với máy chủ Lỗi Ủy quyền @@ -76,7 +53,6 @@ Lưu Sao chép Ghi chú - Văn bản Độ khó Thẻ/Nhãn Không đáng kể @@ -88,18 +64,7 @@ Tiêu cực ( - ) Danh mục Nhắc nhở - Hành động Thuộc tính - STR - INT - CON - PER - Tần suất - Vào những Ngày cụ thể trong Tuần - Mỗi X ngày - Tóm lại - Lặp lại - Lặp lại vào Mỗi ngày Mỗi tuần Mỗi tháng @@ -113,28 +78,15 @@ Thứ 6 Thứ 7 Chủ nhật - Hoan hô! Đừng tuyệt vọng! Bạn đã hết Máu! Hồi máu & Thử Lại Màng lọc - Hình đại diện - %d MP - Bạn dùng %1$s tốn %2$d mana. Bạn dùng %1$s. mục mới trong danh mục - Thêm Sử dụng Kĩ Năng - Sắp có mặt - Bạn có chắc tin nhắn này vi phạm nội quy không? - Gắn Cờ Mở khóa ở Cấp 11 - Bạn không ở trong nhóm nào cả. Để tham gia một nhóm, vui lòng ghé thăm trang web. Quên Mật khẩu - Tái kích hoạt Công Việc Hằng Ngày - Tạm dừng Công Việc Hằng Ngày - Mua - Giải tán Party Chat Thành viên @@ -142,8 +94,6 @@ Công Việc Hằng Ngày Việc Cần Làm Phần Thưởng - Bạn chắc chứ? - Bạn có chắc là muốn xóa không? Có Không Nhiệm vụ @@ -151,7 +101,6 @@ Tóc Áo Da - Tai Động vật Thân cơ thể Màu da Râu @@ -165,28 +114,16 @@ Mở khóa set với %d Đá Quý Mua Mua set %s - Chấp nhận - Từ chối - Bắt đầu Quest - Hủy lời mời - Hủy Quest - Rời Quest - Đang chờ - Đã chấp nhận - Đã từ chối - Người tham gia Phiên bản %1$s (%2$d) Giúp đỡ & Những câu hỏi thường gặp Đã hiểu! Nhắc tôi lại lần nữa Chào mừng đến - Habitica Giờ là lúc có được niềm vui khi hoàn thành công việc. Tham gia với %s người khác đang cải thiện cuộc sống của họ với một nhiệm vụ mỗi lần. Tiến trình trong trò chơi Tiến trình ngoài đời thực Chiến đấu quái vật Bắt đầu nào! - Chào mừng tới Habitica, nơi mà tiến bộ trong game sẽ cải thiện cuộc sống thực! Khi bạn hoàn thành mục tiêu đời thực, bạn sẽ mở khóa Trang bị, Thú cưng, Nhiệm vụ, và nhiều hơn thế nữa. Việc làm Thể dục Sức khỏe @@ -207,10 +144,7 @@ Bang hội Rời Tham gia - Người đứng đầu Đá Quý - Gửi Tin nhắn riêng - Gắn cờ Xóa Tên Mô tả @@ -228,7 +162,6 @@ Thú cưỡi Bán (%d vàng) Ấp bằng Thuốc - Cho thú cưng ăn Ấp bằng trứng Cho %s ăn: Cho ăn @@ -464,9 +397,6 @@ Những thử thách của tôi Giữ Xóa - Bạn có muốn xóa những công việc\? - Xóa công việc - Bạn có chắc muốn rời Thử thách \"%s\"\? Rời Thử thách Trạng thái Gói đăng ký Bạn có những lợi ích này khi trở thành một Người đăng ký @@ -902,7 +832,6 @@ Nhập số lượng Gem bạn muốn gửi ở dưới hoặc đổi qua mục khác để mua Gem rồi tặng Nhiệm vụ hoàn thành! Bạn không tham gia - Cấp độ %d Hoàn thành Nhiệm vụ %d Mở khóa bằng cách đạt tới cấp độ %d Mở khóa bằng cách hoàn thành Nhiệm vụ %d diff --git a/Habitica/res/values-w360dp/styles.xml b/Habitica/res/values-w360dp/styles.xml deleted file mode 100644 index a6b3daec9..000000000 --- a/Habitica/res/values-w360dp/styles.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/Habitica/res/values-zh-rTW/strings.sidebar.xml b/Habitica/res/values-zh-rTW/strings.sidebar.xml index cb52d06ad..47acf637f 100644 --- a/Habitica/res/values-zh-rTW/strings.sidebar.xml +++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml @@ -6,7 +6,6 @@ 訊息 酒館 隊伍 - 購買寶石 公會 挑戰 物品欄 diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml index 0fd433a4e..183f582ad 100644 --- a/Habitica/res/values-zh-rTW/strings.xml +++ b/Habitica/res/values-zh-rTW/strings.xml @@ -340,14 +340,11 @@ 您將可以從市場上以每枚20金幣的價格購買寶石！ 獲得神秘沙漏在時空穿越者的商店購買物品！ 現在訂閱，可以得到贈品，和每月得到新的物品！ - 雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！ %d 個神秘沙漏 付款方式 訂閱 活躍的 取消訂閱 - 想要取消訂閱嗎？你可以在 Google Play 裡的「我的應用程式」取消訂閱。 - 想要取消訂閱嗎？由於你的支付方式，你只能在網站上取消訂閱，點擊下方的按鈕以打開網頁！ 查訪 Habitica 官方網站 現在的加成獎勵 月訂閱 @@ -363,9 +360,6 @@ 成為會員你會得到這些好處 訂閱狀態 離開挑戰 - 你確認你要離開\"%s\"挑戰嗎？ - 移除任務 - 你確定要刪除這個任務嗎？ 刪除 保留 我的挑戰 @@ -678,8 +672,6 @@ 贈送禮物 伺服器 你的禮物已送出！ - 你贈送了 %s 長達 %s 個月的 Habitica 訂閱，同樣時長的訂閱已經發放到你的帳號，這是我們的買一送一促銷活動！ - 你贈送了%s長達 %s 個月的 Habitica 訂閱。 探索 暫停傷害 重要公告 @@ -739,7 +731,6 @@ 完成副本“%d”來解鎖 升到%d級來解鎖 完成副本“%d” - %d級 副本已完成！ 你沒有參加這個副本 定期登錄Habitica diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml index df4ee86dd..379071183 100644 --- a/Habitica/res/values-zh/strings.sidebar.xml +++ b/Habitica/res/values-zh/strings.sidebar.xml @@ -6,7 +6,6 @@ 讯息 酒馆 队伍 - 宝石&开通会员 公会 挑战 物品栏 diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml index bd0e5b219..381f73c9a 100644 --- a/Habitica/res/values-zh/strings.xml +++ b/Habitica/res/values-zh/strings.xml @@ -372,9 +372,6 @@ 成为订阅者你会得到这些好处 订阅状态 放弃挑战 - 你是否确定想放弃这个挑战“%s”？ - 删除任务 - 你确定要删除这个任务吗？ 删除 保持 我的挑战 @@ -674,8 +671,6 @@ 赠送礼物 服务器 你的礼物已送出！ - 你赠送了 %s 长达 %s-月的Habitica会员，同样时长的会员已经发放到你的账户，这是我们的买一送一促销活动！ - 你赠送了 %s 长达 %s-月的Habitica 会员。 探索 暂停伤害 重要通知 @@ -893,7 +888,6 @@ 完成副本“%d”来解锁 升到%d级来解锁 完成副本“%d” - %d级 你没有参加这个副本 副本已完成！ 没有奖励 diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml index 6b62b8d07..24f1a8061 100644 --- a/Habitica/res/xml/remote_config_defaults.xml +++ b/Habitica/res/xml/remote_config_defaults.xml @@ -86,7 +86,7 @@ feedbackURL - + enableAdventureGuide diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java index 478dc4187..8d086df2f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java @@ -85,7 +85,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase)); removeGift(purchase.sku); }, throwable -> { - if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) { + if (throwable.getClass().equals(retrofit2.HttpException.class)) { HttpException error = (HttpException) throwable; ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable); if (error.code() == 401) { @@ -118,7 +118,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase)); removeGift(purchase.sku); }, throwable -> { - if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) { + if (throwable.getClass().equals(retrofit2.HttpException.class)) { HttpException error = (HttpException)throwable; ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable); if (error.code() == 401) { @@ -149,7 +149,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null); EventBus.getDefault().post(new UserSubscribedEvent()); }, throwable -> { - if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) { + if (throwable.getClass().equals(retrofit2.HttpException.class)) { HttpException error = (HttpException) throwable; ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable); if (error.code() == 401) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt index f91d954b2..df04a0c4b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt @@ -35,7 +35,6 @@ import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import io.reactivex.Flowable import io.reactivex.FlowableTransformer import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.BiFunction import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import okhttp3.Cache diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt index 88949f64a..23ac8c658 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.data.implementation import android.content.Context +import androidx.preference.PreferenceManager import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.ContentRepository import com.habitrpg.android.habitica.data.local.ContentLocalRepository @@ -36,11 +37,19 @@ abstract class ContentRepositoryImpl(localRepository } } - override fun retrieveWorldState(): Flowable { + override fun retrieveWorldState(context: Context?): Flowable { val now = Date().time return if (now - this.lastWorldStateSync > 3600000) { lastWorldStateSync = now - apiClient.worldState.doOnNext { localRepository.saveWorldState(it) } + apiClient.worldState.doOnNext { + localRepository.saveWorldState(it) + + val editor = PreferenceManager.getDefaultSharedPreferences(context).edit() + editor.putString("currentEvent", it.currentEventKey) + editor.putLong("currentEventStartDate", it.currentEventStartDate?.time ?: 0) + editor.putLong("currentEventEndDate", it.currentEventEndDate?.time ?: 0) + editor.apply() + } } else { Flowable.empty() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt index 4077fe492..ab50c5c84 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt @@ -13,8 +13,6 @@ import com.habitrpg.android.habitica.models.social.* import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable import io.reactivex.Single -import io.reactivex.functions.BiFunction -import io.reactivex.functions.Consumer import io.realm.RealmResults import java.util.* import kotlin.collections.HashMap diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt index c7dab7ad7..45fba656f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt @@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.Single -import io.reactivex.functions.Consumer import io.realm.Realm import io.realm.RealmResults import java.text.SimpleDateFormat diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt index 31bad18bf..f5e34b563 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt @@ -19,7 +19,6 @@ import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable import io.reactivex.Maybe -import io.reactivex.functions.Consumer import io.realm.RealmResults import java.util.* import java.util.concurrent.TimeUnit diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt index 0c91f03fc..08f8c0ee0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.data.local.implementation -import android.content.Context import com.habitrpg.android.habitica.data.local.InventoryLocalRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.inventory.* @@ -10,14 +9,13 @@ 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 io.reactivex.Flowable -import io.reactivex.functions.Consumer import io.realm.Realm import io.realm.RealmObject import io.realm.RealmResults import io.realm.Sort -class RealmInventoryLocalRepository(realm: Realm, private val context: Context) : RealmContentLocalRepository(realm), InventoryLocalRepository { +class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(realm), InventoryLocalRepository { override fun getQuestContent(keys: List): Flowable> { return realm.where(QuestContent::class.java) .`in`("key", keys.toTypedArray()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java index 30a395db1..7c82a0751 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/executors/JobExecutor.java @@ -21,18 +21,14 @@ public class JobExecutor implements ThreadExecutor { // Sets the Time Unit to seconds private static final TimeUnit KEEP_ALIVE_TIME_UNIT = TimeUnit.SECONDS; - private final BlockingQueue workQueue; - private final ThreadPoolExecutor threadPoolExecutor; - private final ThreadFactory threadFactory; - @Inject public JobExecutor() { - this.workQueue = new LinkedBlockingQueue<>(); - this.threadFactory = new JobThreadFactory(); + BlockingQueue workQueue = new LinkedBlockingQueue<>(); + ThreadFactory threadFactory = new JobThreadFactory(); this.threadPoolExecutor = new ThreadPoolExecutor(INITIAL_POOL_SIZE, MAX_POOL_SIZE, - KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, this.workQueue, this.threadFactory); + KEEP_ALIVE_TIME, KEEP_ALIVE_TIME_UNIT, workQueue, threadFactory); } @Override public void execute(Runnable runnable) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt index 80ab2d1c1..1b9518301 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt @@ -104,10 +104,15 @@ class AppConfigManager { return remoteConfig.getBoolean("enableAdventureGuide") } - fun activePromo(): HabiticaPromotion? { - val key = remoteConfig.getString("activePromo") - if (key.isNotBlank()) { - return getHabiticaPromotionFromKey(key) + fun activePromo(context: Context): HabiticaPromotion? { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + val key = preferences.getString("currentEvent", null) + if (key?.isNotBlank() == true) { + val startDateLong = preferences.getLong("currentEventStartDate", 0) + val startDate = if (startDateLong > 0) Date(startDateLong) else null + val endDateLong = preferences.getLong("currentEventEndDate", 0) + val endDate = if (endDateLong > 0) Date(endDateLong) else null + return getHabiticaPromotionFromKey(key, startDate, endDate) } return null } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt index 53da0b252..1475dd55c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.helpers import android.content.Context -import androidx.core.os.bundleOf import com.google.firebase.analytics.FirebaseAnalytics import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.ApiClient @@ -15,13 +14,9 @@ import com.habitrpg.android.habitica.models.notifications.FirstDropData import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar -import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog import io.reactivex.BackpressureStrategy import io.reactivex.Completable import io.reactivex.Flowable -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Action -import io.reactivex.functions.Consumer import io.reactivex.subjects.BehaviorSubject import org.greenrobot.eventbus.EventBus import java.util.* diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt index 6fdaf2fcb..e2270b20e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt @@ -5,9 +5,7 @@ import android.content.Intent import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import org.solovyev.android.checkout.* -import java.lang.NullPointerException import java.util.* -import javax.annotation.Nonnull class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy) { private val billing = HabiticaBaseApplication.getInstance(activity.applicationContext)?.billing diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt index 8205c2e76..85c5c2e8a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.helpers import com.habitrpg.android.habitica.HabiticaBaseApplication import io.reactivex.Maybe -import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt index 4fbb73e15..002227421 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt @@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.receivers.TaskReceiver import com.habitrpg.shared.habitica.HLogger import com.habitrpg.shared.habitica.LogLevel import io.reactivex.Flowable -import io.reactivex.functions.Consumer import java.util.* class TaskAlarmManager(private var context: Context, private var taskRepository: TaskRepository, private var userId: String) { @@ -56,7 +55,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository: taskRepository.getTaskCopies(userId) .firstElement() .toFlowable() - .flatMap { Flowable.fromIterable(it) } + .flatMap { Flowable.fromIterable(it) } .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError()) if (!preventDailyReminder) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt index a895ba525..d73dc9926 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt @@ -3,10 +3,8 @@ package com.habitrpg.android.habitica.helpers.notifications import com.google.firebase.iid.FirebaseInstanceId import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage -import com.habitrpg.android.habitica.HabiticaApplication import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.components.UserComponent -import java.util.* import javax.inject.Inject class HabiticaFirebaseMessagingService : FirebaseMessagingService() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt index 0c6e910c1..02272b51b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt @@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.helpers.AmplitudeManager import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User -import io.reactivex.functions.Consumer import java.util.* class PushNotificationManager(var apiClient: ApiClient, private val sharedPreferences: SharedPreferences, private val context: Context) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt index d7bf998a2..70cea0804 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.kt @@ -32,7 +32,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh displayClassSelectionActivity(requestValues.isInitialSelection, requestValues.currentClass, requestValues.activity) } - Flowable.empty() + Flowable.empty() } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt index 5776d9cb9..092b0a057 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt @@ -26,7 +26,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut }, 3000L) } - Flowable.empty() + Flowable.empty() } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt index f1a19186c..48bd42369 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt @@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.Flowable -import io.reactivex.functions.Consumer import org.greenrobot.eventbus.EventBus import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt index e076e92ed..32a386ba8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt @@ -39,7 +39,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh if (requestValues.hasLeveledUp == true) { return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.context)) - .flatMap { userRepository.retrieveUser(true) } + .flatMap { userRepository.retrieveUser(true) } .map { it.stats } } else { val pair = getNotificationAndAddStatsToUser(requestValues.context, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp, requestValues.questDamage, requestValues.user) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt index ee1853576..8cc768194 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt @@ -123,10 +123,10 @@ class ScoreTaskLocallyInteractor { var totalConstitution = levelStat var totalPerception = levelStat - totalStrength += user.stats?.buffs?.getStr()?.toInt() ?: 0 + totalStrength += user.stats?.buffs?.str?.toInt() ?: 0 totalIntelligence += user.stats?.buffs?.get_int()?.toInt() ?: 0 - totalConstitution += user.stats?.buffs?.getCon()?.toInt() ?: 0 - totalPerception += user.stats?.buffs?.getPer()?.toInt() ?: 0 + totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0 + totalPerception += user.stats?.buffs?.per?.toInt() ?: 0 totalStrength += user.stats?.strength ?: 0 totalIntelligence += user.stats?.intelligence ?: 0 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java index 900ec24ef..f08fb797c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java @@ -7,21 +7,15 @@ import io.reactivex.Flowable; public abstract class UseCase { - private final ThreadExecutor threadExecutor; private final PostExecutionThread postExecutionThread; protected UseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) { - this.threadExecutor = threadExecutor; this.postExecutionThread = postExecutionThread; } - /** - * Builds an {@link rx.Flowable} which will be used when executing the current {@link UseCase}. - */ protected abstract Flowable buildUseCaseObservable(Q requestValues); - @SuppressWarnings("unchecked") public Flowable observable(Q requestValues) { return this.buildUseCaseObservable(requestValues) .subscribeOn(postExecutionThread.getScheduler()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java deleted file mode 100644 index 66a77e762..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.habitrpg.android.habitica.models; - - -import androidx.annotation.Nullable; - -import com.habitrpg.android.habitica.models.user.Outfit; -import com.habitrpg.android.habitica.models.user.Stats; - -/** - * Created by phillip on 29.06.17. - */ - -public interface Avatar { - @Nullable - String getCurrentMount(); - - @Nullable - String getCurrentPet(); - - boolean getSleep(); - - @Nullable - Stats getStats(); - - @Nullable - AvatarPreferences getPreferences(); - - @Nullable - Integer getGemCount(); - - @Nullable - Integer getHourglassCount(); - - @Nullable - Outfit getCostume(); - @Nullable - Outfit getEquipped(); - - boolean hasClass(); - - boolean isValid(); -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt new file mode 100644 index 000000000..f122dae58 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.kt @@ -0,0 +1,21 @@ +package com.habitrpg.android.habitica.models + +import com.habitrpg.android.habitica.models.user.Outfit +import com.habitrpg.android.habitica.models.user.Stats + +/** + * Created by phillip on 29.06.17. + */ +interface Avatar { + val currentMount: String? + val currentPet: String? + val sleep: Boolean + val stats: Stats? + val preferences: AvatarPreferences? + val gemCount: Int? + val hourglassCount: Int? + val costume: Outfit? + val equipped: Outfit? + fun hasClass(): Boolean + val isValid: Boolean +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java deleted file mode 100644 index 36d4a4e6f..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.habitrpg.android.habitica.models; - -import com.habitrpg.android.habitica.models.user.Hair; - -/** - * Created by phillip on 15.09.17. - */ - -public interface AvatarPreferences { - - String getUserId(); - - Hair getHair(); - - boolean getCostume(); - - boolean getSleep(); - - String getShirt(); - - String getSkin(); - String getSize(); - - String getBackground(); - - String getChair(); - - boolean getDisableClasses(); -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt new file mode 100644 index 000000000..e271c00e6 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AvatarPreferences.kt @@ -0,0 +1,16 @@ +package com.habitrpg.android.habitica.models + +import com.habitrpg.android.habitica.models.user.Hair + +interface AvatarPreferences { + val userId: String? + val hair: Hair? + val costume: Boolean + val sleep: Boolean + val shirt: String? + val skin: String? + val size: String? + val background: String? + val chair: String? + val disableClasses: Boolean +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt index 65da67a38..76d268836 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt @@ -1,6 +1,5 @@ package com.habitrpg.android.habitica.models -import com.facebook.internal.Mutable import com.habitrpg.android.habitica.models.inventory.QuestProgress import com.habitrpg.android.habitica.models.inventory.QuestRageStrike import java.util.* diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java deleted file mode 100644 index 96c1b7f90..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.habitrpg.android.habitica.models.inventory; - -public interface Animal { - - String getKey(); - - void setKey(String key); - - String getText(); - - void setText(String text); - - String getType(); - - void setType(String type); - - String getAnimal(); - - void setAnimal(String animal); - - String getColor(); - - void setColor(String color); - - boolean getPremium(); - - void setPremium(boolean premium); - - Integer getNumberOwned(); - - void setNumberOwned(Integer numberOwned); - - Integer getTotalNumber(); - - void setTotalNumber(Integer totalNumber); -} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt new file mode 100644 index 000000000..211909ca1 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.kt @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.models.inventory + +interface Animal { + var key: String? + var text: String? + var type: String? + var animal: String? + var color: String? + var premium: Boolean + var numberOwned: Int? + var totalNumber: Int? +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt index ac7a25e30..12394fa6d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestColors.kt @@ -17,19 +17,19 @@ open class QuestColors : RealmObject() { var light: String? = null var extralight: String? = null - var darkColor: Int = 0 + val darkColor: Int get() { return Color.parseColor(dark) } - var mediumColor: Int = 0 + val mediumColor: Int get() { return Color.parseColor(medium) } - var lightColor: Int = 0 + val lightColor: Int get() { return Color.parseColor(light) } - var extraLightColor: Int = 0 + val extraLightColor: Int get() { return Color.parseColor(extralight) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt index 89c187510..fe6387683 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/FindUsernameResult.kt @@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName import com.habitrpg.android.habitica.models.user.Authentication import com.habitrpg.android.habitica.models.user.ContributorInfo import com.habitrpg.android.habitica.models.user.Profile -import io.realm.annotations.PrimaryKey class FindUsernameResult { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt index 6921ff821..7cdf310a2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt @@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.models.Tag import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.ui.helpers.MarkdownParser -import io.reactivex.functions.Consumer import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.Ignore diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java deleted file mode 100644 index 21898ac0b..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.habitrpg.android.habitica.models.user; - -import com.google.gson.annotations.SerializedName; - -import io.realm.RealmObject; -import io.realm.annotations.PrimaryKey; - -public class Buffs extends RealmObject { - - @PrimaryKey - private String userId; - - public Float con, str, per; - @SerializedName("int") - public Float _int; private Boolean snowball; - private Boolean streaks; - private Boolean seafoam; - private Boolean spookySparkles; - private Boolean shinySeed; - - public Buffs() { - this(false, false); - } - - public Buffs(Boolean snowball, Boolean streaks) { - this.snowball = snowball; - this.streaks = streaks; - } - - public Boolean getSnowball() { - return snowball != null ? snowball : Boolean.FALSE; - } - - public void setSnowball(Boolean snowball) { - this.snowball = snowball; - } - - public Boolean getSeafoam() { - return seafoam != null ? seafoam : Boolean.FALSE; - } - - public void setSeafoam(Boolean seafoam) { - this.seafoam = seafoam; - } - - public Boolean getSpookySparkles() { - return spookySparkles != null ? spookySparkles : Boolean.FALSE; - } - - public void setSpookySparkles(Boolean spookySparkles) { - this.spookySparkles = spookySparkles; - } - - public Boolean getShinySeed() { - return shinySeed != null ? shinySeed : Boolean.FALSE; - } - - public void setShinySeed(Boolean shinySeed) { - this.shinySeed = shinySeed; - } - - public Boolean getStreaks() { - return streaks != null ? streaks : Boolean.FALSE; - } - - public void setStreaks(Boolean streaks) { - this.streaks = streaks; - } - - public void merge(Buffs stats) { - if (stats == null) { - return; - } - this.con = stats.con != null ? stats.con : this.con; - this.str = stats.str != null ? stats.str : this.str; - this.per = stats.per != null ? stats.per : this.per; - this._int = stats._int != null ? stats._int : this._int; - this.snowball = stats.snowball != null ? stats.snowball : this.snowball; - this.streaks = stats.streaks != null ? stats.streaks : this.streaks; - this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam; - this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed; - this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles; - } - - public Float getStr() { - return str; - } - - public Float get_int() { - return _int; - } - - public Float getCon() { - return con; - } - - public Float getPer() { - return per; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt new file mode 100644 index 000000000..d366f518c --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.kt @@ -0,0 +1,42 @@ +package com.habitrpg.android.habitica.models.user + +import com.google.gson.annotations.SerializedName +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class Buffs : RealmObject() { + @PrimaryKey + var userId: String? = null + var con: Float? = null + var str: Float? = null + var per: Float? = null + + @SerializedName("int") + var _int: Float? = null + var seafoam: Boolean? = null + get() { return field ?: false } + var spookySparkles: Boolean? = null + get() { return field ?: false } + var shinySeed: Boolean? = null + get() { return field ?: false } + var snowball: Boolean? = null + get() { return field ?: false } + var streaks: Boolean? = null + get() { return field ?: false } + + + fun merge(stats: Buffs?) { + if (stats == null) { + return + } + con = if (stats.con != null) stats.con else con + str = if (stats.str != null) stats.str else str + per = if (stats.per != null) stats.per else per + _int = if (stats._int != null) stats._int else _int + snowball = if (stats.snowball != null) stats.snowball else snowball + streaks = if (stats.streaks != null) stats.streaks else streaks + seafoam = if (stats.seafoam != null) stats.seafoam else seafoam + shinySeed = if (stats.shinySeed != null) stats.shinySeed else shinySeed + spookySparkles = if (stats.spookySparkles != null) stats.spookySparkles else spookySparkles + } +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java index 576e729f2..1b940aa02 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java @@ -1,12 +1,9 @@ package com.habitrpg.android.habitica.models.user; -import android.util.SparseArray; import android.util.SparseIntArray; import com.habitrpg.android.habitica.R; -import java.util.HashMap; - import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; @@ -79,10 +76,6 @@ public class ContributorInfo extends RealmObject { return rColor; } - public int getContributorForegroundColor() { - return android.R.color.white; - } - public String getUserId() { return userId; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java deleted file mode 100644 index 402f66d67..000000000 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.habitrpg.android.habitica.models.user; - -import com.habitrpg.android.habitica.models.TutorialStep; - -import java.util.List; - -import io.realm.RealmList; -import io.realm.RealmObject; -import io.realm.annotations.PrimaryKey; - -public class Flags extends RealmObject { - - @PrimaryKey - private String userId; - - RealmList tutorial; - private boolean showTour; - private boolean dropsEnabled; - private boolean itemsEnabled; - private boolean newStuff; - private boolean classSelected; - private boolean rebirthEnabled; - private boolean welcomed; - private boolean armoireEnabled; - private boolean armoireOpened; - private boolean armoireEmpty; - private boolean communityGuidelinesAccepted; - private boolean verifiedUsername; - private boolean warnedLowHealth; - - public List getTutorial() { - return tutorial; - } - - public void setTutorial(RealmList tutorial) { - this.tutorial = tutorial; - } - - public boolean getShowTour() { - return showTour; - } - - public void setShowTour(boolean showTour) { - this.showTour = showTour; - } - - public boolean getDropsEnabled() { - return dropsEnabled; - } - - public void setDropsEnabled(boolean dropsEnabled) { - this.dropsEnabled = dropsEnabled; - } - - public boolean getItemsEnabled() { - return itemsEnabled; - } - - public void setItemsEnabled(boolean itemsEnabled) { - this.itemsEnabled = itemsEnabled; - } - - public boolean getNewStuff() { - return newStuff; - } - - public void setNewStuff(boolean newStuff) { - this.newStuff = newStuff; - } - - public boolean getClassSelected() { - return classSelected; - } - - public void setClassSelected(boolean classSelected) { - this.classSelected = classSelected; - } - - public boolean getRebirthEnabled() { - return rebirthEnabled; - } - - public void setRebirthEnabled(boolean rebirthEnabled) { - this.rebirthEnabled = rebirthEnabled; - } - - public boolean getWelcomed() { - return welcomed; - } - - public void setWelcomed(boolean welcomed) { - this.welcomed = welcomed; - } - - public boolean getArmoireEnabled() { - return armoireEnabled; - } - - public void setArmoireEnabled(boolean armoireEnabled) { - this.armoireEnabled = armoireEnabled; - } - - public boolean getArmoireOpened() { - return armoireOpened; - } - - public void setArmoireOpened(boolean armoireOpened) { - this.armoireOpened = armoireOpened; - } - - public boolean getArmoireEmpty() { - return armoireEmpty; - } - - public void setArmoireEmpty(boolean armoireEmpty) { - this.armoireEmpty = armoireEmpty; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public boolean isCommunityGuidelinesAccepted() { - return communityGuidelinesAccepted; - } - - public void setCommunityGuidelinesAccepted(boolean communityGuidelinesAccepted) { - this.communityGuidelinesAccepted = communityGuidelinesAccepted; - } - - public boolean isVerifiedUsername() { - return verifiedUsername; - } - - public void setVerifiedUsername(boolean verifiedUsername) { - this.verifiedUsername = verifiedUsername; - } - - public boolean isWarnedLowHealth() { - return warnedLowHealth; - } - - public void setWarnedLowHealth(boolean warnedLowHealth) { - this.warnedLowHealth = warnedLowHealth; - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt new file mode 100644 index 000000000..ff2cde0ba --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.kt @@ -0,0 +1,25 @@ +package com.habitrpg.android.habitica.models.user + +import com.habitrpg.android.habitica.models.TutorialStep +import io.realm.RealmList +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class Flags : RealmObject() { + @PrimaryKey + var userId: String? = null + var tutorial: RealmList? = null + var showTour = false + var dropsEnabled = false + var itemsEnabled = false + var newStuff = false + var classSelected = false + var rebirthEnabled = false + var welcomed = false + var armoireEnabled = false + var armoireOpened = false + var armoireEmpty = false + var isCommunityGuidelinesAccepted = false + var isVerifiedUsername = false + var isWarnedLowHealth = false +} \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt index f56e6524a..d07a896e1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.kt @@ -2,9 +2,7 @@ package com.habitrpg.android.habitica.models.user import io.realm.RealmList import io.realm.RealmObject -import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey -import java.util.* open class Inbox : RealmObject() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java index cb43e1e52..6f03d6ccd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.java @@ -112,7 +112,7 @@ public class UserRepositoryModule { @Provides InventoryLocalRepository providesInventoryLocalRepository(Realm realm, Context context) { - return new RealmInventoryLocalRepository(realm, context); + return new RealmInventoryLocalRepository(realm); } @Provides diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt index 5e3b24443..468729888 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/implementation/EmptyCrashlyticsProxy.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.proxy.implementation -import android.content.Context - import com.habitrpg.android.habitica.proxy.CrashlyticsProxy class EmptyCrashlyticsProxy : CrashlyticsProxy { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt index d742c6925..49941a2ce 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt @@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User -import io.reactivex.functions.Consumer import javax.inject.Inject class LocalNotificationActionReceiver : BroadcastReceiver() { @@ -90,7 +89,7 @@ class LocalNotificationActionReceiver : BroadcastReceiver() { } context?.getString(R.string.complete_task_action) -> { intent?.extras?.getString("taskID")?.let { - taskRepository.taskChecked(null, it, up = true, force = false) { _ -> + taskRepository.taskChecked(null, it, up = true, force = false) { }.subscribe({}, RxErrorHandler.handleEmptyError()) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt index 1e2299fbb..ed4dd1334 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt @@ -22,7 +22,6 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.MainActivity import io.reactivex.functions.BiFunction -import io.reactivex.functions.Consumer import io.realm.RealmResults import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt index e960974ee..91dfffe84 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.kt @@ -3,12 +3,8 @@ package com.habitrpg.android.habitica.ui import android.content.Context import android.view.View import android.view.ViewGroup -import android.widget.Button import android.widget.FrameLayout -import android.widget.RelativeLayout -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.OverlayTutorialBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.TutorialStep diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt index 8c1ae4d6a..a6fcdd5d1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt @@ -5,11 +5,8 @@ import android.appwidget.AppWidgetManager import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import androidx.preference.PreferenceManager -import android.widget.Button import androidx.core.content.edit -import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.databinding.ActivityMainBinding +import androidx.preference.PreferenceManager import com.habitrpg.android.habitica.databinding.WidgetConfigureAddTaskBinding import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt index dfebfd72e..bc2e1f736 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt @@ -18,7 +18,6 @@ import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils -import io.reactivex.functions.Consumer import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt index fcdeb94f9..5445a66c2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt @@ -7,11 +7,12 @@ import android.content.Intent import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.* -import android.widget.* +import android.widget.AdapterView +import android.widget.ArrayAdapter +import android.widget.EditText import androidx.appcompat.widget.AppCompatCheckedTextView import androidx.appcompat.widget.AppCompatTextView import androidx.appcompat.widget.Toolbar -import com.google.android.material.textfield.TextInputLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ChallengeRepository @@ -30,7 +31,6 @@ import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.Flowable -import io.reactivex.functions.Consumer import io.reactivex.rxkotlin.zipWith import java.util.* import javax.inject.Inject @@ -491,7 +491,7 @@ class ChallengeFormActivity : BaseActivity() { return editText.text.toString() } - private inner class GroupArrayAdapter(context: Context) : ArrayAdapter(context, android.R.layout.simple_spinner_item) { + private class GroupArrayAdapter(context: Context) : ArrayAdapter(context, android.R.layout.simple_spinner_item) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val checkedTextView = super.getView(position, convertView, parent) as? AppCompatTextView diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt index 2943056e4..3a136b95f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt @@ -17,8 +17,6 @@ import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper -import io.reactivex.functions.Action -import io.reactivex.functions.Consumer import javax.inject.Inject import javax.inject.Named diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index 59187fdc5..680c6fbaa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -4,12 +4,13 @@ import android.content.Context import android.graphics.Typeface import android.os.Bundle import android.view.* -import android.widget.* -import androidx.appcompat.widget.AppCompatImageView +import android.widget.ProgressBar +import android.widget.TableLayout +import android.widget.TableRow +import android.widget.TextView import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.core.os.bundleOf -import androidx.core.widget.NestedScrollView import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.controller.BaseControllerListener import com.facebook.drawee.view.SimpleDraweeView @@ -33,12 +34,14 @@ import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel import com.habitrpg.android.habitica.ui.adapter.social.AchievementProfileAdapter -import com.habitrpg.android.habitica.ui.helpers.* +import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper +import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard +import com.habitrpg.android.habitica.ui.helpers.loadImage +import com.habitrpg.android.habitica.ui.helpers.setMarkdown import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.Flowable -import io.reactivex.functions.Consumer import io.realm.RealmResults import net.pherth.android.emoji_library.EmojiEditText import java.text.SimpleDateFormat @@ -401,7 +404,8 @@ class FullProfileActivity : BaseActivity() { val buffs = stats.buffs addAttributeRow(getString(R.string.profile_allocated), stats.strength?.toFloat() ?: 0f, stats.intelligence?.toFloat() ?: 0f, stats.constitution?.toFloat() ?: 0f, stats.per?.toFloat() ?: 0f, true, false) - addAttributeRow(getString(R.string.buffs), buffs?.getStr() ?: 0f, buffs?.get_int() ?: 0f, buffs?.getCon() ?: 0f, buffs?.getPer() ?: 0f, roundDown = true, isSummary = false) + addAttributeRow(getString(R.string.buffs), buffs?.str + ?: 0f, buffs?.get_int() ?: 0f, buffs?.con ?: 0f, buffs?.per ?: 0f, roundDown = true, isSummary = false) // Summary row addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, roundDown = false, isSummary = true) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt index d84d72c4f..aad47184e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt @@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment -import io.reactivex.functions.Consumer import org.greenrobot.eventbus.Subscribe import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt index b75b2467d..d6b180ef7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt @@ -4,12 +4,9 @@ import android.content.Intent import android.os.Bundle import android.view.MenuItem import android.view.View -import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter import androidx.navigation.navArgs -import androidx.viewpager.widget.ViewPager -import com.google.android.material.tabs.TabLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository @@ -23,7 +20,6 @@ import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import io.reactivex.functions.Consumer import org.greenrobot.eventbus.Subscribe import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt index 7ecbf7e98..1cc20c156 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt @@ -4,12 +4,13 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.View -import android.widget.* import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.ActivityGroupFormBinding -import com.habitrpg.android.habitica.ui.helpers.* -import com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView +import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter +import com.habitrpg.android.habitica.ui.helpers.AutocompleteTokenizer +import com.habitrpg.android.habitica.ui.helpers.MarkdownParser +import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard class GroupFormActivity : BaseActivity() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt index 6ff77e072..02485b00b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt @@ -6,35 +6,27 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.view.View -import android.view.ViewGroup -import androidx.appcompat.widget.Toolbar import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager -import com.google.android.material.tabs.TabLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.databinding.ActivityGroupFormBinding import com.habitrpg.android.habitica.databinding.ActivityPartyInviteBinding import com.habitrpg.android.habitica.extensions.runDelayed import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment -import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar -import io.reactivex.functions.Consumer import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Named - class GroupInviteActivity : BaseActivity() { private lateinit var binding: ActivityPartyInviteBinding diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt index 612394e5d..04a1a3860 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt @@ -8,7 +8,6 @@ import android.view.View import androidx.core.content.edit import androidx.preference.PreferenceManager import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TaskRepository @@ -18,7 +17,6 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider -import io.reactivex.functions.Consumer import javax.inject.Inject import javax.inject.Named diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt index aa4cf0bd8..819267186 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt @@ -17,7 +17,6 @@ import com.habitrpg.android.habitica.databinding.ActivityIntroBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment import com.viewpagerindicator.IconPagerAdapter -import io.reactivex.functions.Consumer import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt index c33e47685..b9592ac46 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt @@ -16,7 +16,8 @@ import android.view.View import android.view.Window import android.view.WindowManager import android.view.inputmethod.EditorInfo -import android.widget.* +import android.widget.EditText +import android.widget.LinearLayout import androidx.core.content.ContextCompat import androidx.core.content.edit import androidx.preference.PreferenceManager @@ -48,8 +49,6 @@ import com.habitrpg.android.habitica.models.auth.UserAuthResponse import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import com.habitrpg.android.habitica.ui.views.login.LockableScrollView -import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration import io.reactivex.Flowable import io.reactivex.exceptions.Exceptions diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt index 6399d60ba..1b87333f0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt @@ -4,21 +4,15 @@ import android.content.Intent import android.os.Bundle import android.text.method.LinkMovementMethod import android.view.View -import android.widget.Button -import android.widget.TextView import androidx.core.net.toUri -import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.api.MaintenanceApiService import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ApiClient -import com.habitrpg.android.habitica.databinding.ActivityMainBinding import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.helpers.setMarkdown -import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt index b1914c5da..891700c37 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt @@ -6,16 +6,9 @@ import android.os.Build import android.os.Build.VERSION_CODES import android.os.Bundle import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.EditText -import android.widget.ImageButton -import android.widget.TextView import androidx.annotation.RequiresApi -import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.navigation.navArgs -import com.google.android.material.appbar.AppBarLayout import com.google.android.material.bottomsheet.BottomSheetBehavior import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent @@ -26,7 +19,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.helpers.setMarkdown -import io.reactivex.functions.Consumer import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt index 0435abb44..ac7f404ca 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt @@ -8,7 +8,6 @@ import android.os.Bundle import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager -import android.widget.Button import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.core.content.edit @@ -31,11 +30,8 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment -import com.habitrpg.android.habitica.ui.views.FadingViewPager -import com.viewpagerindicator.IconPageIndicator import com.viewpagerindicator.IconPagerAdapter import io.reactivex.BackpressureStrategy -import io.reactivex.functions.Consumer import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt index 8605179ce..5375b29c9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.view.View import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository @@ -13,7 +12,6 @@ import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.ActivitySkillMembersBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter -import io.reactivex.functions.Consumer import javax.inject.Inject class SkillMemberActivity : BaseActivity() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt index f98fb0959..dbdbbffcc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt @@ -9,18 +9,14 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import androidx.viewpager.widget.ViewPager -import com.google.android.material.tabs.TabLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TaskRepository -import com.habitrpg.android.habitica.databinding.ActivitySkillMembersBinding import com.habitrpg.android.habitica.databinding.ActivitySkillTasksBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.modules.AppModule import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment -import io.reactivex.functions.Consumer import javax.inject.Inject import javax.inject.Named diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt index 6af7ce64b..280353506 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.activities import android.app.Activity -import android.content.Context import android.content.Intent import android.content.res.ColorStateList import android.graphics.Typeface @@ -9,21 +8,19 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.Handler import android.view.* -import android.view.inputmethod.InputMethodManager import android.widget.CheckBox -import android.widget.EditText -import android.widget.LinearLayout import android.widget.TextView import androidx.appcompat.widget.AppCompatCheckBox -import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat import androidx.core.view.children import androidx.core.view.forEachIndexed import androidx.core.widget.NestedScrollView -import com.google.android.material.textfield.TextInputLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent -import com.habitrpg.android.habitica.data.* +import com.habitrpg.android.habitica.data.ChallengeRepository +import com.habitrpg.android.habitica.data.TagRepository +import com.habitrpg.android.habitica.data.TaskRepository +import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher import com.habitrpg.android.habitica.extensions.addCancelButton @@ -38,8 +35,6 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.models.user.Stats import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import com.habitrpg.android.habitica.ui.views.tasks.form.* -import io.reactivex.functions.Consumer import io.realm.RealmList import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt index cecb3d034..d5d7df52a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt @@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding import com.habitrpg.android.habitica.models.tasks.Task -import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt index 8e10075ff..be2c77988 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt @@ -3,13 +3,11 @@ package com.habitrpg.android.habitica.ui.adapter.inventory import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.BitmapDrawable -import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout import android.widget.TextView -import com.facebook.drawee.view.SimpleDraweeView +import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.GearListItemBinding import com.habitrpg.android.habitica.models.inventory.Equipment @@ -25,7 +23,7 @@ class EquipmentRecyclerViewAdapter(data: OrderedRealmCollection?, aut var isCostume: Boolean? = null var type: String? = null - val equipEvents: PublishSubject = PublishSubject.create() + val equipEvents: PublishSubject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GearViewHolder { val view = LayoutInflater.from(parent.context).inflate(R.layout.gear_list_item, parent, false) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt index 259eec1a0..20d973d92 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.adapter.inventory import android.view.ViewGroup -import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.models.inventory.Mount import com.habitrpg.android.habitica.models.inventory.StableSection import com.habitrpg.android.habitica.models.user.OwnedMount diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt index ae5f8d4ba..a611af4f7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.adapter.inventory import android.view.ViewGroup -import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.models.inventory.* import com.habitrpg.android.habitica.models.user.OwnedItem import com.habitrpg.android.habitica.models.user.OwnedMount diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt index d2d1c4393..62ddf3709 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt @@ -9,9 +9,7 @@ import android.widget.Button import android.widget.TextView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.ShopHeaderBinding -import com.habitrpg.android.habitica.databinding.ShopSectionHeaderBinding import com.habitrpg.android.habitica.extensions.inflate -import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.models.shops.Shop import com.habitrpg.android.habitica.models.shops.ShopCategory @@ -20,10 +18,9 @@ import com.habitrpg.android.habitica.models.user.OwnedItem import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder -import com.habitrpg.android.habitica.ui.views.NPCBannerView -class ShopRecyclerAdapter(private val configManager: AppConfigManager) : androidx.recyclerview.widget.RecyclerView.Adapter() { +class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() { private val items: MutableList = ArrayList() private var shopIdentifier: String? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt index 07a52dc6d..b7e73282e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt @@ -21,7 +21,6 @@ import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import io.reactivex.subjects.PublishSubject -import io.realm.RealmResults class StableRecyclerAdapter : RecyclerView.Adapter() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt index fb92149e6..f26731efe 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.kt @@ -1,11 +1,8 @@ package com.habitrpg.android.habitica.ui.adapter.setup -import android.content.Context import android.graphics.PorterDuff import android.view.View import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt index bceae1740..fe5f23111 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt @@ -42,10 +42,6 @@ class InboxAdapter(private var user: User?) : PagedListAdapter { - return likeMessageEvents.toFlowable(BackpressureStrategy.DROP) - } - fun getUserLabelClickFlowable(): Flowable { return userLabelClickEvents.toFlowable(BackpressureStrategy.DROP) } @@ -58,10 +54,6 @@ class InboxAdapter(private var user: User?) : PagedListAdapter { - return replyMessageEvents.toFlowable(BackpressureStrategy.DROP) - } - fun getCopyMessageFlowable(): Flowable { return copyMessageEvents.toFlowable(BackpressureStrategy.DROP) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt index ac194745e..1987e1faa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt @@ -122,7 +122,7 @@ class ChallengeTasksRecyclerViewAdapter(taskFilterHelper: TaskFilterHelper?, lay } } - private inner class DividerViewHolder(itemView: View) : BindableViewHolder(itemView) { + private class DividerViewHolder(itemView: View) : BindableViewHolder(itemView) { private val dividerName: TextView = itemView.findViewById(R.id.divider_name) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt index 8a20de7ef..d2a254032 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt @@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.proxy.CrashlyticsProxy import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers import java.util.* import javax.inject.Inject @@ -98,7 +97,7 @@ abstract class BaseTasksRecyclerViewAdapter>(var t private fun loadContent(forced: Boolean) { if (this.content == null || forced) { taskRepository.getTasks(this.taskType, this.userID ?: "") - .flatMap { Flowable.fromIterable(it) } + .flatMap { Flowable.fromIterable(it) } .map { task -> task.parseMarkdown() task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt index e4b2c2d45..2f22451cf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt @@ -2,13 +2,11 @@ package com.habitrpg.android.habitica.ui.fragments import android.content.Context import android.graphics.PorterDuff -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat import androidx.viewbinding.ViewBinding import com.google.android.material.appbar.AppBarLayout import com.google.android.material.tabs.TabLayout @@ -20,7 +18,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.SoundManager import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.MainActivity -import io.reactivex.functions.Consumer import javax.inject.Inject abstract class BaseMainFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt index f35851a7f..46c9dd1c2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt @@ -216,14 +216,14 @@ class StatsFragment: BaseMainFragment() { binding?.constitutionStatsView?.levelValue = levelStat binding?.perceptionStatsView?.levelValue = levelStat - totalStrength += currentUser.stats?.buffs?.getStr()?.toInt() ?: 0 + totalStrength += currentUser.stats?.buffs?.str?.toInt() ?: 0 totalIntelligence += currentUser.stats?.buffs?.get_int()?.toInt() ?: 0 - totalConstitution += currentUser.stats?.buffs?.getCon()?.toInt() ?: 0 - totalPerception += currentUser.stats?.buffs?.getPer()?.toInt() ?: 0 - binding?.strengthStatsView?.buffValue = currentUser.stats?.buffs?.getStr()?.toInt() ?: 0 + totalConstitution += currentUser.stats?.buffs?.con?.toInt() ?: 0 + totalPerception += currentUser.stats?.buffs?.per?.toInt() ?: 0 + binding?.strengthStatsView?.buffValue = currentUser.stats?.buffs?.str?.toInt() ?: 0 binding?.intelligenceStatsView?.buffValue = currentUser.stats?.buffs?.get_int()?.toInt() ?: 0 - binding?.constitutionStatsView?.buffValue = currentUser.stats?.buffs?.getCon()?.toInt() ?: 0 - binding?.perceptionStatsView?.buffValue = currentUser.stats?.buffs?.getPer()?.toInt() ?: 0 + binding?.constitutionStatsView?.buffValue = currentUser.stats?.buffs?.con?.toInt() ?: 0 + binding?.perceptionStatsView?.buffValue = currentUser.stats?.buffs?.per?.toInt() ?: 0 totalStrength += currentUser.stats?.strength ?: 0 totalIntelligence += currentUser.stats?.intelligence ?: 0 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt index d10211734..72496fb20 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt @@ -6,7 +6,6 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt index 6bb518872..b069005e0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt @@ -7,13 +7,11 @@ import android.view.ViewGroup import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding -import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.Gear import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment -import io.reactivex.functions.Consumer import javax.inject.Inject class EquipmentOverviewFragment : BaseMainFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index 11e38b2a6..bc2911a43 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -6,15 +6,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.Window -import android.widget.Button -import android.widget.TextView import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentItemsBinding -import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler @@ -24,10 +21,10 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter import com.habitrpg.android.habitica.ui.fragments.BaseFragment -import com.habitrpg.android.habitica.ui.helpers.* +import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils +import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar -import io.reactivex.functions.Consumer import javax.inject.Inject class ItemRecyclerFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt index 27bb706b4..772e1d690 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt @@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding -import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.events.GearPurchasedEvent import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.RxErrorHandler @@ -63,7 +62,7 @@ class ShopFragment : BaseFragment() { adapter = binding?.recyclerView?.adapter as? ShopRecyclerAdapter if (adapter == null) { - adapter = ShopRecyclerAdapter(configManager) + adapter = ShopRecyclerAdapter() adapter?.context = context binding?.recyclerView?.adapter = adapter binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt index 1f77a383d..a0ce53343 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt @@ -10,7 +10,6 @@ import com.google.firebase.analytics.FirebaseAnalytics import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository -import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.shops.Shop diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt index 3add5e2b8..8c286a7e9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt @@ -179,7 +179,7 @@ class PetDetailRecyclerFragment : BaseMainFragment( fragment.isHatching = false fragment.itemType = "food" fragment.itemTypeText = getString(R.string.food) - parentFragmentManager?.let { fragment.show(it, "feedDialog") } + parentFragmentManager.let { fragment.show(it, "feedDialog") } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt index 2b21b88be..53fb37799 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt @@ -1,16 +1,15 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.stable import android.os.Bundle -import androidx.fragment.app.FragmentPagerAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup - +import androidx.fragment.app.FragmentPagerAdapter import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent -import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment + class StableFragment : BaseMainFragment() { override var binding: FragmentViewpagerBinding? = null diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt index f9c643208..afbdd7252 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt @@ -8,7 +8,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding -import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.getTranslatedType import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.RxErrorHandler @@ -99,7 +98,7 @@ class StableRecyclerFragment : BaseFragment() { adapter?.let { compositeSubscription.add(it.getEquipFlowable() - .flatMap { key -> inventoryRepository.equip(user, if (itemType == "pets") "pet" else "mount", key) } + .flatMap { key -> inventoryRepository.equip(user, if (itemType == "pets") "pet" else "mount", key) } .subscribe({ }, RxErrorHandler.handleEmptyError())) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt index 2029e3f7b..1b8cb1a9a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt @@ -24,7 +24,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView -import io.reactivex.functions.Consumer import javax.inject.Inject class AuthenticationPreferenceFragment: BasePreferencesFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt index caa251488..375b5000c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt @@ -8,7 +8,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.modules.AppModule import io.reactivex.disposables.CompositeDisposable -import io.reactivex.functions.Consumer import javax.inject.Inject import javax.inject.Named diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt index ce561ce75..68ca2ee22 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt @@ -6,7 +6,6 @@ import androidx.preference.CheckBoxPreference import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User -import io.reactivex.functions.Consumer class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt index 6d2836ffd..7433efdbc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt @@ -26,7 +26,6 @@ import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.activities.PrefsActivity -import io.reactivex.functions.Consumer import java.util.* import javax.inject.Inject @@ -202,7 +201,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare @Suppress("DEPRECATION") activity?.resources?.updateConfiguration(configuration, activity?.resources?.displayMetrics) userRepository.updateLanguage(user, languageHelper.languageCode ?: "en") - .flatMap { contentRepository.retrieveContent(context,true) } + .flatMap { contentRepository.retrieveContent(context,true) } .subscribe({ }, RxErrorHandler.handleEmptyError()) if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt index a321cb5ac..d7fd63236 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt @@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import io.reactivex.Flowable -import io.reactivex.functions.Consumer class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt index 037f1a589..0b0c79db6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt @@ -6,7 +6,6 @@ import androidx.preference.CheckBoxPreference import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User -import io.reactivex.functions.Consumer class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt index bc4aed5d3..92b7237dc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt @@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding -import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding import com.habitrpg.android.habitica.extensions.addCancelButton import com.habitrpg.android.habitica.helpers.* import com.habitrpg.android.habitica.proxy.CrashlyticsProxy @@ -24,7 +23,6 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import io.reactivex.functions.Consumer import javax.inject.Inject class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragment { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt index e5db2a912..03f0ce010 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt @@ -4,21 +4,12 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button -import android.widget.EditText -import android.widget.TextView -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentGiftGemBalanceBinding -import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.members.Member -import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.fragments.BaseFragment -import com.habitrpg.android.habitica.ui.views.social.UsernameLabel -import io.reactivex.functions.Consumer import javax.inject.Inject class GiftBalanceGemsFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt index 333c19834..b40075395 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt @@ -4,24 +4,16 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import com.habitrpg.android.habitica.HabiticaPurchaseVerifier -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.databinding.FragmentGiftGemBalanceBinding import com.habitrpg.android.habitica.databinding.FragmentGiftGemPurchaseBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.helpers.PurchaseHandler import com.habitrpg.android.habitica.helpers.PurchaseTypes -import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.proxy.CrashlyticsProxy -import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView import com.habitrpg.android.habitica.ui.fragments.BaseFragment -import com.habitrpg.android.habitica.ui.views.social.UsernameLabel -import io.reactivex.functions.Consumer import javax.inject.Inject class GiftPurchaseGemsFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt index 833303d02..180f88939 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.purchases import android.content.Intent import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,7 +12,6 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding import com.habitrpg.android.habitica.events.UserSubscribedEvent import com.habitrpg.android.habitica.extensions.addCancelButton @@ -31,7 +29,6 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView -import io.reactivex.functions.Consumer import org.greenrobot.eventbus.Subscribe import org.solovyev.android.checkout.Inventory import org.solovyev.android.checkout.Purchase diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt index b1e5ca564..a72e558bf 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt @@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.SetupCustomizationRepository import com.habitrpg.android.habitica.data.UserRepository -import com.habitrpg.android.habitica.databinding.FragmentIntroBinding import com.habitrpg.android.habitica.databinding.FragmentSetupAvatarBinding import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.models.SetupCustomization diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt index 0d8709833..009da53eb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt @@ -7,7 +7,6 @@ import android.view.View import android.view.ViewGroup import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentIntroBinding -import com.habitrpg.android.habitica.databinding.FragmentSetupTasksBinding import com.habitrpg.android.habitica.ui.fragments.BaseFragment class IntroFragment : BaseFragment() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt index ca6169214..54a14702a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt @@ -5,11 +5,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.modules.AppModule diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt index 6afcb91b1..a92dc0cc4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt @@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentChatBinding -import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt index 775b0b994..8a339bee4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildDetailFragment.kt @@ -7,21 +7,14 @@ import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button -import android.widget.ImageView -import android.widget.TextView -import androidx.lifecycle.Observer -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.databinding.FragmentGuildDetailBinding -import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.models.social.Group -import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.activities.GroupFormActivity import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity import com.habitrpg.android.habitica.ui.activities.MainActivity @@ -32,7 +25,6 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIcons import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog -import com.habitrpg.android.habitica.ui.views.social.UsernameLabel import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt index 39ba8aba3..b7dc8a79a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt @@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.MainNavDirections import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.databinding.FragmentGuildsOverviewBinding import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.MainNavigationController diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt index c7fde5d81..0cc5a9369 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt @@ -57,7 +57,7 @@ class NoPartyFragmentFragment : BaseMainFragment() { socialRepository.joinGroup(it) .flatMap { userRepository.retrieveUser(false) } .subscribe({ - parentFragmentManager?.popBackStack() + parentFragmentManager.popBackStack() MainNavigationController.navigate(R.id.partyFragment, bundleOf(Pair("partyID", user?.party?.id))) }, RxErrorHandler.handleEmptyError()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt index 7c9ca7641..58a898a06 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.kt @@ -8,14 +8,12 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator -import io.reactivex.functions.Consumer import javax.inject.Inject class PublicGuildsFragment : BaseMainFragment(), SearchView.OnQueryTextListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt index 5464e6698..18d105f57 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt @@ -8,7 +8,6 @@ import androidx.lifecycle.ViewModelProvider import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.SocialRepository -import com.habitrpg.android.habitica.databinding.FragmentPartyInviteBinding import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.models.social.Group import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt index a5635368a..634e19e8b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt @@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.data.ChallengeRepository import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.databinding.FragmentChallengeslistBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.helpers.MainNavigationController import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.social.Challenge diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt index ce66d6dae..03857a7aa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt @@ -18,7 +18,6 @@ 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.databinding.FragmentFaqOverviewBinding import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler @@ -41,7 +40,6 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt index c7fd34a63..3c0657d99 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt @@ -6,13 +6,11 @@ import android.graphics.PorterDuff import android.os.Bundle import android.view.* import androidx.appcompat.widget.SearchView -import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentPagerAdapter import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.data.TagRepository -import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding import com.habitrpg.android.habitica.extensions.getThemeColor import com.habitrpg.android.habitica.helpers.AmplitudeManager @@ -25,7 +23,6 @@ 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 import io.reactivex.disposables.Disposable -import io.reactivex.functions.Consumer import java.util.* import javax.inject.Inject import kotlin.collections.ArrayList diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt index 87bc4edd3..24d601990 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt @@ -103,26 +103,12 @@ object DataBindingUtils { } } - fun setForegroundTintColor(view: TextView, color: Int) { - var thisColor = color - if (thisColor > 0) { - thisColor = ContextCompat.getColor(view.context, thisColor) - } - view.setTextColor(thisColor) - } - fun setRoundedBackground(view: View, color: Int) { val drawable = ResourcesCompat.getDrawable(view.resources, R.drawable.layout_rounded_bg, null) drawable?.setColorFilter(color, PorterDuff.Mode.MULTIPLY) view.background = drawable } - fun setRoundedBackgroundInt(view: View, color: Int) { - if (color != 0) { - setRoundedBackground(view, ContextCompat.getColor(view.context, color)) - } - } - class LayoutWeightAnimation(internal var view: View, internal var targetWeight: Float) : Animation() { private var initializeWeight: Float = 0.toFloat() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java index 912917dc0..026bb45b0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ItemTouchHelperAdapter.java @@ -9,25 +9,6 @@ import androidx.recyclerview.widget.RecyclerView; * @author Paul Burke (ipaulpro) */ public interface ItemTouchHelperAdapter { - - /** - * Called when an item has been dragged far enough to trigger a move. This is called every time - * an item is shifted, and not at the end of a "drop" event. - * - * @param fromPosition The start position of the moved item. - * @param toPosition Then end position of the moved item. - * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder) - * @see RecyclerView.ViewHolder#getAdapterPosition() - */ void onItemMove(int fromPosition, int toPosition); - - - /** - * Called when an item has been dismissed by a swipe. - * - * @param position The position of the item dismissed. - * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder) - * @see RecyclerView.ViewHolder#getAdapterPosition() - */ void onItemDismiss(int position); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt index 5c70ffdb7..4fda1518d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt @@ -20,8 +20,6 @@ import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter import android.os.Build import android.view.View -import android.view.ViewGroup -import android.view.ViewTreeObserver import android.view.ViewTreeObserver.OnGlobalLayoutListener import android.widget.ImageButton import androidx.appcompat.view.menu.ActionMenuItemView @@ -40,8 +38,7 @@ import java.util.* object ToolbarColorHelper { /** * Use this method to colorize toolbar icons to the desired target color - * @param toolbarView toolbar view being colored - * @param toolbarIconsColor the target color of toolbar icons + * @param toolbar toolbar view being colored * @param activity reference to activity needed to register observers */ fun colorizeToolbar(toolbar: Toolbar, activity: Activity?, overrideModernHeader: Boolean? = null) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt index 7c6b0f99b..b91b392e1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt @@ -2,9 +2,7 @@ package com.habitrpg.android.habitica.ui.menu import android.content.Context import android.view.View -import android.widget.LinearLayout import com.google.android.material.bottomsheet.BottomSheetDialog -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.MenuBottomSheetBinding class BottomSheetMenu(context: Context) : BottomSheetDialog(context), View.OnClickListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt index 8c065d604..0a5996232 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt @@ -6,10 +6,6 @@ import android.content.res.Resources import android.graphics.drawable.BitmapDrawable import android.text.method.LinkMovementMethod import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.LinearLayout -import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R @@ -19,12 +15,9 @@ import com.habitrpg.android.habitica.extensions.getAgoString import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.models.social.ChatMessage import com.habitrpg.android.habitica.models.user.User -import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils import com.habitrpg.android.habitica.ui.helpers.MarkdownParser -import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper -import com.habitrpg.android.habitica.ui.views.social.UsernameLabel import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt index 9dac2464a..3667d9116 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt @@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.subjects.PublishSubject class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.mount_overview_item)), View.OnClickListener { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt index 0a9f1430f..6d479c769 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt @@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem import com.habitrpg.android.habitica.ui.views.dialogs.PetSuggestHatchDialog import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.subjects.PublishSubject import org.greenrobot.eventbus.EventBus diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt index 27d5bc1e5..a4a837161 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt @@ -37,11 +37,11 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task init { checklistIndicatorWrapper.isClickable = true checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() } - checkbox.setOnCheckedChangeListener(this) expandCheckboxTouchArea(checkboxHolder, checkbox) } override fun bind(newTask: Task, position: Int, displayMode: String) { + checkbox.setOnCheckedChangeListener(this) var completed = newTask.completed if (newTask.isPendingApproval) { completed = false diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt index ab0137fc6..aa59ed853 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt @@ -1,8 +1,6 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks import android.view.View -import android.widget.TextView -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.models.responses.TaskDirection import com.habitrpg.android.habitica.models.tasks.ChecklistItem import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt index 7534d6a6e..a7d9b0380 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt @@ -5,7 +5,6 @@ import android.view.View import android.widget.Button import android.widget.FrameLayout import android.widget.ImageView -import android.widget.TextView import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.isUsingNightModeResources diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt index d0e9d4385..770739e12 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt @@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.user.User import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable -import io.reactivex.functions.Consumer import javax.inject.Inject abstract class BaseViewModel: ViewModel() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt index 5ecefc734..830394052 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt @@ -18,7 +18,6 @@ import com.habitrpg.android.habitica.models.social.Group import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.subjects.BehaviorSubject import io.realm.RealmResults import java.util.* diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt index 0ce1eaae8..5c59162e6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt @@ -19,7 +19,6 @@ import com.habitrpg.android.habitica.models.social.ChatMessage import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.reactivex.subjects.BehaviorSubject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt index 8154ee00d..2fe2e80f2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt @@ -16,7 +16,6 @@ import io.reactivex.BackpressureStrategy import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.BiFunction -import io.reactivex.functions.Consumer import io.reactivex.subjects.BehaviorSubject import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt index 69e19c054..ab4193319 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt @@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.models.members.Member import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar import io.reactivex.BackpressureStrategy import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import io.realm.RealmResults import org.greenrobot.eventbus.EventBus diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt index 5b73c9e26..042f80630 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt @@ -77,7 +77,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A fun onSwap(firstView: View?, firstPosition: Int, secondView: View, secondPosition: Int) } - private inner class DraggableChild { + private class DraggableChild { /** * If non-null, a reference to an on-going position animation. */ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt index eaf5d96f1..e8bc515b8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt @@ -7,7 +7,6 @@ import android.graphics.drawable.BitmapDrawable import android.util.AttributeSet import android.widget.FrameLayout import android.widget.ImageView -import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.NpcBannerBinding import com.habitrpg.android.habitica.extensions.layoutInflater @@ -15,7 +14,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import kotlin.math.roundToInt class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt index 60e79aeb4..5e8d1155c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/adventureGuide/AdventureGuideMenuBanner.kt @@ -9,7 +9,6 @@ import android.widget.TextView import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.AdventureGuideMenuBannerBinding -import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.user.User @@ -34,6 +33,6 @@ class AdventureGuideMenuBanner @JvmOverloads constructor( val completed = achievements.count { it.earned } binding.progressBar.max = achievements.size binding.progressBar.progress = completed - binding.countView.text = "${completed} / ${achievements.size}" + binding.countView.text = "$completed / ${achievements.size}" } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt index 0e4989234..af3c341f9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/FirstDropDialog.kt @@ -2,12 +2,9 @@ package com.habitrpg.android.habitica.ui.views.dialogs import android.content.Context import android.view.LayoutInflater -import android.view.View -import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.helpers.MainNavigationController -import com.habitrpg.android.habitica.models.Notification import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils class FirstDropDialog(context: Context) : HabiticaAlertDialog(context) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt index 5ab7ffbaa..10ae653c3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt @@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views.dialogs import android.app.Activity import android.content.Context import android.text.method.ScrollingMovementMethod -import android.util.Log import android.view.* import android.view.animation.AccelerateInterpolator import android.widget.* @@ -19,7 +18,6 @@ import com.plattysoft.leonids.ParticleSystem import java.lang.ref.WeakReference - open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.HabiticaAlertDialogTheme) { var isCelebratory: Boolean = false @@ -182,7 +180,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style. fun addButton(buttonView: View, autoDismiss: Boolean = true, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): View { - val weakThis = WeakReference(this) + val weakThis = WeakReference(this) val buttonIndex = buttonsWrapper.childCount buttonView.setOnClickListener { weakThis.get()?.let { it1 -> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt index b23757a41..d38a451af 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.drawable.BitmapDrawable import android.view.LayoutInflater import android.view.View -import android.widget.FrameLayout import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat @@ -22,7 +21,6 @@ import com.habitrpg.android.habitica.ui.views.CurrencyView import io.reactivex.Flowable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt index cbfb4f045..dfc304370 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.kt @@ -121,7 +121,7 @@ class LoginBackgroundView(context: Context, attrs: AttributeSet?) : RelativeLayo if (viewWidth <= 0 ||viewHeight <= 0 || didLayoutStars || starViews?.size == 0) { return } - for (view in starViews ?: emptyList()) { + for (view in starViews ?: emptyList()) { view.layoutParams = starParams } didLayoutStars = true diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt index 52de669f8..bf0ed39d2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt @@ -46,7 +46,7 @@ class StarView : AppCompatImageView { if (blinkIndex >= blinkDurations?.size ?: 0) { blinkIndex = 0 } - val animator = ObjectAnimator.ofFloat(this, View.ALPHA, 0f) + val animator = ObjectAnimator.ofFloat(this, View.ALPHA, 0f) animator.duration = 1000 animator.startDelay = blinkDurations?.get(blinkIndex)?.toLong() ?: 0 animator.repeatCount = 1 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt index df8cd48bb..a2e4cbb4b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationItem.kt @@ -4,15 +4,13 @@ import android.content.Context import android.graphics.PorterDuff import android.util.AttributeSet import android.view.View -import android.widget.ImageView import android.widget.RelativeLayout -import android.widget.TextView import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.BottomNavigationItemBinding import com.habitrpg.android.habitica.extensions.getThemeColor -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater + class BottomNavigationItem @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : RelativeLayout(context, attrs, defStyleAttr) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt index 43cb282a0..047db3356 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/BottomNavigationSubmenuItem.kt @@ -3,13 +3,10 @@ package com.habitrpg.android.habitica.ui.views.navigation import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet -import android.widget.ImageView import android.widget.RelativeLayout -import android.widget.TextView -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.BottomNavigationSubmenuBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater + class BottomNavigationSubmenuItem @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : RelativeLayout(context, attrs, defStyleAttr) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt index 86d191275..3b79dd94f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt @@ -5,14 +5,10 @@ import android.content.Context import android.graphics.PorterDuff import android.util.AttributeSet import android.view.MotionEvent -import android.view.ViewGroup import android.view.animation.Animation import android.view.animation.BounceInterpolator import android.view.animation.LinearInterpolator import android.view.animation.RotateAnimation -import android.widget.ImageButton -import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat @@ -20,9 +16,9 @@ import androidx.core.view.children import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.MainNavigationViewBinding import com.habitrpg.android.habitica.extensions.getThemeColor -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.tasks.Task + class HabiticaBottomNavigationView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : RelativeLayout(context, attrs, defStyleAttr) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt index 5be0d3abb..07209639f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCategoryView.kt @@ -18,7 +18,7 @@ class AvatarCategoryView(context: Context, attrs: AttributeSet?) : LinearLayout( init { View.inflate(context, R.layout.avatar_category, this) - textView = findViewById(com.habitrpg.android.habitica.R.id.text_view) + textView = findViewById(R.id.text_view) val a = context.theme.obtainStyledAttributes( attrs, R.styleable.AvatarCategoryView, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt index 9c63a21fb..84dbf9f62 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/setup/AvatarCustomizationDrawer.kt @@ -4,9 +4,7 @@ package com.habitrpg.android.habitica.ui.views.setup import android.content.Context import android.util.AttributeSet import android.widget.LinearLayout -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.AvatarSetupDrawerBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater class AvatarCustomizationDrawer(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt index 75a36b05e..45ea6c769 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt @@ -37,7 +37,6 @@ import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.disposables.CompositeDisposable -import io.reactivex.functions.Consumer import io.realm.RealmResults import org.greenrobot.eventbus.EventBus import java.util.* diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt index 6ecedde2e..85e70af87 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBaseContent.kt @@ -1,12 +1,8 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context -import android.util.AttributeSet import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView - -import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.databinding.DialogPurchaseContentGearBinding import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding import com.habitrpg.android.habitica.extensions.layoutInflater diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt index 9b47b6e6d..85561fc57 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGearContent.kt @@ -1,9 +1,8 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context -import androidx.core.content.ContextCompat -import android.util.AttributeSet import android.widget.TextView +import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogPurchaseContentGearBinding diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt index e26d228d6..142eaa350 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt @@ -3,14 +3,11 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView -import com.habitrpg.android.habitica.R -import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding import com.habitrpg.android.habitica.databinding.DialogPurchaseGemsBinding import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.shops.ShopItem import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper -import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) { internal val binding = DialogPurchaseGemsBinding.inflate(context.layoutInflater, this) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt index a6bdd29a3..4cbc83346 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogItemContent.kt @@ -1,16 +1,11 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context -import android.util.AttributeSet import android.widget.TextView import com.facebook.drawee.view.SimpleDraweeView -import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.DialogPurchaseContentItemBinding -import com.habitrpg.android.habitica.extensions.asDrawable import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.shops.ShopItem -import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper -import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView class PurchaseDialogItemContent(context: Context) : PurchaseDialogContent(context) { private val binding = DialogPurchaseContentItemBinding.inflate(context.layoutInflater, this) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt index fc79b93bf..7ff929403 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views.shops import android.content.Context import android.text.TextUtils -import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt index 68302635c..f6e6aa0b7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views.social import android.content.Context import android.util.AttributeSet -import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout import android.widget.TextView diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt index 45204434b..458eae88e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt @@ -6,14 +6,12 @@ import android.graphics.RectF import android.util.AttributeSet import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import com.facebook.drawee.view.SimpleDraweeView import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.QuestProgressOldBinding -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.models.inventory.QuestContent diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt index a7b490b50..9e265f8ef 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt @@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views.stats import android.app.ProgressDialog import android.content.Context import android.os.Bundle -import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt index 6550ec943..7af543d17 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsSliderView.kt @@ -6,7 +6,6 @@ import android.graphics.PorterDuff import android.os.Build import android.util.AttributeSet import android.view.Gravity -import android.view.View import android.widget.LinearLayout import android.widget.SeekBar import androidx.core.content.ContextCompat diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt index 23865dc5b..d8211e1d7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt @@ -64,7 +64,7 @@ class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, init { - val attributes = context?.theme?.obtainStyledAttributes( + val attributes = context.theme?.obtainStyledAttributes( attrs, R.styleable.StatsView, 0, 0) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt index 2fe18b08e..67a972899 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt @@ -24,7 +24,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.Tag import com.habitrpg.android.habitica.models.tasks.Task import io.reactivex.Observable -import io.reactivex.functions.Consumer import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt index e9f1b06ec..2ab1036cb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt @@ -4,7 +4,6 @@ import android.content.Context import android.graphics.Typeface import android.util.AttributeSet import android.view.Gravity -import android.view.View import android.view.accessibility.AccessibilityEvent import android.widget.LinearLayout import androidx.core.content.ContextCompat diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt index 3e3190f87..2e19a31c4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt @@ -18,7 +18,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.TaskFormReminderItemBinding import com.habitrpg.android.habitica.extensions.dpToPx import com.habitrpg.android.habitica.extensions.getThemeColor -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.tasks.RemindersItem import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt index efa1fe899..32749bfad 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt @@ -3,14 +3,11 @@ package com.habitrpg.android.habitica.ui.views.tasks.form import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet -import android.widget.EditText -import android.widget.ImageButton import android.widget.RelativeLayout import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.FormStepperValueBinding import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher import com.habitrpg.android.habitica.extensions.asDrawable -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper import java.text.DecimalFormat diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt index 469fcea5f..890f49182 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt @@ -8,15 +8,12 @@ import android.os.Build import android.text.TextUtils import android.util.AttributeSet import android.view.View -import android.view.ViewGroup import android.view.accessibility.AccessibilityEvent import android.widget.* -import androidx.appcompat.widget.AppCompatEditText import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.TaskFormTaskSchedulingBinding import com.habitrpg.android.habitica.extensions.dpToPx -import com.habitrpg.android.habitica.extensions.inflate import com.habitrpg.android.habitica.extensions.layoutInflater import com.habitrpg.android.habitica.models.tasks.Days import com.habitrpg.android.habitica.models.tasks.Task diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt index f87178b42..1715e2cee 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views.yesterdailies import android.app.Activity import android.content.Context -import android.os.Build import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt index e15c91c6e..7ed7285a4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt @@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.AvatarView import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper -import io.reactivex.functions.Consumer class AvatarStatsWidgetProvider : BaseWidgetProvider() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt index 520103c83..2380b4f9e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt @@ -10,8 +10,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.responses.TaskDirection -import io.reactivex.functions.Action -import io.reactivex.functions.Consumer import javax.inject.Inject class HabitButtonWidgetProvider : BaseWidgetProvider() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt index ee955ca38..7eeeecaec 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt @@ -20,7 +20,6 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.responses.TaskDirection import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.helpers.MarkdownParser -import io.reactivex.functions.Consumer import net.pherth.android.emoji_library.EmojiHandler import java.util.* import javax.inject.Inject @@ -50,7 +49,7 @@ class HabitButtonWidgetService : Service() { stopSelf() - return Service.START_STICKY + return START_STICKY } private fun updateData(task: Task?) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt index 2399a17d9..4c488888e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt @@ -17,7 +17,6 @@ import com.habitrpg.android.habitica.models.tasks.Task import com.habitrpg.android.habitica.ui.helpers.MarkdownParser import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.functions.Consumer import net.pherth.android.emoji_library.EmojiHandler import java.util.* import javax.inject.Inject diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt index 778b8f5c1..94a20fcff 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt @@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.ui.activities.MainActivity -import io.reactivex.functions.Consumer import javax.inject.Inject abstract class TaskListWidgetProvider : BaseWidgetProvider() { diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java index 207068303..9beab9368 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java @@ -1,8 +1,5 @@ package com.habitrpg.android.habitica.models; -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; @@ -10,9 +7,6 @@ import com.habitrpg.android.habitica.models.user.User; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import io.realm.RealmList; diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java index b0635f4b2..bb60cd864 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java @@ -6,13 +6,8 @@ import com.google.gson.JsonParseException; import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; -import com.habitrpg.android.habitica.BuildConfig; - import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.lang.reflect.Type; import java.util.Date;