From a9edc575fd959ae798dd8959ed9d1acb0451cde3 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 30 Mar 2017 14:02:37 +0200 Subject: [PATCH] improve character setup design --- .../res/drawable-hdpi/npc_justin_only.png | Bin 0 -> 19106 bytes .../res/drawable-mdpi/npc_justin_only.png | Bin 0 -> 18902 bytes .../res/drawable-xhdpi/npc_justin_only.png | Bin 0 -> 19264 bytes .../res/drawable-xxhdpi/npc_justin_main.png | Bin 0 -> 19698 bytes Habitica/res/drawable/npc_justin_only.png | Bin 2151 -> 0 bytes Habitica/res/layout/activity_setup.xml | 6 +- Habitica/res/layout/avatar_category.xml | 11 ++- Habitica/res/layout/avatar_setup_drawer.xml | 83 ++++++++++-------- Habitica/res/layout/fragment_setup_avatar.xml | 74 +++++++++------- Habitica/res/layout/fragment_welcome.xml | 4 +- .../res/layout/setup_customization_item.xml | 4 +- Habitica/res/layout/speechbubble.xml | 4 +- Habitica/res/values-h320dp/dimens.xml | 6 ++ Habitica/res/values-h601dp/dimens.xml | 6 ++ Habitica/res/values-w320dp/dimens.xml | 4 + Habitica/res/values-w321dp/dimens.xml | 4 + Habitica/res/values/styles.xml | 2 +- .../SetupCustomizationRepositoryImpl.java | 4 +- .../setup/CustomizationSetupAdapter.java | 2 +- .../fragments/setup/AvatarSetupFragment.java | 51 +++++++++-- .../ui/views/setup/AvatarCategoryView.java | 1 - 21 files changed, 172 insertions(+), 94 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/npc_justin_only.png create mode 100644 Habitica/res/drawable-mdpi/npc_justin_only.png create mode 100644 Habitica/res/drawable-xhdpi/npc_justin_only.png create mode 100644 Habitica/res/drawable-xxhdpi/npc_justin_main.png delete mode 100644 Habitica/res/drawable/npc_justin_only.png create mode 100644 Habitica/res/values-h320dp/dimens.xml create mode 100644 Habitica/res/values-h601dp/dimens.xml create mode 100644 Habitica/res/values-w320dp/dimens.xml create mode 100644 Habitica/res/values-w321dp/dimens.xml diff --git a/Habitica/res/drawable-hdpi/npc_justin_only.png b/Habitica/res/drawable-hdpi/npc_justin_only.png new file mode 100644 index 0000000000000000000000000000000000000000..55278fcae82522b95f2605623e9e0841d028fa2f GIT binary patch literal 19106 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 T4xV)fSciql7UO)Q-QoWM$1I7s literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/npc_justin_only.png b/Habitica/res/drawable-mdpi/npc_justin_only.png new file mode 100644 index 0000000000000000000000000000000000000000..bc79a18350627cf8400c8bf7b24ec14af146d7ef GIT binary patch literal 18902 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/npc_justin_only.png b/Habitica/res/drawable-xhdpi/npc_justin_only.png new file mode 100644 index 0000000000000000000000000000000000000000..a57292c441e7be77b4ac18c228b22be882915e58 GIT binary patch literal 19264 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 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable/npc_justin_only.png b/Habitica/res/drawable/npc_justin_only.png deleted file mode 100644 index 62f124f5e3e80423074a12e1d9a41e4523a6abc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2151 zcmZ`)4LDP496xA_;i`)g%I?w^+1ZEBnUzdYNKAK1G}{?tbJjMGb#*JbeQ&ofeNMX7 ztw>@;SFNZ}w;m;h(DSH96bXgC&^>2VyB?kAIcM+t`~QCL@Bjb5@B3_fXviXSoGlIj z0Q0~AW*G8ILf(1CSmb+}wFCvm#rX#N0)Tp#=>P|V%uU1rkx~FKwM1V7;7Fzo!XXG) zY#BQ^h{lCQL=F#*g@|&I7-0hdT~0%WB1p!;%SFN@DNXJ}&@pJp7==LsUPqB7`ViQ` zp?E)70^!|=u0#@nfy3kRbP1173u7)Eks~u7LcB~Srh#BeN(wQBN`xhGAlb{y3nWoM z3dIFsxJcI~$vASCBM zq%5RB5RHIjA_*Kz2FV3KkfD(u%6QywRf&@&LS0QfE(i%B5tJm8B0BPzc1Ul(3ICU* zoFg7K(=~CpHaeO)Eew*v!eq1s5lI3WgF@F8G#dWikzth|ED}o~sT7eh+(sn&*l0fc zyA8wRtA{=~TCh|iKq}>+c`?W%2Kv}&e&kpN`kYRo_N0peN*UY0~7_1c)os+bv|zbZ0*tS_A6A zbZ|^I9XScKV3;T1uVr#%5Q9P@yV1xb8rcg^rlJEcWYc>Z-%8Ng&gg6_2T1;hSjb zYt@t;;ds1gTOXca<@;(?yhYt6ZEgCtT0b>D0*+2d?OWbikv_ho!fAG1MS4HpYV+Bx zEf&T&+X+kSV%0Na^W5(X_rj$@{*i{6Zl5Qe{@CBC^60wvKAC?-a5J~dDdWnQh-0~@ z`p@*{IEW%dnuI5;#5rz#)y2-s;<6%A|`RRC@YQm*EAaMu*-*owhVeu z+~2=f%dzE?pDjKa9of4>>%U)Fb@BP4lP!)}29FJ+4pS=oT95Q%xf*$q!Ft)J*#lMc z)*8JwbovxFe#WfwUt0tA%|MCqC0fkmeY?qzc!}4$cjn$!FxMs!f> z1((np+gIkVerkr-tq?W&W8USrj#Yn7*}wbPG`Gf8109ij%BlDgpu?%~W$CRsXHS$p z%K!arepc2r8&MmfKk&?>?zrn*^(syPjkmS80;PsdJQ478QweDKxZAVTj4HIPclRE0 zR(N--*L9sz4H(NgZ|u4?TOHC;yBrKARc-uWcrJIh*7$9hm7mAlGvV)}(-%K+Dv$ex z0dD4{t6B3EeXrMaKV1EMyk<3fDcvXvX#T7G&~z$T8<@U)eTK^RhRYJnLJWIF&XC=} zHga2A#U}i*I6H-Yv{i9@Q$;IHh^=C1umSp|CsWvk!!uvl^QM z@~4~BWVTzB)D%>hTwB3>+IF#(YGZE&7N)VFX{z{;5D&BgGBRMMI7C7CP4 z^=5RZeQloVTQ3X`ZD-H254rEQCR4SmYL)Tr?yi`uOxMP#gI*Sj3cH3Eca>&C5LS`C zgtP+$ST%=4585wK{)qMOw7U~SH`1Dl_fN<*v~uRw3@!Uy*E<t2g}zCM84J diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml index eaae781fb..56913b267 100644 --- a/Habitica/res/layout/activity_setup.xml +++ b/Habitica/res/layout/activity_setup.xml @@ -20,10 +20,10 @@ android:layout_alignParentStart="true" android:layout_alignParentEnd="true" android:background="@color/brand_300" - android:paddingLeft="21dp" - android:paddingRight="21dp" + android:paddingLeft="@dimen/content_inset" + android:paddingRight="@dimen/content_inset" android:gravity="center_vertical" - android:elevation="4dp"> + android:elevation="8dp">