Commit graph

261 commits

Author SHA1 Message Date
Phillip Thelen
bda64ecbff Improve stable display 2020-07-22 15:14:41 +02:00
Phillip Thelen
a5ce77ff72 Implement purchasing debuff potions. Fixes #1321 2020-07-20 18:16:27 +02:00
Phillip Thelen
1956df6f66
Merge pull request #1304 from HiroinaProtagonist/party-invite
Party invite
2020-06-11 14:21:28 +02:00
Phillip Thelen
9c931973c6
Merge branch 'develop' into resize-petnmounts-cards 2020-06-10 14:07:50 +02:00
Phillip Thelen
7d60b338e4 Display adventure guide status in menu 2020-06-05 11:26:44 +02:00
Leland Wu
0ab69c33ef resolve merge conflict in strings 2020-05-15 16:59:47 -04:00
Zoe Abrams
dca164e6d1 Merge remote-tracking branch 'upstream/develop' into party-invite 2020-04-11 03:52:34 -07:00
Phillip Thelen
4d6435b007 Support screen tweaks 2020-04-03 15:36:41 +02:00
Phillip Thelen
2ea68a1b58 Implement bulk buying gems 2020-04-02 13:55:16 +02:00
Phillip Thelen
dadc3885fa Implement more avatar customization options. Fixes #1137 2020-03-20 17:37:29 +01:00
Phillip Thelen
edc2a83a08 Implement improved help screen 2020-03-18 15:34:23 +01:00
Zoe Abrams
5243f694b4 front-end changes 2020-03-13 12:27:11 -07:00
Phillip Thelen
ffa8f8e1ce Improve shop locked item display 2020-02-06 18:06:44 +01:00
Phillip Thelen
5b3b25a0d3 Update skill design 2020-01-24 17:01:55 +01:00
Phillip Thelen
7ddef238cb Improve info about g1g1 2020-01-06 17:38:06 +01:00
Phillip Thelen
049cc3587c Add promo to menu 2019-11-30 20:02:13 +01:00
Phillip Thelen
636f51b4e4 Finalize subscription page tweaks 2019-11-26 10:58:14 +01:00
Phillip Thelen
58fc185532 update gem purchase screen 2019-11-25 14:58:20 +01:00
Phillip Thelen
6918dd3e12 Sub page improvements 2019-11-25 13:03:27 +01:00
Phillip Thelen
ba24ce0167 Redesign subscription page 2019-11-19 18:07:45 +01:00
Phillip Thelen
ef8c7c30ec Implement redesigned equipment overview 2019-11-05 17:49:08 +01:00
Phillip Thelen
683d3e520b Add option to gift gems from balance 2019-10-30 14:43:44 +01:00
Phillip Thelen
6665308916 More celebration for leveling up 2019-10-10 19:57:05 +02:00
Phillip Thelen
edc62302a2 Implement gifting gems 2019-10-07 19:13:29 +02:00
Phillip Thelen
5682e5aa69 update design for subscription promo 2019-10-07 19:13:29 +02:00
Phillip Thelen
8ad5ae2d90 Add search to task view 2019-08-30 13:25:15 +02:00
Phillip Thelen
216b057fc4 Fix various linting errors 2019-08-24 12:33:14 +02:00
Phillip Thelen
8aa52acfd2 Fix widget crash. Fixes #1174 2019-08-23 12:24:15 +02:00
Phillip Thelen
4d9a1fdc4e Add more interactions to member list. Fixes #1214 2019-08-16 15:14:05 +02:00
Phillip Thelen
59bf5b10d6 Clean up themes 2019-08-07 10:29:58 +02:00
Phillip Thelen
5b840ab5ae Visual tweaks 2019-06-19 11:46:26 +02:00
Phillip Thelen
109c3f06fd Allow checklist items to be reordered 2019-06-12 10:49:40 +02:00
Phillip Thelen
e657a2262d Add submenu for new add task button 2019-06-06 17:13:50 +02:00
Phillip Thelen
a05ea079d1 Implement new bottom navigation design 2019-06-06 14:33:29 +02:00
Phillip Thelen
f6d6308601 Don’t draw app behind navbar
Fixes #1164
2019-06-03 17:12:29 +02:00
Phillip Thelen
73114f14f1 Merge branch '794-global-notifications' of https://github.com/cvuorinen/habitica-android into cvuorinen-794-global-notifications
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
2019-06-03 12:36:33 +02:00
Phillip Thelen
2ffa14907e Implement first version of achievement screen 2019-05-31 10:22:36 +02:00
Phillip Thelen
cdda95295d Update purchase dialog 2019-05-31 10:22:36 +02:00
Carl Vuorinen
edc54be6a4 Change badge color from red to purple + improved badge layout
Previously with the padding in the badge shape, it didn't handle large
numbers well (partly cut off) and also the shape wasn't round with small
numbers. Using minWidth & center gravity without padding fixes both issues.
2019-05-22 18:37:21 +03:00
Carl Vuorinen
60abfe12ac Notifications view header with title, badge with count + dismiss all button 2019-05-22 18:32:09 +03:00
Phillip Thelen
7a1ef8a7cc Begin implementing new modals 2019-05-17 19:30:05 +02:00
Phillip Thelen
1d2f3ab1bb Theming test 2019-05-17 13:57:29 +02:00
Phillip Thelen
d970c31e9a Fix setup icon issue 2019-04-30 14:00:08 +02:00
Phillip Thelen
7c552c5162 Remove instabug 2019-04-30 13:39:00 +02:00
Phillip Thelen
2cb410d203 tweak report message screen 2019-04-26 10:28:06 +02:00
Phillip Thelen
e2c17fef90 Various style fixes 2019-04-24 10:17:24 +02:00
Phillip Thelen
0ee9936ec3 Implement new class selection screen. Fixes #828 2019-04-17 14:48:08 +02:00
Phillip Thelen
008fdc1d22 Implement reward value form field 2019-04-05 11:16:44 +02:00
Phillip Thelen
80ef5e1bdb Continue implementing new task form 2019-04-05 09:45:26 +02:00
Phillip Thelen
cca994fad5 Begin building new task form 2019-04-05 09:45:26 +02:00
Phillip Thelen
2edf68b474 Implement party creation 2019-03-05 13:14:42 +01:00
Phillip Thelen
def26be822 fix opening challenge creation screen 2019-01-08 19:54:45 +01:00
Phillip Thelen
750d81068b Implement subscription gifting 2018-12-04 16:34:22 +01:00
Phillip Thelen
3898e0577e replace pngs with webp versions 2018-12-04 14:32:24 +01:00
Phillip Thelen
70e7b54cc1 Begin implementing new navigation architecture 2018-12-03 19:26:47 +01:00
Phillip Thelen
c7f0346ff8 Fix layout issues on devices with a notch 2018-11-19 18:13:35 +01:00
Phillip Thelen
f00ae57b34 Redesign no party screen 2018-11-08 15:20:59 +01:00
Phillip Thelen
d298c62fc1 Tweak UI 2018-11-07 15:17:25 +01:00
Phillip Thelen
b065cf0acc Implement new welcome screen 2018-11-05 13:57:42 +01:00
Phillip Thelen
d6973d905d Make it easier to confirm usernames 2018-09-28 17:20:21 +02:00
Phillip Thelen
bb8b795cfa Indicate which gear is two handed. See #688 2018-08-29 17:44:16 +02:00
Phillip Thelen
624eb99d37 Improve chatmessage display. Fixes #891 2018-08-27 13:04:52 +02:00
Phillip Thelen
401df2273b Add widget previews. Fixes #1010 2018-08-22 19:25:11 +02:00
Phillip Thelen
333d08e11c Improve chat design 2018-08-09 14:37:53 +02:00
Phillip Thelen
64d420d40a Improve chat message styling 2018-08-07 18:21:18 +02:00
Phillip Thelen
cda7e4a403 fix crashes 2018-08-06 14:23:02 +02:00
Phillip Thelen
5626b76956 Begin implementing new challenge design and layout 2018-07-23 18:03:58 +02:00
Phillip Thelen
5040574bf0 Begin redesigning chat 2018-07-13 15:58:53 +02:00
Phillip Thelen
7cc208a191 Improve chat entry 2018-02-26 13:12:23 +01:00
Phillip Thelen
24e0407870 add world boss description dialog 2018-02-13 13:01:52 +01:00
Phillip Thelen
483c4f6e12 Implement new no-party screen. Fixes #814 2018-02-09 18:13:44 +01:00
Phillip Thelen
7022dc1c69 start adding world boss progress to tavern 2018-01-30 17:57:12 +01:00
Phillip Thelen
c69322651c
Merge pull request #928 from caipivara/feature/optimize-resources-with-loseless-algorithms
Optimize image resources with ImageOptim (with lossless algorithms) #1
2018-01-30 14:34:50 +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
31a9e36ad7 implement additional tavern features 2018-01-30 13:41:22 +01:00
Daniel Gomez Rico
d1a21d5fb1 Optimize resources using imageoptim 2018-01-29 11:24:18 -05:00
Phillip Thelen
1173a0a94f replace materialdrawer library with custom implementation 2017-11-17 20:09:36 +01:00
Phillip Thelen
4c713e8c92 resize streak icon. Fixes #849 2017-11-17 14:12:13 +01:00
Phillip Thelen
60a4e3fac3 update stats icon. Fixes #839 2017-11-17 14:12:13 +01:00
Phillip Thelen
95b1be7415 implement bulk attribute point allocation. Fixes #821 2017-11-17 14:12:02 +01:00
Phillip Thelen
7dc99b722b make icon adaptive 2017-11-17 14:12:02 +01:00
Phillip Thelen
438ebb2201 assign attribute points 2017-11-17 14:11:51 +01:00
Phillip Thelen
c5b77cd59f display stats 2017-11-17 14:11:51 +01:00
Phillip Thelen
857d5ed184 improve fix character values design 2017-11-17 14:11:51 +01:00
Phillip Thelen
021a6f45c7 resize streak icon. Fixes #849 2017-11-02 18:30:57 +01:00
Phillip Thelen
329812878a update stats icon. Fixes #839 2017-11-02 13:14:39 +01:00
Phillip Thelen
2aaa8ccdaa implement bulk attribute point allocation. Fixes #821 2017-10-30 13:27:19 +01:00
Phillip Thelen
38b905cf86 make icon adaptive 2017-10-27 12:21:58 +02:00
Phillip Thelen
50e4484002 assign attribute points 2017-10-17 21:23:06 +02:00
Phillip Thelen
afb173c61f display stats 2017-10-17 19:18:34 +02:00
Phillip Thelen
120da990b0 improve fix character values design 2017-10-16 13:58:18 +02:00
Phillip Thelen
abca017f05 remove unneeded bottom bar icons 2017-09-26 17:47:51 +02:00
Phillip Thelen
2949e63eb9 improve snackbar displays 2017-09-26 17:01:01 +02:00
Phillip Thelen
95fa5ccc41 rename habitica colors 2017-09-11 13:31:20 +02:00
Phillip Thelen
022b885cdc Merge remote-tracking branch 'origin/develop' into shops
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
2017-08-22 11:40:26 +02:00
Phillip Thelen
377ff8dbc3 fix various minor crashes 2017-08-03 13:45:32 +02:00
Phillip Thelen
aae43575e6 add purchase dialog for quests 2017-07-25 18:27:00 +02:00
Phillip Thelen
c45488ba23 improve snackbar design 2017-07-21 20:41:29 +02:00
Phillip Thelen
8c0e52dbcb Improve currency display 2017-07-21 14:45:56 +02:00
Phillip Thelen
9dfb15bde7 begin shop redesign 2017-07-21 14:42:03 +02:00
Phillip Thelen
38352ad4c2 fix various errors 2017-07-05 22:25:29 +02:00
Phillip Thelen
52f421d71b Redo party view 2017-05-23 17:40:33 +02:00
Phillip Thelen
3c61635394 Merge branch 'realm' of github.com:HabitRPG/habitrpg-android into realm
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/anim/fab_slide_in.xml
#	Habitica/res/anim/fab_slide_out.xml
#	Habitica/res/layout/floating_menu_tasks.xml
#	Habitica/res/values-ru/strings.tutorial.xml
#	Habitica/res/values-ru/strings.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeSerializer.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
#	translations/store_strings-ru.xml
2017-04-29 19:42:27 +02:00
Negue
a490fdb38a Merge remote-tracking branch 'origin/develop' into create_challenges
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
	Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
2017-04-23 15:28:37 +02:00
Negue
bcc9b13602 show gem errors / recolor gem buttons (based on state) 2017-04-22 15:55:37 +02:00
Phillip Thelen
f5ad6488bc Move all db access to repositories 2017-04-20 21:14:23 +02:00
Phillip Thelen
6a6a7addf9 improve task filter layout 2017-04-17 15:11:19 +02:00
Negue
98fac6c0a5 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
2017-04-10 22:56:31 +02:00
Phillip Thelen
b3b84b193b creator improvements 2017-04-10 18:48:06 +02:00
Phillip Thelen
368608693a improve creator view 2017-04-07 15:56:23 +02:00
Phillip Thelen
b6c760bc6b add badge to filter menu item 2017-04-06 22:02:19 +02:00
Negue
3f5347486c Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
2017-04-06 21:10:05 +02:00
Negue
94a4ef6b1d more layout + open new/edit TaskFormActivity without saving to DB + extract ChallengeTasksRecyclerViewAdapter 2017-04-06 20:58:51 +02:00
Phillip Thelen
e79bd18c3a Implement more task filtering options 2017-04-03 19:36:44 +02:00
Phillip Thelen
21b25e5658 update bottom bar design 2017-04-03 15:42:20 +02:00
Phillip Thelen
d17411495d Implement bottom navigation bar 2017-04-02 23:59:22 +02:00
Phillip Thelen
fd99ab3d1d improve character setup design 2017-03-31 11:16:36 +02:00
Phillip Thelen
a9edc575fd improve character setup design 2017-03-30 14:02:44 +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
Phillip Thelen
7d491fbdba New intro 2017-03-23 14:12:28 +01:00
Phillip Thelen
27f3e5645b subscription layout changes 2017-02-03 13:21:42 +01:00
Phillip Thelen
1c85fbfa43 small design tweaks 2017-02-01 20:03:36 +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
0c44813a0e fix minor graphical issues 2017-01-23 13:16:11 +01:00
Phillip Thelen
1c5e081e48 remove borders from dailies and todos 2017-01-16 20:02:43 +01:00
Negue
3f1722de64 redesign task list in challenge details / buy reward button 2017-01-12 21:44:40 +01:00
Negue
8d499f5110 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenges_joined
Conflicts:
	Habitica/AndroidManifest.xml
	Habitica/res/drawable-hdpi/ic_header_exp.png
	Habitica/res/drawable-hdpi/ic_header_gem.png
	Habitica/res/drawable-hdpi/ic_header_gold.png
	Habitica/res/drawable-hdpi/ic_header_healer.png
	Habitica/res/drawable-hdpi/ic_header_heart.png
	Habitica/res/drawable-hdpi/ic_header_mage.png
	Habitica/res/drawable-hdpi/ic_header_magic.png
	Habitica/res/drawable-hdpi/ic_header_rogue.png
	Habitica/res/drawable-hdpi/ic_header_silver.png
	Habitica/res/drawable-hdpi/ic_header_warrior.png
	Habitica/res/drawable-mdpi/ic_header_exp.png
	Habitica/res/drawable-mdpi/ic_header_gem.png
	Habitica/res/drawable-mdpi/ic_header_gold.png
	Habitica/res/drawable-mdpi/ic_header_healer.png
	Habitica/res/drawable-mdpi/ic_header_heart.png
	Habitica/res/drawable-mdpi/ic_header_mage.png
	Habitica/res/drawable-mdpi/ic_header_magic.png
	Habitica/res/drawable-mdpi/ic_header_rogue.png
	Habitica/res/drawable-mdpi/ic_header_silver.png
	Habitica/res/drawable-mdpi/ic_header_warrior.png
	Habitica/res/drawable-xhdpi/ic_header_exp.png
	Habitica/res/drawable-xhdpi/ic_header_gem.png
	Habitica/res/drawable-xhdpi/ic_header_gold.png
	Habitica/res/drawable-xhdpi/ic_header_healer.png
	Habitica/res/drawable-xhdpi/ic_header_heart.png
	Habitica/res/drawable-xhdpi/ic_header_mage.png
	Habitica/res/drawable-xhdpi/ic_header_magic.png
	Habitica/res/drawable-xhdpi/ic_header_rogue.png
	Habitica/res/drawable-xhdpi/ic_header_silver.png
	Habitica/res/drawable-xhdpi/ic_header_warrior.png
	Habitica/res/drawable-xxhdpi/ic_header_exp.png
	Habitica/res/drawable-xxhdpi/ic_header_gem.png
	Habitica/res/drawable-xxhdpi/ic_header_gold.png
	Habitica/res/drawable-xxhdpi/ic_header_healer.png
	Habitica/res/drawable-xxhdpi/ic_header_heart.png
	Habitica/res/drawable-xxhdpi/ic_header_mage.png
	Habitica/res/drawable-xxhdpi/ic_header_magic.png
	Habitica/res/drawable-xxhdpi/ic_header_rogue.png
	Habitica/res/drawable-xxhdpi/ic_header_silver.png
	Habitica/res/drawable-xxhdpi/ic_header_warrior.png
	Habitica/res/values/colors.xml
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
	Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
2017-01-11 22:37:00 +01:00
Negue
a281d7fbf8 show tasks inside dialog / improve loading challenges 2017-01-06 23:45:21 +01:00
Negue
c55872fa78 redesign public challenge item - use styles for fontFamily - new header icons 2016-12-19 18:01:54 +01:00
Negue
dde293de19 redesign "my challenges" list / custom Title override by fragment / save taskLists and groupId/name of a challenge to the database 2016-12-18 18:46:03 +01:00
Phillip Thelen
bcfd01e73f move seeds button 2016-12-07 14:40:03 +01:00
Phillip Thelen
89420b81da implement seeds sdk 2016-12-07 14:40:03 +01:00
Phillip Thelen
e5e710eb1c improve IAP display 2016-10-11 19:38:23 +02:00
Phillip Thelen
185e93ffc2 start building new gem purchase screen 2016-10-11 19:38:23 +02:00
Phillip Thelen
44b6de04be Start working on habit button widget 2016-09-22 16:02:01 +02:00
Phillip Thelen
256d9e3ea9 Continue work on widgets 2016-09-12 21:11:35 +02:00
Phillip Thelen
fc7ab5c319 Initial version for Avatar Stats Widget 2016-09-09 21:19:51 +02:00
Negue
98d13ca147 use APIHelper in ContentCache, get language from user.preferences, use common card-styles, 2016-08-12 22:17:02 +02:00
Phillip Thelen
051fed2f72 add RxJava and multidexing 2016-04-07 20:14:41 +02:00
Phillip Thelen
095ba04f4e make spacing and sizing more consistent 2016-03-16 13:52:42 +01:00
Phillip Thelen
9c8e1be9d4 improve layouts 2016-03-08 20:53:03 +01:00
Phillip Thelen
2f09ab00b3 fix display of elements on older androids 2016-03-05 18:08:49 +01:00
Phillip Thelen
1469e6fe54 Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/layout/activity_task_form.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
2016-02-26 14:02:15 +01:00
Phillip Thelen
2c982d5fb0 Add Intro before login 2016-02-02 15:02:26 +01:00
Phillip Thelen
cda0a1d56c Display tutorial messages 2016-02-02 15:02:26 +01:00
Data5tream
3c69a0a802 Added icons for keyboard switch 2016-01-12 18:26:39 +01:00
Max Dörfler
5851bacb98 optical feedback on habit button +/- touch 2015-12-16 14:39:32 +01:00
Negue
2afbbd9b1c [#86] remove unused drawables / animations / layout / styles 2015-12-12 19:54:25 +01:00