From b3e3ffa0bf7c8569c6c892dc5ee174d7ed2162e6 Mon Sep 17 00:00:00 2001 From: Steven Conner Date: Tue, 21 Mar 2017 19:45:36 -0700 Subject: [PATCH 01/62] fix qrcode layout --- Habitica/build.gradle | 2 +- Habitica/res/layout/qr_code.xml | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 5 ++--- seeds-sdk/build.gradle | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 7df7d48b2..369f3f083 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -153,7 +153,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion "24.0.3" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.habitrpg.android.habitica" diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml index 150a1608b..0194c200e 100644 --- a/Habitica/res/layout/qr_code.xml +++ b/Habitica/res/layout/qr_code.xml @@ -11,6 +11,7 @@ android:text="@string/qr_section_title" style="@style/SectionTitle" android:layout_gravity="center" + android:layout_marginTop="40dp" /> Date: Tue, 21 Mar 2017 19:55:20 -0700 Subject: [PATCH 02/62] changed button on qrcodescreen to say close instead of ok --- Habitica/res/layout/qr_dialogue.xml | 2 +- Habitica/res/values/strings.profile.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml index b0c658db3..d5e10426d 100644 --- a/Habitica/res/layout/qr_dialogue.xml +++ b/Habitica/res/layout/qr_dialogue.xml @@ -10,7 +10,7 @@ android:id="@+id/dialogButtonOK" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/profile_achievement_ok" + android:text="@string/profile_qrcode_close" android:layout_marginTop="5dp" android:layout_marginRight="5dp" android:layout_centerHorizontal="true" diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml index 5e06d4258..caec9cab9 100644 --- a/Habitica/res/values/strings.profile.xml +++ b/Habitica/res/values/strings.profile.xml @@ -13,5 +13,6 @@ Private Message Achievements Ok + Close \ No newline at end of file From 9af58a096ab269756b5c0efbc831097aa7ae20e9 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 10 Apr 2017 21:37:53 +0200 Subject: [PATCH 03/62] fix content deserialization --- .../tasks/RewardsRecyclerViewAdapter.java | 1 - .../lib/utils/ContentDeserializer.java | 19 +++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java index 18f3012e7..12a728006 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java @@ -43,7 +43,6 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter { // get itemdata list ArrayList itemKeys = new ArrayList<>(); diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java index e6cde8568..79d826470 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java @@ -6,7 +6,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.reflect.TypeToken; - import com.magicmicky.habitrpgwrapper.lib.models.ContentGear; import com.magicmicky.habitrpgwrapper.lib.models.ContentResult; import com.magicmicky.habitrpgwrapper.lib.models.Customization; @@ -27,8 +26,8 @@ import com.raizlabs.android.dbflow.structure.BaseModel; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; +import java.util.Map; public class ContentDeserializer implements JsonDeserializer { @@ -61,21 +60,21 @@ public class ContentDeserializer implements JsonDeserializer { items.addAll(result.food); items.addAll(result.hatchingPotions); - result.pets = context.deserialize(object.get("pets"), new TypeToken>() { + result.pets = context.deserialize(object.get("pets"), new TypeToken>() { }.getType()); - result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken>() { + result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken>() { }.getType()); - result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken>() { + result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken>() { }.getType()); - result.questPets = context.deserialize(object.get("questPets"), new TypeToken>() { + result.questPets = context.deserialize(object.get("questPets"), new TypeToken>() { }.getType()); - result.mounts = context.deserialize(object.get("mounts"), new TypeToken>() { + result.mounts = context.deserialize(object.get("mounts"), new TypeToken>() { }.getType()); - result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken>() { + result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken>() { }.getType()); - result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken>() { + result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken>() { }.getType()); - result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken>() { + result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken>() { }.getType()); for (Egg egg : result.eggs) { From 1ac2b0d025dc46710ad73d274587ca6b1a47a765 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 10 Apr 2017 22:39:35 +0200 Subject: [PATCH 04/62] improve text display --- Habitica/res/drawable-hdpi/justin_textbox.png | Bin 18676 -> 21584 bytes Habitica/res/drawable-mdpi/justin_textbox.png | Bin 18574 -> 18885 bytes .../res/drawable-xhdpi/justin_textbox.png | Bin 18757 -> 19114 bytes .../res/drawable-xxhdpi/justin_textbox.png | Bin 18940 -> 19312 bytes Habitica/res/layout/speechbubble.xml | 74 +++++++++--------- .../tasks/TaskRecyclerViewFragment.java | 50 ++++++------ .../ui/fragments/tasks/TasksFragment.java | 8 +- 7 files changed, 68 insertions(+), 64 deletions(-) diff --git a/Habitica/res/drawable-hdpi/justin_textbox.png b/Habitica/res/drawable-hdpi/justin_textbox.png index ef95baee9af7e634079e7fe3bb2580f4db36629e..07db1dbf773ae1ae5db5b1252d43ee7535ed16ae 100644 GIT binary patch delta 3728 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 dH2EU|p!K->xAoC|PFGBTsgb2&y}orb1fa@8^O z8tWRFhZq@K85vj^8&6i?vqTd~4q~_$4{S`elq2dLiMDc-~7z{5}XVdJJ?*5t)B0Q*?6=>&^2%wbB5XMxFv#GQWrbw zfiknMJoMi6!L~QxVuzcFg4D&G%O7aP#;nutdVAaa{7gQF+V%6?CM5#Z&sxcRu_41{ zvQ(((Eo>TF)v&+(@KE1!>#09;CHKC2WQN&YTEab^=VOL&h~lVFZ{|hky=)_rEqD2 zt%Xp~MITv^Z>4(XKR$Z(+uJQ#?{)Y5pAnbycbVJowOwsxyS9dO`u;6>w>zo&^&;JE z_4;%517LboxURVbtva&IWK-EUm2J`At+o`)-ugLVN{L`pP}p9z<%|9Fmq49j5>Zg* zJ;UvN*8M3;CR?T$Z7h9~b>`8IxUA2Q4sVv$4gMcu63h+?mUFh}@;EO`D2QtOJyG5p z^?%-!=tC~=^7gNUgom{t@46uOW#)6#JNKN(UhZtVC3x{QkZ0~J@N+dTWmqKGn^AD^ aJ%eyU_+nLJUoY5lEC+b>Q0*MskG;<3h zChgC$US180+fh{)_G@){BXYj{{LcErZ)-s?G|G{0DUlA`g|O=s@iGvxogZ@0Qk zy`t{tR^fsz7Dt-@uyfeoXgQp?y7gv`S-~6$MJ1WOKLOm~*~w)yGR$ z7hg?F%|2Z?>FT2+9HvH287;f+=I^^ZYeUrU&#F6_d{t9c-P?I%+pITl^LbMq|B3eO zWnau5+AXE*vWUAc8d7O-YaIEwTfHP+CL+azxKlSr+Ruda-aT|sJN|2 z+#PT*vs|#qE5lEvUdZs5(u~O`Q+ldjPPn%4JjcWjPVbKgZm+KS7u6|i)A}-}@_rT1 zckh=?QucG7Ua8QrI~3c|A}+Mxh=!lBI{z^}mc0UByhU$t@Z1f#bkrzbL?`9Rt_gtw zUErXb!l9^GRrl@?qwa5I@e+9;(JJA_;i?!<4iG|*Ynf}AY zjZbm4ykwBq6|=()Vo}qXzpwi7@gT>-%9HdRBD`X@cScl?OSo_d}m(9z@hbeG=iQlBLk dRvo|3aC_3;Fwq)^6kz^k@O1TaS?83{1OOp+eK7z4 delta 701 zcmX>)nXzvoqhe=(pF1y?6c+;n1FxrtOAwH@0b&adHXyk$cXrA~#Ud^y>rb1fa@8^O z8tWRFhZq@K8CqJI7)@5-vqTd~ES|5=Qg!9?`N?VSdi9LEJzX3_DsCmEERgxLJiuO=S(Z`wFbDHuIk|TY z6EE3h=jHiLWcHh9<9Xf2cGePiTN|d&2BDwdI6QxOQN{Mv!$h_SkF%RkH{}NY2+ZaW ze!{@>+2He+`mARVX~7BYADQIpt{B`3e&8^Xd0*`>d#S@fv%eaY-oB(U^HqIbIA_#Kq1S3Q3h_BiJKYgQb%FQy)7zxDM~u!|nX@$XMfa6WsOr~acY9B-ygbPfA6bU zYkl&`Sdo2ql{SM7o_I|@&E>Rn#pf;e_cW_qJ^bQt;+KEM(`-(6tnazGg=_1Ximx*Z zP1=A#bm?{Cq+6@zPoMty?BW*;w*8;o$|k*X6Zvivv9wWXr9fHo7F}S_O^oB89I{2P zyThhqnOv!?nBwP+Yd$(K-roL4670<{Ha-`lPW}HMxLM-Y3{fiw`NK*})iE-6bM#atmKX+a(DJ}*E23}7OmmnaW0K|11Y(Vn1i^%1TibY&ZHm5dE<*H-m zHPJOR2r)FZGB&d^GMucyXNe|~#%HaPXq0H0mSmQ!Yiwa|plgznmZFOilLcNa*~;`rLJjWO0uq@p?RV%kZYiuVqk7;X=0d|n3|HhS&zS+ zg*YQ+g)C5Avsq4L3FG7{Q7(0t{N&Qy)VvbMyyVp4lKi4#J1zwzU{jQmX62NaK3P#% zqTVhsB|jv^ zbWfh>reFWx)5S5Q;?|qF=e?pGMcUto7Ameh>bqNuL+lruuh}-Iqf4a^)^lsRYLs4e zy=dno9kWCGZbwH5?+!sn0oJ3wpV)Lw6n11Obo7=?zqjvzrMTaWLZg@8b=yzhxl=Re zasSMZYQBdiR?f5cRa&6W$fCd?(7?cPs8)s5@U2L<>w5G0wO6wOmnds7Fmf;eWvdie zSv{>cE?3rS5Nly@U|>=ZVBUB6-1eD;g*6`^TzcKS^83}xfnrLsfs9)eSQwZD7zCFp z2)DLxdVKl2aNPUf&&%CdL82TE3@=JHol`v4UG=lM;^SiVzp-Br^uFF^VYhA9yHD1O zm@*t27=ZeB)yt-5JFY9+!FPX;$no~Jrv^ql3;ke5+&CHiykOI_;2Hl@emRs^%lls6 zJoAv0&_qn?){w4jk z1e(qS3aAUdB}IA~p+PO0vcCCo9gnYVRd^dSp=_Uq`r9Sbu9Qbiyd1T7Y7j6SfWgGT zX!zjo+D@spcTIy=UAz!4!!# zvGo_OouB;qn#;t;i_PE`uhu;AT0bderi|5=%jcwSX=c2(xmEo1&m%Tu6)n@ml77k> zzAetOEzopr0Cuj|3jhEB delta 885 zcmZ2AmGS5#M#atmKX+a(DJ}*E23}7OmmnZr0mKCyY(Vm=`Ih|~6^po-tiNoY%2mhA zYpiQz9%5u{Wn^GwYBX7a&k{`}jn7)ez&y#)(9|+j*V4c!P1hvJ)IvAO%pz4cB`GyI z)!4$+B*`Fc@=-oljwBO9phQ~AWGykd%?A9fEW~M*6|&|+IAXJ$$P&iQGsWZ?nGKB$ zChrorU@|n?{6#!ppGAuQ^u5XH?)vowo-U3d6}R5pvCkH9lsNt|R+PK*R;DV4StaW` z(|?+4a#;esrK7tAYB{BJa&mQCLYT}P1&%mv+*!$<$;7D5AC%EF_2U|ybu-fw%kuS4 zKEKVk+uG)SHCvszb#(Y)W7!`+OG`T}!xkz@urwzK@H9CZJe$q9*>Zd4EJyAML00uw zEF;;Y7daYmupLy8U|IaRXZr=q?<=0C$mVo{MSz-mB>le3Exvze*Cg5f-~ZiSz{>Gl z{P~j?d*4N|gN@__DP-4T7vET7_FwwfpAWwlu>Sa)y{Z{zYV(7|&a?NP$_cm=6@4%&`kje*gRC$I|+%>9JQLK<4;BobY*Jh5e5A-)EV>i$C2r-)eIIO!Im57eQ_V z+vRBRFF4%x{dc{)l|d#4_m=l}uY3RdXZODNHO;ygVTuf$cgXJvo_pr`gRK1-Op7mS zSjSb>S?u~>VWYRJK4iYw6uE$Pr5jYGfJWAXgJjpqfZU>6{o<={c7Lz?r#ma*W%c!o z-xnw^dS5fQenVKv|C7t-zWMR&_1ZT-u7*#CY6a`Ob@^FMf$Wn5i{{jPetP{)#ml;a z5<3g4`a4R`-TtelyxzQV-ua)C?}9?A2^t)CFCM*lWzqMl^80pLr|LHf2KL$2e$Tvb zdgfYsb**Lf$D_AryPm&(a9Re~0${w%Sa`Os!0foGZ?H)tUr|QE|B$bi|EC09{Ldh7 z{|6j2!k~ENI95|!u-?*~=jP>_o}PWhqJp*TtH1mUtPS$A0*4+rgd=4B@iN?eQDyw- UF!Ln_24LRuboFyt=akR{0NE#OF8}}l diff --git a/Habitica/res/drawable-xxhdpi/justin_textbox.png b/Habitica/res/drawable-xxhdpi/justin_textbox.png index f8155a191423a47b900694e03f102cf5adc0f070..194e39505699f79dc755b76ce7c07e0bd014e75a 100644 GIT binary patch delta 1433 zcmew}neoFkM#atmKX+a(DJ}*E23}7OmmnZL0f_fYB}RB1;%2SBY||yW}UA=BDPAIOZj%7MJ7~729zsAOV}Alr$@+#PrFE z!V>j%i7EL>sa7fZ$(bou1sVAz`NbLe1y-p>iALtBKqs1{StLRno0w#js+$IMX^L@b zVp?Ldv5h{+pqxxJ)4`%Z~)x$E2An<#PM<8y<^6W(UYOGTbaTWtOql#;o4kFJX5#!VMK z2+q)XlcMYyw=8GL6pc+YpGyZ!*<_?@IQg!H-Jx3Db$RD!{{9|qKlk}O5nSe<1WMB7^)f2;`LepmmyE^2?awE$QFOAAOr z(}Y`x*RGTnN{d{7*bOQJ)yiw!Ie)5=N=?lphmSKhpSS0E<;}C!@`GjVefPYZa#uE7 z#POp4goD?0_p^svEcQtJLxK7 z?UO)Cd8GUA*T>h}sJ-qwa>7_h`Ft`DAE$Ej-ACm=k~Z47#KxVRsdyXJ#Vh`@J(v=m z7d|gWUvBc(NmEWZ6uq7qZTesS==%?^AMJb8{>JX7W~yzO!k-qfeGZ^Vzu0z0Td13P z-N%YKMT?FcjC~MO8~*zJtKW917k<5ZS|7Fb{c+SNaW0t~Ri#f# zQ`Z!`?mN8iJ-g@xSx_hd{Q@<6<}CGYo`YF@D$76S_usiz`|*_1*8QhZ4Ls~4zT=jG z(VkV6yFXTmN}9RlZQWO$m;Z4_I=_AW?ZywnZNOv)4qX;(_H4pBk0bsPOi&XA1WIDf4>%^B zyqS z3q!+XL*qot$w&EIIg*kLEzAszQzvVQ$!#{^Z)G7)tE`YU7s3&n-MH$QgEQ^Cr=Mr_XMj z{Ci*3rkT5crbe9DaC`MBbIqE6d%ITde4_1eK_NrHghR@)d4VIC+0?eF^rMX9i~1b5 z*z2zP4qh*n*36WZV&QFagDPd|1uLD=7deM}#_G+IJ1u`FwxdY`jhw~3_Wq;vP4mv) zh>hp#t^e}R`y#i%zdZ+EFQ2mL{Q}KjZ`x(0w##7He(39NvxNtp-qh#k)Msyf!TRHC z@ggT{6c@6A9s9w5cDg|epS%pOe7oMhipQHmfA&Alf4=bJ_HFTJ7IA{KKwS#=pMmVn z`KK>#Enm=M7UuMLeO$k6Zp3ZNfT`HLSD&#uy!4HwbTj+;O?3}8m-}yy+n@b;{`Th; zHx?G2W^4jELJ(vJFOaF6p%L?Ar;Pg5sTY16eP#2SJ!6)dNgdGr!Jj4jk4HWij$JRN zHgmnam3C75FO%w{!k@D$FXewUUiewwd-mZq>GtpT{*sZJ|9huQ zwl(|0kBfV!YW=89i(Ri(5thD1+*-Q0X4dzqI%OGmiW)nA`|@coHj ze0`U<`#U{eoUXfQQM&6o+nRe@P5IVdzrGjf(EEGpXO#ZKuKoJ6oiYpmf4yEh_bc<6 z2RbeVb}L_9`aU`6RMoU+kK6B;p(Q#{XeL(u3O#-<&Ba%3<6>Zv BwrKzW diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml index f1e62d2b8..306a71d36 100644 --- a/Habitica/res/layout/speechbubble.xml +++ b/Habitica/res/layout/speechbubble.xml @@ -14,48 +14,50 @@ android:layout_marginRight="30dp"/> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="46dp" + android:background="@drawable/white_rounded_bg" + android:orientation="vertical" + android:paddingBottom="14dp" + android:paddingLeft="21dp" + android:paddingRight="21dp" + android:paddingTop="16dp"> + - style="@style/Body1" - tools:text="@string/welcome_text"/> + android:id="@+id/confirmation_buttons" + style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal">