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

1076 commits

Author SHA1 Message Date
Phillip Thelen
c5aef23b43 add shop header to shops 2016-07-26 19:30:13 +02: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
70fec9fa45 Removed extra code. Fixed Menu index 2016-06-24 15:00:46 -05:00
Keith Holliday
46320f4ba3 Added reading inbox 2016-06-23 13:37:25 -05:00
Phillip Thelen
dbd46af4a2 update translations 2016-06-20 11:36:43 +02:00
Phillip Thelen
af2be913c4 move secret strings to gradle config file 2016-06-17 12:43:49 +02:00
Phillip Thelen
635d784b93 display leader message in guild info. Fixes #558 2016-06-14 15:47:06 +02:00
Keith Holliday
c74296c38d Added task reminders interface and model 2016-06-12 11:16:14 -06:00
nivl4
e2e24317ca feat: add GIF supported AvatarView 2016-05-23 13:00:16 +08:00
Phillip Thelen
4b5265e170 finalize v3 update 2016-05-21 20:05:43 +02:00
Phillip Thelen
f7c2e97e66 improve display for class selection 2016-05-20 18:31:17 +02:00
Phillip Thelen
41605386f3 fix class selection 2016-05-19 13:15:35 +02:00
Phillip Thelen
a4e7fc2682 add fragment lifecycle tests 2016-05-15 11:26:56 +02:00
Phillip Thelen
845b7e3062 update translations 
# Conflicts:
#	Habitica/AndroidManifest.xml
 2016-05-14 11:56:49 +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
a3fae22c44 Color the buttons within an alert dialog to be the brand purple 2016-05-07 00:30:06 -05:00
Phillip Thelen
d64f150bdc allow party editing and leaving 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
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
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
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
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
8de649b7e0 Enhancement Complete 
Still need to add locale strings for translation of 'today'
 2016-03-29 13:00:15 +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
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
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
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
ba747d55ee fix several crashes 2016-03-15 13:53:59 +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
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
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
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
823f6a93bf Fixed material styling on the preferences pages. 2016-02-27 22:46:32 +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
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
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
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
1a96430491 Add version to about screen 2016-01-26 16:31:58 +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
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
5c527b8ad6 Allow customizations and sets to be purchased 2016-01-16 18:05:14 +01:00
Phillip Thelen
d9d795fb3b Allow users to select owned customizations 2016-01-13 17:25:08 +01:00
Phillip Thelen
ca2f89087f Display current avatar customization 2016-01-12 17:08:02 +01:00
Negue
921b14183c extract constant strings 2016-01-11 20:29:05 +01:00
Dan Lew
eebc7fc91c Extracted string resource for "Quest" 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
Phillip Thelen
d29a1c923e remove keys 2015-12-14 14:36:49 +01:00
Negue
2633d3f7e3 [#86] remove unused strings / styles [#167] extract strings to resources 2015-12-12 21:02:44 +01: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
c64a6c6a10 Change task form handling. Fixes #141 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
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
Negue
405722e06a edit rewards - closes #89 #102 - refactor task form view / class a bit 2015-12-05 23:12:03 +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
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
Phillip Thelen
1283244b61 Allow checklist item editing 2015-11-30 23:01:41 +01: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
Franze Jr
d1ceb6d6b9 [#13] First version of SettingsActivity 2015-11-26 18:56:22 -03: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
615053b692 correct colors for tasks 2015-11-24 20:46:12 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
012278e4b9 add email to sidebar 2015-11-18 16:08:59 +01:00
Phillip Thelen
29db6a99cc better feedback on user login 2015-11-18 13:05:38 +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
3aa5ec4608 Add basic facebook login 2015-11-14 15:59:44 +01:00
Negue
ba1a408c6a Merge branch 'develop' into TaskListDesign 
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/dimens.xml
 2015-11-09 20:34:22 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
0cff8749d9 Merge pull request #41 from HabitRPG/offline-warning 
Offline warning
 2015-11-08 11:58:20 +01:00
Phillip Thelen
e8c12522b7 Adjust checkboxes in task lists 2015-11-07 19:10:03 +01: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
26341da346 last header line with placeholder text 2015-10-29 22:37:06 +01:00
Mickael Goubin
75c7fa401d Use darker colorPrimaryDark 2015-10-29 20:18:06 +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
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
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
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
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
Negue
04a2c3cfab Fix Colors in Views 2015-08-10 20:04:53 +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
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
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
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
1ccdf9852e Merge: develop changes 2015-06-27 20:25:58 +02:00
Negue
c57d2219ad Port Checklist Feature 2015-06-27 20:22:38 +02:00
Phillip Thelen
5910c3f532 Don't crash when no internet connection is available 2015-06-27 17:29:47 +02:00
Negue
33240311e8 add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +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