Phillip Thelen
2c1102da55
Merge branch 'version/4.2' of https://github.com/HabitRPG/habitica-android into version/4.2
2023-05-04 15:26:40 +02:00
Phillip Thelen
742a1de9b5
Merge pull request #1962 from Hafizzle/Fiz/insufficient-level-class-gear-message
...
When user is below level 10, update locked class gear message
2023-05-04 15:25:59 +02:00
Phillip Thelen
9793f9cb05
fix small issues
2023-05-04 15:23:18 +02:00
Phillip Thelen
30773b13b9
allow rescinding invites from party screen
2023-05-04 14:51:14 +02:00
Phillip Thelen
5c46ffeaa0
l4p fixes
2023-05-03 17:12:36 +02:00
Hafiz
cadbcd17bd
When user is below level 10, update locked class gear message
...
Over level 10:
This item is only available to a specific class.
You can change your class from Settings.
Below level 10:
This item is only available to a specific class.
You can select a class after level 10.
2023-05-02 13:39:46 -04:00
Phillip Thelen
c2547252de
disable R8 full mode for now
2023-05-02 14:16:57 +02:00
Hafiz
c0a45a678f
Re-add message that show's when you don't have all the items / Check armoire count
2023-05-01 00:38:00 -04:00
Hafiz
2fa66ecbf4
Update state for when you have all armoire items
2023-04-06 14:09:32 -04:00
Hafiz
bb18865720
Sync up the change class confirmation messages
...
new combined text:
Do you want to change your class to [newClass] for 3 Gems?
This will refund your stat points, switch which gear is unlocked in shops, and change your available skills.
2023-03-29 11:13:20 -04:00
Hafiz
546a765cb1
Update party invite notification and party invite strings
2023-03-29 14:22:43 +02:00
Phillip Thelen
fb17a97e14
Minor improvements
2023-03-29 12:11:28 +02:00
Phillip Thelen
d5a8e1fe42
Add empty state
2023-03-28 12:03:10 +02:00
Phillip Thelen
c7fc3d70aa
show armoire in market if all gear was purchased
2023-03-27 16:23:15 +02:00
Phillip Thelen
eb8bd4bb16
Allow class to be switched from market
2023-03-27 16:23:15 +02:00
Hafiz
113080c991
Updated No Party design UI
...
No Party design changes
Updated Create party string resources
2023-03-23 02:05:39 -04:00
Phillip Thelen
2a78e89624
finalize first version of party seeking
2023-03-22 13:25:23 +01:00
Phillip Thelen
cdc105bec7
Initial party seeking version
2023-03-13 18:18:26 +01:00
Phillip Thelen
ec44f0ac31
migrate to hilt
2023-03-08 09:53:33 +01:00
Phillip Thelen
f80c169a3a
Minor dialog refactoring
2023-03-07 11:43:35 +01:00
Phillip Thelen
a499548ecc
Add option to pause/resume damage to app settigns
2023-03-07 09:30:51 +01:00
Phillip Thelen
b1c6f21557
minor event improvements
2023-01-16 19:55:55 +01:00
Phillip Thelen
6222b24df6
Fix some tests
2023-01-13 12:05:29 +01:00
Phillip Thelen
553cd19176
work in feedback
2023-01-13 10:24:09 +01:00
Phillip Thelen
1b81f0ce2f
fix bugs and crashes
2023-01-13 10:24:09 +01:00
Phillip Thelen
6f5aa2d6f7
Fix displaying banner
2023-01-13 10:24:09 +01:00
Phillip Thelen
382d3e685e
Merge branch 'version/4.1' of https://github.com/HabitRPG/habitica-android into version/4.1
...
# Conflicts:
# Habitica/res/values-iw/strings.xml
# Habitica/res/values-lt/strings.xml
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
2023-01-09 16:36:53 +01:00
Hafiz
c50a07db35
Feedback updates
2023-01-09 07:46:12 -05:00
Hafiz
9db4ee5d07
dialog that redirects to habitica notif system settings
...
summary shows "System Push Notifications for Habitica are disabled - you won't receive push notifications until they are enabled"
When a user attempts to turn on notifications again if they've previously denied the request or manually turned off notifs in system settings, they will be shown a dialog that redirects them to their system settings for Habitica notifications access
2023-01-08 20:34:46 -05:00
Phillip Thelen
a6d16c7e31
Many fixes
2023-01-06 10:49:24 +01:00
Phillip Thelen
a9f7375452
Begin allowing pet to be purchased
2023-01-04 15:47:01 +01:00
Phillip Thelen
beb20de968
preparing
2023-01-04 14:34:12 +01:00
Phillip Thelen
3cfdf48fe4
Fix many small issues
2022-12-21 14:52:36 +01:00
Phillip Thelen
e50f2f42be
various fixes
2022-12-20 13:37:10 +01:00
Phillip Thelen
bc685cdc82
multiple fixes
2022-12-20 13:37:10 +01:00
Phillip Thelen
80012485b4
dark mode improvements
2022-12-20 13:37:10 +01:00
Phillip Thelen
175f067083
various small improvements
2022-12-09 15:35:31 +01:00
Phillip Thelen
d32fe481e4
Display assigned avatars
2022-12-09 13:12:12 +01:00
Phillip Thelen
d7523c7bdf
Refactor Refactor
2022-12-09 13:12:12 +01:00
Phillip Thelen
b3686f72d4
Merge branch 'version/4.1' into Hafiz/update-sub-benefit-ui
2022-12-05 17:51:27 +01:00
Phillip Thelen
5049c622dd
Improve group plans support
2022-11-22 15:48:15 +01:00
Phillip Thelen
2ea1096622
build basic task summary view
2022-11-17 17:33:15 +01:00
Phillip Thelen
4520248ed8
More coroutine work
2022-11-07 13:37:43 +01:00
Phillip Thelen
fc96c6146e
implement new header and group task display
2022-09-26 18:52:24 +02:00
Hafiz
db371e3da8
Subscription detail updates
2022-09-12 23:19:49 -04:00
Hafiz
7ac30c819b
Updated sub benefit UI
2022-09-06 07:38:06 -04:00
Phillip Thelen
751e87338a
finalize 4.0.2
2022-09-02 17:09:21 +02:00
Phillip Thelen
327f76db72
Implement copy shared tasks setting
2022-08-31 11:33:51 +02:00
Phillip Thelen
247366821a
Merge branch 'main' of https://github.com/HabitRPG/habitica-android
2022-08-18 16:46:39 +02:00
Hafiz
c3bfa52366
Top line text roboto 16 medium
...
Category text lines roboto 16 regular
food description updated
less character spacing for supporting text
less character spacing for top text
2022-08-18 16:46:31 +02:00
Phillip Thelen
f80de5dc49
minor fixes
2022-08-18 15:10:27 +02:00
Phillip Thelen
513c1baa2a
challenge form fixes
2022-08-17 11:19:32 +02:00
Phillip Thelen
a7e3e11526
Improve group task display
2022-08-16 10:56:04 +02:00
Pranshu Jha
d347c09337
fixed typo in Habitica/res/values/strings.xml where Experience is spelled as Ezperience
2022-08-07 15:50:41 +05:30
Phillip Thelen
37a307184c
Fix RYA issues
2022-08-01 11:30:44 +02:00
Phillip Thelen
642ef76519
fix wear issues
2022-07-29 11:35:02 +02:00
Phillip Thelen
9ea87f93e7
Redeigned insufficient gem screen
2022-07-28 11:54:47 +02:00
Phillip Thelen
9b0ecc914e
Improve account delete flow for subscribed users
2022-07-28 09:57:19 +02:00
Phillip Thelen
a9e09db6bd
Fix account deletion issues
2022-07-28 09:49:45 +02:00
Phillip Thelen
de36a0351e
UI fixes
2022-07-27 17:05:22 +02:00
Hafiz
6fdcc212bc
Background Bottomsheet UI fixes
2022-07-27 10:09:49 -04:00
Phillip Thelen
17aa7a321c
minor improvements
2022-07-26 15:34:01 +02:00
Phillip Thelen
08980d1933
show account reset confirmation
2022-07-26 15:34:01 +02:00
Phillip Thelen
d5a3bb5635
Improve phone communication handling
2022-07-25 09:47:56 +02:00
Phillip Thelen
0d0c4e4038
Various minor improvements
2022-06-27 22:09:33 +02:00
Phillip Thelen
bd7caff14f
various improvements
2022-06-24 15:15:15 +02:00
Phillip Thelen
d5d9f6f39e
very basic task form
2022-06-14 16:20:06 +02:00
Phillip Thelen
430e49e6be
Implement basic authntication flow
2022-06-09 11:41:02 +02:00
Phillip Thelen
71356a491c
create empty missing activities
2022-06-06 12:17:13 +02:00
Phillip Thelen
4f4ac804b5
Very Very barebones wearos skeleton
2022-06-03 11:23:14 +02:00
Phillip Thelen
6c536fa655
move and create models for tasks as well
2022-06-03 11:22:56 +02:00
Phillip Thelen
857a5a6ed1
basic avatar display
...
# Conflicts:
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
2022-06-03 11:22:54 +02:00
Phillip Thelen
69ee64203c
Move code into common module
2022-06-02 09:14:08 +02:00
Phillip Thelen
fd4c49ecde
Implement new faint screen
2022-05-27 10:06:00 +02:00
Phillip Thelen
400c5f2fcf
Bottom sheet improvements
2022-05-27 10:06:00 +02:00
Phillip Thelen
52a5f0baf4
Armoire tweaks
2022-05-27 10:06:00 +02:00
Phillip Thelen
8a1c058fd5
Merge pull request #1764 from Hafizzle/Hafiz/Fixes#1722
...
Fixes#1722 - Show next hourglass month on sub info screen
2022-05-27 10:05:28 +02:00
Phillip Thelen
c7ef292721
Merge pull request #1773 from Hafizzle/Hafiz/#1523
...
#1523 - Update Reset/Delete Modals
2022-05-24 09:53:37 +02:00
Hafiz
1647026e5d
Updated forgot pw strings
2022-05-15 16:24:23 -04:00
Hafiz
ed7d7af9c2
Enable delete account for OAuth users
2022-05-15 15:55:21 -04:00
Hafiz
b4655d5f73
Handle basic monthly subscription user receive hourglass on four month
2022-05-15 14:13:03 -04:00
Phillip Thelen
037fd43a4a
Fixes #1746
2022-05-13 14:06:08 +02:00
Phillip Thelen
765204821a
Improve armoire display
2022-05-09 16:39:36 +02:00
Phillip Thelen
d1b0573564
Improve backgrounds
2022-05-02 17:26:52 +02:00
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
