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
5753 commits 3 branches 1 tag 142 MiB
Commit graph

5753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phillip Thelen
36bdd2a904 Move some processing to background task 2015-11-28 20:57:48 +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
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
negue
8b7cbcac8f Merge pull request #69 from HabitRPG/rewards-design 
[#36] Open dialog only using the button
 2015-11-27 22:39:27 +01:00
Franze Jr
5da94e4dde [#13] Add Logout and small refactorings 2015-11-26 19:48:10 -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
cab560ee88 minor fix 2015-11-24 23:34:18 +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
dba6030c25 display completed dailies 2015-11-24 20:50:04 +01:00
Phillip Thelen
615053b692 correct colors for tasks 2015-11-24 20:46:12 +01:00
Phillip Thelen
f0343a9514 update tasks when refreshing user object 2015-11-24 20:42:23 +01:00
Negue
3219cbb980 Version 0.0.10 2015-11-23 23:28:46 +01:00
negue
a62cc07de9 Merge pull request #64 from HabitRPG/fragments 
Use Fragments instead of Activities
 2015-11-23 23:06:37 +01:00
Negue
9a52b4c64b move fragments to other namespace 2015-11-23 23:02:34 +01:00
Negue
2d76ee6799 FIX: Hide / Show / Fill Tagfilter 2015-11-23 22:53:49 +01:00
Phillip Thelen
383824c2d6 fix flickering on first drawer selection 2015-11-23 12:08:25 +01:00
Phillip Thelen
d852c8947c Close drawer on back button 2015-11-23 11:51:48 +01:00
Phillip Thelen
687c915bb4 better back handling for fragments 2015-11-23 11:44:55 +01:00
Franze Jr
7c4fe1478a [#40] Solve conflicts and rebase with develop branch 2015-11-19 21:14:18 -03: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
237b66cb6b Merge pull request #61 from HabitRPG/sidebar 
Sidebar redesign
 2015-11-18 17:16:01 +01:00
Phillip Thelen
8b88923f9f Fix crash when saving dailies 2015-11-18 17:07:21 +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
d0ae3a5b4a Merge branch 'optimize-imports-format-code' of github.com:HabitRPG/habitrpg-android into develop 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/APIHelper.java
	Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-18 13:21:12 +01:00
Phillip Thelen
29db6a99cc better feedback on user login 2015-11-18 13:05:38 +01:00
Franze Jr
e975c1ee35 [#40] Add on the adapter 2015-11-17 20:11:57 -03:00
Franze Jr
6f097f41f4 [#40] Add button for adding new checklist. 2015-11-17 20:11:57 -03: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
Franze Jr
5ebc1d7796 [#40] Remove old code, I was not working with checklist itself 2015-11-17 20:11:56 -03:00
Franze Jr
46d1444a0f Fix conflicts 2015-11-17 20:11:36 -03:00
Franze Jr
b284a9a236 [#36] Open dialog only using the button 2015-11-16 19:37:23 -03:00
Negue
d0e0094a86 Version 0.0.9 2015-11-16 22:51:30 +01:00
Negue
cdc671f911 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2015-11-16 22:41:14 +01:00
Negue
582107c2c7 use the user_id as primary key for foreign tables / add user_id to task / tag 2015-11-16 22:40:03 +01:00
Phillip Thelen
b39a223c05 Basic sidebar header 2015-11-16 22:22:04 +01:00
Phillip Thelen
a98977849d fix potential crash for levelup dialog 2015-11-16 20:02:55 +01:00
Negue
d42c178ece update changelog 2015-11-15 20:32:41 +01:00
Negue
7a50974e25 fixes [#11] hide completed tasks / refactor filter in HabitItemRecyclerViewAdapter 2015-11-15 20:16:13 +01:00