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

5759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phillip Thelen
4c65e79356 Merge pull request #704 from AlbRoehm/fix_#700_titleAlwaysChallenge 
Fix #700 title always challenge
 2017-01-23 13:15:12 +01:00
Phillip Thelen
d02764aa5d Merge pull request #703 from AlbRoehm/fix_#702 
Changes inbox chatAdapter to not get a nullPointer when using the menu
 2017-01-23 13:09:07 +01:00
AlbrechtRoehm
5387da77b3 remove unnessecary else braces to make code more readable 2017-01-22 20:28:59 +01:00
AlbrechtRoehm
10a95ee9af fix_#700_titleAlwaysChallenge 
add customTitle() for all the fragments to display title according to the current fragmet
 2017-01-22 16:51:17 +01:00
AlbrechtRoehm
8cad6876f2 Start to add titles, replace customTitle() 2017-01-21 19:16:45 +01:00
AlbrechtRoehm
7a08ca75b9 Changes inbox chatAdapter to not get a nullPointer when using the menu 2017-01-21 13:55:04 +01:00
Phillip Thelen
5905af486b fix potential crashes 2017-01-19 13:12:30 +01:00
Phillip Thelen
a1fa9af152 remove WAKE_LOCK permission 2017-01-19 12:03:02 +01:00
Negue
c033c3e75b copy & reimplement TaskRepository from clean-architecture 2017-01-18 19:07:07 +01:00
Phillip Thelen
c307739f5a show message when user has dev setting active 2017-01-17 11:43:51 +01:00
Phillip Thelen
12ac130060 fix challenge item alignments 2017-01-16 20:03:00 +01:00
Phillip Thelen
15a9bd369d update colors 2017-01-16 20:02:51 +01:00
Phillip Thelen
1c5e081e48 remove borders from dailies and todos 2017-01-16 20:02:43 +01:00
Phillip Thelen
0bf3242c9c improve yellow habit buttons 2017-01-16 20:02:31 +01:00
Phillip Thelen
e70ab07cba fix font sizing 2017-01-16 18:14:28 +01:00
Phillip Thelen
44552f6861 update translations 2017-01-16 17:39:16 +01:00
Phillip Thelen
d4b63b8f69 fix editing reminders 2017-01-16 17:39:16 +01:00
Phillip Thelen
4351ca456d improve notification icon on some android versions 
Fixes #693
 2017-01-16 17:39:16 +01:00
Phillip Thelen
0cfccc2d8e improve party member list 2017-01-16 17:39:16 +01:00
Phillip Thelen
557824b872 Merge pull request #696 from AlbRoehm/displayCorrectClassNames 
changed PlayerMinStats.getCleanedClassName() to display correct class strings
 2017-01-16 16:50:32 +01:00
Negue
f57d86a77a add onErrors to retrofit callbacks + ArrayList<String> Result on postTaskNewPosition 2017-01-15 20:24:32 +01:00
Negue
c2bdddb208 use a different observable to repeat the getUserChallenges API Request 2017-01-15 19:52:35 +01:00
Negue
ec0d94ad0b add refresh listener 2017-01-15 18:48:45 +01:00
Negue
db2f65d2f7 fix challenge refreshing 2017-01-15 18:32:30 +01:00
Negue
37b9a9c11e tapping on avatar - shows avatar overview fragment 2017-01-15 18:32:13 +01:00
Negue
57c40d3993 challenge detail dialog - show task titles with emoji / markdown 2017-01-15 18:31:08 +01:00
Negue
da2ee328ce change challenge dialog height multiplier to 0.7 2017-01-15 18:30:35 +01:00
Negue
7ec9352e00 fix user title (user object was null) 2017-01-15 17:47:10 +01:00
AlbrechtRoehm
b977351862 Changed method name to show what function is inteded for 2017-01-15 15:24:16 +01:00
AlbrechtRoehm
22b2cfcea9 some cleanup 2017-01-15 15:04:00 +01:00
AlbrechtRoehm
96c70e5694 changed PlayerMinStats.getCleanedClassName() to display correct class string 2017-01-15 14:41:05 +01:00
Phillip Thelen
929814bec9 change task description text 2017-01-15 12:39:19 +01:00
Phillip Thelen
512ad82ad7 update translations 2017-01-13 19:55:56 +01:00
Phillip Thelen
43345951c7 fix boss quest images 2017-01-13 19:41:23 +01:00
Phillip Thelen
d03d9ee155 revert checked tasks if network fails 
Fixes #648
 2017-01-13 18:19:38 +01:00
Phillip Thelen
a35ffd3918 more design changes 2017-01-13 17:42:05 +01:00
Phillip Thelen
ab3a90ca6d fix minor design issues 2017-01-13 13:42:24 +01:00
Phillip Thelen
f1cde5b12e Merge pull request #665 from HabitRPG/challenges_joined 
WIP: Challenges
 2017-01-13 11:11:47 +01:00
Negue
3f1722de64 redesign task list in challenge details / buy reward button 2017-01-12 21:44:40 +01:00
Negue
91781936a4 new task item styles 2017-01-11 23:46:26 +01:00
Negue
8d499f5110 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenges_joined 
Conflicts:
	Habitica/AndroidManifest.xml
	Habitica/res/drawable-hdpi/ic_header_exp.png
	Habitica/res/drawable-hdpi/ic_header_gem.png
	Habitica/res/drawable-hdpi/ic_header_gold.png
	Habitica/res/drawable-hdpi/ic_header_healer.png
	Habitica/res/drawable-hdpi/ic_header_heart.png
	Habitica/res/drawable-hdpi/ic_header_mage.png
	Habitica/res/drawable-hdpi/ic_header_magic.png
	Habitica/res/drawable-hdpi/ic_header_rogue.png
	Habitica/res/drawable-hdpi/ic_header_silver.png
	Habitica/res/drawable-hdpi/ic_header_warrior.png
	Habitica/res/drawable-mdpi/ic_header_exp.png
	Habitica/res/drawable-mdpi/ic_header_gem.png
	Habitica/res/drawable-mdpi/ic_header_gold.png
	Habitica/res/drawable-mdpi/ic_header_healer.png
	Habitica/res/drawable-mdpi/ic_header_heart.png
	Habitica/res/drawable-mdpi/ic_header_mage.png
	Habitica/res/drawable-mdpi/ic_header_magic.png
	Habitica/res/drawable-mdpi/ic_header_rogue.png
	Habitica/res/drawable-mdpi/ic_header_silver.png
	Habitica/res/drawable-mdpi/ic_header_warrior.png
	Habitica/res/drawable-xhdpi/ic_header_exp.png
	Habitica/res/drawable-xhdpi/ic_header_gem.png
	Habitica/res/drawable-xhdpi/ic_header_gold.png
	Habitica/res/drawable-xhdpi/ic_header_healer.png
	Habitica/res/drawable-xhdpi/ic_header_heart.png
	Habitica/res/drawable-xhdpi/ic_header_mage.png
	Habitica/res/drawable-xhdpi/ic_header_magic.png
	Habitica/res/drawable-xhdpi/ic_header_rogue.png
	Habitica/res/drawable-xhdpi/ic_header_silver.png
	Habitica/res/drawable-xhdpi/ic_header_warrior.png
	Habitica/res/drawable-xxhdpi/ic_header_exp.png
	Habitica/res/drawable-xxhdpi/ic_header_gem.png
	Habitica/res/drawable-xxhdpi/ic_header_gold.png
	Habitica/res/drawable-xxhdpi/ic_header_healer.png
	Habitica/res/drawable-xxhdpi/ic_header_heart.png
	Habitica/res/drawable-xxhdpi/ic_header_mage.png
	Habitica/res/drawable-xxhdpi/ic_header_magic.png
	Habitica/res/drawable-xxhdpi/ic_header_rogue.png
	Habitica/res/drawable-xxhdpi/ic_header_silver.png
	Habitica/res/drawable-xxhdpi/ic_header_warrior.png
	Habitica/res/values/colors.xml
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
	Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
 2017-01-11 22:37:00 +01:00
Phillip Thelen
ca0f7688c7 Merge branch 'andrewlord1988-single_click_fab' into develop 2017-01-10 18:09:48 +01:00
Phillip Thelen
ad91748670 Merge branch 'single_click_fab' of https://github.com/andrewlord1990/habitrpg-android into andrewlord1990-single_click_fab 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
 2017-01-10 18:09:16 +01:00
Phillip Thelen
53f4ebfee3 remove unneeded icons 2017-01-10 18:02:52 +01:00
Phillip Thelen
82ce2ea718 update header icons 2017-01-10 18:02:52 +01:00
Phillip Thelen
cb7190b0ec Merge pull request #644 from caipivara/feature/clean-login-style 
Clean login layout style
 2017-01-10 17:57:58 +01:00
Phillip Thelen
b2afa3246b Merge pull request #668 from Pandhariix/messages-when-changing-class 
Messages when changing class
 2017-01-10 17:56:40 +01:00
Phillip Thelen
34f0fc4a48 Merge pull request #684 from anitawoodruff/reenable-alarm-manager-tests 
Update robolectric & re-enable alarm manager tests
 2017-01-10 17:55:19 +01:00
Phillip Thelen
cc27c66476 Merge pull request #687 from anitawoodruff/fix-levelup 
Fix health bar not restoring immediately on level up
 2017-01-10 17:53:25 +01:00
Negue
935eb4fe23 "You aren't taking on any challenges at the moment" - View if no other challenges available 2017-01-09 21:58:50 +01:00