sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-30 02:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5753 commits 3 branches 1 tag 142 MiB
Commit graph

1318 commits

Author SHA1 Message Date
Phillip Thelen
44b6de04be Start working on habit button widget 2016-09-22 16:02:01 +02:00
Phillip Thelen
3ed0be06d0 Finish dailies widget 2016-09-22 13:07:06 +02:00
Phillip Thelen
d10cfec978 list dailies in widget 2016-09-18 00:21:38 +02:00
Vlad Vassilovski
71fce3d021 Fix #617, #618: Correct profile's pet/mount counts 
The profile's mounts tamed count wrongly ignores mounts with null value.

Also, null/nonexistent pet/mount collections have counts showing as "#".

Both counts should instead be shown as 0 for such null collections.

This fix matches the web app, which does the following:
1. Mounts tamed count = sum mount entries with any value (true, null)
2. Nonexistent pet/mount collections have counts showing as 0

Fix #617, #618
 2016-09-15 20:49:21 -04:00
Phillip Thelen
776b6d58fd start working on dailies widget 2016-09-13 21:03:12 +02:00
Phillip Thelen
256d9e3ea9 Continue work on widgets 2016-09-12 21:11:35 +02:00
Negue
a8201a936a Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into profile-achievements 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
 2016-09-12 15:15:00 +02:00
Phillip Thelen
fc7ab5c319 Initial version for Avatar Stats Widget 2016-09-09 21:19:51 +02:00
Negue
3e27fe90e3 Dialog with OK-Button, Count-Bubble on an Achievement-Icon 2016-09-08 19:19:32 +02:00
Negue
85d0ac004d update to new api-result, list achievements in 3 columns, show achievement dialog 2016-09-08 17:22:59 +02:00
Negue
6840009e93 first implementation of achievements as grid (auto break newline) 2016-09-06 21:33:17 +02:00
Phillip Thelen
ad7a1b7566 allow users to accept party invites 2016-09-04 15:28:21 +02:00
Phillip Thelen
cfced48f0d Add google login 2016-09-02 19:27:32 +02:00
Phillip Thelen
23353cce9b Merge pull request #600 from jjbillings/delete-tags 
Delete and edit tags - Issues: 496, 507
 2016-08-22 18:34:58 +02:00
jjbillings
2b1f63ccd2 Sync from main repo 
# Conflicts:
#	Habitica/res/values/strings.xml

Conflicts resolved
 2016-08-21 19:45:54 -05:00
Phillip Thelen
51ce4ec529 allow users to send messages from inbox 2016-08-19 18:54:11 +02:00
Phillip Thelen
1f759aeffd imporove qr code display 2016-08-19 16:20:01 +02:00
Phillip Thelen
a954f481d9 Merge pull request #595 from TheHollidayInn/invites-qr-code 
Invites qr code
 2016-08-19 12:54:20 +02:00
jjbillings
67d6626382 Merge branch 'develop' of https://github.com/jjbillings/habitrpg-android into delete-tags 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java

Resolved conflicts.
 2016-08-18 10:18:15 -05:00
Phillip Thelen
9aadfe62f8 fix shop display issue on old devices 2016-08-18 16:05:13 +02:00
jjbillings
f850fe7d68 Clean up code, fix keyboard dismissing issues 2016-08-17 14:34:55 -05:00
jjbillings
d2e7b0fe26 Update String resources 2016-08-17 13:11:52 -05:00
jjbillings
36c1990449 Add AlertDialog for editing/deleting tag 2016-08-16 20:32:08 -05:00
Keith Holliday
9762dc3a04 Fixed styles. Made QR code purple. Encoded url to QR code. Made QR code larger 2016-08-16 20:17:18 -05:00
Phillip Thelen
43a63794bc Merge pull request #591 from jjbillings/guild-search-bar 
Guild Search Bar - Issue #513
 2016-08-16 18:20:46 +02:00
Keith Holliday
4904cbc7b9 Restyled popup for QR 2016-08-15 22:30:59 -05:00
jjbillings
5abcc1bb7d Move guild search bar to toolbar 2016-08-14 14:11:07 -05:00
Phillip Thelen
0c030106a1 Merge pull request #587 from HabitRPG/full-profile 
WIP fullprofile: show avatar / stats / attributes / equipment
 2016-08-13 14:58:59 +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
Keith Holliday
9ed527378c Quried the user from the database rather than the api 2016-08-12 14:37:07 -05:00
Keith Holliday
4bc2ace8f2 Added configure method for avaterview. Added dialgoue in preferences for qr code 2016-08-12 14:27:06 -05:00
jjbillings
ed84dcee85 Add "Edit" mode to tag filter - only UI so far. 2016-08-12 12:32:59 -05:00
Keith Holliday
796a9a7613 Refactored QR code and fixed layout issues 2016-08-12 11:15:48 -05:00
Keith Holliday
45d9dc2d35 Added download qr. Added invite by qr. 2016-08-12 11:15:48 -05:00
Keith Holliday
d789a50de4 Added download button 2016-08-12 11:15:48 -05:00
Keith Holliday
30b736d9a1 Added QR Code to party page if you are not in a party 2016-08-12 11:15:48 -05:00
Keith Holliday
d65212f4d2 Added qrcode library. Added qr code imageview to account details 2016-08-12 11:15:48 -05:00
Phillip Thelen
d89609d562 spacing and icon tweaks 2016-08-11 18:06:55 +02:00
Negue
9f3d67419b rename sub-layouts to profile_* , extract resources, toggle attributes, hide costume card if the user doesn't activated it 2016-08-09 22:29:05 +02:00
Negue
2af95690b8 Pet / Mount Counts 2016-08-08 18:09:26 +02:00
Jack Billings
b85a30de0a Add guild search bar 2016-08-07 19:30:40 -05:00
Negue
127464537d Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into full-profile 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
 2016-08-06 20:47:01 +02:00
Negue
1629c8cde6 Send messages to members from profile view 2016-08-06 16:32:15 +02:00
Negue
66ffcece3d Equipment / Costume Gear with Image, Attributes as grid 2016-08-04 23:11:39 +02:00
jjbillings
3896d73e43 Add guild search bar 2016-08-03 21:04:17 -04:00
Negue
246926f23f fullprofile: show avatar / stats / attributes / equipment 2016-08-03 00:12:15 +02:00
Phillip Thelen
fcdeb8092b various shop improvements 2016-07-29 12:13:13 +02:00
Phillip Thelen
f5f5f0012e Merge pull request #581 from schrockblock/feature/schrockblock/reorder-tasks 
allow habits, dailies, and todos rearranging
 2016-07-29 12:13:00 +02:00
Phillip Thelen
c5aef23b43 add shop header to shops 2016-07-26 19:30:13 +02:00
Elliot
955926c569 allow habits, dailies, and todos rearranging 2016-07-22 12:19:13 -04:00
Phillip Thelen
d29c7b72ca display shops in the app 2016-07-22 18:07:00 +02:00
Phillip Thelen
0ea1f4d4b1 Fix todo reminder dialog not being scrollable. 
Fixes #579
 2016-07-22 12:03:11 +02:00
Keith Holliday
3dcff2f5de Fixed edit for new reminder dialogue. Added new date format 2016-07-12 13:13:41 -05:00
Keith Holliday
2baf90b9ef Fixed chat display 2016-06-23 13:37:25 -05:00
Keith Holliday
46320f4ba3 Added reading inbox 2016-06-23 13:37:25 -05:00
Phillip Thelen
52c0ab48b9 fix various lint errors 2016-06-21 14:26:51 +02:00
Phillip Thelen
fbc349c0dd more unified checkbox look for task form 2016-06-21 13:24:57 +02:00
Phillip Thelen
94f826119a update emoji library 2016-06-21 11:28:51 +02:00
Phillip Thelen
635d784b93 display leader message in guild info. Fixes #558 2016-06-14 15:47:06 +02:00
Phillip Thelen
243f269549 improve task form display 2016-06-14 15:00:49 +02:00
Phillip Thelen
34ca62f6e7 improve reminder editing display 2016-06-14 14:25:11 +02:00
Keith Holliday
a64610faf4 Added ability to edit reminders 2016-06-12 11:16:14 -06:00
Keith Holliday
c74296c38d Added task reminders interface and model 2016-06-12 11:16:14 -06:00
nivl4
5c077e7489 change ClassSelectionActivity to use AvatarView 2016-05-23 14:04:51 +08:00
nivl4
30b72cf8f4 change PartyMemberRecyclerViewAdapter to use AvatarView 2016-05-23 14:03:49 +08:00
nivl4
7de73c589f change AvatarSetupFragment to use AvatarView 2016-05-23 14:02:34 +08:00
nivl4
e405f433fd change MainActivity to use AvatarView 2016-05-23 14:02:00 +08:00
nivl4
2ba9990171 change AvatarWithBarsViewModel to use AvatarView 2016-05-23 14:00:24 +08:00
Phillip Thelen
4444a9943c layout fix 2016-05-12 14:41:38 +02:00
Phillip Thelen
ff70591cc5 performance improvements for task list 2016-05-12 13:44:29 +02:00
Phillip Thelen
b01890427b Rewrite task lists 2016-05-10 16:07:12 +02:00
Phillip Thelen
0ed79c8b53 Initial apiv3 support 2016-05-09 17:23:39 +02:00
Phillip Thelen
edcec62858 add option to display maintenance and deprecation screen 2016-05-09 16:17:34 +02:00
Jawnnypoo
fddd053777 Add ripple touch state to guilds so that it is more apparent that they are clickable 2016-05-07 01:25:02 -05:00
Phillip Thelen
47ceb276f8 fix pet feeding progress display 2016-04-26 16:49:56 +02:00
Phillip Thelen
ebdfe62f65 limit notes length to 3 lines 2016-04-26 16:49:56 +02:00
Phillip Thelen
9ec7e7453a fix popups 2016-04-26 16:49:56 +02:00
Phillip Thelen
25ab28a5c2 Begin implementing party invitations 2016-04-26 16:49:56 +02:00
Phillip Thelen
a444dfd3a9 display skill icons 2016-04-26 16:49:56 +02:00
Phillip Thelen
35fe0f78d2 allow class selection 2016-04-26 16:49:56 +02:00
Phillip Thelen
bd2934d31c update translations 2016-04-12 18:54:28 +02:00
Phillip Thelen
cd75b36637 Fix contributor gear display 2016-04-12 18:03:52 +02:00
Phillip Thelen
f93d8ba585 fix deprecated usages 2016-04-12 15:04:16 +02:00
Phillip Thelen
9dd99afbe6 update translations 2016-04-12 15:04:16 +02:00
Phillip Thelen
4d156a31a7 Improve content loading 2016-04-12 15:04:16 +02:00
Phillip Thelen
17961c1a9f add world boss display 2016-04-12 15:04:16 +02:00
Phillip Thelen
b136949cd6 improve stable handling. 2016-04-07 20:14:41 +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
jeubank12
7aa2e4238a Works when creating a new task 
TODO:
-Add a today button to the calendar
-Make sure it works for edit a task
 2016-03-29 12:59:53 +02:00
jeubank12
a4aaf44b88 Edited task form res and activity, working on getting the manifest to build so that I can test 2016-03-29 12:59:53 +02:00
Phillip Thelen
ced7d44de7 Display inventory items 2016-03-29 12:40:21 +02:00
Phillip Thelen
f1c38e7614 start working on items 2016-03-29 12:40:21 +02:00
Phillip Thelen
243750b7e1 Merge branch 'feature/eschrock/add-attributes-to-task-creation' of git://github.com/schrockblock/habitrpg-android into schrockblock-feature/eschrock/add-attributes-to-task-creation 2016-03-22 16:39:59 +01:00
Phillip Thelen
dd8de672d0 change menu section titles 2016-03-22 16:36:19 +01:00
Phillip Thelen
0f1f77b10e fix tasks 2016-03-22 16:07:54 +01:00
Elliot
5aa05582a5 add attributes to task creation if auto allocated 2016-03-18 13:16:27 -04:00
Phillip Thelen
1e3e852f06 add news view 2016-03-16 21:01:51 +01:00
Phillip Thelen
6c98952e28 add icons to menu headers 2016-03-16 20:47:42 +01:00
Phillip Thelen
095ba04f4e make spacing and sizing more consistent 2016-03-16 13:52:42 +01:00
Phillip Thelen
911a345166 update translations 2016-03-15 13:54:21 +01:00
Phillip Thelen
ba747d55ee fix several crashes 2016-03-15 13:53:59 +01:00
Phillip Thelen
d1fb5770f0 display gear names in overview 2016-03-11 13:41:01 +01:00
Phillip Thelen
a63b3352cb highlight equipped gear 2016-03-10 14:34:35 +01:00
Phillip Thelen
11eb098d35 allow changing equipment 2016-03-10 14:05:32 +01:00
Phillip Thelen
9c8e1be9d4 improve layouts 2016-03-08 20:53:03 +01:00
Phillip Thelen
cb162a8a74 make guilds list scrollable 2016-03-08 16:40:11 +01:00
Phillip Thelen
8d66a54a81 Merge branch 'WhatsEmo-develop' into develop 2016-03-08 15:40:28 +01:00
Phillip Thelen
b2a7a99336 hide gems on party info page 2016-03-08 12:04:38 +01:00
Phillip Thelen
231d3751a5 Merge branch 'quest-progress' of git://github.com/saranlert/habitrpg-android into saranlert-quest-progress 
# Conflicts:
#	Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/GroupSerialization.java
 2016-03-07 18:25:16 +01:00
Phillip Thelen
7cc94e04b5 fix dailies layout 2016-03-07 18:21:59 +01:00
Brandon Cheng
61094d0f52 Merge pull request #6 from HabitRPG/develop 
Update to main branch
 2016-03-06 17:57:33 -08:00
Phillip Thelen
1caf6de984 fix post button 2016-03-06 17:09:34 +01:00
Phillip Thelen
53329ae75e allow guild editing 2016-03-06 16:49:35 +01:00
Saran Lertpradit
7880bb6a13 add quest progress 
- hp bar and rage bar for boss
- item list for collection quest
 2016-03-06 17:07:16 +07:00
Brandon Cheng
8fd5dbeab9 Merge pull request #5 from HabitRPG/develop 
Update to main branch
 2016-03-05 10:44:31 -08:00
Phillip Thelen
3d12e22c81 update dependencies 2016-03-05 16:53:36 +01:00
Phillip Thelen
9d89d65419 Merge pull request #365 from camdroid/develop 
Reordered currencies to match web version
 2016-03-05 15:00:21 +01:00
Phillip Thelen
6c44e997e2 Merge branch 'settings_page_fixes' of git://github.com/andrewlord1990/habitrpg-android into andrewlord1990-settings_page_fixes 
# Conflicts:
#	Habitica/res/values/colors.xml
 2016-03-05 14:57:23 +01:00
Phillip Thelen
db6a7e2bdb Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
 2016-03-05 14:56:24 +01:00
Phillip Thelen
ae0ff33e41 Add more guild functionality 2016-03-05 14:54:19 +01:00
Phillip Thelen
7efb1b4f72 Merge pull request #429 from saranlert/quest-invitation 
add quest invitation accept/reject
 2016-03-05 14:47:46 +01:00
Andrew Lord
2e147db4b1 Added toolbar to the settings page and handle the up button from account settings page. 2016-02-27 23:05:23 +00:00
Andrew Lord
e15edfa674 Switching preferences pages working correctly. 2016-02-27 22:26:05 +00:00
WhatsEmo
9313a00783 Cleared some merge conflicts 2016-02-27 13:35:37 -08:00
WhatsEmo
46a3ce995f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2016-02-27 13:17:12 -08:00
Phillip Thelen
6e763fea5f fix merge conflicts 2016-02-26 14:33:05 +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
467c314896 display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
WhatsEmo
c74d183235 Something to help 2016-02-20 00:29:45 -08:00
WhatsEmo
2a03191def GitHub Glitched 
All these updates were already made
 2016-02-20 00:19:21 -08:00
Saran Lertpradit
222fb7e411 add quest interaction 
-list of quest participants in party view
-buttons to accept/reject/etc.. quest
 2016-02-19 01:18:24 +07:00
Negue
99bff54292 Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
Phillip Thelen
1f34c8c8a7 Merge pull request #394 from dbarnett/edittext 
Add android:inputType="textCapSentences" to auto-capitalize first letter of most EditText widgets
 2016-02-09 12:36:29 +01:00
Phillip Thelen
6099c2c080 minor fixes 2016-02-03 13:56:43 +01:00
Phillip Thelen
d74ad6040e Fix avatar margin 2016-02-02 20:30:25 +01:00
Phillip Thelen
da3bdd50a3 prevent header overlapping 2016-02-02 15:25:48 +01:00
Phillip Thelen
95c377ea54 Show setup after registration 2016-02-02 15:02:27 +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
Phillip Thelen
e59326e141 display FAQ Articles 2016-02-02 15:02:17 +01:00
Phillip Thelen
b03bc629be Merge pull request #389 from patheticpat/party-memberlist 
Don't animate health bar in party member list
 2016-01-31 15:42:58 +01:00
David Barnett
83caf8921d Add inputType=textCapSentences to most EditText widgets 2016-01-30 22:59:04 -08:00
Phillip Thelen
1a96430491 Add version to about screen 2016-01-26 16:31:58 +01:00
Michael Kaiser
007be89c5e Don't animate health bar in party member list 2016-01-25 18:09:02 +01:00
Phillip Thelen
48336c96ac Fix avatar size in dialogs 2016-01-20 15:44:40 +01:00
Phillip Thelen
5dbdd212ac fix scaling for customizations 2016-01-20 15:31:34 +01:00
Phillip Thelen
999ddd053d Support due date for todos. Fixes 2016-01-20 14:20:09 +01:00
Phillip Thelen
68bd9dfa51 Better header sizing 2016-01-20 11:37:11 +01:00
Phillip Thelen
de353c011a correct sorting for checklist items 2016-01-20 11:21:53 +01:00
Phillip Thelen
5c29001cca fix sorting for backgrounds 2016-01-19 20:55:22 +01:00
Phillip Thelen
21d6342968 Better formatting for customizations 2016-01-19 19:43:24 +01:00
Phillip Thelen
3a5710d93a allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
Phillip Thelen
c4b6cc87e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into AvatarCustomization 2016-01-19 13:48:50 +01:00
Phillip Thelen
5c527b8ad6 Allow customizations and sets to be purchased 2016-01-16 18:05:14 +01:00
syi
96f495fa9f fixed #216 2016-01-14 14:56:59 -05:00
Phillip Thelen
d9d795fb3b Allow users to select owned customizations 2016-01-13 17:25:08 +01:00
Data5tream
b5ed128fa5 merged develop to resolve merge-conflicts 2016-01-12 19:10:30 +01:00
Phillip Thelen
ca2f89087f Display current avatar customization 2016-01-12 17:08:02 +01:00
Data5tream
3b3fdc3166 Fix for issue #376 2016-01-12 16:50:54 +01:00
Data5tream
2d41d44a53 Added emoji toggles to TaskForm (still problems with actual input) 2016-01-11 22:53:40 +01:00
Data5tream
cd5ab889ff Added own icon 2016-01-11 17:54:21 +01:00
Data5tream
2da4dd0e87 Added emojikeyboard to chat 2016-01-11 17:09:49 +01:00
Phillip Thelen
77a7718dda Merge pull request #366 from yishanhe/fix-345 
Fix #345
 2016-01-11 14:10:06 +01:00
Phillip Thelen
12786109f2 Merge branch 'refactor' of git://github.com/michaldrabik/habitrpg-android into michaldrabik-refactor 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
 2016-01-11 13:36:07 +01:00
syi
0ddd91ba69 Fix #345 2016-01-06 12:38:54 -05:00
Cam
9fce7be410 Reordered currencies to match web version 2016-01-05 21:07:18 -05:00
Data5tream
b4c8739abe Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
Data5tream
09fe66847b Code cleanup 2015-12-26 13:11:55 +01:00
Data5tream
b7b898e6f6 Removed emojikeyboard until topic is discussed 2015-12-25 18:19:20 +01:00
Data5tream
17799bd263 Added emoji-keyboard to task-title form 2015-12-25 14:27:37 +01:00
Data5tream
0092186caa Added markdown and emoji support to party info 2015-12-25 12:55:48 +01:00
Data5tream
797742931b Added binding Adapter to parse markdown in Tasks 2015-12-25 12:49:53 +01:00
Data5tream
bad2e6f365 Added emojis to tavern chat 2015-12-22 20:10:28 +01:00
Data5tream
4b519c893b Added emojis to tasks (including edit forms) 2015-12-22 19:58:55 +01:00
Phillip Thelen
b7b659a19e expand toucharea for checklist items 2015-12-22 00:52:29 +01:00
Michal
79b2a82904 Merge branch 'develop' into refactor 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
 2015-12-21 23:43:43 +01:00
Darron Lumley
de9432404e added touch delegate to checkbox on daily/todo items. 2015-12-21 20:25:44 +01:00
Darron Lumley
20e8af1c97 removed references to checkbox holder in daily/todo items 2015-12-21 20:25:44 +01:00
Darron Lumley
b5165752df Made the relativelayout holder of the task checkbox react to click events 2015-12-21 20:25:44 +01:00
Negue
433bebf109 fixes #329 & fixes #162 2015-12-21 20:24:39 +01:00
Michal
c005c64f39 Move activities to /ui/activities package 2015-12-21 20:19:51 +01:00
Dan Lew
eebc7fc91c Extracted string resource for "Quest" 2015-12-17 07:01:52 -06:00
Dan Lew
82fcc5c95d Greatly simplified quset description layout 
The GridLayout was completely unnecessary
 2015-12-17 07:01:52 -06: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
Dan Lew
888e0b7cfa HTML-format quest text 
Some quests use HTML, this will automatically format it.
 2015-12-17 07:01:52 -06:00
Max Dörfler
5851bacb98 optical feedback on habit button +/- touch 2015-12-16 14:39:32 +01:00
Negue
f5cf8c9166 [#172] vertically centered checklist label 2015-12-14 21:52:06 +01:00
Franze Jr
ccddc47355 Remove commented code on layout file 2015-12-13 20:01:45 -03:00
Negue
2d645bff40 fix logout and invisible input fields 2015-12-13 20:11:10 +01:00
Phillip Thelen
3e00abda9c Merge pull request #226 from HabitRPG/clean-up-res 
Clean up res - fixes #86 fixes #167
 2015-12-13 14:38:47 +01:00
Franze Jr
50659d0d00 #119 - Add android.support.design.widget.TextInputLayout around EditText 2015-12-12 20:35:47 -03:00
Franze Jr
5ae22e3d25 Clean up gradle packages. Fixes #119 2015-12-12 16:17:08 -03:00
Negue
2afbbd9b1c [#86] remove unused drawables / animations / layout / styles 2015-12-12 19:54:25 +01:00
Phillip Thelen
dd925b8b41 display link to reset password on website. 2015-12-10 02:26:31 +01:00
Phillip Thelen
9ee5e90587 change login button to purple 2015-12-09 03:22:20 +01:00
Phillip Thelen
f63cd745ea fix login 2015-12-09 00:43:30 +01:00
Phillip Thelen
7795d82b49 Fix potential crash when flagging chatmessages. 
Fixes #140
 2015-12-09 00:22:27 +01:00
Phillip Thelen
15c0ff9e8b temporarily remove boss stats from party display. 
Fixes #138
 2015-12-09 00:22:26 +01:00
Negue
26804dfc36 fix taskform for rewards - no checklist, startDate and difficulty 2015-12-08 19:22:52 +01:00
Negue
935cf8cf9c closes #115 - improve about screen 2015-12-07 23:50:22 +01:00
Phillip Thelen
378d2acaee Change login field to "Email or Username". Fixes #118 2015-12-07 15:01:08 +01:00
Phillip Thelen
a1581cc842 Fix avatar generation. Fixes #113 2015-12-06 22:56:09 +01:00
Negue
190a2eb66a Refactor save-tags - closes #112 2015-12-06 21:25:07 +01:00
Negue
405722e06a edit rewards - closes #89 #102 - refactor task form view / class a bit 2015-12-05 23:12:03 +01:00
Franze Jr
de70efb20d [#101] Small refactorings on TaskForm 2015-12-05 16:43:14 -03:00
Franze Jr
7f4ac9278a [#101] Fix space in edit form 2015-12-05 16:20:52 -03:00
Phillip Thelen
dd99bbe3ba Improve reward list handling. Fixes #103 2015-12-05 16:12:01 +01:00
Phillip Thelen
f783443d14 task form improvements 2015-12-03 21:41:03 +01:00
Franze Jr
8a7fb6e844 Fix bug on click reward 2015-12-02 21:04:54 -03:00
Negue
dbadc948ae fixes #50 - delete tasks from inside the app / refactor deletion 2015-12-02 21:45:27 +01: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
41ef6e59d1 Merge branch 'develop' into ability-change-checklist 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
	Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
	Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
 2015-12-01 01:22:09 +01:00
Negue
b6201ae5a3 21+ Gems , Purchase Cache 2015-12-01 01:04:47 +01:00
Phillip Thelen
1283244b61 Allow checklist item editing 2015-11-30 23:01:41 +01:00
Franze Jr
a0f40c0755 [#40] Drag and drop working. Auto-height not working. It still need to save the order of checklists 2015-11-30 21:01:43 +01:00
Franze Jr
689c5b3234 Optimize imports - all the project 2015-11-30 20:57:50 +01:00
Phillip Thelen
fc779800b5 correct daily checklist rendering 2015-11-30 20:57:50 +01:00
Negue
2946e0bdb1 Merge branch 'develop' into iap 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
 2015-11-30 20:38:22 +01:00
Franze Jr
1c53973f33 Optimize imports - all the project 2015-11-29 22:22:35 -03:00
Negue
0913c62f1e Merge branch 'develop' into iap 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-29 21:35:41 +01:00
Negue
65df55f57e [#19] Purchase Gems now working :) 2015-11-29 21:10:32 +01:00
Phillip Thelen
259e725602 correct daily checklist rendering 2015-11-29 17:34:04 +01:00
Franze Jr
bfbf31220f [#40] Fix conflicts 2015-11-28 18:59:38 -03:00
Phillip Thelen
effdc76390 add ability to use skills 2015-11-28 19:30:48 +01:00
Phillip Thelen
422b79a2a3 Fix floating menu button 2015-11-28 19:30:48 +01:00
Phillip Thelen
b00d545d1c better display for skills 2015-11-26 21:26:53 +01:00
Phillip Thelen
2d2e8ad9ab Display skills 2015-11-25 18:47:56 +01:00
Phillip Thelen
116020171e Improve header layout 2015-11-25 14:41:06 +01:00
Phillip Thelen
02c2123088 Rotate refresh icon when refreshing. Fixes #65 2015-11-25 14:04:24 +01:00
Negue
b1c3520e0e [#19] gem purchase part 1 / BaseFragment bugfixes 2015-11-24 23:22:40 +01:00
Phillip Thelen
933c9cd515 better formatting for tasks 2015-11-24 21:21:32 +01:00
Phillip Thelen
687c915bb4 better back handling for fragments 2015-11-23 11:44:55 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
aa79010ea0 begin reworking activities into fragments 2015-11-19 16:50:03 +01:00
Franze Jr
813674a328 [#40] Add button for adding new checklist. 2015-11-17 20:11:56 -03:00
Franze Jr
482dc055c0 [#40] Drag and drop working. Auto-height working with scrollbar for a huge number of elements. 2015-11-17 20:11:56 -03:00
Franze Jr
5b30f190e8 [#40] Drag and drop working. Auto-height not working. It still need to save the order of checklists 2015-11-17 20:11:56 -03:00
Negue
dc6ca83da7 rename BuyRewardCommand - add potion to rewards - reposition the reward texts 2015-11-15 19:48:06 +01:00
Negue
718052da6b redesign chat item - fixes #34 / show the toggle sleep button before chat messages loaded 2015-11-15 19:30:30 +01:00
Negue
72d1a33e08 Merge branch 'faint-screen' of https://github.com/HabitRPG/habitrpg-android into develop 
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/strings.xml
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-15 18:57:19 +01:00
Phillip Thelen
75ad7523cc Display levelup popup 2015-11-15 17:22:05 +01:00
Phillip Thelen
3b0e565144 Display faint dialog and allow to revive 2015-11-15 16:33:06 +01:00
Phillip Thelen
e181c51fdc Merge branch 'rewards-design' into develop 
# Conflicts:
#	Habitica/Habitica.iml
#	Habitica/build.gradle
 2015-11-15 15:20:39 +01:00
Phillip Thelen
a61f53caf5 correctly display dailies as due 2015-11-14 19:02:20 +01:00
Phillip Thelen
3aa5ec4608 Add basic facebook login 2015-11-14 15:59:44 +01:00
Franze Jr
36e6c42890 [#36] First version - Using MaterialDialogs 2015-11-10 18:01:34 -03: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
4dc0fcbb13 correct class colors 2015-11-09 18:59:42 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
18a808adc9 Merge pull request #45 from HabitRPG/party-design 
Party design
 2015-11-09 14:10:23 +01:00
Franze Jr
86edf6b4e4 [#35] - Create databinding and logic for party members 2015-11-07 20:29:34 -03:00
Phillip Thelen
e8c12522b7 Adjust checkboxes in task lists 2015-11-07 19:10:03 +01:00
Phillip Thelen
afd23a4ae9 Redesign habit buttons 2015-11-07 15:27:17 +01:00
Franze Jr
93ed6dbd94 [#35] - Change colors for class 2015-11-06 18:32:40 -03:00
Franze Jr
24cc7ea104 [#26] - Changes proposed by team. Add report a bug button, source code button and small changes and refactorings 2015-11-05 18:28:17 -03:00
Franze Jr
8b643ca957 [#26] - Moving strings to string resources 2015-11-04 23:28:37 -03:00
Franze Jr
66de7ea08f [#26] - First version of About Screen. 2015-11-04 20:30:42 -03:00
Mickael Goubin
dd5da62836 Starting header for other activities 2015-11-01 23:01:58 +01:00
Mickael Goubin
9bfe1ff7c5 use real data for header (except gems) 2015-11-01 22:12:02 +01:00
Mickael Goubin
19a738e91d smaller gold/silver/gems icon size 2015-10-29 22:50:40 +01:00
Mickael Goubin
005a6def4d Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 2015-10-29 22:37:19 +01:00
Mickael Goubin
26341da346 last header line with placeholder text 2015-10-29 22:37:06 +01:00
Mickael Goubin
1a98aa9dd0 Bigger icons 2015-10-29 21:51:27 +01:00
Mickael Goubin
bf9b3207eb set up icons for header view 2015-10-29 21:23:23 +01:00
Negue
310cba8449 Load buyable gear rewards & save them to the db too 2015-10-29 20:49:57 +01:00
Negue
ca43925f7d remove unneeded layout [button_day_of_week] 2015-10-29 20:02:31 +01:00
Mickael Goubin
8470bcc031 Fix #16 statusbar color 2015-10-29 19:53:37 +01:00
Negue
94af661353 Cleanup / fixes / set title on TaskForm / Version 0.0.5 2015-10-21 22:33:32 +02:00
Mickael Goubin
8027959364 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
 2015-10-21 18:23:24 +02:00
Mickael Goubin
c7735d7ad8 Update layout and AvatarActivityBase to fix the name of the activity not on the right spot 2015-10-21 01:06:03 +02:00
Negue
9c1d903752 Refactor MainDrawerBuilder / start with gempurchases 2015-10-19 20:25:57 +02:00
Mickael Goubin
3be1154d2d Update to new version of design library. Tabs on single line. Tuning for new version of design lib 2015-10-11 18:32:20 +02:00
Negue
550ee32baa Replace Floating Action Button with a custom control (and on sub item for each task type) 2015-10-09 23:13:28 +02:00
Negue
ba225096c6 remove buttons .. for now 2015-10-01 21:28:13 +02:00
Negue
c47031a60b Party information / ContentCache / 2015-10-01 20:58:04 +02:00
Negue
1588f856a5 Party Part 2 - Memberlist / Fix Avatars 2015-09-23 22:39:04 +02:00
Negue
560669da95 Extract ChatListFragment 
Extract MainActivity to AvatarActivityBase
Party - Part 1 - Chat
 2015-09-15 21:56:23 +02:00
Negue
937d6aa09f Replace MaterialViewPager with Google Controls 2015-09-14 20:05:15 +02:00
Negue
6c351f8e8f Filter by Tags, fix multiple TaskTags in db 2015-09-10 21:56:58 +02:00
Negue
f6af21ba86 improve tavern performance (no databinding) / layout 2015-09-05 22:52:47 +02:00
Negue
63548df9e5 tavern: pull-to-refresh, scrollbar 2015-09-04 21:32:55 +02:00
Negue
c10c55288e Filter flagged messages, show likes with different colors for each state 2015-09-02 21:36:26 +02:00
Phillip Thelen
447456c58e Enable checking off checklist items 2015-08-31 19:02:12 +02:00
Phillip Thelen
a72d5f06ce Display checklists in task list 2015-08-31 17:48:56 +02:00
Negue
5665dd2fdb Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
 2015-08-30 20:04:12 +02:00
Negue
4f44bd44b5 List Tavern Messages, Send / Delete them, Toggle Sleep 2015-08-30 19:56:46 +02:00
Phillip Thelen
59927ef0f1 Update UI when task is scored 2015-08-26 21:09:51 +02:00
Negue
b26e48c104 Create TavernActivity / extract Sidebar Strings / extract MainDrawerBuilder 2015-08-18 21:46:12 +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
0a3a693f91 redesign daily list 2015-08-17 22:06:29 +02:00
Phillip Thelen
92ef8c6e44 Refactor models for checklists and tags 2015-08-17 17:37:43 +02:00
Phillip Thelen
ab84bf83d9 Combine task classes into one 2015-08-10 15:56:52 +02:00
Phillip Thelen
efecb79e81 Use more databindings 2015-08-03 18:14:20 +02:00
Phillip Thelen
bbe80a30c4 First working task creating/update form 2015-08-03 15:55:17 +02:00
Phillip Thelen
73f8c596d3 Start building new form for tasks 2015-08-03 15:55:17 +02:00
Negue
912898a3ac Buyable Item Images / clean up imports / nullcheck of gear 2015-07-28 19:37:18 +02:00
Phillip Thelen
92d558739f First implementation of avatar rendering 2015-07-20 19:00:03 +02:00
Negue
ee48c6adfa initialize fabric / send events from viewAdapter / change AddTaskDialog to use taskId / change menu background color 2015-07-11 20:49:09 +02:00
Negue
08c9ab0fe1 Login Screen with Snackbar instead of Crouton 2015-07-11 20:45:26 +02:00
Negue
4416366fa7 revert fragment_recyclerview.xml changes (FAB sometimes moved to the left side) 2015-07-11 15:28:14 +02:00
Negue
1eeaabffa7 Update Libraries / "Note" in Changelogs / Fix Crash on first start 2015-07-07 20:28:57 +02:00
Phillip Thelen
305d676976 refactor tasks layouts 2015-06-29 18:24:44 +02:00
Phillip Thelen
a7e78dbd68 Remove old code 2015-06-29 17:53:22 +02:00
Phillip Thelen
50ba0e07ab Fix actionbar offset 2015-06-29 17:43:03 +02:00
Phillip Thelen
ef177cef0f Start using material design viewpager 2015-06-29 16:04:03 +02:00
Negue
dce33fe2b4 Animate Value Bar 2015-06-27 20:23:14 +02:00
Negue
c57d2219ad Port Checklist Feature 2015-06-27 20:22:38 +02:00
Negue
aacceab336 Add AboutLibraries & Paperboy 2015-06-27 20:18:25 +02:00
Negue
33240311e8 add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +02:00
Negue
0b2361b8fa change Id of a textview 2015-06-20 20:34:46 +02:00
Negue
467161a5f2 Use new Avatar Control / VM 2015-06-20 20:32:34 +02:00
Negue
dc6b066b46 Avatar Control, Value Bar Control (HP, MP, XP), new colors 2015-06-20 20:13:44 +02:00
Negue
43086228d2 Rename to Habitica - Part 2 (Namespaces) / Update Fabric 2015-05-27 18:48:19 +02:00
Negue
33239d8d24 Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00