Phillip Thelen
bfd7323813
Merge branch '3.5.2' into Fixes#1475
2022-03-18 11:49:06 +01:00
Phillip Thelen
a7f854f9cf
Merge pull request #1720 from Hafizzle/Fixes#1258
...
Fixes#1258 - Fixed reminders occurring randomly or not at all
2022-03-18 11:45:35 +01:00
Phillip Thelen
79ef909ecc
Merge pull request #1725 from Hafizzle/Fixes#1710
...
Hide gold from other user profiles
2022-03-18 11:43:30 +01:00
Hafiz
0542a8d3bf
Hide gold from other user profiles
2022-03-14 04:07:21 -04:00
Hafiz
92cf00def3
Code Cleanup & update create party string resources
2022-03-01 08:27:30 -05:00
Hafiz
7d086e79e4
setAlarmClock use replace setAndAllowWhileIdle
...
Replace setAndAllowWhileIdle with setAlarmClock due to both setAndAllowWhileIdle and setExactAndAllowWhileIdle have triggering alarm & notification restrictions - setAlarmClock is exact and does not limit alarm count.
2022-03-01 08:11:19 -05:00
Dhruv
33162b1a36
Show category of item in 'You dont have any item' error instead of null.
...
Closes #1663
2022-02-26 01:46:44 +05:30
Hafiz
ede1668da4
Update party name from name -> name's party
2022-02-18 11:12:23 -05:00
Hafiz
f645f22715
User null check
2022-02-18 10:52:08 -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
b31f66d423
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into develop
...
# Conflicts:
# Habitica/build.gradle
2022-02-18 14:19:03 +01:00
Phillip Thelen
4c3947f70a
Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5
2022-02-18 14:16:37 +01:00
Phillip Thelen
6cbeee971f
fix issue with subscriptions
2022-02-18 14:16:34 +01:00
Phillip Thelen
268d329e2d
Merge pull request #1706 from Hafizzle/#1349_Fix
...
#1349 Issue - Add ability to use transformation items from Items with same functionality as from Skills
2022-02-18 14:15:42 +01:00
Phillip Thelen
42a805c3b6
Merge branch '3.5' into #1349_Fix
2022-02-18 14:15:25 +01:00
Hafiz
c32fb7914d
Optimization
2022-02-16 12:13:30 -05:00
Hafiz
699462110e
Recreate implementation of special items to match other items
...
Recreate current implementation of special items to match other items (Eggs, hatching potions, etc).
Update Special items in Item tab to reflect changes
2022-02-14 15:32:31 -05:00
Phillip Thelen
67be57556e
Fix displaying customizations
2022-02-14 18:23:35 +01:00
Phillip Thelen
9aabe00874
Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5
2022-02-14 18:07:25 +01:00
Phillip Thelen
0fb85684ae
Fix
2022-02-14 18:07:22 +01:00
Hafizzle
1a5800c0ef
Added question mark to Discard string ( #1707 )
2022-02-14 15:41:42 +01:00
Hafiz
3d85075a26
Remove previously created unused methods
...
Remove previously created unused methods
Cleanup
2022-02-14 06:44:45 -05:00
Hafiz
d2774fa53c
Clean up logic
2022-02-14 06:41:52 -05:00
Hafiz
dfbcdc7125
Ability to use special items from Items added
2022-02-14 05:51:43 -05:00
Hafiz
741b59b46b
Transformation items added to Item special tab
2022-02-12 03:33:32 -05:00
Phillip Thelen
23e6e88466
fix handling new subscriptions
2022-02-08 16:14:01 +01:00
Phillip Thelen
83a22fb35b
Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5
2022-02-07 21:16:55 +01:00
Phillip Thelen
2dbda95725
fix equipping things
2022-02-07 21:16:52 +01: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
996142e16d
Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5
...
# Conflicts:
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
2022-02-02 11:59:38 +01:00
Joshua Soberg
7ca3a80859
Pluralize warrior to warriors for the sentence "Warriors benefit from a high Strength state." in the Warrior class description ( #1700 )
2022-02-02 10:25:08 +01:00
Hafizzle
2ed5a7d124
Fixed chat scroll ( #1703 )
...
Data observer added to Chat Adapter
2022-02-01 21:25:32 +01:00
Phillip Thelen
e08b3a9d5b
fix icon
2022-02-01 17:03:29 +01:00
Phillip Thelen
05227415e4
update present icon
2022-02-01 16:43:00 +01:00
Phillip Thelen
703f51d28d
Fix crashes
2022-02-01 12:14:13 +01:00
Phillip Thelen
354a73f6f1
Remove unused call
2022-02-01 11:33:45 +01:00
Phillip Thelen
dde0aa72b4
update dependencies
2022-02-01 10:17:14 +01:00
Phillip Thelen
46caca91e2
Start using a central userViewModel
2022-01-31 15:58:15 +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
009fc24fbd
Begin moving logic out of main activity
2022-01-28 16:24:13 +01:00
Phillip Thelen
a37de3f497
Fix issue with reporting messages
2022-01-27 13:10:45 +01:00
Phillip Thelen
7a13395773
Implement new version of adventure guide
2022-01-25 16:49:21 +01:00
Ahmet Burak Baraklı
777d3dc9fb
Update PurchaseDialog.kt ( #1693 )
2022-01-24 09:17:00 +01:00
Phillip Thelen
3ac9a652d1
Fixes #1670
2022-01-20 15:12:26 +01:00
Phillip Thelen
42fe386b6c
Fixes #1688
2022-01-20 15:00:57 +01:00
Alejandro Rios
c4753f8f32
- 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-01-20 11:55:52 +01:00
Phillip Thelen
bc7a9ebad4
Fully remove eventbus
2022-01-13 15:33:07 +01:00
Phillip Thelen
bfe0d3da71
Fixes #1685
2022-01-12 15:49:16 +01:00