Commit graph

111 commits

Author SHA1 Message Date
Phillip Thelen
d12f1d3762 fix menu design issues. Fixes #941 2018-02-14 11:14:13 +01:00
Phillip Thelen
24e0407870 add world boss description dialog 2018-02-13 13:01:52 +01:00
Phillip Thelen
b54de0c30b Merge remote-tracking branch 'origin/custom-menu' into develop
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/build.gradle
#	Habitica/res/layout/fragment_about.xml
#	Habitica/res/layout/fragment_avatar_overview.xml
#	Habitica/res/layout/fragment_equipment_overview.xml
#	Habitica/res/layout/fragment_group_info.xml
#	Habitica/res/layout/fragment_news.xml
#	Habitica/res/layout/fragment_stats.xml
#	Habitica/res/layout/fragment_tavern_detail.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/res/values/attrs.xml
#	Habitica/res/values/colors.xml
#	Habitica/res/values/dimens.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewHolder-Extensions.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
#	build.gradle
2018-01-30 14:06:03 +01:00
Phillip Thelen
1173a0a94f replace materialdrawer library with custom implementation 2017-11-17 20:09:36 +01:00
Phillip Thelen
a1364a1c2c begin implementing custom menu 2017-11-17 15:34:51 +01:00
Phillip Thelen
79cb82e8d8 stats screen design tweaks 2017-11-17 14:11:51 +01:00
Phillip Thelen
c5b77cd59f display stats 2017-11-17 14:11:51 +01:00
Phillip Thelen
7c09effb63 stats screen design tweaks 2017-10-18 13:19:10 +02:00
Phillip Thelen
afb173c61f display stats 2017-10-17 19:18:34 +02:00
Phillip Thelen
12325641cc fix minor bugs 2017-10-04 16:15:55 +02:00
Phillip Thelen
c82b47ed33 fix minor bugs 2017-10-03 23:17:48 +02:00
Phillip Thelen
e69ad2e3e9 improve sprite display 2017-09-27 14:54:50 +02:00
Phillip Thelen
2949e63eb9 improve snackbar displays 2017-09-26 17:01:01 +02:00
Phillip Thelen
cf6242336f design tweaks 2017-09-25 20:33:27 +02:00
Phillip Thelen
f3afda0720 Design fixes 2017-09-20 12:45:48 +02:00
Phillip Thelen
fb632e7ba9 begin implementing new rewards design 2017-08-22 21:13:29 +02:00
Phillip Thelen
aae43575e6 add purchase dialog for quests 2017-07-25 18:27:00 +02:00
Phillip Thelen
31baca2d26 start building new purchase dialog 2017-07-21 20:41:23 +02:00
Phillip Thelen
cd3a8b5d43 Add new shop banners 2017-07-21 17:53:51 +02:00
Phillip Thelen
9dfb15bde7 begin shop redesign 2017-07-21 14:42:03 +02:00
Phillip Thelen
cc79b47fb3 improve party view 2017-07-17 16:41:18 +02:00
Phillip Thelen
52f421d71b Redo party view 2017-05-23 17:40:33 +02:00
Phillip Thelen
7adaa6cad7 update translations 2017-04-07 15:56:29 +02:00
Phillip Thelen
c923e93d35 Implement new avatar customization 2017-03-30 14:02:44 +02:00
Phillip Thelen
a3ef5ef242 redesign intro and login 2017-03-24 17:30:58 +01:00
Negue
16e32a7ec3 "my challenges" - filter 2017-03-01 13:45:43 +01:00
Phillip Thelen
0021404751 display subscription status 2017-01-26 19:33:46 +01:00
Phillip Thelen
b575287f85 start working on subscriptions 2017-01-26 19:33:45 +01:00
Phillip Thelen
ab3a90ca6d fix minor design issues 2017-01-13 13:42:24 +01:00
Negue
3f1722de64 redesign task list in challenge details / buy reward button 2017-01-12 21:44:40 +01:00
Daniel Gomez Rico
875ee30ea5 Merge branch 'develop' into feature/clean-login-style 2017-01-06 20:55:41 -05:00
Phillip Thelen
3f00de6c4d update task design 2017-01-05 18:19:06 +01:00
Daniel Gomez Rico
68ac51a5ff Clean login layout button style
- It was hard to edit
- The size of the buttons where a little weird
- The logo at the top with weird padding hide fields in small screen sizes
2016-12-15 15:37:59 -05:00
Phillip Thelen
44b6de04be Start working on habit button widget 2016-09-22 16:02:01 +02:00
Phillip Thelen
d10cfec978 list dailies in widget 2016-09-18 00:21:38 +02:00
Phillip Thelen
fc7ab5c319 Initial version for Avatar Stats Widget 2016-09-09 21:19:51 +02:00
Phillip Thelen
d89609d562 spacing and icon tweaks 2016-08-11 18:06:55 +02:00
Phillip Thelen
c5aef23b43 add shop header to shops 2016-07-26 19:30:13 +02:00
Phillip Thelen
871077ed5a add hatching and feeding 2016-03-31 15:57:57 +02:00
Phillip Thelen
ee30133a47 add item selling and quest inviting 2016-03-29 20:00:24 +02:00
Phillip Thelen
ced7d44de7 Display inventory items 2016-03-29 12:40:21 +02:00
Phillip Thelen
dd8de672d0 change menu section titles 2016-03-22 16:36:19 +01:00
Phillip Thelen
095ba04f4e make spacing and sizing more consistent 2016-03-16 13:52:42 +01:00
Phillip Thelen
11eb098d35 allow changing equipment 2016-03-10 14:05:32 +01:00
Phillip Thelen
5dbdd212ac fix scaling for customizations 2016-01-20 15:31:34 +01:00
Phillip Thelen
68bd9dfa51 Better header sizing 2016-01-20 11:37:11 +01:00
Phillip Thelen
3a5710d93a allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
Phillip Thelen
d9d795fb3b Allow users to select owned customizations 2016-01-13 17:25:08 +01:00
Dan Lew
9f5c219605 Dynamically size quest image based on presence
If it's there, it's 128dp x 128dp. If it's not, the ImageView is basically
hidden.
2015-12-17 07:01:52 -06:00
Phillip Thelen
ff5c1ece48 better display for rewards 2015-12-02 18:46:27 +01:00
Phillip Thelen
3be14accd7 Whitespace for tasks. Fixes #82 2015-12-01 19:41:07 +01:00
Negue
ba1a408c6a Merge branch 'develop' into TaskListDesign
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/dimens.xml
2015-11-09 20:34:22 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
e8c12522b7 Adjust checkboxes in task lists 2015-11-07 19:10:03 +01:00
Phillip Thelen
a72d5f06ce Display checklists in task list 2015-08-31 17:48:56 +02:00
Phillip Thelen
46962bdfbe fix avatar scale in header 2015-08-18 00:01:09 +02:00
Phillip Thelen
e58baadbc7 Begin header redesign 2015-08-17 23:37:56 +02:00
Phillip Thelen
efadeeecb6 redesign habit and todo list 2015-08-17 22:32:21 +02:00
Phillip Thelen
92d558739f First implementation of avatar rendering 2015-07-20 19:00:03 +02:00
Negue
dc6b066b46 Avatar Control, Value Bar Control (HP, MP, XP), new colors 2015-06-20 20:13:44 +02:00
Negue
33239d8d24 Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
Renamed from HabitAndroRPG/res/values/dimens.xml (Browse further)