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

805 commits

Author SHA1 Message Date
Anita W
cd9361e5c8
Talkback improvements for main stats panel (#1308) 
* Rename unlock_level_short string to level_unabbreviated

* Refactor: extract methods for setting user level within avatar

* Set content description of 'Lvl ..' text view to 'Level ..'

* Set content description of value bar to null
 2020-05-04 17:21:18 +02:00
Phillip Thelen
b56c16654b desgin tweaks 2020-04-15 15:06:13 +02:00
Zoe Abrams
dca164e6d1 Merge remote-tracking branch 'upstream/develop' into party-invite 2020-04-11 03:52:34 -07:00
Phillip Thelen
7e76c78fc7 improve bulk gem purchasing handling 2020-04-09 14:25:54 +02:00
Phillip Thelen
4d6435b007 Support screen tweaks 2020-04-03 15:36:41 +02:00
Phillip Thelen
dadc3885fa Implement more avatar customization options. Fixes #1137 2020-03-20 17:37:29 +01:00
Phillip Thelen
3d9a4eb950 Fix minor display issues 2020-03-19 16:50:55 +01:00
Phillip Thelen
55bac855db Add back ability to message from overview screen. Fixes #1075 2020-03-19 13:12:49 +01:00
Phillip Thelen
ff13231a1b change about screen 2020-03-18 15:34:36 +01:00
Phillip Thelen
edc2a83a08 Implement improved help screen 2020-03-18 15:34:23 +01:00
Zoe Abrams
5243f694b4 front-end changes 2020-03-13 12:27:11 -07:00
Leland Wu
771e73714d
Rename appropriate sections in Pets & Mounts screen (#1267) 
* Add getTranslatedType in pet and mount classes

* fix translation method

* Create kotlin extension of animal class

* rewrite if else as kotlin when

* move animal extension to extensions folder

* write unit tests, add some dependencies in build.gradle
 2020-03-12 15:24:36 +01:00
Phillip Thelen
826873e4b8 Fix issue with quest completion dialog 2020-02-21 16:56:44 +01:00
Phillip Thelen
975dfd7023 Better indication for when user is not participating in quest 2020-02-12 17:21:43 +01:00
Phillip Thelen
ffa8f8e1ce Improve shop locked item display 2020-02-06 18:06:44 +01:00
Phillip Thelen
25b9b85044 update account deletion text 2020-02-05 09:16:21 +01:00
Phillip Thelen
df4417d0a3 Fix sharing 2020-02-04 15:34:48 +01:00
Phillip Thelen
fea83fd387 Improve quest shop display? Maybe? 2020-02-04 12:39:36 +01:00
Phillip Thelen
5b3b25a0d3 Update skill design 2020-01-24 17:01:55 +01:00
Phillip Thelen
f8fe4d49e6 Add settings for email notifications 2020-01-24 15:05:52 +01:00
Phillip Thelen
a5f5e98aad Attempt workaround for apple sign in 2020-01-21 14:54:17 +01:00
Phillip Thelen
48a99e1412 improve empty task view 2020-01-15 18:32:17 +01:00
Phillip Thelen
c47d2c5c96 improve background handling 2020-01-10 13:17:58 +01:00
Phillip Thelen
c7d61c18e4 fix incorrect description 2020-01-06 17:38:06 +01:00
Phillip Thelen
7ddef238cb Improve info about g1g1 2020-01-06 17:38:06 +01:00
Phillip Thelen
049cc3587c Add promo to menu 2019-11-30 20:02:13 +01:00
Phillip Thelen
b22a4b14ad Tweaks 2019-11-26 17:37:01 +01:00
Phillip Thelen
636f51b4e4 Finalize subscription page tweaks 2019-11-26 10:58:14 +01:00
Phillip Thelen
81a1a23cf7 Improve button text during registration. Fixes #1249 2019-11-25 13:18:19 +01:00
Phillip Thelen
6918dd3e12 Sub page improvements 2019-11-25 13:03:27 +01:00
Phillip Thelen
ba24ce0167 Redesign subscription page 2019-11-19 18:07:45 +01:00
Phillip Thelen
d718bf4b6d Make party leader messages mor eclear 2019-11-12 15:50:42 +01:00
Phillip Thelen
5fba3fa86e Make party invite screen clearer 2019-11-07 12:55:49 +01:00
Phillip Thelen
1054a575db Display in overview if equipment is two handed 2019-11-05 19:40:34 +01:00
Phillip Thelen
6cbc811151 List authentication methods in preferences. Fixes #916 2019-11-04 17:09:55 +01:00
Phillip Thelen
b5e727146d Implement viewing multiple party invitations. Fixes #1020 2019-11-04 16:21:59 +01:00
Phillip Thelen
3da46b9c99 Fix ago strings 2019-11-01 14:35:48 +01:00
Phillip Thelen
4ab7efe177 Add push notification settings 
# Conflicts:
#	Habitica/res/values/strings.xml
 2019-11-01 12:20:26 +01:00
Phillip Thelen
99c958406c Improve login handling 2019-10-31 13:46:19 +01:00
Phillip Thelen
d4c3d7aff6 Add option to copy userID from profile. Fixes #1144 2019-10-30 18:38:01 +01:00
Phillip Thelen
683d3e520b Add option to gift gems from balance 2019-10-30 14:43:44 +01:00
Phillip Thelen
81a4ff50f8 Tweak remaining sub time display 2019-10-30 11:11:16 +01:00
Phillip Thelen
f1c83abef3 Test adding remaining subscription time in menu 2019-10-29 12:50:20 +01:00
Phillip Thelen
e904d37db6 Tweak purchase page designs 2019-10-16 09:59:28 +02:00
Phillip Thelen
62b9a157a5 improve gifting flows 2019-10-11 13:18:38 +02:00
Phillip Thelen
edc62302a2 Implement gifting gems 2019-10-07 19:13:29 +02:00
Phillip Thelen
3a4b0e3925 Allow users to purchase gems right from insufficient-gems screen 2019-10-07 19:13:29 +02:00
Phillip Thelen
5682e5aa69 update design for subscription promo 2019-10-07 19:13:29 +02:00
Phillip Thelen
bbd5684950 Add promo for subscribing to gem purchase page 2019-10-07 19:13:29 +02:00
Phillip Thelen
6fe25ddce4 Add option to enable/disable party activity notifications 2019-09-25 21:25:43 +02:00
Phillip Thelen
00d978109b Improve push notification display fallback. Fixes #1222 2019-09-09 17:18:59 +02:00
Phillip Thelen
8ad5ae2d90 Add search to task view 2019-08-30 13:25:15 +02:00
Phillip Thelen
8ad0822935 Allow tasks to be completed from notification. Fixes #962 2019-08-29 16:26:44 +02:00
Phillip Thelen
50177b0005 Add switch to disable auto equipping. Fixes #1192 2019-08-29 13:45:49 +02:00
Phillip Thelen
0769ddc7e9 Improve leaving guilds and parties. Fixes #906 2019-08-29 12:26:38 +02:00
Phillip Thelen
6165caafa1 show popups when user receives certain achievements. Fixes #1162 2019-08-28 19:05:41 +02:00
Phillip Thelen
656162ecb7 Begin improving dialog display 2019-08-28 13:04:32 +02:00
Phillip Thelen
2899bbdbfa Fix string naming 2019-08-24 13:00:20 +02:00
Phillip Thelen
216b057fc4 Fix various linting errors 2019-08-24 12:33:14 +02:00
Phillip Thelen
2eec91d635 Improve mystery item feedback. Fixes #1188 2019-08-23 14:33:03 +02:00
Phillip Thelen
4d9a1fdc4e Add more interactions to member list. Fixes #1214 2019-08-16 15:14:05 +02:00
Phillip Thelen
66ca495763 Improve push notification handling 2019-08-15 17:44:22 +02:00
Phillip Thelen
c53529aca4 Fix sending cards. Fixes #1055 2019-08-08 17:09:48 +02:00
Phillip Thelen
3d1b26f290 Fix issue with monthly dailies. Fixes #1195 2019-08-08 12:57:10 +02:00
Phillip Thelen
2b77acc593 Add basic theme switching 2019-08-07 09:14:11 +02:00
Phillip Thelen
8236aa3fee
Fix typo 2019-07-31 11:21:36 +02:00
Phillip Thelen
4454c70d34 Fix various issues 2019-06-25 17:32:11 -04:00
Phillip Thelen
c94054f512 Improve challenge sharing 2019-06-14 17:26:34 +02:00
Phillip Thelen
0bb02d49be Fix armoire notifications 2019-06-14 17:03:48 +02:00
Phillip Thelen
262779197a add a way to view quest rewards from items screen 2019-06-13 09:03:30 +02:00
Carl Vuorinen
8eed9cb197 Global Notification support - pt2 (#1171) 
* Create custom notifications for Guild, Party & Quest invitations

Merge custom notifications with the ones coming from server.
Skip marking custom notifications as seen or dismissing them.

* Create actionable notification item views

Set result code based on accept/reject button click

* Handle accept & reject results from actionable notifications

Accept / reject quests & group invites based on notification type
Reload user after accept/reject to refresh notifications

* Create observable from custom notifications also & combine with server notifications

* Better styles for small buttons

* Handle displaying quest data for quest invitation notification

* Add translations related to notifications
 2019-06-12 18:00:08 +02:00
Phillip Thelen
78c7833035 Add task type to form title. Fixes #1180 2019-06-07 14:31:57 +02:00
Phillip Thelen
e657a2262d Add submenu for new add task button 2019-06-06 17:13:50 +02:00
Phillip Thelen
04e88a8494 Improve settings dialogs 2019-06-05 11:37:18 +02:00
Phillip Thelen
73114f14f1 Merge branch '794-global-notifications' of https://github.com/cvuorinen/habitica-android into cvuorinen-794-global-notifications 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
 2019-06-03 12:36:33 +02:00
Phillip Thelen
d2044f307c Improve offline notice 2019-05-31 11:07:36 +02:00
Phillip Thelen
2ffa14907e Implement first version of achievement screen 2019-05-31 10:22:36 +02:00
Phillip Thelen
ec14b054ca update login incentive modal 2019-05-31 10:22:36 +02:00
Phillip Thelen
b448c6bd6d update no currency dialogs 2019-05-31 10:22:36 +02:00
Phillip Thelen
cdda95295d Update purchase dialog 2019-05-31 10:22:36 +02:00
Phillip Thelen
6401a085d8 Implement new level up related dialogs 2019-05-31 10:22:36 +02:00
Phillip Thelen
f66d7c8ab9 tweak new alert design 2019-05-31 10:22:36 +02:00
Carl Vuorinen
81516734f5 Add support for mystery items notifications 2019-05-22 18:37:21 +03:00
Carl Vuorinen
2cf3e29f4d Use different notification for party chat message 
Using getUserData() did not work (value comes too late) so added local
var for party that's populated from same observable as notifications
 2019-05-22 18:36:58 +03:00
Carl Vuorinen
0f86f44b33 Create notification item view and implement few notification types 2019-05-22 18:36:58 +03:00
Carl Vuorinen
60abfe12ac Notifications view header with title, badge with count + dismiss all button 2019-05-22 18:32:09 +03:00
Carl Vuorinen
4c2a48ae69 Implement "no notifications" view, display when notifications list empty 2019-05-22 18:31:45 +03:00
Carl Vuorinen
48c5fc59e3 Add notifications icon to navigation drawer + notifications activity 2019-05-22 18:30:28 +03:00
Phillip Thelen
bde04d1424 Partially replace standard AlertDialog with HabiticaAlertDialogs 2019-05-20 14:25:48 +02:00
Phillip Thelen
7a1ef8a7cc Begin implementing new modals 2019-05-17 19:30:05 +02:00
Remigiusz Samborski
3135c9f694 Fixing bug 1139: Rewards: Wrong message in modal when you try to purchase without enough Gold (#1151) 
Translation for English, Polish, German and Spanish added too.
 2019-05-15 15:14:17 +02:00
bacowan
2f2fbce0ba Long usernames no longer cover up likes in chat (#1130) 
* Switching the LinearLayout containing the username and likes with a
table whose columns can stretch such that the username will word wrap,
but the moderator or likes text will not word wrap or spill out.

* - Fixing line endings (had it set to CRLF)
- Removing a grivity=right since the table is now taking care of it

* nevermind, that was just autoformatting :/

* Switching from wordwrap to elipses

* Moving back to word wrap and shortened Mod tag

* missed committing this

* Not fully resolving LayoutParams for consistency
 2019-05-15 14:58:54 +02:00
Phillip Thelen
5559db6ef4 Fix various minor issues 2019-05-02 12:53:27 +02:00
Phillip Thelen
4129fcd08e Implement invite to guild button 2019-04-29 17:42:29 +02:00
Phillip Thelen
598cadfcf4 display guild members and bank 2019-04-29 17:04:29 +02:00
Phillip Thelen
adfc54b4ac add additional default habits 2019-04-29 15:54:43 +02:00
Phillip Thelen
c664ec0dc1 Fix task form issues 2019-04-29 15:53:05 +02:00
Phillip Thelen
8605667adf support 1 trillion gold 2019-04-26 11:49:37 +02:00
Phillip Thelen
2cb410d203 tweak report message screen 2019-04-26 10:28:06 +02:00
Phillip Thelen
9fb3ac7fd6 update accept guidelines design 2019-04-25 13:46:27 +02:00
Phillip Thelen
21f52e89e9 Improve stable display 2019-04-25 11:43:40 +02:00
Phillip Thelen
12002b47cf Build new guild detail screen 2019-04-25 10:06:56 +02:00
Phillip Thelen
e2c17fef90 Various style fixes 2019-04-24 10:17:24 +02:00
Phillip Thelen
d0b56baef5 Fix time travelers shop display. Fixes #862 2019-04-19 13:05:31 +02:00
Phillip Thelen
fbf6ac031d Impelement new report view. Fixes #355 2019-04-18 11:54:32 +02:00
Phillip Thelen
fbeaef460c add option to link users to party wanted guild from party screen. Fixes #1126 2019-04-17 15:41:41 +02:00
Phillip Thelen
0ee9936ec3 Implement new class selection screen. Fixes #828 2019-04-17 14:48:08 +02:00
Phillip Thelen
6ab2868dcf Add link to help guild to FAQ page. Fixes #1128 2019-04-17 10:46:24 +02:00
Phillip Thelen
067d2ba609 Inform users on about screen that update is available 2019-04-17 10:14:17 +02:00
Phillip Thelen
487460ce31 Fix item ownership issues 2019-04-16 19:08:10 +02:00
Phillip Thelen
396ddffc55 Squashed commit of the following: 
commit b2c0612855b8129ccd5236f8b045f20f4490e02e
Author: Phillip Thelen <viirus@pherth.net>
Date:   Mon Apr 15 13:26:51 2019 +0200

    Fix issues with items and pets

commit 15ae2ee15057522f1407147a389c94ab87591892
Author: Phillip Thelen <viirus@pherth.net>
Date:   Wed Apr 10 12:52:52 2019 +0200

    fix typo

commit 225d096155f5989740454d64025e99418893e0f3
Author: Phillip Thelen <viirus@pherth.net>
Date:   Wed Apr 10 02:20:33 2019 +0200

    fix wacky pets deserialization
 2019-04-15 13:29:48 +02:00
Phillip Thelen
22e1e7448e Make users read community guidelines before posting. Fixes #671 2019-04-08 18:26:49 +02:00
Phillip Thelen
ec5751ba10 Improve deserialization speeds 2019-04-05 09:45:26 +02:00
Phillip Thelen
80ef5e1bdb Continue implementing new task form 2019-04-05 09:45:26 +02:00
Phillip Thelen
cca994fad5 Begin building new task form 2019-04-05 09:45:26 +02:00
Phillip Thelen
685d9edb92 improve change password. 2019-04-05 09:44:32 +02:00
Phillip Thelen
d7a10324f7 Implement password changing 2019-03-27 15:09:59 +01:00
Phillip Thelen
121860c301 add support for upcoming pets and mounts 2019-03-27 13:17:37 +01:00
Phillip Thelen
960919f401 Fix creating checklist items 2019-03-19 11:52:21 +01:00
Phillip Thelen
2edf68b474 Implement party creation 2019-03-05 13:14:42 +01:00
Angelo Viado
da7acb5502 Fix text of delete account confirmation 
Should ask user to input password on a secure input text box when
user has a local authentication. Otherwise ask the user to input
the text DELETE on a plain text box.

Fixes #882
 2019-02-27 15:45:57 +01:00
Angelo Viado
8e8e39accd Change progress bar title when opting out of classes 
Fixes #1003
 2019-02-27 15:45:19 +01:00
Phillip Thelen
af187debc4 Various fixes 2019-01-10 14:04:49 +01:00
Phillip Thelen
7e43b261b1 Display if user has damage paused in main menu 2019-01-08 16:14:09 +01:00
Phillip Thelen
2c75e0c5b8 Fix challenges display issues 2019-01-08 13:52:42 +01:00
Phillip Thelen
1cba3d3068 Fix gifting subscription flow 2018-12-30 19:44:37 +01:00
Phillip Thelen
1904c6df3a Fix navigation issues 2018-12-14 16:33:22 +01:00
Phillip Thelen
dde73cf0ae Fix minor issues 2018-12-10 13:36:30 +01:00
Phillip Thelen
10c91b25e1 Begin implementing gifting subscriptions 2018-12-04 14:28:03 +01:00
Phillip Thelen
70e7b54cc1 Begin implementing new navigation architecture 2018-12-03 19:26:47 +01:00
Phillip Thelen
6a105c779e update translations 2018-11-12 14:47:32 +01:00
Phillip Thelen
e4b58d9cb7 Fix various issues 2018-11-12 14:47:32 +01:00
Phillip Thelen
358a89a0f1 Fix UI Issues 2018-11-08 11:29:15 +01:00
Phillip Thelen
85ca0bcc18 Add sample todo when creating account 2018-11-07 16:17:14 +01:00
Phillip Thelen
8c15df4d8a Fix various username bugs 2018-11-06 14:04:27 +01:00
Phillip Thelen
b065cf0acc Implement new welcome screen 2018-11-05 13:57:42 +01:00
Phillip Thelen
6d3bb9c10b Improve username display on party screen 2018-10-17 18:38:38 +02:00
Phillip Thelen
762d1faa2c Implement username changes 2018-10-17 16:28:23 +02:00
Phillip Thelen
3007e788eb Implement modal to force users to verify their username 2018-10-12 11:34:31 +02:00
Phillip Thelen
d6973d905d Make it easier to confirm usernames 2018-09-28 17:20:21 +02:00
Phillip Thelen
bc20ab80e0 Prepare app for username changes. Fixes #1048 2018-09-20 12:07:43 +02:00
Phillip Thelen
bb8b795cfa Indicate which gear is two handed. See #688 2018-08-29 17:44:16 +02:00
Phillip Thelen
488e5210e2 Improve profile display 2018-08-29 14:57:41 +02:00
Phillip Thelen
7cfc97cceb Implement reminder for users after 1 week of inactivity. Fixes #1040 2018-08-29 13:42:04 +02:00
Phillip Thelen
29227f7772 Add option to reset habit streaks. Fixes #1039 2018-08-28 14:41:34 +02:00
Phillip Thelen
9cf2b1a71b Allow notes to expand and expand notes edittext. Fixes #1037 2018-08-27 15:54:44 +02:00
Phillip Thelen
624eb99d37 Improve chatmessage display. Fixes #891 2018-08-27 13:04:52 +02:00
Phillip Thelen
aa204fa6b3 Implement final text for daily notifications. Fixes #1007 2018-08-27 11:22:57 +02:00
Phillip Thelen
941ce87fd9 Start adding random motivational tips to daily checkin. 
See #1007
 2018-08-22 20:07:41 +02:00
Phillip Thelen
60c717b808 Implement better notifications for the first reminders 2018-08-22 13:14:53 +02:00
Phillip Thelen
d1b579efb3 Don’t show points to allocate below level 10. Fixes #1025 2018-08-10 11:15:54 +02:00
Phillip Thelen
333d08e11c Improve chat design 2018-08-09 14:37:53 +02:00
Phillip Thelen
8fe091e830 fix challenge editing 2018-08-07 12:39:58 +02:00
Phillip Thelen
97d1723e85 Allow challenges to be edited 2018-08-06 14:24:15 +02:00
Phillip Thelen
b34e7ab969 Update android studio 2018-08-03 10:31:52 +02:00
Phillip Thelen
ae98b69e99 Redesign challenge list 2018-07-24 13:45:23 +02:00
Phillip Thelen
5626b76956 Begin implementing new challenge design and layout 2018-07-23 18:03:58 +02:00
Phillip Thelen
5040574bf0 Begin redesigning chat 2018-07-13 15:58:53 +02:00
Donatas Kucinskas
91d00d047a Add custom message for evolved pet 2018-03-04 12:38:56 +02:00
Phillip Thelen
f7aa5068b7 Fix design issues 2018-02-14 20:49:19 +01:00
Phillip Thelen
c35610d8c6 Fix world boss design issues. Fixes #954 2018-02-14 14:25:51 +01:00
Phillip Thelen
6c80b19ec2 Fix rage strike npc names. Fixes #945 2018-02-14 11:15:47 +01:00
Phillip Thelen
aeac52ef88 Update world boss dialogs 2018-02-13 13:43:48 +01:00
Phillip Thelen
24e0407870 add world boss description dialog 2018-02-13 13:01:52 +01:00
Phillip Thelen
4104e893f8 Fix copying message to clipboard 2018-02-12 13:53:15 +01:00
Phillip Thelen
3692854f12 add new subscriber gem modal design 2018-02-09 19:31:16 +01:00
Phillip Thelen
483c4f6e12 Implement new no-party screen. Fixes #814 2018-02-09 18:13:44 +01:00
Phillip Thelen
9d3bcc2525 show world boss state on tavern menu entry 2018-02-09 17:14:16 +01:00
Phillip Thelen
da18a6b77d improve world boss display 2018-02-09 17:05:50 +01:00
Phillip Thelen
27d290d963 show active rage strike alert 2018-02-06 17:57:23 +01:00
Phillip Thelen
49d9b77d15 Add alerts to explain rage strikes 2018-02-01 19:35:26 +01:00
Phillip Thelen
2e09e951c1 add rage strikes to tavern 2018-02-01 18:50:05 +01:00
Phillip Thelen
7022dc1c69 start adding world boss progress to tavern 2018-01-30 17:57:12 +01:00
Phillip Thelen
b54de0c30b Merge remote-tracking branch 'origin/custom-menu' into develop 
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/build.gradle
#	Habitica/res/layout/fragment_about.xml
#	Habitica/res/layout/fragment_avatar_overview.xml
#	Habitica/res/layout/fragment_equipment_overview.xml
#	Habitica/res/layout/fragment_group_info.xml
#	Habitica/res/layout/fragment_news.xml
#	Habitica/res/layout/fragment_stats.xml
#	Habitica/res/layout/fragment_tavern_detail.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/res/values/attrs.xml
#	Habitica/res/values/colors.xml
#	Habitica/res/values/dimens.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewHolder-Extensions.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
#	build.gradle
 2018-01-30 14:06:03 +01:00
Phillip Thelen
31a9e36ad7 implement additional tavern features 2018-01-30 13:41:22 +01:00
Phillip Thelen
6fd4481a46 fix minor crashes 2017-11-17 23:57:49 +01:00
Phillip Thelen
a1364a1c2c begin implementing custom menu 2017-11-17 15:34:51 +01:00
Phillip Thelen
1e4f5006c4 begin tavern redesign 2017-11-17 14:12:14 +01:00
Phillip Thelen
e64c46a254 fix bulk allocation issues. Fixes #865 2017-11-17 14:12:14 +01:00
Phillip Thelen
59dfacac70 update stable section titles. #878 2017-11-17 14:12:13 +01:00
Phillip Thelen
5fc8ab8114 rename equipment category. fixes #856 2017-11-17 14:12:13 +01:00
Phillip Thelen
c74d743a3d Fix copying PM to clipboard and update inbox name. Fixes #877 2017-11-17 14:12:13 +01:00
Phillip Thelen
86ad0be06b fix class change wording. Fixes #870 2017-11-17 14:12:13 +01:00
Phillip Thelen
d4ff2dfa62 show number of available stat points in menu. Fixes #869 2017-11-17 14:12:13 +01:00
Phillip Thelen
f0da87f0d3 update change class description Fixes #870 2017-11-17 14:12:13 +01:00
Phillip Thelen
6e5f609c36 add information for purchasing class gear. Fixes #855 2017-11-17 14:12:13 +01:00
Phillip Thelen
fcc5da1da5 fix shop equipment header. Fixes #856. Fixes #857. Fixes #858 2017-11-17 14:12:13 +01:00
Phillip Thelen
8035920079 Make equipment available in shop. Fixes #825 2017-11-17 14:12:12 +01:00
Phillip Thelen
95b1be7415 implement bulk attribute point allocation. Fixes #821 2017-11-17 14:12:02 +01:00
Phillip Thelen
0732b0500e begin implementing bulk allocation 2017-11-17 14:12:02 +01:00
Lula Villalobos
4d11bcf172 deleted translations from quest_begin_message for the change on format string 2017-11-17 14:12:02 +01:00
Lula Villalobos
4756369b3b added new confirmation message for begin quest alert dialog 2017-11-17 14:12:02 +01:00
Phillip Thelen
79cb82e8d8 stats screen design tweaks 2017-11-17 14:11:51 +01:00
Phillip Thelen
438ebb2201 assign attribute points 2017-11-17 14:11:51 +01:00
Phillip Thelen
c5b77cd59f display stats 2017-11-17 14:11:51 +01:00
Phillip Thelen
ffbbed6d9e redesign fix character values screen 2017-11-17 14:11:51 +01:00
Phillip Thelen
24f6f28923 implement changing login name and email 2017-11-17 14:11:44 +01:00
Phillip Thelen
00ffd7847e refactor settings 2017-11-17 14:11:44 +01:00
Phillip Thelen
e50976f3c5 implement password reset 2017-11-17 14:11:44 +01:00
Phillip Thelen
24ed9d1455 implement fixing character values 2017-11-17 14:11:44 +01:00
LunarGem
e4f503b46b Add unlock strings 2017-11-17 14:11:35 +01:00
Phillip Thelen
d2eaebcc14 begin tavern redesign 2017-11-16 19:35:15 +01:00
Phillip Thelen
7ff1830310 fix bulk allocation issues. Fixes #865 2017-11-15 19:30:01 +01:00
Phillip Thelen
c21c0a5e04 update stable section titles. #878 2017-11-13 19:47:59 +01:00
Phillip Thelen
c4796df94c rename equipment category. fixes #856 2017-11-13 17:40:04 +01:00
Phillip Thelen
9b7b71021f Fix copying PM to clipboard and update inbox name. Fixes #877 2017-11-13 17:39:56 +01:00
Phillip Thelen
9f25f10eed fix class change wording. Fixes #870 2017-11-13 09:40:36 +01:00
Phillip Thelen
024d3b1fc4 show number of available stat points in menu. Fixes #869 2017-11-08 20:43:49 +01:00
Phillip Thelen
3fe6faf4ef update change class description Fixes #870 2017-11-08 16:52:35 +01:00
Phillip Thelen
213f968633 add information for purchasing class gear. Fixes #855 2017-11-07 17:40:11 +01:00
Phillip Thelen
6565a7abba fix shop equipment header. Fixes #856. Fixes #857. Fixes #858 2017-11-06 12:49:28 +01:00
Phillip Thelen
2c6ea19e20 Merge branch 'develop' of https://github.com/LunarGem/habitica-android into LunarGem-develop 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
 2017-11-01 14:46:10 +01:00
Phillip Thelen
aab9ee273e
Merge pull request #830 from LulaV14/feature/begin-quest-confirmation 
Add confirmation step to "begin" button for quests. Fixes #804
 2017-11-01 14:38:48 +01:00
Phillip Thelen
b938dd0ff0 Make equipment available in shop. Fixes #825 2017-10-31 18:31:06 +01:00
Phillip Thelen
2aaa8ccdaa implement bulk attribute point allocation. Fixes #821 2017-10-30 13:27:19 +01:00
Phillip Thelen
17d9b46fd3 begin implementing bulk allocation 2017-10-30 09:25:33 +01:00
Lula Villalobos
0202635b5d deleted translations from quest_begin_message for the change on format string 2017-10-27 16:08:14 -07:00
Lula Villalobos
1d17f72806 added new confirmation message for begin quest alert dialog 2017-10-27 14:34:06 -07:00
Phillip Thelen
7c09effb63 stats screen design tweaks 2017-10-18 13:19:10 +02:00
Phillip Thelen
50e4484002 assign attribute points 2017-10-17 21:23:06 +02:00
Phillip Thelen
afb173c61f display stats 2017-10-17 19:18:34 +02:00
Phillip Thelen
6d9d6585df redesign fix character values screen 2017-10-16 11:40:24 +02:00
Phillip Thelen
af80d60ee1 implement changing login name and email 2017-10-12 17:39:48 +02:00
Phillip Thelen
6abab307ea refactor settings 2017-10-03 20:13:29 +02:00
Phillip Thelen
00911fad26 implement password reset 2017-10-03 15:52:33 +02:00
Phillip Thelen
fe01f892bb implement fixing character values 2017-10-03 15:19:19 +02:00
Phillip Thelen
6b7fdc963d implement empty view for shops 2017-09-27 20:05:02 +02:00
Phillip Thelen
ccc774f062 add insufficient currency dialogs 2017-09-27 18:46:30 +02:00
Phillip Thelen
2949e63eb9 improve snackbar displays 2017-09-26 17:01:01 +02:00
LunarGem
c64e1642a1 Add unlock strings 2017-09-21 20:02:26 -04:00
Phillip Thelen
ac5f82c490 Merge pull request #800 from MrTequila/develop 
Update Attributes strings
 2017-09-05 16:50:02 +02:00
Phillip Thelen
cc08fa3b14 add resetting and deleting an account 2017-08-25 01:11:44 +02:00
Michał Jagiellicz
50f4b6349e Update Attributes strings 
Update Attributes strings for:
'physical' - 'Strength'
'mental' - 'Intelligence'
'social' - 'Constitution'
'other' - 'Perception'
 2017-08-14 22:52:51 +02:00
Phillip Thelen
c551ed85e7 Add dialog for gear 2017-07-25 19:30:10 +02:00
Phillip Thelen
e455677da9 Reimplement purchasing 2017-07-25 19:05:33 +02:00
Phillip Thelen
aae43575e6 add purchase dialog for quests 2017-07-25 18:27:00 +02:00
Phillip Thelen
31baca2d26 start building new purchase dialog 2017-07-21 20:41:23 +02:00
Phillip Thelen
8c0e52dbcb Improve currency display 2017-07-21 14:45:56 +02:00
Phillip Thelen
7da825219a improve content reloading 2017-07-21 14:41:39 +02:00
Phillip Thelen
cc79b47fb3 improve party view 2017-07-17 16:41:18 +02:00
Phillip Thelen
a6e5a2a496 improve checkin display 2017-07-05 16:00:38 +02:00
Phillip Thelen
436d932ea1 fix new user setup flow 2017-07-05 13:16:47 +02:00
Phillip Thelen
5c64078a83 Implement yesterdailies 2017-06-21 19:34:53 +02:00
Phillip Thelen
b2543f96c9 start adding yesterdailies 2017-06-20 23:29:26 +02:00
Phillip Thelen
52f421d71b Redo party view 2017-05-23 17:40:33 +02:00
Phillip Thelen
0431e64c19 fix crashes when loading rewards 2017-05-23 17:40:33 +02:00
Phillip Thelen
d0645de11f readd pausing dailies 2017-05-18 15:48:42 +02:00
Phillip Thelen
ba49430cd8 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into chatrewrite 
# Conflicts:
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
 2017-05-09 12:29:24 +02:00
Keith Holliday
1ca55f4ea9 Merge branch 'develop' into add-repeatables 2017-05-08 10:14:46 -06:00
Phillip Thelen
cd3bfbcd67 fix challenge list 2017-05-04 19:52:42 +02:00
Keith Holliday
a516d74282 Added string resource 2017-05-02 10:47:25 -06:00
Phillip Thelen
3c61635394 Merge branch 'realm' of github.com:HabitRPG/habitrpg-android into realm 
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/anim/fab_slide_in.xml
#	Habitica/res/anim/fab_slide_out.xml
#	Habitica/res/layout/floating_menu_tasks.xml
#	Habitica/res/values-ru/strings.tutorial.xml
#	Habitica/res/values-ru/strings.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeSerializer.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
#	translations/store_strings-ru.xml
 2017-04-29 19:42:27 +02:00
Negue
ffd74efa23 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges 
Conflicts:
	Habitica/res/values/strings.xml
 2017-04-27 19:02:21 +02:00
Negue
b26f22c0b8 update labels 2017-04-27 18:59:52 +02:00
Phillip Thelen
a893206a58 Fix item interactions 2017-04-26 20:04:05 +02:00
Phillip Thelen
e35318834c display message when device doesn't support billing 2017-04-26 15:27:27 +02:00
Negue
eee013ee49 Show progress while saving & dialog if not all required fields are filled 2017-04-25 22:31:56 +02:00
Negue
f82df5a0ae requested changes / fixes / refactorings 2017-04-24 19:57:15 +02:00
Negue
e083a52b45 show errors if the user doesn't fill the fields or add tasks 2017-04-23 18:04:35 +02:00
Negue
a490fdb38a Merge remote-tracking branch 'origin/develop' into create_challenges 
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
	Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
 2017-04-23 15:28:37 +02:00
Negue
bcc9b13602 show gem errors / recolor gem buttons (based on state) 2017-04-22 15:55:37 +02:00
Negue
13c7b1ee42 Update challenge / -tasks 2017-04-22 14:24:18 +02:00
Phillip Thelen
f5ad6488bc Move all db access to repositories 2017-04-20 21:14:23 +02:00
Negue
b4e8b95116 Navigation ChallengeList -> CreateChallenge / list possible challenge locations 2017-04-20 00:31:47 +02:00
Negue
82007a5f89 add / edit / remove tasks 2017-04-19 21:01:55 +02:00
Keith Holliday
47af28546b Added initial repeatabls UI 2017-04-19 08:32:58 -06:00
Keith Holliday
20cedc2e0c Began adding repeatables layout 2017-04-19 08:27:16 -06:00
Phillip Thelen
6a6a7addf9 improve task filter layout 2017-04-17 15:11:19 +02:00
Phillip Thelen
11c3f2ba2e better handling for dailyDueDefaultView setting 2017-04-15 18:05:50 +02:00
Phillip Thelen
469d39bb96 fix background naming 2017-04-14 14:44:03 +02:00
Phillip Thelen
746f6860f9 mention community guidelines in chat 2017-04-13 18:06:52 +02:00
Phillip Thelen
a9714ed053 better error messages 2017-04-13 16:28:04 +02:00
Phillip Thelen
09f9c9f837 expand task walkthorugh 2017-04-13 15:41:07 +02:00
Phillip Thelen
f70449b3b1 consistent writing for To-Do 2017-04-13 12:26:48 +02:00
Phillip Thelen
a4631e666c capitalize task names in fab 2017-04-13 12:25:26 +02:00
Phillip Thelen
a112297123 add empty view to tasks (currently disabled) 2017-04-11 01:08:07 +02:00
Negue
98fac6c0a5 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges 
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
 2017-04-10 22:56:31 +02:00
Phillip Thelen
3283cd8187 fix various linter errors 2017-04-10 15:54:39 +02:00
Phillip Thelen
2418af37eb fix string formatting 2017-04-10 12:34:37 +02:00
Phillip Thelen
7adaa6cad7 update translations 2017-04-07 15:56:29 +02:00
Negue
3f5347486c Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges 
Conflicts:
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
 2017-04-06 21:10:05 +02:00
Negue
94a4ef6b1d more layout + open new/edit TaskFormActivity without saving to DB + extract ChallengeTasksRecyclerViewAdapter 2017-04-06 20:58:51 +02:00
Phillip Thelen
b113917c01 Add clear button to task filters 2017-04-06 18:36:45 +02:00
Marco Fras
f8a3fe28a5 Update strings.xml 
Fixed a typo. Is this the correct way to do it? Someonw reported an issue on this on Transifex, did you see it or there's the need for someone to manually check the issues?
 2017-04-04 23:33:45 +02:00
Phillip Thelen
158acea5a1 make status and navbar transparent for intro and login 2017-04-04 17:45:24 +02:00
Phillip Thelen
e79bd18c3a Implement more task filtering options 2017-04-03 19:36:44 +02:00
Phillip Thelen
c923e93d35 Implement new avatar customization 2017-03-30 14:02:44 +02:00
Phillip Thelen
acd5c01ff7 Add new welcome screen 2017-03-27 15:33:57 +02:00
Phillip Thelen
a3ef5ef242 redesign intro and login 2017-03-24 17:30:58 +01:00
Phillip Thelen
0a7c60e83f Merge branch 'develop' into challenge_filter 
# Conflicts:
#	Habitica/res/values/strings.xml
 2017-03-23 14:13:13 +01:00
Phillip Thelen
7d491fbdba New intro 2017-03-23 14:12:28 +01:00
Negue
afc0a92e37 leave / remove tasks on deleting a challenge 2017-03-09 21:15:57 +01:00
Negue
16e32a7ec3 "my challenges" - filter 2017-03-01 13:45:43 +01:00
Phillip Thelen
d0a0b845e4 update translations 2017-02-26 12:07:23 +01:00
Phillip Thelen
27f3e5645b subscription layout changes 2017-02-03 13:21:42 +01:00
Phillip Thelen
67a0deee61 fix a bunch of linter errors 2017-02-01 16:58:53 +01:00
Phillip Thelen
33f1e4c22d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Habitica/res/values/strings.xml
 2017-01-30 16:24:02 +01:00
Phillip Thelen
6af6c29e3d Implement subscriber features 2017-01-30 12:47:54 +01:00
Phillip Thelen
7d4f4c47e8 show subscription details in account details 2017-01-26 19:35:35 +01:00
Phillip Thelen
0021404751 display subscription status 2017-01-26 19:33:46 +01:00
Phillip Thelen
b575287f85 start working on subscriptions 2017-01-26 19:33:45 +01:00
Phillip Thelen
8d1ab45424 update translations 2017-01-26 19:30:02 +01:00
AlbrechtRoehm
bf5e70f749 Change strings in checkInReward to make them translatable 2017-01-24 11:52:51 +01:00
AlbrechtRoehm
8cad6876f2 Start to add titles, replace customTitle() 2017-01-21 19:16:45 +01:00
Phillip Thelen
c307739f5a show message when user has dev setting active 2017-01-17 11:43:51 +01:00
Phillip Thelen
ab3a90ca6d fix minor design issues 2017-01-13 13:42:24 +01:00
Negue
3f1722de64 redesign task list in challenge details / buy reward button 2017-01-12 21:44:40 +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
b2afa3246b Merge pull request #668 from Pandhariix/messages-when-changing-class 
Messages when changing class
 2017-01-10 17:56:40 +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
Negue
a281d7fbf8 show tasks inside dialog / improve loading challenges 2017-01-06 23:45:21 +01:00
Phillip Thelen
3f00de6c4d update task design 2017-01-05 18:19:06 +01:00
josephnw
cb0084a3e5 Display group leader name 2016-12-30 19:34:14 +07:00
Negue
c55872fa78 redesign public challenge item - use styles for fontFamily - new header icons 2016-12-19 18:01:54 +01:00
Negue
dde293de19 redesign "my challenges" list / custom Title override by fragment / save taskLists and groupId/name of a challenge to the database 2016-12-18 18:46:03 +01:00
Negue
a1f9aab852 join / leave a challenge, open profile of the challenge leader, multiple fixes 2016-12-13 21:04:15 +01:00
Keith Holliday
fef633e7b5 Added notificaiton data model. Added login incentive notification dialogs 2016-12-13 12:35:00 -06:00
Maxime Busy
f6f47f3a30 Update strings.xml 2016-12-08 10:57:19 +01:00
Negue
7b21285657 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into todo_widget 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
 2016-12-08 00:18:52 +01:00
Pandhariix
a31d066c7b final changes on the texts 2016-12-06 23:29:53 +01:00
Negue
5d0c1df11f requested changes - load local challenges from database - load available challenges from api&database 2016-12-06 19:48:07 +01:00
Pandhariix
0c4d534d4d Correct confirmation message for changing class, and add a warning relative to the gear 2016-12-06 00:54:53 +01:00
AlbrechtRoehm
6c10c13ad0 Remove translations from commit 2016-12-05 19:26:54 +01:00
AlbrechtRoehm
63f745bcd2 Revert "Added strings to for correct display in the preferences_fragment; changed strings.xml in de and eng; Changed some upper case letters in the strings.tutorial.xml" 
This reverts commit 57867549a2.
 2016-12-05 19:21:45 +01:00
Pandhariix
6702379725 Erase the test code and finalize changes 2016-12-04 18:13:47 +01:00
Negue
445d1781d7 challenge detail activity 2016-12-01 21:48:24 +01:00
Pandhariix
b8a1c8653c Add strings and popups linked to the class changements 2016-12-01 00:49:02 +01:00
Negue
7958a08efc load / list challenges of user 2016-11-25 15:03:47 +01:00
AlbrechtRoehm
57867549a2 Added strings to for correct display in the preferences_fragment; changed strings.xml in de and eng; Changed some upper case letters in the strings.tutorial.xml 2016-11-19 00:22:39 +01:00
Negue
5a59f4451d revert from settings activity - split widgets into separate classes / providers 2016-11-18 22:16:45 +01:00
Negue
d69895279f activity to choose task type before adding the widget 2016-11-17 22:55:30 +01:00
negue
7fed4b92de Merge pull request #646 from HabitRPG/sounds 
Sounds
 2016-11-07 18:59:52 +01:00
Negue
ec8d8f201c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into sounds 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
 2016-10-31 14:57:11 +01:00
Phillip Thelen
6d0efd5717 improve reminder scheduling on different android versions 2016-10-28 19:53:08 +02:00
Phillip Thelen
5d6f15cac9 add setting for custom day start. Fixes #641 2016-10-27 17:01:16 +02:00
Phillip Thelen
42662da172 Merge pull request #632 from hcorion/userid-in-profile 
Userid in profile
 2016-10-26 18:11:08 +02:00
Negue
05b63282c2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into sounds 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
 2016-10-22 14:56:44 +02:00
Negue
26484dcea9 add audio preferences 2016-10-20 22:39:09 +02:00
Phillip Thelen
fa9a4ab266 start adding shop info to items list 2016-10-17 08:47:49 +02:00
Zion Nimchuk
3a33552290 Added better UserID UI with copy button 2016-10-13 16:03:37 -07:00
Negue
8b1865166c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations 
Conflicts:
	Habitica/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
 2016-10-12 21:15:05 +02:00
Phillip Thelen
32fc3642b4 create gem purchase activity 2016-10-11 19:38:44 +02:00
Phillip Thelen
185e93ffc2 start building new gem purchase screen 2016-10-11 19:38:23 +02:00
Negue
c5452523a2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations 
Conflicts:
	Habitica/res/values/strings.xml
 2016-10-03 22:49:03 +02:00
Negue
15ea308a42 Apply avatar transformations (if items available) / update gradle 2016-10-03 22:47:02 +02:00
Phillip Thelen
4b7c402657 improve widget update behaviour 2016-09-30 17:31:05 +02:00
Phillip Thelen
cde5cdb6ef update translations 2016-09-26 15:20:40 +02:00
Phillip Thelen
cde4bb0e4c update translations 2016-09-23 20:50:27 +02:00
Phillip Thelen
e62c6b567c update translations 2016-09-23 20:50:27 +02:00
Phillip Thelen
fc6513ccad Merge branch 'refs/heads/pr/613' into develop 
# Conflicts:
#	Habitica/res/xml/preferences_fragment.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java

#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java

#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
 2016-09-23 19:17:08 +02:00