From 5c527b8ad643290ca57864e662fbc9dbbd5a7dae Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Sat, 16 Jan 2016 18:05:14 +0100 Subject: [PATCH] Allow customizations and sets to be purchased --- .../res/layout/customization_grid_item.xml | 27 +++- .../layout/customization_section_header.xml | 13 +- .../layout/dialog_purchase_customization.xml | 35 +++++ Habitica/res/values/strings.xml | 2 + .../habitrpg/android/habitica/APIHelper.java | 16 +-- .../habitica/callbacks/UnlockCallback.java | 40 ++++++ .../events/commands/OpenMenuItemCommand.java | 8 ++ .../events/commands/UnlockPathCommand.java | 11 ++ .../habitica/ui/activities/MainActivity.java | 12 ++ .../CustomizationRecyclerViewAdapter.java | 135 ++++++++++++++++-- .../AvatarCustomizationFragment.java | 29 ++-- .../ui/fragments/AvatarOverviewFragment.java | 10 +- .../habitrpgwrapper/lib/api/ApiService.java | 5 +- .../lib/models/ContentResult.java | 3 + .../lib/models/Customization.java | 69 ++++++--- .../lib/models/HabitRPGUser.java | 5 + .../habitrpgwrapper/lib/models/Purchases.java | 11 ++ .../lib/models/responses/UnlockResponse.java | 18 +++ .../lib/utils/CustomizationDeserializer.java | 86 +++++++++++ .../lib/utils/PurchasedDeserializer.java | 63 ++++++++ gradlew | 34 ++--- gradlew.bat | 34 ++--- 22 files changed, 564 insertions(+), 102 deletions(-) create mode 100644 Habitica/res/layout/dialog_purchase_customization.xml create mode 100644 Habitica/src/com/habitrpg/android/habitica/callbacks/UnlockCallback.java create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/UnlockPathCommand.java create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/responses/UnlockResponse.java create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/CustomizationDeserializer.java create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml index f313afe72..0fb0876f3 100644 --- a/Habitica/res/layout/customization_grid_item.xml +++ b/Habitica/res/layout/customization_grid_item.xml @@ -3,22 +3,35 @@ android:id="@+id/card_view" android:layout_height="wrap_content" android:layout_width="match_parent"> - + - + android:scaleType="fitEnd" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> + + \ No newline at end of file diff --git a/Habitica/res/layout/customization_section_header.xml b/Habitica/res/layout/customization_section_header.xml index 3e52c9937..5d3039267 100644 --- a/Habitica/res/layout/customization_section_header.xml +++ b/Habitica/res/layout/customization_section_header.xml @@ -4,8 +4,15 @@ android:layout_height="match_parent"> + android:layout_weight="1" + android:layout_gravity="bottom" + android:textAppearance="?android:attr/textAppearanceMedium"/> + +