From 114fabd939a17cba49d9385589d27bf0706de429 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 4 Sep 2023 11:22:57 +0200 Subject: [PATCH] quest design update --- .../res/drawable-hdpi/icon_boss_health.png | Bin 0 -> 3131 bytes Habitica/res/drawable-hdpi/icon_boss_rage.png | Bin 0 -> 2185 bytes .../res/drawable-mdpi/icon_boss_health.png | Bin 0 -> 2036 bytes Habitica/res/drawable-mdpi/icon_boss_rage.png | Bin 0 -> 1476 bytes .../res/drawable-xhdpi/icon_boss_health.png | Bin 0 -> 4030 bytes .../res/drawable-xhdpi/icon_boss_rage.png | Bin 0 -> 2837 bytes .../res/drawable-xxhdpi/icon_boss_health.png | Bin 0 -> 5637 bytes .../res/drawable-xxhdpi/icon_boss_rage.png | Bin 0 -> 3865 bytes Habitica/res/drawable/pill_bg_green.xml | 4 +- Habitica/res/layout/activity_death.xml | 24 ++++- Habitica/res/layout/fragment_party_detail.xml | 8 +- .../preference_child_summary_danger.xml | 4 +- Habitica/res/layout/quest_collect.xml | 10 +- .../res/layout/quest_mechanics_dialog.xml | 2 + Habitica/res/layout/quest_progress_old.xml | 99 +++++++++++++----- Habitica/res/layout/row_shopitem.xml | 1 - Habitica/res/values-de/strings.xml | 2 +- Habitica/res/values-es/strings.xml | 2 +- Habitica/res/values-fr/strings.xml | 2 +- Habitica/res/values-hr-rHR/strings.xml | 2 +- Habitica/res/values-it/strings.xml | 2 +- Habitica/res/values-ja/strings.xml | 2 +- Habitica/res/values-ko/strings.xml | 2 +- Habitica/res/values-night/colors.xml | 1 + Habitica/res/values-pt-rBR/strings.xml | 2 +- Habitica/res/values-ru/strings.xml | 2 +- Habitica/res/values-tr/strings.xml | 2 +- Habitica/res/values-uk/strings.xml | 2 +- Habitica/res/values-zh-rTW/strings.xml | 2 +- Habitica/res/values-zh/strings.xml | 2 +- Habitica/res/values/colors.xml | 1 + Habitica/res/values/strings.xml | 12 ++- Habitica/res/values/styles.xml | 6 +- Habitica/res/xml/preferences_fragment.xml | 9 +- .../models/inventory/Customization.kt | 17 +-- .../habitica/ui/activities/BaseActivity.kt | 2 +- ...stomizationEquipmentRecyclerViewAdapter.kt | 8 +- .../CustomizationRecyclerViewAdapter.kt | 9 +- .../PushNotificationsPreferencesFragment.kt | 1 - .../social/party/PartyDetailFragment.kt | 6 +- .../ui/viewHolders/ShopItemViewHolder.kt | 6 ++ .../habitica/ui/views/BottomSheetUtils.kt | 7 +- .../views/equipment/EquipmentOverviewView.kt | 2 +- .../habitica/ui/views/shops/PurchaseDialog.kt | 2 +- .../ui/views/social/OldQuestProgressView.kt | 27 +++-- .../common/habitica/views/ValueBar.kt | 4 +- common/src/main/res/values-night/colors.xml | 14 +-- version.properties | 2 +- 48 files changed, 191 insertions(+), 123 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/icon_boss_health.png create mode 100644 Habitica/res/drawable-hdpi/icon_boss_rage.png create mode 100644 Habitica/res/drawable-mdpi/icon_boss_health.png create mode 100644 Habitica/res/drawable-mdpi/icon_boss_rage.png create mode 100644 Habitica/res/drawable-xhdpi/icon_boss_health.png create mode 100644 Habitica/res/drawable-xhdpi/icon_boss_rage.png create mode 100644 Habitica/res/drawable-xxhdpi/icon_boss_health.png create mode 100644 Habitica/res/drawable-xxhdpi/icon_boss_rage.png diff --git a/Habitica/res/drawable-hdpi/icon_boss_health.png b/Habitica/res/drawable-hdpi/icon_boss_health.png new file mode 100644 index 0000000000000000000000000000000000000000..8c42c61a5d612d90256eadbcd188b62698914a5a GIT binary patch literal 3131 zcmV-B48-$^P)81t4C0yZy(khFA3)ofYQmn`k*+te0y(JC#P_E$S?Yd5L??2oPc zZ&IpCZKbTziZs$zYnyCDTdTBPwj`xV3IX$CyI=x@7=tkw{C>XM^PIWkaBU1JILVr? zbh^9W-P!lK=l6Sl&-2_7a$C1`Teo!!iKc3N?2%^ZEXQ^iz+2B<#-p*EN=5e2alkEhlLQ1_`SkI z@Zdw>39(UL;kuO`Ldq`v_~VC-TqJsotm%iCVV?3HdCwuD6md*j^fREfnN^9Xq549eFG20^UzxDR(Kh$m35sgN@?7VO|61#TQ z?LTwo?AWKL&$wrOvoYDP2NWds^7|d{-!$Djt%c21^=eAVK5_rP1K%yDlupseVe1xc)2;^7-h1vY>H6}rd)`0KE*@6%RI$%e+xTC*-F8zrH74DGNL<}3-w%hQ zg5?4W0TPKsQ(mLjZ`Qu}+h5!RLtvBCh<+f>{h_6$wTRpVN^9Yvp`KVxb>n?-$D47# za!1AHvhq>`ZpVN<+0v+JG>R5i-POF?)Z5c1SsKQTj_~{*uyp5*wluTiQOb>on_jOs zBtNv0rE_!jU$ZoLd?Q-=@Pmi1+w-r7Rs`k=mAbX9XJ9({crtXHPI_xnHoZm&L9FG2H!t3+sWgR~-W zh|O6xo!AE)*HWFg5_DnV*1TW7_Kn;hRT6+HsuiL9frIudGykSF0Xig zHlZ^DqwLPU&f4mF*rE+$8$vssLz7KSjinH5e9ieGv`VcOf)hC~s@l9GUz3wVFL(7U zgRZqScm^Fd7ui6q3K%u$?6W09&v<&L)6f{AqbJ$W_@#lqk{~~(e{^iyX=mZWmty~AJ+N3TqRHA6>zgwth}Vk({ovM zYuiVet1hdyuqd>2y}2#`(2^rVOZWHNCwD@|q|st3ddPZb)Ai;bdPvbnV>_Vummj!M%7zuOi9qoq}AzEwRINboz1(q@87?#cHj5z zt+iOHw+{|F$Kx!^K|Rd?&h;eOC}5P`+3%?`Te>K8!L>r;_>}{r5c=x)gm(f192scq zvrp~W|NVW9JE|&63kwSjIiLl9K;fO9iS_sOe}(5^3JU4xCz;aEmD9sjr~{mfLalxQ zVoIrC@1Af6UpxBddH?);Fx53M=1DY7?0w{C&o$T9nRCVchYsFfZ!{L>%g^zF!<(D) zlM&a*ny0XDWMNT*gFS(|`dyu1vG0J{gt!|mec_8sTV7khzyw256k0bB zSn@^JCa#Um&CV_P2R?qBtWxW0VNsYzZ>!k#A0-nv$diss7rWeGWmQQ@u_5`IWJ`~Y zPLOogJ$LT>MbWxEC7zR~-d*);p$!2>Av7i($(h#WuHGpq`H*ef%L|gP5uyG5c``Sf zn2yo9i7+%Vg`ssF4yV*p7=|8OOTw{Xz@k!RT79+wZ#rl%Oj%H95JFK@ChMN)c;_ft zgEkx(h4FWdxd9v*k&5xj&}dPoeVB}1xe8NS06eu4t+%3e!CAFqzE0MltN^2GEDf#V zbR`O*jfKX1@3c>gpqNgI3cy?&3oW}@dL!?mU&o9`dp+mvk z>w;eQc{r6IO|XjFMx!xzvu^XU00h1A#Q20Tj>YjRN*B38^7@VvCY&gYY=t61OA|Fe zQxUR==ZLRyR`bG6NwOfyVVO5kTq!aYNuC+Yx*oSjSSKqO3{4w+pRyI~C8UtDaG ztT64F{u(TTj$a*f%*=Sfqz0lf6f|wqOqa`HMOEn?=6iBA?^fUxB^Pv1!ABHHv71d>^{=7F_#gW~D?x*q@ypo0{^BB|w+-k*}%y$!$ZVscciZ zyxl!HMcke#Ql}+?rA6peQt)x92DahA5II@#iKCz%tyQX&N*t>YUkhyrIyyG$2n7Sd zbieVp(H-4|`7^{?5Eh_CSW$J_ar2gnCzJtQ^_sZ&BmrY)5GIeM_n;7Ly!p~DEt_%7rn38_D0v%?w{|PAqDZVaycwYwc{mHSN~Gw z*2U4jFbnhe&h{_n{Ziw_~kg*rHq*THd2KWOMC=*UD^6ed<8EGk!Dgf(HITf_BIeRx9y5Bx?8 zl81JzZYmf>08FS73j-(y5_fo4{OXBQ@4THZ<4N_#V<>EL*Y0{YKhOLtEx#CfqASEj z3)L`{2LJo>vB@cy;3#;8iP{~uf8usl=HU~k-osBPgwH4Nvqm-?tz;+{_@Lvx-ql>6 z%FwL#^;~o)hNr zP$(dbe}s)LWsl_Ziyu2qp8B&iMWF+X^O0A@{j7wR>n6%e56Tw~1;sIoz&M6e!oqv1 z4%wH0S-0>v5v7cW=M#}xpX1U@V4ig8b%laM;=c;SK0DVg`GHihs9OqHuIcIVATFtn zrGrJ?T3wpsGmib0U{P7Cc&vvk)wS?~LE)hcf>X$ZD7<22APb^V{L&~B>}`D;^grc< VJ+aV{HKqUn002ovPDHLkV1lIP7HI$g literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-hdpi/icon_boss_rage.png b/Habitica/res/drawable-hdpi/icon_boss_rage.png new file mode 100644 index 0000000000000000000000000000000000000000..a0527dec0ab5f6a2e0e7d1aa42316a3b2cde9814 GIT binary patch literal 2185 zcmV;42zK|0P)fEIE5a$x>7XJr! zZ#~61w3niQ-6n@PKoZ9YV#kUSIkplhjx9?fMT*Pa$$PWZdVi1!ms%=0@B;`ghr2WL z&AfTcEJO2>dgq{6YqD@I(;koi z$gSH(TB1iN|83$(E3%@n10t0P-%bl-U*-iukI@stYf}f0D}^Z8(in`Re}vq77-C=~ z{1}`5M{8409Y+t5IN|E_Z@+2>JK~#L(lxhv^vsak)JG z^cnOBi4x}cYAbayGRTuJz?l4vdtKZKS=vq8Eg>I!0%CY?v?Jxb*{fKc7-62Eq5u?b zHzs}y;}^fy*CJb_5e;fgK@@kn6Br(ANt*lW1?fZxv!Do*6=nv;Grxn}|6Fq<10py0 z===OIkj}eb5ox*eNxCot{c@k>>4`UyAhr~i+6f9xmYfrNG zwgu4}=|p06S0?QViVn!?T_v*GK@nN+-l0)4_g~TbZqKwe$U5Zi zLp_Vtu?e>o6dYq;_;Zjf4^Z0Up3hV^(wE5QVeC5$xno>=Z4XSEW3_)FTx^+iEW+&s z1@DNCv1V{r1cx9dOI}%n9%hrZ>oq#I?z!cKFvgEUj*Nw7WZE@ax)-WMcX>!hKn5GGJlTOLXH<7NK<-1VJ3(+xz ze6?`yv-5}nqm!FB9y(Bwjy?MD z9p}!++DyGgAoFGu)dC|f=p1Jby@VPq#Omx-uQ|nMJ)K1+RYb-Ll2$*Si3QNn8LnsQ zr-^hh2Ch&jq444-%Q04tJwsl109}L5boS|EFnwp*s#Q>1y$`b<-eDc8UPlacM3@6U z8Q*Dto2spn`7Q?TQ){#U4z`R&wT#BYuLEuQlzczs$>_x;xtgsX@ZE{AMpq>>a1cjY!e{jCL zjc&1V`x=~DnM4XXs&r1bm2#13#x~_m#3KAdrp-#qYa?@1>nn(h`r;fm7H&S89A#Ab zjG2fjdwn7%q>`m@n^G!zW21)HeP;`S&qg|f;^@A}eU5OtP9kCvb|sw%*#w9v&XnTAMX`aMJR^GG%J$0xdQ>`HV?C)diX(q)JZ$+MQl=CrSpyTwgJpI%eC=n^BRq75ZRx~W7Mh{@{rBg5miZJM08k7d|!Z0?| zLqTFir-v*sC~+`X7a%q&k-nI${pI_urgb{5+KN@v;-s78CD*Y6=VqM$;T-P8&J*H3}nC&B*D`46a|PrCFGbYNQYQ)BoxkmmiANo>C`^GoN2UOvEnY zwfljr;V3NE90W87?V7RYAPUdF?2%?<_e^-#Ox9Ysfh?@xK$L|wuK&AL;y+KG=ValH z*=y(mv0W-lI!eh;5Sw{_yGiG7Bu5HY`qq&0TKnFYs9gUK?DBG?FD}d0zxo7e6(UP= zwQ=>IEy;4_vRkr@u3|_#(yVz)Ss5fK2L>s@lzJ!{aBkia9%+E)!)Wvd5s)dt-Q{?-P~Pv zOwO%$B4o)G{$p@v_7oCABEKyaXXegOtPbR-ynBNgsVfy4WZM3eF-1&0vUjd&ZyYAe zeI`kkk=UH%yd{*o@kv^00000 LNkvXXu0mjfg-Hf} literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/icon_boss_health.png b/Habitica/res/drawable-mdpi/icon_boss_health.png new file mode 100644 index 0000000000000000000000000000000000000000..764c499f8063d3a5900e1df2eade100bd8d4bd0e GIT binary patch literal 2036 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/icon_boss_rage.png b/Habitica/res/drawable-xhdpi/icon_boss_rage.png new file mode 100644 index 0000000000000000000000000000000000000000..f7662ba1168a94c2f703d2090921d5fc8608bcd4 GIT binary patch literal 2837 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_health.png b/Habitica/res/drawable-xxhdpi/icon_boss_health.png new file mode 100644 index 0000000000000000000000000000000000000000..54f7c4919a80095c36bad871e3cd1ee0ad513ab1 GIT binary patch literal 5637 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 M-N+nXZQvUHf0ZFa)&Kwi literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable/pill_bg_green.xml b/Habitica/res/drawable/pill_bg_green.xml index ed85dcfaa..6d0e91380 100644 --- a/Habitica/res/drawable/pill_bg_green.xml +++ b/Habitica/res/drawable/pill_bg_green.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/layout/activity_death.xml b/Habitica/res/layout/activity_death.xml index d9b3ebb4f..0968a1d16 100644 --- a/Habitica/res/layout/activity_death.xml +++ b/Habitica/res/layout/activity_death.xml @@ -64,8 +64,8 @@ android:layout_marginVertical="@dimen/spacing_medium" android:gravity="center" android:lineSpacingExtra="4dp" - android:textColor="@color/text_primary" - android:textSize="20sp" + android:textColor="@color/text_secondary" + android:textSize="16sp" android:paddingHorizontal="12dp" /> - + + android:layout_marginBottom="8dp"> - + + + android:textColor="@color/text_ternary" /> @@ -125,11 +127,13 @@ android:textColor="@color/green_1" tools:text="Pending Items" android:background="@color/green_100" + android:minHeight="28dp" android:visibility="gone"/> + android:textColor="@color/brand_button" /> - \ No newline at end of file + diff --git a/Habitica/res/layout/quest_collect.xml b/Habitica/res/layout/quest_collect.xml index 30ccf4ed4..eecd2c2a5 100644 --- a/Habitica/res/layout/quest_collect.xml +++ b/Habitica/res/layout/quest_collect.xml @@ -1,5 +1,4 @@ - + android:layout_marginEnd="16dp" /> + app:barBackgroundColor="@color/offset_background" + app:barForegroundColor="@color/green_100" + app:valueTextColor="@color/text_ternary"/> diff --git a/Habitica/res/layout/quest_mechanics_dialog.xml b/Habitica/res/layout/quest_mechanics_dialog.xml index a2f272fde..798ef8ca3 100644 --- a/Habitica/res/layout/quest_mechanics_dialog.xml +++ b/Habitica/res/layout/quest_mechanics_dialog.xml @@ -53,6 +53,7 @@ android:layout_height="wrap_content" android:text="@string/quest_mechanics_damage_description" style="@style/ArmoireDescriptionTextView" + android:layout_marginBottom="12dp" /> - - - + + + + + + + + + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + - - \ No newline at end of file + diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml index 73ee85d1a..63baec8c8 100644 --- a/Habitica/res/layout/row_shopitem.xml +++ b/Habitica/res/layout/row_shopitem.xml @@ -89,6 +89,5 @@ android:layout_gravity="end" android:visibility="gone" android:layout_alignEnd="@id/container" - android:layout_marginEnd="-4dp" style="@style/CountLabel"/> diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml index 32ee57bbc..9eb372c91 100644 --- a/Habitica/res/values-de/strings.xml +++ b/Habitica/res/values-de/strings.xml @@ -1123,7 +1123,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben. Offener Laden Fülle diese 5 Minuten Umfrage aus, um uns beim Wachsen zu helfen und eine Errungenschaft zu erhalten! Du hast noch keine Ausrüstung für diesen Typen. Du kannst Ausrüstung vom Markt mit dem Gold, das du verdient hast, kaufen. - ausstehend %.01f dmg + %s Schaden ausstehend %s verbleibend Zähler zurücksetzen Zähler anpassen diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml index 75b180bf1..3ef569b86 100644 --- a/Habitica/res/values-es/strings.xml +++ b/Habitica/res/values-es/strings.xml @@ -1116,7 +1116,7 @@ Un usuario bloqueado no puede enviarte mensajes privados pero seguirás viendo sus comentarios en la Taberna o los Gremios. Suscripción única de 1 mes Pulsa sobre \"Regala una Suscripción\" y escribe el usuario de la cuenta a la que quieres regalársela. Luego, elige la duración de la suscripción que quieres regalar y realizar el pago. Tu cuenta será premiada automáticamente con una suscripción igual que la que acabas de regalar. - %.01f de daño restante + %s de daño restante Eclosiona Has sido invitado a unirte a un equipo Formulario para usuarios de Habitica diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 7c8a38193..3550b00e3 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -1121,7 +1121,7 @@ Conditions d\'utilisation Politique de Confidentialité Vous avez fini toutes vos tâches. Bravo ! - %.01f dégâts en cours + %s dégâts en cours Réinitialiser le compteur Ajuster le compteur %s restant diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml index c3b45c803..54cbd3e09 100644 --- a/Habitica/res/values-hr-rHR/strings.xml +++ b/Habitica/res/values-hr-rHR/strings.xml @@ -1082,7 +1082,7 @@ Ovo je vremenski ograničeno događanje koje počinje %s (13:00 UTC) i završava %s (01:00 UTC). Ova promocija se samo primjenjuje kada poklanjaš drugom Habiticanu. Ako ti ili tvoj primatelj poklona već imate pretplatu, poklonjena pretplata će dodati mjesece kredita koji će biti iskorišteni samo nakon što je trenutna pretplata otkazana ili kad istekne. Još nemaš ovakvu opremu. Možeš kupiti opremu iz dućana koristeći zlato koje si zaradio/la. Nisi član nikakvih Izazova. - %.01f štete čeka + %s štete čeka Jednokratna pretplata od 1 mjesec Nisi član nikakvih Cehova. Rasprodaja završava za %s diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml index e248db44f..795b01bf6 100644 --- a/Habitica/res/values-it/strings.xml +++ b/Habitica/res/values-it/strings.xml @@ -1130,7 +1130,7 @@ Aggiunta autenticazione %s %s copiato negli appunti La vendita termina fra %s - %.01f danno in sospeso + %s danno in sospeso Scarta Vuoi cambiare la tua classe in %s per %d gemme\? Completa questi obbiettivi e guadagnerai <b>5 Medaglie</b> e <font color=#EE9109><b>100 Ori</b></font> quando avrai finito! diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml index 65f7307e3..5da6b1b3c 100644 --- a/Habitica/res/values-ja/strings.xml +++ b/Habitica/res/values-ja/strings.xml @@ -1121,7 +1121,7 @@ 利用規約 プライバシーポリシー すべてのタスクを完了しました。すばらしい！ - %.01f ダメージを保留中 + %s ダメージを保留中 回数を修正 カウンターをリセット 残り%s diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml index d6e9cfa8e..e26331374 100644 --- a/Habitica/res/values-ko/strings.xml +++ b/Habitica/res/values-ko/strings.xml @@ -1143,7 +1143,7 @@ 탐색 탭으로 이동하여 참여할만한 것을 찾아보세요! 모든 과제를 완료하셨습니다. 잘하셨어요! 개인정보보호정책 - %.01f피해 대기 중 + %s피해 대기 중 로그인 방법 비밀번호 추가 연결 diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml index 2cd59c3ab..e66f3e4e3 100644 --- a/Habitica/res/values-night/colors.xml +++ b/Habitica/res/values-night/colors.xml @@ -64,5 +64,6 @@ @color/gray_400 @color/gray_10 @color/red_100 + @color/brand_600 diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml index 1abeea197..32022751a 100644 --- a/Habitica/res/values-pt-rBR/strings.xml +++ b/Habitica/res/values-pt-rBR/strings.xml @@ -1100,7 +1100,7 @@ Tema Colorido Termos de Serviço Nada aqui ainda - %.01f de dano pendente + %s de dano pendente Política de Privacidade Loja Aberta Estilo diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml index 4eb4ad879..d874b286c 100644 --- a/Habitica/res/values-ru/strings.xml +++ b/Habitica/res/values-ru/strings.xml @@ -1120,7 +1120,7 @@ Условия Использования Политика Конфиденциальности Вы завершили все ваши задания. Отлично! - %.01f ожидаемого урона + %s ожидаемого урона Сбросить счётчик Настроить счётчик Вы уверены, что не хотите сохранять изменения в этой задаче\? diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml index d6c820deb..230c45680 100644 --- a/Habitica/res/values-tr/strings.xml +++ b/Habitica/res/values-tr/strings.xml @@ -1045,7 +1045,7 @@ Şimdi olmaz Sorularınızın bir başka oyuncu tarafından cevaplanması için%s içinde bir mesaj gönderin. Bir Alışkanlık, Günlük İş veya Yapılacak İş - %.01f hasar bekliyor + %s hasar bekliyor %s kaldı %s seni kazanan olarak seçti! Zaferin başarımlarının arasına eklendi.]]> 12 aylık tek seferlik abonelik diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml index 81f65a51a..4573bff9d 100755 --- a/Habitica/res/values-uk/strings.xml +++ b/Habitica/res/values-uk/strings.xml @@ -1124,7 +1124,7 @@ Ви завершили всі свої завдання. Чудова робота! Політика конфіденційності Умови обслуговування - %.01f пошкоджень буде нанесено + %s пошкоджень буде нанесено %s залишилось Розпродаж закінчується %s Мій акаунт diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml index b1f824395..3627d2f22 100644 --- a/Habitica/res/values-zh-rTW/strings.xml +++ b/Habitica/res/values-zh-rTW/strings.xml @@ -1179,7 +1179,7 @@ 更改你的職業成為%s需要%d的寶石，確認更改\? 你在衣櫥裏找到了一個稀有裝備！ 新手任務 - %.01f即將造成的傷害 + %s即將造成的傷害 你在衣櫥搜查，然後找到了食物。那爲什麼在這裏？ 完成這些任務，即可贏得<b>5項成就</b>和<font color=#EE9109><b>100金幣</b></font>！ Habitica 用戶問卷 diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml index fe1d824c3..305f7acce 100644 --- a/Habitica/res/values-zh/strings.xml +++ b/Habitica/res/values-zh/strings.xml @@ -1126,7 +1126,7 @@ 转职为%s需要%d宝石，是否确定更改？ 对队伍成员使用物品> 修改未保存 - 即将造成%.01f点伤害 + 即将造成%s点伤害 已将%s复制到剪贴板 调整连击次数 重置连击次数 diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index 24939ef1d..91297bdd4 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -131,4 +131,5 @@ @color/gray_200 @color/gray_700 @color/maroon_100 + @color/brand_400 diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 5b17f4a0f..dd5ecdd7a 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -1163,7 +1163,7 @@ You completed all your tasks. Well done! Privacy Policy Terms of Service - %.01f damage pending + %s Damage pending %s remaining Sale ends in %s My Account @@ -1432,6 +1432,10 @@ "If you’re struggling to complete your Dailies, you can pause damage from Settings for a break. This will prevent the Boss from hurting you or others, but also pause your own damage. Other members missed Dailies will still cause damage, so be careful out there! " Rage meters Some difficult bosses have an orange Rage meter under their HP. This meter fills up when participants miss Dailies. When it fills completely, the boss will let out a fearsome attack that does extra damage! + Your subscription lets you have a second chance each day if you run out of HP + Rage + Invited to Group Plan + \@Mentions in Group Plans You @@ -1463,8 +1467,8 @@ every %d years - No items pending - %d item pending - %d items pending + No Items pending + %d Item pending + %d Items pending diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index d43ef13cc..65d5e6f49 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -867,8 +867,8 @@ @@ -882,7 +882,7 @@ @color/red_10