sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4715 commits 3 branches 1 tag 142 MiB
Commit graph

671 commits

Author SHA1 Message Date
Hafiz
156f40595e Set when user will next get hourglass as month using offset 2022-05-02 00:17:24 -04:00
Phillip Thelen
327d36e58d
Merge branch 'version/3.6' into Fixes#1523 2022-04-28 12:01:54 +02:00
Hafiz
3b97f903c6 Update account delete to type 'DELETE' vs pw, updated description 2022-04-28 02:39:28 -04:00
Phillip Thelen
3e20f25a4d CDS iprovements 2022-04-26 15:07:30 +02:00
Hafiz
c3240be6d8 Create Account Dialog fragment for resetting and deleting account 2022-04-26 04:15:33 -04:00
Phillip Thelen
fffae439a4 Implement background/customization filtering 2022-04-22 13:43:40 +02:00
Phillip Thelen
caa0804cc3 Fixes #1712 2022-04-21 13:31:33 +02:00
Phillip Thelen
ce76c40eec Implement ad cooldown 2022-04-21 11:08:36 +02:00
Phillip Thelen
c1b29a547a Implement new armoire screen 2022-04-19 17:17:45 +02:00
Phillip Thelen
4cb2c7212f Prototype ad implementation 2022-04-05 14:50:52 +02:00
Phillip Thelen
a60856a92d Code Cleanup & update create party string resources 2022-03-31 15:10:04 +02:00
Phillip Thelen
21805d0916 Add ability for users to create party from quest items 2022-03-31 15:08:45 +02:00
Joshua Soberg
b8e35a0da4 Pluralize warrior to warriors for the sentence "Warriors benefit from a high Strength state." in the Warrior class description (#1700) 2022-03-31 14:46:49 +02:00
Phillip Thelen
e2bb4ccf0a - Ukranian language included in resConfig options and language selection. (#1689) 
- Missing Ukranian and Turk translations included.
- Some string values where defined as non-transaltable.
 2022-03-31 14:46:49 +02:00
Phillip Thelen
bfd7323813
Merge branch '3.5.2' into Fixes#1475 2022-03-18 11:49:06 +01:00
Hafiz
92cf00def3 Code Cleanup & update create party string resources 2022-03-01 08:27:30 -05:00
Hafiz
5409066318 Update quest item menu description 
Update quest item menu description
Retrieve members
 2022-02-18 10:40:59 -05:00
Hafiz
bcd2c2e2aa Add ability for users to create party from quest items 2022-02-18 09:43:17 -05:00
Phillip Thelen
42a805c3b6
Merge branch '3.5' into #1349_Fix 2022-02-18 14:15:25 +01:00
Hafizzle
1a5800c0ef
Added question mark to Discard string (#1707) 2022-02-14 15:41:42 +01:00
Hafiz
dfbcdc7125 Ability to use special items from Items added 2022-02-14 05:51:43 -05:00
Hafizzle
9088d1d566
Discard Modal for user editing a Task and presses back (#1704) 
* Check created task being edited

isBeingEdited added to check for views being edited
check for edited views onBackPressed
Add res Strings for discard dialog

* Compare by task

Check if user is editing by comparing dummy task created during init to any changes

* Discard dialog events added

fire events to check if user accepted discard on back pressed, or if cancel was pressed and task was saved.

Code cleanup

* Dialog dismiss listener added

Set isDiscardCancelled true to Dialog onDismiss

* Format code / cleanup
 2022-02-07 21:13:08 +01:00
Phillip Thelen
2e654c9c63 Design fixes 2022-01-31 13:54:01 +01:00
Phillip Thelen
c6305d9121 Fix minor issues 2022-01-31 11:46:31 +01:00
Phillip Thelen
7a13395773 Implement new version of adventure guide 2022-01-25 16:49:21 +01:00
Phillip Thelen
42fe386b6c Fixes #1688 2022-01-20 15:00:57 +01:00
Phillip Thelen
7273767c96 Rewrite PurchaseHandler to use BillingClient 4.0 2022-01-11 14:39:15 +01:00
Phillip Thelen
ea6adb6f16 Various settings fixes 2021-11-19 11:42:49 +01:00
Phillip Thelen
3b6251f114 Improve social login handling for logged in users 2021-11-10 15:12:29 +01:00
Phillip Thelen
2affda87a8 finish bugfix update 2021-10-08 10:58:04 +02:00
Phillip Thelen
9e3ba67f13 move more code to user viewmodel 2021-10-04 14:28:32 +02:00
Phillip Thelen
262e6252f6 Display quest status in menu 2021-10-01 19:03:42 +02:00
Phillip Thelen
3fce5a2a5c Fixes #1618 2021-09-22 11:26:01 +02:00
Phillip Thelen
ceb034490a update detekt 2021-09-14 14:53:55 +02:00
Phillip Thelen
d1c28a8dff Improve notification handling 2021-08-03 16:25:12 +02:00
Phillip Thelen
75879bc8d6 Finish up 3.3.1 2021-07-27 11:27:43 +02:00
Phillip Thelen
79a18eadf6 Fix various minor issues 2021-07-08 14:55:20 +02:00
Phillip Thelen
d42f0bd9db fix crashes 2021-07-08 12:39:42 +02:00
Phillip Thelen
658ee56f25 Improve all kind of list handling. Fixes #1578 2021-07-06 14:43:12 +02:00
Parminder Singh
f07477de8e
Fixed accessibility focus on Daily checkbox and todo checkbox. Also fixed transaction ran on button click. (#1570) 2021-07-06 14:18:36 +02:00
chh-2
8b887e8b10
Leaving group with challenges (#1535) 
* Revert "Getting Most Recent Translations"

* revert

* adding back in .example files

* string xml is a little funky

* userRepository added

* added strings and set up for if user has group challenges

* checking challenge/party membership

* Just trying to learn flowables

* Recognizes user as part of group challenges

* Log statements to track code flow

* Fixed the code flow

* Fixed the timing issue, not super elegant

* reverting GroupViewModel to its initial for now

* Adding functionality to remove challenges

* Added Chloe's guild changes

* quick guild fix

* Fixed guild modal formatting issue for consistency and added new strings to strings.xml

* Fixed an instance of if/else formatting

* Update GuildDetailFragment.kt

Corrected alert title for leaving a guild while not a member of Guild Challenges.

Co-authored-by: Isabel Lally <43449214+ilally93@users.noreply.github.com>
Co-authored-by: Isabel Lally <ilally93@gmail.com>
Co-authored-by: Isabel Lally <lallyir@g.cofc.edu>
Co-authored-by: Phillip Thelen <phillip@habitica.com>
 2021-06-16 12:14:24 +02:00
Phillip Thelen
d92fbced36 Fix avatar loading issues 2021-06-10 10:47:15 +02:00
Phillip Thelen
dbea9ce516 minor fixes 2021-06-09 20:15:32 +02:00
Phillip Thelen
b15bc38c0a Update deprecated code 2021-06-04 16:11:48 +02:00
Phillip Thelen
49ae3cb76c update some notification strings 2021-06-04 10:46:07 +02:00
Phillip Thelen
8611351cf0
Merge pull request #1538 from alejandro-rios/equip_mount_label_fix 
Equip mount label fix
 2021-06-01 10:42:52 +02:00
Alejandro Rios
058f42df87 Merge branch 'develop' into equip_mount_label_fix 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
 2021-05-26 20:32:31 -05:00
Phillip Thelen
b828f7c37e Fix a bunch of crashes 2021-05-18 10:41:05 +02:00
Phillip Thelen
fd8662129d Fixes #1546 2021-05-17 11:59:05 +02:00
Phillip Thelen
4222848058 add support to run surveys 2021-05-14 15:48:47 +02:00
Alejandro Rios
835b2a737e - User model included on Pet, Mount and Stable Adapters to verify item status. 
- Added "Equip" and "Unequip" strings in different languages.
 2021-04-21 15:20:54 -05:00
Phillip Thelen
20c5dd83a3 Improve event promo 2021-04-07 14:34:28 +02:00
Phillip Thelen
d3ae17f4ca show event stuff in menu 2021-04-01 14:16:07 +02:00
Phillip Thelen
1d30855936 Improve event support 2021-04-01 13:07:51 +02:00
Phillip Thelen
aaebb10bc0 Allow users to choose which view the app starts on 2021-02-23 16:17:40 +01:00
Phillip Thelen
4ea15382f5 improve guild list display 2021-02-17 11:03:34 +01:00
Phillip Thelen
5a87a6a5cc finalize 3.2 2021-02-12 12:36:06 +01:00
Phillip Thelen
cef71d6f80 Fixes #1482 2021-02-08 16:49:07 +01:00
Phillip Thelen
823cc9d58c mystery item dialog improvements 2021-02-08 14:32:46 +01:00
Phillip Thelen
5f9e5ca6df begin implementing guild list redesign 2021-02-08 14:32:46 +01:00
Phillip Thelen
7c60122452 Fixes #1411 2021-01-29 14:15:49 +01:00
Phillip Thelen
ddcd5ed640 Code Cleanup 2021-01-28 12:31:17 +01:00
Phillip Thelen
f5e5a987d9 add ability to view team task boards 2021-01-28 12:31:17 +01:00
Phillip Thelen
6438b8dc3b
Merge pull request #1474 from Mike-Antonacci/armoire-food-popup 
Fix extra spacing issue in armoireFood string
 2021-01-28 12:30:56 +01:00
Mike-Antonacci
d66bf5c7a2 Fix extra spacing issue in armoireFood string 2021-01-24 08:36:10 -07:00
Mike-Antonacci
7c78fc712d Fix typos in strings with two spaces instead of one 2021-01-20 17:47:55 -07:00
Phillip Thelen
c8e3622d40 Fix pluralization issue 2021-01-04 12:05:35 +01:00
Phillip Thelen
86ccb5258a update g1g1 2020-12-14 11:16:55 +01:00
Phillip Thelen
17764880e7 Alert fixes 2020-11-23 18:13:49 +01:00
Phillip Thelen
a50b91713c Fix various issues 2020-11-19 16:58:18 +01:00
Phillip Thelen
1b0bf4aef1 Fixes #1382 2020-11-10 18:24:35 +01:00
Phillip Thelen
0f91410987 implement basic modal for winning challenge 2020-11-03 12:54:03 +01:00
Phillip Thelen
75f6181cec Fix multiple minor issues 2020-11-02 18:20:56 +01:00
Phillip Thelen
eff62eaf53 update strings 2020-10-27 17:11:04 +01:00
Phillip Thelen
f1cc1652d7 Fixes #1393 2020-10-27 17:00:40 +01:00
Phillip Thelen
bb38e3d14f Implement fortify potion. Fixes #1343 2020-10-27 15:13:18 +01:00
Phillip Thelen
e3e53f0060 Fix various minor issues 2020-09-29 12:48:20 +02:00
Phillip Thelen
f2c21c0604 Fix release breaking issues 2020-09-22 16:10:15 +02:00
Phillip Thelen
499fca1d34 Fix minor bugs 2020-09-18 18:34:53 +02:00
Phillip Thelen
6d8e0a36c0
Merge branch 'develop' into collection-quest-indication 2020-09-18 09:39:01 +02:00
Phillip Thelen
e1886f6928 Fix styling issues 2020-09-15 09:28:34 +02:00
Phillip Thelen
2aed223100 Improve event handling 2020-09-10 11:23:01 +02:00
Phillip Thelen
0728eed1af Begin implementing dark mode 2020-09-04 18:17:34 +02:00
Phillip Thelen
be51217b65 Implement fall and spooky promo 2020-09-01 12:53:46 +02:00
Phillip Thelen
75fd669107 Implement disabling PMs. Fixes #1331 2020-08-26 16:29:37 +02:00
Phillip Thelen
c269bae53c Implement blocking users. Fixes #1330 2020-08-26 13:30:30 +02:00
Wojciech Matusiak
6e18bfe0ad Localized strings for indicated number of quest items 2020-08-25 23:35:15 +02:00
Phillip Thelen
fb4ab4203d Fix stable display issues 2020-07-30 12:44:01 +02:00
Phillip Thelen
9bc66ac90b Refactor pets and mounts screens 2020-07-24 12:19:56 +02:00
Phillip Thelen
5b72add5ef Improve deleting challenge tasks. Fixes #1328 2020-07-21 17:54:37 +02:00
Phillip Thelen
2fdf81583d Many Many more pet hatch modal states. Fixes #1342 2020-07-21 14:38:42 +02:00
Phillip Thelen
74bceccaf4 Improve using saddle. Fixes #937 2020-07-20 16:24:43 +02:00
Phillip Thelen
cc41b3853e rename To-Dos to To Do’s 2020-07-16 16:53:37 +02:00
Phillip Thelen
96682e106f Improve stable overview and add new dialog for unhatched 2020-07-16 08:38:49 +02:00
Phillip Thelen
c083deef26 AG fixes 2020-06-23 12:28:48 +02:00
Phillip Thelen
1b12b3924d Fix minor issues 2020-06-22 15:13:04 +02:00
Phillip Thelen
13829e34a5 Fix bulk warning handling 2020-06-18 17:30:19 +02:00
Phillip Thelen
efce4158b5 Finish up AG 2020-06-18 12:28:14 +02:00
Phillip Thelen
1c93ffdc4f Adventure guide improvements 2020-06-16 11:46:44 +02:00
Phillip Thelen
6a20d9fbd1 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into develop 2020-06-15 18:46:44 +02:00