From fd99ab3d1d9f16b7f67767eec36af8f0a9cdb136 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 31 Mar 2017 11:16:36 +0200 Subject: [PATCH] improve character setup design --- .../customization_selection_caret.png | Bin 0 -> 835 bytes .../drawable-hdpi/customization_shadow.png | Bin 0 -> 118 bytes .../customization_selection_caret.png | Bin 0 -> 528 bytes .../drawable-mdpi/customization_shadow.png | Bin 0 -> 96 bytes .../customization_selection_caret.png | Bin 0 -> 1184 bytes .../drawable-xhdpi/customization_shadow.png | Bin 0 -> 115 bytes .../customization_selection_caret.png | Bin 0 -> 2120 bytes .../drawable-xxhdpi/customization_shadow.png | Bin 0 -> 127 bytes .../avatar_customization_category_bg.xml | 11 +++++++ .../avatar_customization_subcategory_bg.xml | 11 +++++++ Habitica/res/layout/avatar_setup_drawer.xml | 27 ++++++++++++++---- Habitica/res/values-h320dp/dimens.xml | 3 +- Habitica/res/values-h601dp/dimens.xml | 1 + .../setup/CustomizationSetupAdapter.java | 2 +- .../fragments/setup/AvatarSetupFragment.java | 20 +++++++++++++ 15 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/customization_selection_caret.png create mode 100644 Habitica/res/drawable-hdpi/customization_shadow.png create mode 100644 Habitica/res/drawable-mdpi/customization_selection_caret.png create mode 100644 Habitica/res/drawable-mdpi/customization_shadow.png create mode 100644 Habitica/res/drawable-xhdpi/customization_selection_caret.png create mode 100644 Habitica/res/drawable-xhdpi/customization_shadow.png create mode 100644 Habitica/res/drawable-xxhdpi/customization_selection_caret.png create mode 100644 Habitica/res/drawable-xxhdpi/customization_shadow.png create mode 100644 Habitica/res/drawable/avatar_customization_category_bg.xml create mode 100644 Habitica/res/drawable/avatar_customization_subcategory_bg.xml diff --git a/Habitica/res/drawable-hdpi/customization_selection_caret.png b/Habitica/res/drawable-hdpi/customization_selection_caret.png new file mode 100644 index 0000000000000000000000000000000000000000..fa86eeb8733540ebac62820e138034a34f173d4f GIT binary patch literal 835 zcmV-J1HAl+P)Px%{YgYYR7efwl-+XEFc5`Tj^fy9+R&sFhB9ykZJ8-Q&%i73uE21|lsh_|ft!^2 zr|0ZSv7H*4v@pFunOL$c>D#kMl6!yjp_Y3n$vrR?`Tv1^T{jjx=l*Ht+brKE#Secw zfVgg(omYf6G5sgA+8Q-UJc;3@Gdk0ArjV7s)7RKZ4^$kxYfgblck`Z$*9Z9voru&O1vYJ&;qp9R`oqA7{*?B&GY z!P`I`tFsNl00`5+1^{qb6_Nl#kdp!0^ug{GOFjD;v4zkF??Q=Tl$P2Es}x)+oNY~Y z4W;}!rqm4(1bfH=nsKn^dke0w*B+{ksR7(lTh#$35o)y`xKxU2fyIMbOrdhj)|$4v z9^Y4)rW4O4)KY8UQdmdTWF`;u6B!L2pz{*{LQ4Eu+dzvh`omx%paD01aU5%#Z)-Jc z7LpEjWFJh=4K>dW<;Sm6`FVK?m2^m53T^4}-4btbdSURkpA6mtAe`z;nfNC%9X-P| zC(A2yCw(euvL$C1Uo_epYbQv*n(TbXcld&-29FtFiY={CEwg1Q=C@h)LUO;iOw!GenoQNsLyj=^*rPl)MK=@8I+v$N+xZmSOVtaddfDQSocN4YZ?=){rb!RkQrs;F2 zn;`X{^wT^)mhlaKuCBrNjlrD6jq`Z?4y_vgZ?S9Raw{+?s~5ti6Cjv*Yf z$q5UL64+)PXE73XX)sXkNMJ3DXkd{R_|I-=(fC8(ql>#Ea-*?BRs=)BEvC$NyTXG& Oy$qhNelF{r5}E+x;vP@{ literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/customization_selection_caret.png b/Habitica/res/drawable-mdpi/customization_selection_caret.png new file mode 100644 index 0000000000000000000000000000000000000000..67e45dc1a5f02bac41afbe16a18f987ac76c5fe4 GIT binary patch literal 528 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 y+h~5Sz$R(xlWwC_OC~=zmtLa7xi)=t!2bi< + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml new file mode 100644 index 000000000..4c115a7e4 --- /dev/null +++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml index e7c5d50da..e75e2462d 100644 --- a/Habitica/res/layout/avatar_setup_drawer.xml +++ b/Habitica/res/layout/avatar_setup_drawer.xml @@ -1,14 +1,18 @@ - + + android:background="@drawable/avatar_customization_subcategory_bg" + android:layout_alignParentTop="true"> + + /> + android:layout_below="@id/subcategory_layout" + android:elevation="4dp" + android:id="@+id/category_layout"> - \ No newline at end of file + + + \ No newline at end of file diff --git a/Habitica/res/values-h320dp/dimens.xml b/Habitica/res/values-h320dp/dimens.xml index 4eb3412ed..777a3da91 100644 --- a/Habitica/res/values-h320dp/dimens.xml +++ b/Habitica/res/values-h320dp/dimens.xml @@ -2,5 +2,6 @@ 8dp 120dp - 80dp + 90dp + 81dp \ No newline at end of file diff --git a/Habitica/res/values-h601dp/dimens.xml b/Habitica/res/values-h601dp/dimens.xml index 6de39a717..4c491d85d 100644 --- a/Habitica/res/values-h601dp/dimens.xml +++ b/Habitica/res/values-h601dp/dimens.xml @@ -3,4 +3,5 @@ 20dp 130dp 100dp + 91dp \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java index b30389519..7c73988d7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java @@ -145,7 +145,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.JELLY_BEAN_MR1) { + Resources r = getResources(); + int px = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40, r.getDisplayMetrics()); + params.setMarginStart(location[0]+px); + this.caretView.setLayoutParams(params); + } else { + caretView.setVisibility(View.GONE); + } + } }