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

2600 commits

Author SHA1 Message Date
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
fe8a584a7a update translations 2016-05-09 16:17:34 +02:00
Phillip Thelen
edcec62858 add option to display maintenance and deprecation screen 2016-05-09 16:17:34 +02:00
Phillip Thelen
5974914f7f Merge pull request #529 from Jawnnypoo/update-guild-state 
Update guild state
 2016-05-09 16:16:51 +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
Jawnnypoo
a3fae22c44 Color the buttons within an alert dialog to be the brand purple 2016-05-07 00:30:06 -05:00
Phillip Thelen
275bc861f7 update translations 2016-04-26 16:49:56 +02: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
d64f150bdc allow party editing and leaving 2016-04-26 16:49:56 +02:00
Phillip Thelen
af7da65c0d fix feedback on joining/leaving guild. Fixes #511 2016-04-26 16:49:56 +02:00
Phillip Thelen
30dda364c5 Add sharing to raised pets 2016-04-26 16:49:56 +02:00
Phillip Thelen
8878be49a3 update share messages 2016-04-26 16:49:56 +02:00
Phillip Thelen
5dc6ef5d91 add sharing for level up and pet hatching 2016-04-26 16:49:56 +02:00
Phillip Thelen
9ec7e7453a fix popups 2016-04-26 16:49:56 +02:00
Phillip Thelen
a17fb41ca0 allow users to invite people to their party 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
8654e038f6 handle class selection correctly 2016-04-26 16:49:56 +02:00
Phillip Thelen
ebe09f0301 allow to change class in settings. 2016-04-26 16:49:56 +02:00
Phillip Thelen
0046e43609 finish selecting a class after levelup 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
nivl4
8fbb54d212 chore: add Habitica connection properties to gradle build 
Add Habitica gradle properties file to the gradle build process to
enable debugging against a local instance of Habitica server.
 2016-04-22 11:40:40 +08:00
Phillip Thelen
3d4507c24f Update translations 2016-04-19 12:49:19 +02:00
Phillip Thelen
a020ae486d update translations 2016-04-14 14:30:30 +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
7e44e5f85e better display for classless users. 2016-04-12 16:41:15 +02:00
Phillip Thelen
5a3b6757c9 Code cleanup 2016-04-12 15:46:44 +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
318614ac02 Fix Stable 2016-04-07 20:14:41 +02:00
Phillip Thelen
b136949cd6 improve stable handling. 2016-04-07 20:14:41 +02:00
Phillip Thelen
051fed2f72 add RxJava and multidexing 2016-04-07 20:14:41 +02:00
Phillip Thelen
809a247766 update translations 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
75483985fd Translation Complete 2016-03-29 13:00:41 +02:00
jeubank12
8de649b7e0 Enhancement Complete 
Still need to add locale strings for translation of 'today'
 2016-03-29 13:00:15 +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
ff23078398 Merge pull request #488 from ablx/german-translation-improvement 
German translation improvement
 2016-03-29 12:58:26 +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
Saran Lertpradit
5575f4ff19 add enchanted armoire note 2016-03-29 12:40:21 +02:00
Saran Lertpradit
144a1d9186 Add enchanted armoire to rewards tab 
fixing #439
 2016-03-29 12:40:21 +02:00
Mirco
1044457df0 Update strings.xml 
Corrected wrong translations and edited some so that they make more sense in german
 2016-03-29 11:48:10 +02:00
Mirco
9c81cc4b11 Smaller fixes 2016-03-28 20:10:33 +02:00
Phillip Thelen
7e966ff8cb fix guild crash 2016-03-24 11:00:18 +01:00
Phillip Thelen
b869f0c93e update translations 2016-03-22 20:06:00 +01: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
8f711a8872 bump version number 2016-03-16 21:16:14 +01: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
ba24517d6f make ago labels translatable 2016-03-16 17:14:00 +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
2f09ab00b3 fix display of elements on older androids 2016-03-05 18:08:49 +01: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
WhatsEmo
a1c6efc229 Attempt to fix CI Build Error 2016-03-01 14:20:03 -08:00
Andrew Lord
d370c0ab44 Remove old preferences_account_details. 2016-02-27 23:25:37 +00: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
823f6a93bf Fixed material styling on the preferences pages. 2016-02-27 22:46:32 +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
Andrew Lord
5d76167df0 Back navigation wasn't working properly in settings due to it being a PreferenceFragment which extends from Fragment, whereas the activity is an AppCompatActivity so looks in the support library fragment manager when handling the back key. Switching to use the support-v7 preference library and PreferenceFragmentCompat then allows this to work. This commit has the time preference working (works slightly differently with support library preferences). Switching to account page not working yet and styling of main settings page needs some fixes. 2016-02-27 20:20:33 +00: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
Phillip Thelen
8067b6bcd3 add translations 2016-02-17 22:16:11 +01:00
Phillip Thelen
a362af8ef7 Merge pull request #414 from ExperimentMonty/bugfix/skill-unlock-level 
Change skill unlock level text to 11
 2016-02-17 22:00:59 +01:00
Negue
99bff54292 Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
John Montgomery
f089626349 Change skill unlock level text to 11 2016-02-09 08:56:56 -05: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
Alex Hart
39ee50591a Fix for broken travis build 
The resource amplitude_app_id is missing and is causing build failures.
 2016-02-05 14:00:51 -06: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
6306ba1076 Merge pull request #382 from yishanhe/fix-132 
fix 132
 2016-01-20 18:05:44 +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
syi
ac5bd8ad7a fix 132 2016-01-17 18:38:26 -05: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
Data5tream
3c69a0a802 Added icons for keyboard switch 2016-01-12 18:26:39 +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
Negue
921b14183c extract constant strings 2016-01-11 20:29:05 +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
2c771de119 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
 2016-01-11 13:57:58 +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
Phillip Thelen
6363273548 Merge pull request #341 from Data5tream/notification_fix 
Fix for missing notifications
 2016-01-11 13:28:51 +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
Data5tream
d204cca809 Load default values into preferences in LoginActivity to avoid null objects when requesting settings for the first time 2015-12-22 15:54:43 +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
negue
01cbc612a2 Merge pull request #313 from farsidesoul/hideFABOnScroll 
Hide FloatingActionButton on scroll
 2015-12-20 15:29:17 +01:00
Darron Lumley
08fced059c Added a slide in and out animation to FAB when scrolling 2015-12-18 21:21:05 +11: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
Darron Lumley
2bc41dc520 Removed unnecessary import 2015-12-17 20:06:06 +11:00
Darron Lumley
ccadee266b FAB now hides on scroll 2015-12-17 20:02:29 +11: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
Phillip Thelen
d29a1c923e remove keys 2015-12-14 14:36:49 +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
Negue
2633d3f7e3 [#86] remove unused strings / styles [#167] extract strings to resources 2015-12-12 21:02:44 +01: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
Negue
e1c979507a [#184] Add paperboy to about libraries 2015-12-12 18:51:28 +01:00
Phillip Thelen
dd925b8b41 display link to reset password on website. 2015-12-10 02:26:31 +01:00
Phillip Thelen
b23f175cb1 display information alert when not in party 2015-12-09 23:58:56 +01:00
Phillip Thelen
186afb05f4 disable skills menu item when it's not available. 2015-12-09 14:06:20 +01:00
Phillip Thelen
a30ab7ea0a improve readability for +1 in chat 2015-12-09 03:22:21 +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
e351cf2de9 update app icon 2015-12-09 00:26:28 +01:00
Phillip Thelen
c64a6c6a10 Change task form handling. Fixes #141 2015-12-09 00:22:27 +01:00
Phillip Thelen
7795d82b49 Fix potential crash when flagging chatmessages. 
Fixes #140
 2015-12-09 00:22:27 +01:00
Phillip Thelen
fea1dc3339 Add confirmation dialog when flagging. Fixes #139 2015-12-09 00:22:26 +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
Franze Jr
506bc22a64 Fixes #98 - must supply a layout_width attribute error. 2015-12-06 23:00:31 -03: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
f3ecc21661 Tease upcoming features in sidebar. Fixes #105 2015-12-05 15:16:21 +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
e1c96f69d5 better feedback when using skills 2015-12-02 16:56:13 +01:00
Phillip Thelen
3be14accd7 Whitespace for tasks. Fixes #82 2015-12-01 19:41:07 +01:00
Phillip Thelen
46598945c3 add setting for daily reminder 2015-12-01 02:37:30 +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
Franze Jr
aba46f96a9 [#40] Fix conflicts 2015-11-28 18:51:23 -03:00
Phillip Thelen
0434496de7 Merge branch 'setttings-activity' into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-28 19:51:03 +01: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
Franze Jr
f4fedad38e [#13] Add second screen for Account Details 2015-11-28 09:58:36 -03:00
Franze Jr
0283cc2c0a [#13] Small refactorings, showing value on the screen 2015-11-28 09:28:29 -03:00
Franze Jr
d1ceb6d6b9 [#13] First version of SettingsActivity 2015-11-26 18:56:22 -03: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
615053b692 correct colors for tasks 2015-11-24 20:46:12 +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
Phillip Thelen
012278e4b9 add email to sidebar 2015-11-18 16:08:59 +01:00
Phillip Thelen
d56237e726 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into sidebar 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/AvatarActivityBase.java
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java
 2015-11-18 16:08:49 +01:00
Phillip Thelen
29db6a99cc better feedback on user login 2015-11-18 13:05:38 +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
Phillip Thelen
b39a223c05 Basic sidebar header 2015-11-16 22:22:04 +01: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
negue
07ebfcb46d Merge pull request #52 from HabitRPG/refresh-button 
Add refresh button rather than three dots icon
 2015-11-14 00:49:44 +01:00
Franze Jr
4a58e05f5d Add refresh button rather than three dots icon 2015-11-13 19:27:15 -03: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
Phillip Thelen
0cff8749d9 Merge pull request #41 from HabitRPG/offline-warning 
Offline warning
 2015-11-08 11:58:20 +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
00ae4fe4e0 [#33] - Add new icon for warning 2015-11-06 18:04:48 -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
9df4745488 [#33] - Change error message from server for a more friendly way 2015-11-05 17:47:05 -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
Franze Jr
25c9d69d02 [#33] - Add validations and small refactoring for handleError method 2015-11-03 22:19:11 -03:00
Franze Jr
e03c9c686d [#33] - Add networkChangeReceiver 2015-11-03 20:38:10 -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
Mickael Goubin
75c7fa401d Use darker colorPrimaryDark 2015-10-29 20:18:06 +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
Mickael Goubin
aa03c3e07c Fix #8 while updating to a newer Material Drawer version 2015-10-20 19:39:59 +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
Phillip Thelen
a92afe58f0 fix compatability warnings 2015-08-31 12:56:00 +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
Phillip Thelen
89ba8cb351 Add refresh option to main activity 2015-08-26 20:02:01 +02:00
Phillip Thelen
c8d2483dbc Fix form rendering 2015-08-26 20:01:52 +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
257bbaef4f add new color scheme 2015-08-17 22:06:36 +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
Negue
d116228b13 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2015-08-10 21:23:02 +02:00
Negue
04a2c3cfab Fix Colors in Views 2015-08-10 20:04:53 +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
75c895a86b Set Primary Color to Black 2015-07-07 20:59:49 +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
549281b969 Update Dependencies / change some strings 2015-06-28 19:37:02 +02:00
Negue
80e48529bd toggle sleep / load user in the new activity 2015-06-28 19:02:28 +02:00
Negue
1ccdf9852e Merge: develop changes 2015-06-27 20:25:58 +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
90bcfd7797 Remove old Changelog Dialog 2015-06-27 20:14:26 +02:00
Phillip Thelen
5910c3f532 Don't crash when no internet connection is available 2015-06-27 17:29:47 +02:00
Negue
29915637d3 Version 0.0.1 2015-06-20 20:47:02 +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
dc1d44dd53 add filter list icon 2015-06-20 20:06:10 +02:00
Negue
7a07028528 Move Fragments to other package 2015-06-20 20:05:53 +02:00
Negue
1d776901d7 Update App Icon 2015-06-20 20:03:26 +02:00
Negue
92e4055b0c fix: preferences back button 2015-05-27 20:17:26 +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